summaryrefslogtreecommitdiff
path: root/sw/source/uibase/sidebar
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-04-28 18:38:08 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-04-28 18:38:21 +0200
commit465f385b89bc03da5a30c7f9006883701b22e759 (patch)
tree98acef92ddb23222c8eabb6b34d1ca4c827eb504 /sw/source/uibase/sidebar
parent3e1dbbe21ddd9b40fde12da6cb680e91aa0a4e54 (diff)
sw: fix GCC-4.7 build
Change-Id: Iff6aee8e466c6968048bce751ca7929f18fb8860
Diffstat (limited to 'sw/source/uibase/sidebar')
-rw-r--r--sw/source/uibase/sidebar/PageColumnControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PageOrientationControl.hxx2
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx8
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.hxx8
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.hxx2
6 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 79e22ccfd40f..a7286d6ef849 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -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.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index f6d8d28cef61..26d5df3d47d3 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -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.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index 2bf1f6773e72..c08a944b4f07 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -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 48c7b5af3a2c..045ffe8d3e11 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 05119bf2b34a..19d391deaaf6 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();
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 91f63cea737f..f2875cccc013 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -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;