Kaydet (Commit) a1b0d3ff authored tarafından Noel Grandin's avatar Noel Grandin

remove unused enumerators from PrinterCapType

Change-Id: Id4f788dfae64e7a9bcde16af2db2ddeafaf6900e
Reviewed-on: https://gerrit.libreoffice.org/34468Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 408c0a76
...@@ -117,6 +117,7 @@ def is_ignore(srcLoc): ...@@ -117,6 +117,7 @@ def is_ignore(srcLoc):
"basic/source/inc/filefmt.hxx", # FileOffset "basic/source/inc/filefmt.hxx", # FileOffset
"basic/source/inc/opcodes.hxx", # SbiOpcode "basic/source/inc/opcodes.hxx", # SbiOpcode
"sc/source/filter/inc/flttypes.hxx", # BiffTyp "sc/source/filter/inc/flttypes.hxx", # BiffTyp
"sc/inc/optutil.hxx", # ScOptionsUtil::KeyBindingType
# unit test code # unit test code
"cppu/source/uno/check.cxx", "cppu/source/uno/check.cxx",
# general weird nonsense going on # general weird nonsense going on
...@@ -148,6 +149,8 @@ def is_ignore(srcLoc): ...@@ -148,6 +149,8 @@ def is_ignore(srcLoc):
"basic/source/sbx/sbxres.hxx", # StringId "basic/source/sbx/sbxres.hxx", # StringId
"sc/source/core/tool/chartpos.cxx", # CellState "sc/source/core/tool/chartpos.cxx", # CellState
"sc/source/core/data/global2.cxx", # State "sc/source/core/data/global2.cxx", # State
"sc/inc/global.hxx", # ScAggregateFunc
"registry/source/reflcnst.hxx", #CPInfoTag
# Windows or OSX only # Windows or OSX only
"include/canvas/rendering/icolorbuffer.hxx", "include/canvas/rendering/icolorbuffer.hxx",
"include/vcl/commandevent.hxx", "include/vcl/commandevent.hxx",
...@@ -157,6 +160,7 @@ def is_ignore(srcLoc): ...@@ -157,6 +160,7 @@ def is_ignore(srcLoc):
"include/vcl/salbtype.hxx", "include/vcl/salbtype.hxx",
"include/vcl/commandevent.hxx", # CommandEvent, MediaCommand, ShowDialogId "include/vcl/commandevent.hxx", # CommandEvent, MediaCommand, ShowDialogId
"include/canvas/rendering/irendermodule.hxx", # canvas::IRenderModule::PrimitiveType "include/canvas/rendering/irendermodule.hxx", # canvas::IRenderModule::PrimitiveType
"sal/osl/unx/file.cxx", # FileHandle_Impl::Kind
# must match some other enum # must match some other enum
"include/editeng/bulletitem.hxx", "include/editeng/bulletitem.hxx",
"include/editeng/svxenum.hxx", "include/editeng/svxenum.hxx",
......
...@@ -75,13 +75,11 @@ enum class PrinterCapType ...@@ -75,13 +75,11 @@ enum class PrinterCapType
Copies = 2, Copies = 2,
CollateCopies = 3, CollateCopies = 3,
SetOrientation = 4, SetOrientation = 4,
SetPaperBin = 5,
SetPaperSize = 6, SetPaperSize = 6,
SetPaper = 7, SetPaper = 7,
Fax = 8, Fax = 8,
PDF = 9, PDF = 9,
ExternalDialog = 10, ExternalDialog = 10,
SetDuplex = 11,
UsePullModel = 12, UsePullModel = 12,
}; };
......
...@@ -281,10 +281,6 @@ sal_uInt32 AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapT ...@@ -281,10 +281,6 @@ sal_uInt32 AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, PrinterCapT
return 0xffff; return 0xffff;
case PrinterCapType::SetOrientation: case PrinterCapType::SetOrientation:
return 1; return 1;
case PrinterCapType::SetDuplex:
return 0;
case PrinterCapType::SetPaperBin:
return 0;
case PrinterCapType::SetPaperSize: case PrinterCapType::SetPaperSize:
return 1; return 1;
case PrinterCapType::SetPaper: case PrinterCapType::SetPaper:
......
...@@ -791,10 +791,6 @@ sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, Pr ...@@ -791,10 +791,6 @@ sal_uInt32 PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, Pr
} }
case PrinterCapType::SetOrientation: case PrinterCapType::SetOrientation:
return 1; return 1;
case PrinterCapType::SetDuplex:
return 1;
case PrinterCapType::SetPaperBin:
return 1;
case PrinterCapType::SetPaperSize: case PrinterCapType::SetPaperSize:
return 1; return 1;
case PrinterCapType::SetPaper: case PrinterCapType::SetPaper:
......
...@@ -1241,12 +1241,6 @@ sal_uInt32 WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, P ...@@ -1241,12 +1241,6 @@ sal_uInt32 WinSalInfoPrinter::GetCapabilities( const ImplJobSetup* pSetupData, P
return TRUE; return TRUE;
return FALSE; 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::SetPaperSize:
case PrinterCapType::SetPaper: case PrinterCapType::SetPaper:
nRet = ImplDeviceCaps( this, DC_PAPERS, nullptr, pSetupData ); nRet = ImplDeviceCaps( this, DC_PAPERS, nullptr, pSetupData );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment