summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-05 10:38:05 +0200
committerNoel Grandin <noel@peralex.com>2016-09-05 10:38:51 +0200
commit74ab2a686144545255a2f07dde3f14f66f37753e (patch)
treedecafc594c3800e162c29d7602deba05b251edfb /vcl
parent2e3717837ffe257f98c854ebde2c7a0ac0ff27fb (diff)
Convert PPDKey::SetupType to scoped enum
Change-Id: I7c39c9bd4bc3b8fe82840665906f8d520e2e2d2a
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/print/printerjob.cxx6
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx14
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 0adb3342284c..1f9689ac9bb2 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -731,11 +731,11 @@ bool PrinterJob::writeFeatureList( osl::File* pFile, const JobData& rJob, bool b
bool bEmit = false;
if( bDocumentSetup )
{
- if( pKey->getSetupType() == PPDKey::DocumentSetup )
+ if( pKey->getSetupType() == PPDKey::SetupType::DocumentSetup )
bEmit = true;
}
- if( pKey->getSetupType() == PPDKey::PageSetup ||
- pKey->getSetupType() == PPDKey::AnySetup )
+ if( pKey->getSetupType() == PPDKey::SetupType::PageSetup ||
+ pKey->getSetupType() == PPDKey::SetupType::AnySetup )
bEmit = true;
if( bEmit )
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 231cd9019f1a..18de0da3a981 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1261,17 +1261,17 @@ void PPDParser::parseOrderDependency(const OString& rLine)
pKey->m_nOrderDependency = nOrder;
if( aSetup == "ExitServer" )
- pKey->m_eSetupType = PPDKey::ExitServer;
+ pKey->m_eSetupType = PPDKey::SetupType::ExitServer;
else if( aSetup == "Prolog" )
- pKey->m_eSetupType = PPDKey::Prolog;
+ pKey->m_eSetupType = PPDKey::SetupType::Prolog;
else if( aSetup == "DocumentSetup" )
- pKey->m_eSetupType = PPDKey::DocumentSetup;
+ pKey->m_eSetupType = PPDKey::SetupType::DocumentSetup;
else if( aSetup == "PageSetup" )
- pKey->m_eSetupType = PPDKey::PageSetup;
+ pKey->m_eSetupType = PPDKey::SetupType::PageSetup;
else if( aSetup == "JCLSetup" )
- pKey->m_eSetupType = PPDKey::JCLSetup;
+ pKey->m_eSetupType = PPDKey::SetupType::JCLSetup;
else
- pKey->m_eSetupType = PPDKey::AnySetup;
+ pKey->m_eSetupType = PPDKey::SetupType::AnySetup;
}
void PPDParser::parseConstraint( const OString& rLine )
@@ -1504,7 +1504,7 @@ PPDKey::PPDKey( const OUString& rKey ) :
m_bUIOption( false ),
m_eUIType( PickOne ),
m_nOrderDependency( 100 ),
- m_eSetupType( AnySetup )
+ m_eSetupType( SetupType::AnySetup )
{
}