summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-05 09:36:04 +0200
committerNoel Grandin <noel@peralex.com>2016-09-05 10:38:51 +0200
commit3dfbf76e587b7ed7ee40ef2b4c4ef4805df22900 (patch)
tree27fc2ac80b24c55765c9960038dce6267d487248 /vcl
parent2c39312bae5973eeac408cb5a615db946c01517d (diff)
convert DuplexMode to scoped enum
Change-Id: Ic6f6e11437e75d17630683196c1b94dc25dd888f
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpprn.cxx8
-rw-r--r--vcl/source/gdi/jobset.cxx36
-rw-r--r--vcl/source/gdi/print3.cxx6
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx16
-rw-r--r--vcl/win/gdi/salprn.cxx16
5 files changed, 41 insertions, 41 deletions
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 35946f283b48..ac6cfdd26cab 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -113,7 +113,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
pKey = nullptr;
pValue = nullptr;
- pJobSetup->SetDuplexMode( DUPLEX_UNKNOWN );
+ pJobSetup->SetDuplexMode( DuplexMode::Unknown );
if( rData.m_pParser )
pKey = rData.m_pParser->getKey( OUString( "Duplex" ) );
if( pKey )
@@ -124,15 +124,15 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
pValue->m_aOption.startsWithIgnoreAsciiCase( "Simplex" )
)
{
- pJobSetup->SetDuplexMode( DUPLEX_OFF );
+ pJobSetup->SetDuplexMode( DuplexMode::Off );
}
else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexNoTumble" ) )
{
- pJobSetup->SetDuplexMode( DUPLEX_LONGEDGE );
+ pJobSetup->SetDuplexMode( DuplexMode::LongEdge );
}
else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexTumble" ) )
{
- pJobSetup->SetDuplexMode( DUPLEX_SHORTEDGE );
+ pJobSetup->SetDuplexMode( DuplexMode::ShortEdge );
}
}
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 0fc9a7cecb74..22de45135d15 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -53,7 +53,7 @@ ImplJobSetup::ImplJobSetup()
{
mnSystem = 0;
meOrientation = Orientation::Portrait;
- meDuplexMode = DUPLEX_UNKNOWN;
+ meDuplexMode = DuplexMode::Unknown;
mnPaperBin = 0;
mePaperFormat = PAPER_USER;
mnPaperWidth = 0;
@@ -271,7 +271,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
rJobData.SetSystem( SVBT16ToShort( pOldJobData->nSystem ) );
rJobData.SetDriverDataLen( SVBT32ToUInt32( pOldJobData->nDriverDataLen ) );
rJobData.SetOrientation( (Orientation)SVBT16ToShort( pOldJobData->nOrientation ) );
- rJobData.SetDuplexMode( DUPLEX_UNKNOWN );
+ rJobData.SetDuplexMode( DuplexMode::Unknown );
rJobData.SetPaperBin( SVBT16ToShort( pOldJobData->nPaperBin ) );
rJobData.SetPaperFormat( (Paper)SVBT16ToShort( pOldJobData->nPaperFormat ) );
rJobData.SetPaperWidth( (long)SVBT32ToUInt32( pOldJobData->nPaperWidth ) );
@@ -294,14 +294,14 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )
OUString aValue = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
if( aKey == "COMPAT_DUPLEX_MODE" )
{
- if( aValue == "DUPLEX_UNKNOWN" )
- rJobData.SetDuplexMode( DUPLEX_UNKNOWN );
- else if( aValue == "DUPLEX_OFF" )
- rJobData.SetDuplexMode( DUPLEX_OFF );
- else if( aValue == "DUPLEX_SHORTEDGE" )
- rJobData.SetDuplexMode( DUPLEX_SHORTEDGE );
- else if( aValue == "DUPLEX_LONGEDGE" )
- rJobData.SetDuplexMode( DUPLEX_LONGEDGE );
+ if( aValue == "DuplexMode::Unknown" )
+ rJobData.SetDuplexMode( DuplexMode::Unknown );
+ else if( aValue == "DuplexMode::Off" )
+ rJobData.SetDuplexMode( DuplexMode::Off );
+ else if( aValue == "DuplexMode::ShortEdge" )
+ rJobData.SetDuplexMode( DuplexMode::ShortEdge );
+ else if( aValue == "DuplexMode::LongEdge" )
+ rJobData.SetDuplexMode( DuplexMode::LongEdge );
}
else
rJobData.SetValueMap(aKey, aValue);
@@ -364,17 +364,17 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )
write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE");
switch( rJobData.GetDuplexMode() )
{
- case DUPLEX_UNKNOWN:
- write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN");
+ case DuplexMode::Unknown:
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DuplexMode::Unknown");
break;
- case DUPLEX_OFF:
- write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF");
+ case DuplexMode::Off:
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DuplexMode::Off");
break;
- case DUPLEX_SHORTEDGE:
- write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE");
+ case DuplexMode::ShortEdge:
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DuplexMode::ShortEdge");
break;
- case DUPLEX_LONGEDGE:
- write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE");
+ case DuplexMode::LongEdge:
+ write_uInt16_lenPrefixed_uInt8s_FromOString(rOStream, "DuplexMode::LongEdge");
break;
}
nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos);
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index f1f24aca4eaa..bfaab261502f 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1717,9 +1717,9 @@ void PrinterController::pushPropertiesToPrinter()
pVal->Value >>= nDuplex;
switch( nDuplex )
{
- case css::view::DuplexMode::OFF: mpImplData->mxPrinter->SetDuplexMode( DUPLEX_OFF ); break;
- case css::view::DuplexMode::LONGEDGE: mpImplData->mxPrinter->SetDuplexMode( DUPLEX_LONGEDGE ); break;
- case css::view::DuplexMode::SHORTEDGE: mpImplData->mxPrinter->SetDuplexMode( DUPLEX_SHORTEDGE ); break;
+ case css::view::DuplexMode::OFF: mpImplData->mxPrinter->SetDuplexMode( DuplexMode::Off ); break;
+ case css::view::DuplexMode::LONGEDGE: mpImplData->mxPrinter->SetDuplexMode( DuplexMode::LongEdge ); break;
+ case css::view::DuplexMode::SHORTEDGE: mpImplData->mxPrinter->SetDuplexMode( DuplexMode::ShortEdge ); break;
}
}
}
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 573518ed7868..58719429434b 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -211,7 +211,7 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
pKey = nullptr;
pValue = nullptr;
- pJobSetup->SetDuplexMode( DUPLEX_UNKNOWN );
+ pJobSetup->SetDuplexMode( DuplexMode::Unknown );
if( rData.m_pParser )
pKey = rData.m_pParser->getKey( OUString("Duplex") );
if( pKey )
@@ -222,15 +222,15 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
pValue->m_aOption.startsWithIgnoreAsciiCase( "Simplex" )
)
{
- pJobSetup->SetDuplexMode( DUPLEX_OFF);
+ pJobSetup->SetDuplexMode( DuplexMode::Off);
}
else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexNoTumble" ) )
{
- pJobSetup->SetDuplexMode( DUPLEX_LONGEDGE );
+ pJobSetup->SetDuplexMode( DuplexMode::LongEdge );
}
else if( pValue->m_aOption.equalsIgnoreAsciiCase( "DuplexTumble" ) )
{
- pJobSetup->SetDuplexMode( DUPLEX_SHORTEDGE );
+ pJobSetup->SetDuplexMode( DuplexMode::ShortEdge );
}
}
@@ -679,18 +679,18 @@ bool PspSalInfoPrinter::SetData(
pValue = nullptr;
switch( pJobSetup->GetDuplexMode() )
{
- case DUPLEX_OFF:
+ case DuplexMode::Off:
pValue = pKey->getValue( OUString("None") );
if( pValue == nullptr )
pValue = pKey->getValue( OUString("SimplexNoTumble") );
break;
- case DUPLEX_SHORTEDGE:
+ case DuplexMode::ShortEdge:
pValue = pKey->getValue( OUString("DuplexTumble") );
break;
- case DUPLEX_LONGEDGE:
+ case DuplexMode::LongEdge:
pValue = pKey->getValue( OUString("DuplexNoTumble") );
break;
- case DUPLEX_UNKNOWN:
+ case DuplexMode::Unknown:
default:
pValue = nullptr;
break;
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 3ec4097d067d..04478467380c 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -707,15 +707,15 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
if( nFlags & JobSetFlags::DUPLEXMODE )
{
- DuplexMode eDuplex = DUPLEX_UNKNOWN;
+ DuplexMode eDuplex = DuplexMode::Unknown;
if( (CHOOSE_DEVMODE(dmFields) & DM_DUPLEX) )
{
if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_SIMPLEX )
- eDuplex = DUPLEX_OFF;
+ eDuplex = DuplexMode::Off;
else if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_VERTICAL )
- eDuplex = DUPLEX_LONGEDGE;
+ eDuplex = DuplexMode::LongEdge;
else if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_HORIZONTAL )
- eDuplex = DUPLEX_SHORTEDGE;
+ eDuplex = DuplexMode::ShortEdge;
}
pSetupData->SetDuplexMode( eDuplex );
}
@@ -988,19 +988,19 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, const ImplJobSet
{
switch( pSetupData->GetDuplexMode() )
{
- case DUPLEX_OFF:
+ case DuplexMode::Off:
CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
CHOOSE_DEVMODE(dmDuplex) = DMDUP_SIMPLEX;
break;
- case DUPLEX_SHORTEDGE:
+ case DuplexMode::ShortEdge:
CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
CHOOSE_DEVMODE(dmDuplex) = DMDUP_HORIZONTAL;
break;
- case DUPLEX_LONGEDGE:
+ case DuplexMode::LongEdge:
CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
CHOOSE_DEVMODE(dmDuplex) = DMDUP_VERTICAL;
break;
- case DUPLEX_UNKNOWN:
+ case DuplexMode::Unknown:
break;
}
}