diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-28 18:12:36 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-04-28 18:12:51 +0200 |
commit | 59077b43b099c68f08afa4ad220f93c5c98eeee7 (patch) | |
tree | 3d69b5704a30f096080f4c17d04b03fd9b03e564 /sd | |
parent | 4de83e2c322509c0fb1b989f7e4898728fc4a408 (diff) |
sd: fix GCC-4.7 build
Change-Id: Ie86c66fe643b6a8cbf2436c3f5a05388ae6a6119
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/Outliner.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/Ruler.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewTabBar.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/Window.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/createtabledesignpanel.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/fupoor.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/table/TableDesignPane.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index a23fa4463284..c1a2b8286d08 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -190,7 +190,7 @@ private: */ ::boost::weak_ptr<ViewShell> mpWeakViewShell; /// This window contains the view. - VclPtr<::sd::Window> mpWindow; + VclPtr< ::sd::Window> mpWindow; /// The document on whose objects and pages this class operates. SdDrawDocument* mpDrawDocument; diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 468428081523..801f7f2f2861 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -351,7 +351,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: } } -VclPtr<::vcl::Window> SlideLayoutController::createPopupWindow( ::vcl::Window* pParent ) +VclPtr< ::vcl::Window> SlideLayoutController::createPopupWindow( ::vcl::Window* pParent ) { return VclPtr<sd::LayoutToolbarMenu>::Create( *this, m_xFrame, pParent, mbInsertPage ); } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 674a8c6e7bc4..ac49bd266c27 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -278,7 +278,7 @@ private: protected: /// The core window that is made accessible. - VclPtr<::sd::Window> mpWindow; + VclPtr< ::sd::Window> mpWindow; /// The API window that is made accessible. ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 9186ebdf3f0e..8ad5147b28ef 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -50,7 +50,7 @@ public: using ::Ruler::SetNullOffset; protected: ::sd::View* pSdView; - VclPtr<::sd::Window> pSdWin; + VclPtr< ::sd::Window> pSdWin; DrawViewShell* pDrViewShell; RulerCtrlItem* pCtrlItem; bool bHorz; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 53ffbfd756f7..8bc7c6b2ea92 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -484,7 +484,7 @@ protected: bool mbHasRulers; /// The active window. - VclPtr<::sd::Window> mpActiveWindow; + VclPtr< ::sd::Window> mpActiveWindow; ::sd::View* mpView; FrameView* mpFrameView; @@ -568,7 +568,7 @@ protected: void doShow(); private: - VclPtr<::vcl::Window> mpParentWindow; + VclPtr< ::vcl::Window> mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit language used to display digits in text shapes. diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 82ed1d584df2..c4db3e6536ae 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -67,7 +67,7 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; - VclPtr<::TabControl> GetTabControl() const { return mpTabControl;} + VclPtr< ::TabControl> GetTabControl() const { return mpTabControl;} bool ActivatePage(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index bd83e2146491..50014b2fd4fc 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -150,7 +150,7 @@ public: void DropScroll (const Point& rMousePos); virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; protected: - VclPtr<::sd::Window> mpShareWin; + VclPtr< ::sd::Window> mpShareWin; Point maWinPos; Point maViewOrigin; Size maViewSize; diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index 44fc06e19334..7f5394767b0e 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -25,7 +25,7 @@ namespace sd { -VclPtr<::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); +VclPtr< ::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index f127a167bf8e..3973b13acb22 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -150,7 +150,7 @@ protected: ::sd::View* mpView; ViewShell* mpViewShell; - VclPtr<::sd::Window> mpWindow; + VclPtr< ::sd::Window> mpWindow; DrawDocShell* mpDocSh; SdDrawDocument* mpDoc; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index a85e3ca526d4..e52152957bfc 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -347,8 +347,8 @@ private: OUString maCharBuffer; Pointer maOldPointer; Pointer maPencil; - std::vector< VclPtr<::sd::Window> > maDrawModeWindows; - VclPtr<::sd::Window> mpOldActiveWindow; + std::vector< VclPtr< ::sd::Window> > maDrawModeWindows; + VclPtr< ::sd::Window> mpOldActiveWindow; Link maStarBASICGlobalErrorHdl; unsigned long mnChildMask; bool mbGridVisible; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 7d337d17c159..016c730a898e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -806,7 +806,7 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -VclPtr<::vcl::Window> createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase ) +VclPtr< ::vcl::Window> createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase ) { return VclPtr<TableDesignPane>::Create( pParent, rBase ); } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 0803ae9d43c1..b8862ca1650e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star; struct SdNavigatorDropEvent : public ExecuteDropEvent { DropTargetHelper& mrTargetHelper; - VclPtr<::sd::Window> mpTargetWindow; + VclPtr< ::sd::Window> mpTargetWindow; sal_uInt16 mnPage; sal_uInt16 mnLayer; |