Kaydet (Commit) 465f385b authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: fix GCC-4.7 build

Change-Id: Iff6aee8e466c6968048bce751ca7929f18fb8860
üst 3e1dbbe2
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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,
......
......@@ -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;
......
......@@ -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;
......
......@@ -41,7 +41,7 @@ public:
virtual void dispose() SAL_OVERRIDE;
private:
VclPtr<::svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet;
VclPtr< ::svx::sidebar::ValueSetWithTextControl> mpOrientationValueSet;
bool mbLandscape;
......
......@@ -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(
......
......@@ -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();
......
......@@ -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;
......
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