summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-01 12:24:02 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-03 06:18:10 +0000
commit5157caf48ac28829afa141dbf8302b2e574a7a12 (patch)
tree278a2780373712088373c7bf69c0a5e1c673da8d /vcl/inc
parentdfad705d5f0c05cbebb4155d69212b35c58a22c0 (diff)
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>
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/printdlg.hxx4
-rw-r--r--vcl/inc/svids.hrc5
2 files changed, 2 insertions, 7 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