summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/tabpages/page.cxx6
-rw-r--r--editeng/source/items/paperinf.cxx2
-rw-r--r--include/vcl/prntypes.hxx2
-rw-r--r--sc/source/ui/docshell/docsh3.cxx2
-rw-r--r--sc/source/ui/view/printfun.cxx2
-rw-r--r--sd/source/core/sdpage.cxx8
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx4
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx20
-rw-r--r--sd/source/ui/view/drviews7.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx6
-rw-r--r--sw/source/core/view/vprint.cxx2
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--vcl/headless/svpprn.cxx2
-rw-r--r--vcl/osx/salprn.cxx16
-rw-r--r--vcl/source/gdi/jobset.cxx2
-rw-r--r--vcl/source/gdi/print.cxx10
-rw-r--r--vcl/source/window/printdlg.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx4
-rw-r--r--vcl/win/gdi/salprn.cxx6
20 files changed, 53 insertions, 53 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index ca206e6b9e40..7b54e08336d1 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -467,7 +467,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
// general page data
SvxNumType eNumType = SVX_ARABIC;
- bLandscape = ( mpDefPrinter->GetOrientation() == ORIENTATION_LANDSCAPE );
+ bLandscape = ( mpDefPrinter->GetOrientation() == Orientation::Landscape );
sal_uInt16 nUse = (sal_uInt16)SVX_PAGE_ALL;
pItem = GetItem( *rSet, SID_ATTR_PAGE );
@@ -1059,10 +1059,10 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void )
void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
{
MapMode aOldMode = mpDefPrinter->GetMapMode();
- Orientation eOri = ORIENTATION_PORTRAIT;
+ Orientation eOri = Orientation::Portrait;
if ( bLandscape )
- eOri = ORIENTATION_LANDSCAPE;
+ eOri = Orientation::Landscape;
Orientation eOldOri = mpDefPrinter->GetOrientation();
mpDefPrinter->SetOrientation( eOri );
mpDefPrinter->SetMapMode( MAP_TWIP );
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 118d532d3a1c..42d49e768369 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -77,7 +77,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter )
const Orientation eOrient = pPrinter->GetOrientation();
Size aSize( GetPaperSize( ePaper ) );
// for Landscape exchange the pages, has already been done by SV
- if ( eOrient == ORIENTATION_LANDSCAPE )
+ if ( eOrient == Orientation::Landscape )
Swap( aSize );
return aSize;
}
diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index 06cf3f800196..169271ecc63e 100644
--- a/include/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
@@ -28,7 +28,7 @@
enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE };
-enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
+enum class Orientation { Portrait, Landscape };
enum class PrintQueueFlags
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 3d9408c80bdb..baf390806fce 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -538,7 +538,7 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlag
{
const SvxPageItem& rOldItem = static_cast<const SvxPageItem&>(rSet.Get(ATTR_PAGE));
bool bWasLand = rOldItem.IsLandscape();
- bool bNewLand = ( pNewPrinter->GetOrientation() == ORIENTATION_LANDSCAPE );
+ bool bNewLand = ( pNewPrinter->GetOrientation() == Orientation::Landscape );
if (bNewLand != bWasLand)
{
SvxPageItem aNewItem( rOldItem );
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 089069736b8a..b23ffcdb163e 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2587,7 +2587,7 @@ void ScPrintFunc::ApplyPrintSettings()
Size aEnumSize = aPageSize;
- pPrinter->SetOrientation( bLandscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT );
+ pPrinter->SetOrientation( bLandscape ? Orientation::Landscape : Orientation::Portrait );
if ( bLandscape )
{
// landscape is always interpreted as a rotation by 90 degrees !
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index d794cff6e101..f7e073fcadea 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -126,11 +126,11 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
if (aPageSize.Width() > aPageSize.Height())
{
- meOrientation = ORIENTATION_LANDSCAPE;
+ meOrientation = Orientation::Landscape;
}
else
{
- meOrientation = ORIENTATION_PORTRAIT;
+ meOrientation = Orientation::Portrait;
}
}
@@ -1732,11 +1732,11 @@ void SdPage::SetSize(const Size& aSize)
// we initialize the orientation.
if (aSize.Width() > aSize.Height())
{
- meOrientation = ORIENTATION_LANDSCAPE;
+ meOrientation = Orientation::Landscape;
}
else
{
- meOrientation = ORIENTATION_PORTRAIT;
+ meOrientation = Orientation::Portrait;
}
}
}
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 02df0da5defc..b4c6095b64c1 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -239,7 +239,7 @@ const SfxItemSet* FuPage::ExecuteDialog( vcl::Window* pParent )
SvxPageItem aPageItem( SID_ATTR_PAGE );
aPageItem.SetDescName( mpPage->GetName() );
aPageItem.SetPageUsage( (SvxPageUsage) SVX_PAGE_ALL );
- aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE );
+ aPageItem.SetLandscape( mpPage->GetOrientation() == Orientation::Landscape );
aPageItem.SetNumType( mpDoc->GetPageNumType() );
aNewAttr.Put( aPageItem );
@@ -524,7 +524,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
mpDoc->SetPageNumType(static_cast<const SvxPageItem*>(pPoolItem)->GetNumType());
eOrientation = static_cast<const SvxPageItem*>(pPoolItem)->IsLandscape() ?
- ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
+ Orientation::Landscape : Orientation::Portrait;
if( mpPage->GetOrientation() != eOrientation )
bSetPageSizeAndBorder = true;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 11269c1dec0b..206cc01f233b 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -694,7 +694,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
if(!::cppu::enum2int( nEnum, aValue ))
throw lang::IllegalArgumentException();
- Orientation eOri = (((view::PaperOrientation)nEnum) == view::PaperOrientation_PORTRAIT)?ORIENTATION_PORTRAIT:ORIENTATION_LANDSCAPE;
+ Orientation eOri = (((view::PaperOrientation)nEnum) == view::PaperOrientation_PORTRAIT)?Orientation::Portrait:Orientation::Landscape;
if( eOri != GetPage()->GetOrientation() )
{
@@ -1054,7 +1054,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
break;
case WID_PAGE_ORIENT:
aAny <<= view::PaperOrientation(
- GetPage()->GetOrientation() == ORIENTATION_PORTRAIT
+ GetPage()->GetOrientation() == Orientation::Portrait
? view::PaperOrientation_PORTRAIT
: view::PaperOrientation_LANDSCAPE);
break;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 3eee8172e629..886f21f6305a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -266,7 +266,7 @@ namespace {
msPageString(),
maPrintSize(0,0),
maPageSize(0,0),
- meOrientation(ORIENTATION_PORTRAIT),
+ meOrientation(Orientation::Portrait),
maMap(),
mbPrintMarkedOnly(bPrintMarkedOnly)
{}
@@ -1374,14 +1374,14 @@ private:
PrintInfo& rInfo)
{
SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
- rInfo.meOrientation = ORIENTATION_PORTRAIT;
+ rInfo.meOrientation = Orientation::Portrait;
if( ! mpOptions->IsBooklet())
{
rInfo.meOrientation = pDocument->GetSdPage(0, ePageKind)->GetOrientation();
}
else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
- rInfo.meOrientation = ORIENTATION_LANDSCAPE;
+ rInfo.meOrientation = Orientation::Landscape;
// Draw and Notes should usually abide by their specified paper size
Size aPaperSize;
@@ -1400,10 +1400,10 @@ private:
if (mpOptions->IsPrinterPreferred(pDocument->GetDocumentType()))
{
- if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
+ if( (rInfo.meOrientation == Orientation::Landscape &&
(aPaperSize.Width() < aPaperSize.Height()))
||
- (rInfo.meOrientation == ORIENTATION_PORTRAIT &&
+ (rInfo.meOrientation == Orientation::Portrait &&
(aPaperSize.Width() > aPaperSize.Height()))
)
{
@@ -1788,10 +1788,10 @@ private:
rInfo.meOrientation = rMaster.GetOrientation();
const Size aPaperSize (rInfo.mpPrinter->GetPaperSize());
- if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
+ if( (rInfo.meOrientation == Orientation::Landscape &&
(aPaperSize.Width() < aPaperSize.Height()))
||
- (rInfo.meOrientation == ORIENTATION_PORTRAIT &&
+ (rInfo.meOrientation == Orientation::Portrait &&
(aPaperSize.Width() > aPaperSize.Height()))
)
{
@@ -2003,7 +2003,7 @@ private:
Size aPrintSize_2 (rInfo.maPrintSize);
Size aPageSize_2 (rInfo.maPageSize);
- if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
+ if (rInfo.meOrientation == Orientation::Landscape)
aPrintSize_2.Width() >>= 1;
else
aPrintSize_2.Height() >>= 1;
@@ -2032,7 +2032,7 @@ private:
aStdMap,
aMap));
- if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
+ if (rInfo.meOrientation == Orientation::Landscape)
{
aOffset.X() = ( ( aAdjustedPrintSize.Width() >> 1 ) - rInfo.maPageSize.Width() ) >> 1;
aOffset.Y() = ( aAdjustedPrintSize.Height() - rInfo.maPageSize.Height() ) >> 1;
@@ -2093,7 +2093,7 @@ private:
{
const std::pair<sal_uInt16, sal_uInt16> aPair (aPairVector[nIndex]);
Point aSecondOffset (aOffset);
- if (rInfo.meOrientation == ORIENTATION_LANDSCAPE)
+ if (rInfo.meOrientation == Orientation::Landscape)
aSecondOffset.X() += aAdjustedPrintSize.Width() / 2;
else
aSecondOffset.Y() += aAdjustedPrintSize.Height() / 2;
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 83e3b28c8ac2..c821eef43d40 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1650,7 +1650,7 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
if (pPage != nullptr && GetDoc() != nullptr)
{
SvxPageItem aPageItem(SID_ATTR_PAGE);
- aPageItem.SetLandscape( pPage->GetOrientation() == ORIENTATION_LANDSCAPE );
+ aPageItem.SetLandscape( pPage->GetOrientation() == Orientation::Landscape );
rSet.Put(SvxSizeItem( SID_ATTR_PAGE_SIZE, pPage->GetSize() ));
rSet.Put(aPageItem);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 59def840f466..cbac68bbfbbc 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1353,7 +1353,7 @@ void SdrPage::SetOrientation(Orientation eOri)
// square: handle like portrait format
Size aSiz(GetSize());
if (aSiz.Width()!=aSiz.Height()) {
- if ((eOri==ORIENTATION_PORTRAIT) == (aSiz.Width()>aSiz.Height())) {
+ if ((eOri==Orientation::Portrait) == (aSiz.Width()>aSiz.Height())) {
SetSize(Size(aSiz.Height(),aSiz.Width()));
}
}
@@ -1362,9 +1362,9 @@ void SdrPage::SetOrientation(Orientation eOri)
Orientation SdrPage::GetOrientation() const
{
// square: handle like portrait format
- Orientation eRet=ORIENTATION_PORTRAIT;
+ Orientation eRet=Orientation::Portrait;
Size aSiz(GetSize());
- if (aSiz.Width()>aSiz.Height()) eRet=ORIENTATION_LANDSCAPE;
+ if (aSiz.Width()>aSiz.Height()) eRet=Orientation::Landscape;
return eRet;
}
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 7fe0801418e4..354328a401cf 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -223,7 +223,7 @@ void SwViewShell::ChgAllPageOrientation( Orientation eOri )
SET_CURR_SHELL( this );
const size_t nAll = GetDoc()->GetPageDescCnt();
- bool bNewOri = eOri != ORIENTATION_PORTRAIT;
+ bool bNewOri = eOri != Orientation::Portrait;
for( size_t i = 0; i < nAll; ++ i )
{
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index fb869051b73e..a341cfca03ed 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -925,9 +925,9 @@ MOVEPAGE:
if(pPPVPD)
{
SfxPrinter* pPrinter = GetPrinter( true );
- if((pPrinter->GetOrientation() == ORIENTATION_LANDSCAPE)
+ if((pPrinter->GetOrientation() == Orientation::Landscape)
!= pPPVPD->GetLandscape())
- pPrinter->SetOrientation(pPPVPD->GetLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT);
+ pPrinter->SetOrientation(pPPVPD->GetLandscape() ? Orientation::Landscape : Orientation::Portrait);
}
::SetAppPrintOptions( m_pViewWin->GetViewShell(), false );
m_bNormalPrint = false;
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index c5c8ea550d2b..35946f283b48 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -60,7 +60,7 @@ inline int PtTo10Mu( int nPoints ) { return (int)((((double)nPoints)*35.27777778
static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
{
- pJobSetup->SetOrientation( (Orientation)(rData.m_eOrientation == orientation::Landscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT) );
+ pJobSetup->SetOrientation( (Orientation)(rData.m_eOrientation == orientation::Landscape ? Orientation::Landscape : Orientation::Portrait) );
// copy page size
OUString aPaper;
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index d151f6cf6890..fa2f88b13c61 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -49,7 +49,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
mbJob( false ),
mpPrinter( nil ),
mpPrintInfo( nil ),
- mePageOrientation( ORIENTATION_PORTRAIT ),
+ mePageOrientation( Orientation::Portrait ),
mnStartPageOffsetX( 0 ),
mnStartPageOffsetY( 0 ),
mnCurPageRangeStart( 0 ),
@@ -65,10 +65,10 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
mpPrintInfo = [pShared copy];
[mpPrintInfo setPrinter: mpPrinter];
#if MACOSX_SDK_VERSION >= 1090
- mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationPortrait) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
+ mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationPortrait) ? Orientation::Landscape : Orientation::Portrait;
[mpPrintInfo setOrientation: NSPaperOrientationPortrait];
#else
- mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT;
+ mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? Orientation::Landscape : Orientation::Portrait;
[mpPrintInfo setOrientation: NSPortraitOrientation];
#endif
}
@@ -109,7 +109,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
NSSize aPaperSize = [mpPrintInfo paperSize];
NSRect aImageRect = [mpPrintInfo imageablePageBounds];
- if( mePageOrientation == ORIENTATION_PORTRAIT )
+ if( mePageOrientation == Orientation::Portrait )
{
// move mirrored CTM back into paper
double dX = 0, dY = aPaperSize.height;
@@ -205,7 +205,7 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation )
{
- Orientation ePaperOrientation = ORIENTATION_PORTRAIT;
+ Orientation ePaperOrientation = Orientation::Portrait;
const PaperInfo* pPaper = matchPaper( i_nWidth, i_nHeight, ePaperOrientation );
if( pPaper )
@@ -323,7 +323,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
o_rOutWidth = static_cast<long>( aImageRect.size.width * fXScaling );
o_rOutHeight = static_cast<long>( aImageRect.size.height * fYScaling );
- if( mePageOrientation == ORIENTATION_LANDSCAPE )
+ if( mePageOrientation == Orientation::Landscape )
{
std::swap( o_rOutWidth, o_rOutHeight );
std::swap( o_rPageWidth, o_rPageHeight );
@@ -669,7 +669,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight,
const_cast<AquaSalInfoPrinter*>(this)->InitPaperFormats( nullptr );
const PaperInfo* pMatch = nullptr;
- o_rOrientation = ORIENTATION_PORTRAIT;
+ o_rOrientation = Orientation::Portrait;
for( int n = 0; n < 2 ; n++ )
{
for( size_t i = 0; i < m_aPaperFormats.size(); i++ )
@@ -681,7 +681,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight,
return pMatch;
}
}
- o_rOrientation = ORIENTATION_LANDSCAPE;
+ o_rOrientation = Orientation::Landscape;
std::swap( i_nWidth, i_nHeight );
}
return pMatch;
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 6424eaacafc3..0fc9a7cecb74 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -52,7 +52,7 @@ struct Impl364JobSetupData
ImplJobSetup::ImplJobSetup()
{
mnSystem = 0;
- meOrientation = ORIENTATION_PORTRAIT;
+ meOrientation = Orientation::Portrait;
meDuplexMode = DUPLEX_UNKNOWN;
mnPaperBin = 0;
mePaperFormat = PAPER_USER;
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index d2c0f87c3834..8b0aa60a055b 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1322,7 +1322,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
rData.SetPaperFormat(
ImplGetPaperFormat( rPaperInfo.getWidth(),
rPaperInfo.getHeight() ));
- rData.SetOrientation( ORIENTATION_PORTRAIT );
+ rData.SetOrientation( Orientation::Portrait );
bFound = true;
break;
}
@@ -1348,7 +1348,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
rData.SetPaperFormat(
ImplGetPaperFormat( rPaperInfo.getWidth(),
rPaperInfo.getHeight() ));
- rData.SetOrientation( ORIENTATION_LANDSCAPE );
+ rData.SetOrientation( Orientation::Landscape );
bFound = true;
break;
}
@@ -1359,7 +1359,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
{
sal_Int64 nBestMatch = SAL_MAX_INT64;
int nBestIndex = 0;
- Orientation eBestOrientation = ORIENTATION_PORTRAIT;
+ Orientation eBestOrientation = Orientation::Portrait;
for( int i = 0; i < nPaperCount; i++ )
{
const PaperInfo& rPaperInfo = GetPaperInfo( i );
@@ -1372,7 +1372,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
{
nBestMatch = nMatch;
nBestIndex = i;
- eBestOrientation = ORIENTATION_PORTRAIT;
+ eBestOrientation = Orientation::Portrait;
}
// check landscape match
@@ -1383,7 +1383,7 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe
{
nBestMatch = nMatch;
nBestIndex = i;
- eBestOrientation = ORIENTATION_LANDSCAPE;
+ eBestOrientation = Orientation::Landscape;
}
}
const PaperInfo& rBestInfo = GetPaperInfo( nBestIndex );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 258df1778a59..0ddf2f6c4570 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -654,7 +654,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
// setup sizes for N-Up
Size aNupSize( maPController->getPrinter()->PixelToLogic(
maPController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
- if( maPController->getPrinter()->GetOrientation() == ORIENTATION_LANDSCAPE )
+ if( maPController->getPrinter()->GetOrientation() == Orientation::Landscape )
{
maNupLandscapeSize = aNupSize;
maNupPortraitSize = Size( aNupSize.Height(), aNupSize.Width() );
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index e9b9d87e6884..573518ed7868 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -156,7 +156,7 @@ inline int TenMuToPt( int nUnits ) { return (int)((((double)nUnits)/35.27777778)
static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
{
pJobSetup->SetOrientation( (Orientation)(rData.m_eOrientation == orientation::Landscape ?
- ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT));
+ Orientation::Landscape : Orientation::Portrait));
// copy page size
OUString aPaper;
@@ -668,7 +668,7 @@ bool PspSalInfoPrinter::SetData(
// merge orientation if necessary
if( nSetDataFlags & JobSetFlags::ORIENTATION )
- aData.m_eOrientation = pJobSetup->GetOrientation() == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
+ aData.m_eOrientation = pJobSetup->GetOrientation() == Orientation::Landscape ? orientation::Landscape : orientation::Portrait;
// merge duplex if necessary
if( nSetDataFlags & JobSetFlags::DUPLEXMODE )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 140ecf3a8cd5..3ec4097d067d 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -466,9 +466,9 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
if ( nFlags & JobSetFlags::ORIENTATION )
{
if ( CHOOSE_DEVMODE(dmOrientation) == DMORIENT_PORTRAIT )
- pSetupData->SetOrientation( ORIENTATION_PORTRAIT );
+ pSetupData->SetOrientation( Orientation::Portrait );
else if ( CHOOSE_DEVMODE(dmOrientation) == DMORIENT_LANDSCAPE )
- pSetupData->SetOrientation( ORIENTATION_LANDSCAPE );
+ pSetupData->SetOrientation( Orientation::Landscape );
}
// PaperBin
@@ -732,7 +732,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, const ImplJobSet
if ( nFlags & JobSetFlags::ORIENTATION )
{
CHOOSE_DEVMODE(dmFields) |= DM_ORIENTATION;
- if ( pSetupData->GetOrientation() == ORIENTATION_PORTRAIT )
+ if ( pSetupData->GetOrientation() == Orientation::Portrait )
CHOOSE_DEVMODE(dmOrientation) = DMORIENT_PORTRAIT;
else
CHOOSE_DEVMODE(dmOrientation) = DMORIENT_LANDSCAPE;
generated by cgit (git 2.34.1) at 2024-06-18 21:39:22 +0000