mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd: fix GCC-4.7 build

Browse Source 
Change-Id: Ie86c66fe643b6a8cbf2436c3f5a05388ae6a6119
This commit is contained in:
Miklos Vajna
2015-04-28 18:12:36 +02:00
parent 4de83e2c32
commit 59077b43b0
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/inc/Outliner.hxx
View File

@@ -190,7 +190,7 @@ private:
*/ */
::boost::weak_ptr<ViewShell> mpWeakViewShell; ::boost::weak_ptr<ViewShell> mpWeakViewShell;
/// This window contains the view. /// This window contains the view.
VclPtr<::sd::Window> mpWindow; VclPtr< ::sd::Window> mpWindow;
/// The document on whose objects and pages this class operates. /// The document on whose objects and pages this class operates.
SdDrawDocument* mpDrawDocument; SdDrawDocument* mpDrawDocument;

2
sd/source/ui/controller/slidelayoutcontroller.cxx
View File

@@ -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 ); return VclPtr<sd::LayoutToolbarMenu>::Create( *this, m_xFrame, pParent, mbInsertPage );
} }

2
sd/source/ui/inc/AccessibleDocumentViewBase.hxx
View File

@@ -278,7 +278,7 @@ private:
protected: protected:
/// The core window that is made accessible. /// The core window that is made accessible.
VclPtr<::sd::Window> mpWindow; VclPtr< ::sd::Window> mpWindow;
/// The API window that is made accessible. /// The API window that is made accessible.
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>

2
sd/source/ui/inc/Ruler.hxx
View File

@@ -50,7 +50,7 @@ public:
using ::Ruler::SetNullOffset; using ::Ruler::SetNullOffset;
protected: protected:
::sd::View* pSdView; ::sd::View* pSdView;
VclPtr<::sd::Window> pSdWin; VclPtr< ::sd::Window> pSdWin;
DrawViewShell* pDrViewShell; DrawViewShell* pDrViewShell;
RulerCtrlItem* pCtrlItem; RulerCtrlItem* pCtrlItem;
bool bHorz; bool bHorz;

4
sd/source/ui/inc/ViewShell.hxx
View File

@@ -484,7 +484,7 @@ protected:
bool mbHasRulers; bool mbHasRulers;
/// The active window. /// The active window.
VclPtr<::sd::Window> mpActiveWindow; VclPtr< ::sd::Window> mpActiveWindow;
::sd::View* mpView; ::sd::View* mpView;
FrameView* mpFrameView; FrameView* mpFrameView;
@@ -568,7 +568,7 @@ protected:
void doShow(); void doShow();
private: private:
VclPtr<::vcl::Window> mpParentWindow; VclPtr< ::vcl::Window> mpParentWindow;
/** This window updater is used to keep all relevant windows up to date /** 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 with reference to the digit language used to display digits in text
shapes. shapes.

2
sd/source/ui/inc/ViewTabBar.hxx
View File

@@ -67,7 +67,7 @@ public:
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
VclPtr<::TabControl> GetTabControl() const { return mpTabControl;} VclPtr< ::TabControl> GetTabControl() const { return mpTabControl;}
bool ActivatePage(); bool ActivatePage();

2
sd/source/ui/inc/Window.hxx
View File

@@ -150,7 +150,7 @@ public:
void DropScroll (const Point& rMousePos); void DropScroll (const Point& rMousePos);
virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE;
protected: protected:
VclPtr<::sd::Window> mpShareWin; VclPtr< ::sd::Window> mpShareWin;
Point maWinPos; Point maWinPos;
Point maViewOrigin; Point maViewOrigin;
Size maViewSize; Size maViewSize;

2
sd/source/ui/inc/createtabledesignpanel.hxx
View File

@@ -25,7 +25,7 @@
namespace sd { namespace sd {
VclPtr<::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); VclPtr< ::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase);
} }

2
sd/source/ui/inc/fupoor.hxx
View File

@@ -150,7 +150,7 @@ protected:
::sd::View* mpView; ::sd::View* mpView;
ViewShell* mpViewShell; ViewShell* mpViewShell;
VclPtr<::sd::Window> mpWindow; VclPtr< ::sd::Window> mpWindow;
DrawDocShell* mpDocSh; DrawDocShell* mpDocSh;
SdDrawDocument* mpDoc; SdDrawDocument* mpDoc;

4
sd/source/ui/slideshow/slideshowimpl.hxx
View File

@@ -347,8 +347,8 @@ private:
OUString maCharBuffer; OUString maCharBuffer;
Pointer maOldPointer; Pointer maOldPointer;
Pointer maPencil; Pointer maPencil;
std::vector< VclPtr<::sd::Window> > maDrawModeWindows; std::vector< VclPtr< ::sd::Window> > maDrawModeWindows;
VclPtr<::sd::Window> mpOldActiveWindow; VclPtr< ::sd::Window> mpOldActiveWindow;
Link maStarBASICGlobalErrorHdl; Link maStarBASICGlobalErrorHdl;
unsigned long mnChildMask; unsigned long mnChildMask;
bool mbGridVisible; bool mbGridVisible;

2
sd/source/ui/table/TableDesignPane.cxx
View File

@@ -806,7 +806,7 @@ short TableDesignDialog::Execute()
return RET_CANCEL; 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 ); return VclPtr<TableDesignPane>::Create( pParent, rBase );
} }

2
sd/source/ui/view/sdview2.cxx
View File

@@ -76,7 +76,7 @@ using namespace ::com::sun::star;
struct SdNavigatorDropEvent : public ExecuteDropEvent struct SdNavigatorDropEvent : public ExecuteDropEvent
{ {
DropTargetHelper& mrTargetHelper; DropTargetHelper& mrTargetHelper;
VclPtr<::sd::Window> mpTargetWindow; VclPtr< ::sd::Window> mpTargetWindow;
sal_uInt16 mnPage; sal_uInt16 mnPage;
sal_uInt16 mnLayer; sal_uInt16 mnLayer;