Kaydet (Commit) 20d1ee06 authored tarafından Noel Grandin's avatar Noel Grandin

convert PaperSizeApp to scoped enum

Change-Id: Ifd452ed0ca53223ae9b45e1b3b232fcfc6d29496
üst 6971da08
...@@ -553,7 +553,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) ...@@ -553,7 +553,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM ); SetMetricValue( *m_pPaperWidthEdit, aPaperSize.Width(), MAP_100TH_MM );
m_pPaperSizeBox->Clear(); 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 ); m_pPaperSizeBox->SetSelection( ePaper );
// application specific // application specific
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <vcl/lstbox.hxx> #include <vcl/lstbox.hxx>
enum PaperSizeApp enum class PaperSizeApp
{ {
PaperSizeStd, Std,
PaperSizeDraw Draw
}; };
class SVX_DLLPUBLIC PaperSizeListBox : public ListBox class SVX_DLLPUBLIC PaperSizeListBox : public ListBox
......
...@@ -147,7 +147,7 @@ bool SlideBackground::IsImpress() ...@@ -147,7 +147,7 @@ bool SlideBackground::IsImpress()
void SlideBackground::Initialize() void SlideBackground::Initialize()
{ {
mpPaperSizeBox->FillPaperSizeEntries( PaperSizeDraw ); mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Draw );
mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl)); mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl)); mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
mpCloseMaster->Hide(); mpCloseMaster->Hide();
......
...@@ -34,7 +34,7 @@ VCL_BUILDER_FACTORY(PaperSizeListBox); ...@@ -34,7 +34,7 @@ VCL_BUILDER_FACTORY(PaperSizeListBox);
void PaperSizeListBox::FillPaperSizeEntries( PaperSizeApp eApp ) 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 ) ); RID_SVXSTRARY_PAPERSIZE_STD : RID_SVXSTRARY_PAPERSIZE_DRAW ) );
sal_uInt32 nCnt = aPaperAry.Count(); sal_uInt32 nCnt = aPaperAry.Count();
......
...@@ -109,7 +109,7 @@ void PageFormatPanel::dispose() ...@@ -109,7 +109,7 @@ void PageFormatPanel::dispose()
void PageFormatPanel::Initialize() void PageFormatPanel::Initialize()
{ {
mpPaperSizeBox->FillPaperSizeEntries( PaperSizeStd ); mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Std );
mpPaperSizeBox->SetDropDownLineCount(6); mpPaperSizeBox->SetDropDownLineCount(6);
meUnit = maPaperSizeController.GetCoreMetric(); meUnit = maPaperSizeController.GetCoreMetric();
SetFieldUnit( *mpPaperWidth, meFUnit ); SetFieldUnit( *mpPaperWidth, meFUnit );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment