[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/osx vcl/unx vcl/win

[Noel Grandin]

 compilerplugins/clang/unusedenumconstants.py |    4 ++++
 include/vcl/prntypes.hxx                     |    2 --
 vcl/osx/salprn.cxx                           |    4 ----
 vcl/unx/generic/print/genprnpsp.cxx          |    4 ----
 vcl/win/gdi/salprn.cxx                       |    6 ------
 5 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit a1b0d3ff53c9cd4299a2372d72eb9eba1fe48e80
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 20 12:01:15 2017 +0200

    remove unused enumerators from PrinterCapType
    
    Change-Id: Id4f788dfae64e7a9bcde16af2db2ddeafaf6900e
    Reviewed-on: https://gerrit.libreoffice.org/34468
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 4404081..7835287 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -117,6 +117,7 @@ def is_ignore(srcLoc):
          "basic/source/inc/filefmt.hxx", # FileOffset
          "basic/source/inc/opcodes.hxx", #  SbiOpcode
          "sc/source/filter/inc/flttypes.hxx", # BiffTyp
+         "sc/inc/optutil.hxx", # ScOptionsUtil::KeyBindingType
         # unit test code
          "cppu/source/uno/check.cxx",
         # general weird nonsense going on
@@ -148,6 +149,8 @@ def is_ignore(srcLoc):
          "basic/source/sbx/sbxres.hxx", # StringId
          "sc/source/core/tool/chartpos.cxx", # CellState
          "sc/source/core/data/global2.cxx", # State
+         "sc/inc/global.hxx", # ScAggregateFunc
+         "registry/source/reflcnst.hxx", #CPInfoTag
         # Windows or OSX only
          "include/canvas/rendering/icolorbuffer.hxx",
          "include/vcl/commandevent.hxx",
@@ -157,6 +160,7 @@ def is_ignore(srcLoc):
          "include/vcl/salbtype.hxx",
          "include/vcl/commandevent.hxx", # CommandEvent, MediaCommand, ShowDialogId
          "include/canvas/rendering/irendermodule.hxx", # canvas::IRenderModule::PrimitiveType
+         "sal/osl/unx/file.cxx", # FileHandle_Impl::Kind
         # must match some other enum
          "include/editeng/bulletitem.hxx",
          "include/editeng/svxenum.hxx",
diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index f39544b..ea67565 100644
--- a/include/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
@@ -75,13 +75,11 @@ enum class PrinterCapType
     Copies             = 2,
     CollateCopies      = 3,
     SetOrientation     = 4,
-    SetPaperBin        = 5,
     SetPaperSize       = 6,
     SetPaper           = 7,
     Fax                = 8,
     PDF                = 9,
     ExternalDialog     = 10,
-    SetDuplex          = 11,
     UsePullModel       = 12,
 };
 
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 562e4d0..7d48ffa 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -281,10 +281,6 @@ sal_uInt32 AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapT
             return 0xffff;
         case PrinterCapType::SetOrientation:
             return 1;
-        case PrinterCapType::SetDuplex:
-            return 0;
-        case PrinterCapType::SetPaperBin:
-            return 0;
         case PrinterCapType::SetPaperSize:
             return 1;
         case PrinterCapType::SetPaper:
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 25bc3a1..7f6d70f 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -791,10 +791,6 @@ sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, Pr
         }
         case PrinterCapType::SetOrientation:
             return 1;
-        case PrinterCapType::SetDuplex:
-            return 1;
-        case PrinterCapType::SetPaperBin:
-            return 1;
         case PrinterCapType::SetPaperSize:
             return 1;
         case PrinterCapType::SetPaper:
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 63c0c24..bd3dd8a 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1241,12 +1241,6 @@ sal_uInt32 WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, P
                 return TRUE;
             return FALSE;
 
-        case PrinterCapType::SetPaperBin:
-            nRet = ImplDeviceCaps( this, DC_BINS, nullptr, pSetupData );
-            if ( nRet && (nRet != GDI_ERROR) )
-                return TRUE;
-            return FALSE;
-
         case PrinterCapType::SetPaperSize:
         case PrinterCapType::SetPaper:
             nRet = ImplDeviceCaps( this, DC_PAPERS, nullptr, pSetupData );