Kaydet (Commit) 59077b43 authored tarafından Miklos Vajna's avatar Miklos Vajna

sd: fix GCC-4.7 build

Change-Id: Ie86c66fe643b6a8cbf2436c3f5a05388ae6a6119
üst 4de83e2c
...@@ -190,7 +190,7 @@ private: ...@@ -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;
......
...@@ -351,7 +351,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: ...@@ -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 );
} }
......
...@@ -278,7 +278,7 @@ private: ...@@ -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>
......
...@@ -50,7 +50,7 @@ public: ...@@ -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;
......
...@@ -484,7 +484,7 @@ protected: ...@@ -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: ...@@ -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.
......
...@@ -67,7 +67,7 @@ public: ...@@ -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();
......
...@@ -150,7 +150,7 @@ public: ...@@ -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;
......
...@@ -25,7 +25,7 @@ ...@@ -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);
} }
......
...@@ -150,7 +150,7 @@ protected: ...@@ -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;
......
...@@ -347,8 +347,8 @@ private: ...@@ -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;
......
...@@ -806,7 +806,7 @@ short TableDesignDialog::Execute() ...@@ -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 );
} }
......
...@@ -76,7 +76,7 @@ using namespace ::com::sun::star; ...@@ -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;
......
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