diff options
Diffstat (limited to 'sw/source/uibase/sidebar')
-rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageOrientationControl.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageOrientationControl.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.hxx | 16 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.hxx | 4 |
10 files changed, 32 insertions, 32 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 4bec55f89fc3..d73654b7d0fb 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -36,8 +36,8 @@ PageColumnControl::PageColumnControl( PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) ) - , mpColumnValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_COLUMN) ) + , mpColumnValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_COLUMN) ) ) , maMoreButton( VclPtr<PushButton>::Create( this, SW_RES(CB_COLUMN_MORE) ) ) , mnColumnType( nColumnType ) , mrPagePropPanel(rPanel) @@ -84,7 +84,7 @@ void PageColumnControl::dispose() { mpColumnValueSet.disposeAndClear(); maMoreButton.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index a7286d6ef849..955323c10159 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -35,7 +35,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageColumnControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageColumnControl( @@ -48,7 +48,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpColumnValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpColumnValueSet; VclPtr<PushButton> maMoreButton; sal_uInt16 mnColumnType; diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index aee46d43e074..66ff08c66ec5 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -48,8 +48,8 @@ PageMarginControl::PageMarginControl( const bool bLandscape, const FieldUnit eFUnit, const SfxMapUnit eUnit ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) - , mpMarginValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_MARGIN) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_MARGIN) ) + , mpMarginValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, 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))) @@ -154,7 +154,7 @@ void PageMarginControl::dispose() maBottom.disposeAndClear(); maBottomMarginEdit.disposeAndClear(); maWidthHeightField.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } void PageMarginControl::SetMetricFieldMaxValues(const Size& rPageSize) diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 26d5df3d47d3..12a6754b83aa 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -47,7 +47,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageMarginControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageMarginControl( @@ -64,7 +64,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpMarginValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpMarginValueSet; VclPtr<FixedText> maCustom; VclPtr<FixedText> maLeft; diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 9e1b284a7328..8dede92c9980 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -32,8 +32,8 @@ PageOrientationControl::PageOrientationControl( vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) - , mpOrientationValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) + , mpOrientationValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::IMAGE_TEXT, this, SW_RES(VS_ORIENTATION) ) ) , mbLandscape( bLandscape ) , mrPagePropPanel(rPanel) { @@ -69,7 +69,7 @@ PageOrientationControl::~PageOrientationControl() void PageOrientationControl::dispose() { mpOrientationValueSet.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index c08a944b4f07..a2ceecff2a5a 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -30,7 +30,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageOrientationControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageOrientationControl( @@ -41,7 +41,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet; bool mbLandscape; diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 045ffe8d3e11..89ac394d3443 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -295,7 +295,7 @@ void PagePropertyPanel::Initialize() mpBindings->Update( SID_ATTR_PAGE_SIZE ); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageOrientationControl>::Create( pParent, *this , mpPageItem->IsLandscape() ); } @@ -372,7 +372,7 @@ void PagePropertyPanel::ClosePageOrientationPopup() maOrientationPopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageMarginControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageMarginControl>::Create( @@ -423,7 +423,7 @@ void PagePropertyPanel::ClosePageMarginPopup() maMarginPopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageSizeControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageSizeControl>::Create( @@ -458,7 +458,7 @@ void PagePropertyPanel::ClosePageSizePopup() maSizePopup.Hide(); } -VclPtr< ::svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ) +VclPtr< svx::sidebar::PopupControl> PagePropertyPanel::CreatePageColumnControl( svx::sidebar::PopupContainer* pParent ) { return VclPtr<PageColumnControl>::Create( diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 19d391deaaf6..81721360d0bc 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -72,11 +72,11 @@ namespace sw { namespace sidebar { return mpBindings; } - VclPtr< ::svx::sidebar::PopupControl> CreatePageOrientationControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageOrientationControl( svx::sidebar::PopupContainer* pParent ); void ExecuteOrientationChange( const bool bLandscape ); void ClosePageOrientationPopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageMarginControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageMarginControl( svx::sidebar::PopupContainer* pParent ); void ExecuteMarginLRChange( const long nPageLeftMargin, const long nPageRightMargin ); @@ -86,11 +86,11 @@ namespace sw { namespace sidebar { void ExecutePageLayoutChange( const bool bMirrored ); void ClosePageMarginPopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageSizeControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageSizeControl( svx::sidebar::PopupContainer* pParent ); void ExecuteSizeChange( const Paper ePaper ); void ClosePageSizePopup(); - VclPtr< ::svx::sidebar::PopupControl> CreatePageColumnControl( ::svx::sidebar::PopupContainer* pParent ); + VclPtr< svx::sidebar::PopupControl> CreatePageColumnControl( svx::sidebar::PopupContainer* pParent ); void ExecuteColumnChange( const sal_uInt16 nColumnType ); void ClosePageColumnPopup(); @@ -190,10 +190,10 @@ namespace sw { namespace sidebar { ::sfx2::sidebar::ControllerItem m_aSwPagePgMetricControl; // popups - ::svx::sidebar::Popup maOrientationPopup; - ::svx::sidebar::Popup maMarginPopup; - ::svx::sidebar::Popup maSizePopup; - ::svx::sidebar::Popup maColumnPopup; + svx::sidebar::Popup maOrientationPopup; + svx::sidebar::Popup maMarginPopup; + svx::sidebar::Popup maSizePopup; + svx::sidebar::Popup maColumnPopup; const css::uno::Reference< css::document::XUndoManager > mxUndoManager; diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index bc9c0b9be335..5ff924683c21 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -41,8 +41,8 @@ PageSizeControl::PageSizeControl( const Paper ePaper, const bool bLandscape, const FieldUnit eFUnit ) - : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) ) - , mpSizeValueSet( new ::svx::sidebar::ValueSetWithTextControl( ::svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, this, SW_RES(VS_SIZE) ) ) + : svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_SIZE) ) + , mpSizeValueSet( new svx::sidebar::ValueSetWithTextControl( svx::sidebar::ValueSetWithTextControl::TEXT_TEXT, 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 ) @@ -151,7 +151,7 @@ void PageSizeControl::dispose() mpSizeValueSet.disposeAndClear(); maMoreButton.disposeAndClear(); maWidthHeightField.disposeAndClear(); - ::svx::sidebar::PopupControl::dispose(); + svx::sidebar::PopupControl::dispose(); } IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index f2875cccc013..ae4756af6604 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -38,7 +38,7 @@ namespace sw { namespace sidebar { class PagePropertyPanel; class PageSizeControl - : public ::svx::sidebar::PopupControl + : public svx::sidebar::PopupControl { public: PageSizeControl( @@ -51,7 +51,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: - VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpSizeValueSet; + VclPtr< svx::sidebar::ValueSetWithTextControl> mpSizeValueSet; VclPtr<PushButton> maMoreButton; // hidden metric field VclPtr<MetricField> maWidthHeightField; |