Convert NupOrderType to scoped enum

Change-Id: If04deb1bc080679d1b71d155f7568ab89cb5888d
Reviewed-on: https://gerrit.libreoffice.org/25765
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 15 insertions, 28 deletions

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index be7641109f64..cf1dea21243b 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -74,7 +74,7 @@ namespace vcl
 
         class ShowNupOrderWindow : public vcl::Window
         {
-            int mnOrderMode;
+            NupOrderType mnOrderMode;
             int mnRows;
             int mnColumns;
             void ImplInitSettings();
@@ -85,7 +85,7 @@ namespace vcl
 
             virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
 
-            void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
+            void setValues( NupOrderType i_nOrderMode, int i_nColumns, int i_nRows )
             {
                 mnOrderMode = i_nOrderMode;
                 mnRows = i_nRows;
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index e23fdc5bf384..7c81ecc6f43f 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -68,11 +68,6 @@
 #define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT           1
 #define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE          2
 
-#define SV_PRINT_PRT_NUP_ORDER_LRTB                     0
-#define SV_PRINT_PRT_NUP_ORDER_TBLR                     1
-#define SV_PRINT_PRT_NUP_ORDER_TBRL                     2
-#define SV_PRINT_PRT_NUP_ORDER_RLTB                     3
-
 #define SV_PRINT_NATIVE_STRINGS                      2050
 
 #define SV_HELPTEXT_CLOSE                           10000
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index f2e73c623fb6..8b17c70ff3e7 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -433,7 +433,7 @@ bool Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
         if( nValue >= 0 )
             aMPS.nVerticalSpacing = nValue;
         aMPS.bDrawBorder = xController->getBoolProperty( "NUpDrawBorder", aMPS.bDrawBorder );
-        aMPS.nOrder = static_cast<PrinterController::NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", aMPS.nOrder ));
+        aMPS.nOrder = static_cast<NupOrderType>(xController->getIntProperty( "NUpSubPageOrder", (sal_Int32)aMPS.nOrder ));
         aMPS.aPaperSize = xController->getPrinter()->PixelToLogic( xController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
         css::beans::PropertyValue* pPgSizeVal = xController->getValue( OUString( "NUpPaperSize" ) );
         css::awt::Size aSizeVal;
@@ -1143,19 +1143,19 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
                 long nCellX = 0, nCellY = 0;
                 switch( rMPS.nOrder )
                 {
-                case PrinterController::LRTB:
+                case NupOrderType::LRTB:
                     nCellX = (nSubPage % rMPS.nColumns);
                     nCellY = (nSubPage / rMPS.nColumns);
                     break;
-                case PrinterController::TBLR:
+                case NupOrderType::TBLR:
                     nCellX = (nSubPage / rMPS.nRows);
                     nCellY = (nSubPage % rMPS.nRows);
                     break;
-                case PrinterController::RLTB:
+                case NupOrderType::RLTB:
                     nCellX = rMPS.nColumns - 1 - (nSubPage % rMPS.nColumns);
                     nCellY = (nSubPage / rMPS.nColumns);
                     break;
-                case PrinterController::TBRL:
+                case NupOrderType::TBRL:
                     nCellX = rMPS.nColumns - 1 - (nSubPage / rMPS.nRows);
                     nCellY = (nSubPage % rMPS.nRows);
                     break;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 0363ea6a3a18..9f16bf40fb45 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -306,7 +306,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
 
 PrintDialog::ShowNupOrderWindow::ShowNupOrderWindow( vcl::Window* i_pParent )
     : Window( i_pParent, WB_NOBORDER )
-    , mnOrderMode( 0 )
+    , mnOrderMode( NupOrderType::LRTB )
     , mnRows( 1 )
     , mnColumns( 1 )
 {
@@ -353,19 +353,19 @@ void PrintDialog::ShowNupOrderWindow::Paint(vcl::RenderContext& rRenderContext,
         int nX = 0, nY = 0;
         switch (mnOrderMode)
         {
-        case SV_PRINT_PRT_NUP_ORDER_LRTB:
+        case NupOrderType::LRTB:
             nX = (i % mnColumns);
             nY = (i / mnColumns);
             break;
-        case SV_PRINT_PRT_NUP_ORDER_TBLR:
+        case NupOrderType::TBLR:
             nX = (i / mnRows);
             nY = (i % mnRows);
             break;
-        case SV_PRINT_PRT_NUP_ORDER_RLTB:
+        case NupOrderType::RLTB:
             nX = mnColumns - 1 - (i % mnColumns);
             nY = (i / mnColumns);
             break;
-        case SV_PRINT_PRT_NUP_ORDER_TBRL:
+        case NupOrderType::TBRL:
             nX = mnColumns - 1 - (i / mnRows);
             nY = (i % mnRows);
             break;
@@ -469,7 +469,7 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll
     mpBorderCB->Check( i_rMPS.bDrawBorder );
     mpNupRowsEdt->SetValue( i_rMPS.nRows );
     mpNupColEdt->SetValue( i_rMPS.nColumns );
-    mpNupOrderBox->SelectEntryPos( i_rMPS.nOrder );
+    mpNupOrderBox->SelectEntryPos( (sal_Int32)i_rMPS.nOrder );
     if( i_rMPS.nRows != 1 || i_rMPS.nColumns != 1 )
     {
         mpNupPagesBox->SelectEntryPos( mpNupPagesBox->GetEntryCount()-1 );
@@ -1492,15 +1492,7 @@ void PrintDialog::updateNup()
 
     aMPS.bDrawBorder        = maNUpPage.mpBorderCB->IsChecked();
 
-    int nOrderMode = maNUpPage.mpNupOrderBox->GetSelectEntryPos();
-    if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTB )
-        aMPS.nOrder = PrinterController::LRTB;
-    else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBLR )
-        aMPS.nOrder = PrinterController::TBLR;
-    else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_RLTB )
-        aMPS.nOrder = PrinterController::RLTB;
-    else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TBRL )
-        aMPS.nOrder = PrinterController::TBRL;
+    aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectEntryPos();
 
     int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectEntryPos();
     if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
@@ -1522,7 +1514,7 @@ void PrintDialog::updateNup()
 
     maPController->setMultipage( aMPS );
 
-    maNUpPage.mpNupOrderWin->setValues( nOrderMode, nCols, nRows );
+    maNUpPage.mpNupOrderWin->setValues( aMPS.nOrder, nCols, nRows );
 
     preparePreview( true, true );
 }