sw/inc/viewsh.hxx | 2 +-
sw/source/ui/index/cnttab.cxx | 2 +-
sw/source/uibase/inc/pview.hxx | 2 +-
sw/source/uibase/inc/view.hxx | 2 +-
sw/source/uibase/sidebar/PageColumnControl.hxx | 2 +-
sw/source/uibase/sidebar/PageMarginControl.hxx | 2 +-
sw/source/uibase/sidebar/PageOrientationControl.hxx | 2 +-
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 8 ++++----
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 8 ++++----
sw/source/uibase/sidebar/PageSizeControl.hxx | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 465f385b89bc03da5a30c7f9006883701b22e759
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Apr 28 18:38:08 2015 +0200
sw: fix GCC-4.7 build
Change-Id: Iff6aee8e466c6968048bce751ca7929f18fb8860
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 610d963..f093028 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -128,7 +128,7 @@ class SW_DLLPUBLIC SwViewShell : public
sw::Ring<SwViewShell>
SwViewShellImp *mpImp; // Core-internals of SwViewShell.
// The pointer is never 0.
- VclPtr<::vcl::Window> mpWin; ///< = 0 during printing or pdf export
+ VclPtr< ::vcl::Window> mpWin; ///< = 0 during printing or pdf export
VclPtr<OutputDevice> mpOut; ///< Window, Printer, VirtDev, ...
VclPtr<OutputDevice> mpTmpRef; // Temporariy reference device. Is used
// during (printer depending) prospect
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index df015f1..3eb2ffc 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -141,7 +141,7 @@ typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base;
class SwEntryBrowseBox : public SwEntryBrowseBox_Base
{
VclPtr<Edit> aCellEdit;
- VclPtr<::svt::CheckBoxControl> aCellCheckBox;
+ VclPtr< ::svt::CheckBoxControl> aCellCheckBox;
OUString sSearch;
OUString sAlternative;
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 1f03c4b..fc29eeb 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
VclPtr<ImageButton> pPageUpBtn,
pPageDownBtn;
// dummy window for filling the lower right edge when both scrollbars are
active
- VclPtr<::vcl::Window> pScrollFill;
+ VclPtr< ::vcl::Window> pScrollFill;
sal_uInt16 mnPageCount;
bool bNormalPrint;
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index bdd9ffd..7a121d5 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.hxx
@@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
bool m_bHScrollbarEnabled;
bool m_bVScrollbarEnabled;
- VclPtr<::vcl::Window> m_pScrollFill; // dummy window for filling the
lower right edge
+ VclPtr< ::vcl::Window> m_pScrollFill; // dummy window for filling the
lower right edge
// when both scrollbars are active
VclPtr<SvxRuler> m_pHRuler,
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx
b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 79e22cc..a7286d6 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 f6d8d28..26d5df3 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 2bf1f67..c08a944 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 48c7b5a..045ffe8 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 05119bf..19d391d 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 91f63ce..f2875cc 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
