commit 20d1ee06c0242948e7e512db5465fdbdedc70916
author Noel Grandin <noel@peralex.com> Tue Aug 23 14:27:36 2016 +0200
committer Noel Grandin <noel@peralex.com> Wed Aug 24 08:47:57 2016 +0200
tree 94b4bd7364197156c5650d7a9eb9f9d0c42809ce
parent 6971da088718321b3790ce4d1d7b238dc8b76ce8

convert PaperSizeApp to scoped enum

Change-Id: Ifd452ed0ca53223ae9b45e1b3b232fcfc6d29496

cui/source/tabpages/page.cxx

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 61d5da6..ca206e6 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -553,7 +553,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
    SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM );
    m_pPaperSizeBox->Clear();

    m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? PaperSizeStd : PaperSizeDraw );
    m_pPaperSizeBox->FillPaperSizeEntries( ( ePaperStart == PAPER_A3 ) ? PaperSizeApp::Std : PaperSizeApp::Draw );
    m_pPaperSizeBox->SetSelection( ePaper );

    // application specific

include/svx/papersizelistbox.hxx

diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx
index 4ff24e3..2d2cf5b 100644
--- a/include/svx/papersizelistbox.hxx
+++ b/include/svx/papersizelistbox.hxx
@@ -24,10 +24,10 @@
#include <svx/svxdllapi.h>
#include <vcl/lstbox.hxx>

enum PaperSizeApp
enum class PaperSizeApp
{
    PaperSizeStd,
    PaperSizeDraw
    Std,
    Draw
};

class SVX_DLLPUBLIC PaperSizeListBox : public ListBox

sd/source/ui/sidebar/SlideBackground.cxx

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 370f27a..4d7b6f4 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -147,7 +147,7 @@ bool SlideBackground::IsImpress()

void SlideBackground::Initialize()
{
    mpPaperSizeBox->FillPaperSizeEntries( PaperSizeDraw );
    mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Draw );
    mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
    mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
    mpCloseMaster->Hide();

svx/source/dialog/papersizelistbox.cxx

diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 30dbf0e..67401cf 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -34,7 +34,7 @@ VCL_BUILDER_FACTORY(PaperSizeListBox);

void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp )
{
    ResStringArray aPaperAry( SVX_RES( ( eApp == PaperSizeStd  ) ?
    ResStringArray aPaperAry( SVX_RES( ( eApp == PaperSizeApp::Std  ) ?
                              RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW ) );
    sal_uInt32 nCnt = aPaperAry.Count();

sw/source/uibase/sidebar/PageFormatPanel.cxx

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index c61e304..6d7bac0 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -109,7 +109,7 @@ void PageFormatPanel::dispose()

void PageFormatPanel::Initialize()
{
    mpPaperSizeBox->FillPaperSizeEntries( PaperSizeStd );
    mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Std );
    mpPaperSizeBox->SetDropDownLineCount(6);
    meUnit = maPaperSizeController.GetCoreMetric();
    SetFieldUnit( *mpPaperWidth, meFUnit );