diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-23 10:03:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-24 08:47:57 +0200 |
| commit | c33a1d47de07c327013979b1165f72298eaded45 (patch) | |
| tree | 593a7cbf57f9c59bbea42d25bed622012ced1ee1 /sw | |
| parent | f72baec784e9956702c429b8464c6d1b624e5481 (diff) | |
convert ViewType to scoped enum
Change-Id: I4904ceae765f3452d8695adcf73043a4a42bbf0b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageOrientationControl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 3b2c3d32439b..8d2697993bc4 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -37,7 +37,7 @@ PageColumnControl::PageColumnControl( const sal_uInt16 nColumnType, const bool bLandscape ) : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) ) - , mpColumnValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) ) + , mpColumnValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::ControlType::ImageText, this, SW_RES(VS_COLUMN) ) ) , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_COLUMN_MORE) ) ) , mnColumnType( nColumnType ) , mrPagePropPanel(rPanel) diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index d9dce30a3915..04b198f2ecc9 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -49,7 +49,7 @@ PageMarginControl::PageMarginControl( const FieldUnit eFUnit, const MapUnit eUnit ) : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) - , mpMarginValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) ) + , mpMarginValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::ControlType::ImageText, this, SW_RES(VS_MARGIN) ) ) , maCustom(VclPtr<FixedText>::Create(this, SW_RES(FT_CUSTOM))) , maLeft(VclPtr<FixedText>::Create(this, SW_RES(FT_LEFT))) , maInner(VclPtr<FixedText>::Create(this, SW_RES(FT_INNER))) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index a9f3fa689cf2..6fecc469f525 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -33,7 +33,7 @@ PageOrientationControl::PageOrientationControl( PagePropertyPanel& rPanel, const bool bLandscape ) : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) - , mpOrientationValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) ) + , mpOrientationValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::ControlType::ImageText, this, SW_RES(VS_ORIENTATION) ) ) , mbLandscape( bLandscape ) , mrPagePropPanel(rPanel) { diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index a6a30e92de68..98784d3e625f 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -42,7 +42,7 @@ PageSizeControl::PageSizeControl( const bool bLandscape, const FieldUnit eFUnit ) : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) ) - , mpSizeValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) ) + , mpSizeValueSet( VclPtr<svx::sidebar::ValueSetWithTextControl>::Create( svx::sidebar::ValueSetWithTextControl::ControlType::TextText, this, SW_RES(VS_SIZE) ) ) , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_SIZE_MORE) ) ) , maWidthHeightField( VclPtr<MetricField>::Create( this, SW_RES(FLD_WIDTH_HEIGHT) ) ) , mePaper( ePaper ) |