diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/sfx2 | |
parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/sfx2')
56 files changed, 186 insertions, 186 deletions
diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index 5c84050fcca4..09922feb60ba 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -class Window; +namespace vcl { class Window; } /** Opens the general query save document dialog. @param _pParent @@ -31,7 +31,7 @@ class Window; The title of the document. */ SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - Window* _pParent, const OUString& _rTitle); + vcl::Window* _pParent, const OUString& _rTitle); #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ca2200067552..5c456af41ded 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -81,7 +81,7 @@ class SfxWorkWindow; class SfxFilterMatcher; class SfxModule; class SfxModule; -class Window; +namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; @@ -176,7 +176,7 @@ public: */ sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); SfxTemplateDialog* GetTemplateDialog(); - Window* GetTopWindow() const; + vcl::Window* GetTopWindow() const; // members SfxFilterMatcher& GetFilterMatcher(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 6c4c1f49d99b..864cf09734c6 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -44,7 +44,7 @@ class FixedLine; //and SfxDockingWindow, where it is changed into a UniqueId and cleared //This reverses the clear of the HelpId -inline void reverseUniqueHelpIdHack(Window &rWindow) +inline void reverseUniqueHelpIdHack(vcl::Window &rWindow) { if (rWindow.GetHelpId().isEmpty()) rWindow.SetHelpId(rWindow.GetUniqueId()); @@ -68,7 +68,7 @@ private: SAL_DLLPRIVATE void init(); protected: - SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); OUString& GetExtraData() { return aExtraData; } sal_uInt32 GetUniqId() const { return nUniqId; } @@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const OString& rID, const OUString& rUIXMLDescription ); + vcl::Window*, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SfxModelessDialog(); virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -132,11 +132,11 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow protected: SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=WB_STDMODELESS); SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~SfxFloatingWindow(); @@ -178,11 +178,11 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog { public: - SfxSingleTabDialog(Window *pParent, const SfxItemSet& rOptionsSet, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); - SfxSingleTabDialog(Window *pParent, const SfxItemSet* pInSet = 0, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index b5b87b0c9f31..c5d93f68846d 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -24,7 +24,7 @@ class SfxCheckinDialog : public ModalDialog DECL_DLLPRIVATE_LINK(OKHdl, void *); public: - SfxCheckinDialog( Window* pParent ); + SfxCheckinDialog( vcl::Window* pParent ); OUString GetComment( ); bool IsMajor( ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 966056e20682..74818e24ac85 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -71,13 +71,13 @@ struct SfxChildWinInfo }; // ChildWindow factory methods -typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow, +typedef SfxChildWindow* (*SfxChildWinCtor)( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); // ChildWindowsContexts factory methods -typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow, +typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( vcl::Window *pParentWindow, SfxBindings *pBindings, SfxChildWinInfo *pInfo); struct SfxChildWinContextFactory @@ -122,7 +122,7 @@ struct SfxChildWindow_Impl; class SFX2_DLLPUBLIC SfxChildWindowContext { friend class SfxChildWindow; - ::Window* pWindow; + vcl::Window* pWindow; sal_uInt16 nContextId; protected: @@ -131,9 +131,9 @@ protected: public: virtual ~SfxChildWindowContext(); - void SetWindow( ::Window* pWin ) + void SetWindow( vcl::Window* pWin ) { pWindow=pWin; } - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } sal_uInt16 GetContextId() const { return nContextId; } @@ -147,12 +147,12 @@ public: class SFX2_DLLPUBLIC SfxChildWindow { - ::Window* pParent; // parent window ( Topwindow ) + vcl::Window* pParent; // parent window ( Topwindow ) sal_uInt16 nType; // ChildWindow-Id protected: SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment - ::Window* pWindow; // actual contents + vcl::Window* pWindow; // actual contents SfxChildWindow_Impl* pImp; // Implementation data private: @@ -163,14 +163,14 @@ private: { return pContext; } protected: - SfxChildWindow(::Window *pParentWindow, sal_uInt16 nId); + SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId); public: virtual ~SfxChildWindow(); void Destroy(); - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - ::Window* GetParent() const + vcl::Window* GetParent() const { return pParent; } SfxChildAlignment GetAlignment() const { return eChildAlignment; } @@ -194,17 +194,17 @@ public: sal_uInt16 GetContextId() const { return pContext ? pContext->GetContextId(): 0; } - ::Window* GetContextWindow() const + vcl::Window* GetContextWindow() const { return pContext ? pContext->GetWindow(): 0; } - ::Window* GetContextWindow( SfxModule *pModule ) const; + vcl::Window* GetContextWindow( SfxModule *pModule ) const; virtual SfxChildWinInfo GetInfo() const; void SaveStatus(const SfxChildWinInfo& rInfo); static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*); - static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&); + static SfxChildWindow* CreateChildWindow( sal_uInt16, vcl::Window*, SfxBindings*, SfxChildWinInfo&); void SetHideNotDelete( bool bOn ); bool IsHideNotDelete() const; bool IsHideAtToggle() const; @@ -231,19 +231,19 @@ public: //! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(SfxModule *pMod=0); \ //! The Macro of the future ... #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \ //! soon obsolete ! #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent, \ @@ -264,7 +264,7 @@ public: // factory. As long as Id is set to 0 and patched in // SfxChildWindow::CreateContext #define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\ @@ -279,7 +279,7 @@ public: #define SFX_DECL_CHILDWINDOW(Class) \ public : \ - static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ + static SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE @@ -295,7 +295,7 @@ public: SFX_IMPL_POS_CHILDWINDOW_WITHID(Class, MyID, CHILDWIN_NOPOS) #define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \ - SfxChildWindow* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindow* Class::CreateImpl( vcl::Window *pParent, \ sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 52eda07573fe..447bf5cb54d3 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -221,10 +221,10 @@ private: hide a control, if an item is unknown. */ class SFX2_DLLPUBLIC DummyWindowWrapper: - public SingleControlWrapper< Window, void* > + public SingleControlWrapper< vcl::Window, void* > { public: - explicit DummyWindowWrapper( Window& rWindow ); + explicit DummyWindowWrapper( vcl::Window& rWindow ); virtual bool IsControlDontKnow() const SAL_OVERRIDE; virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index 74a3af3cd4a8..1d2a2a994efe 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -16,7 +16,7 @@ class DateTime; class LocaleDataWrapper; -class Window; +namespace vcl { class Window; } class VclBuilderContainer; //when two tab pages both have the same basic layout with a preview on the @@ -26,17 +26,17 @@ class VclBuilderContainer; //there has to be a "maingrid" container which contains all the widgets //except for the preview widget -void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage); +void SFX2_DLLPUBLIC setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage); -Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference); OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 111043d3e499..a70b5ee16f46 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -217,13 +217,13 @@ private: void ImplCheckPasswordState(); protected: - SfxDocumentPage( Window* pParent, const SfxItemSet& ); + SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); void EnableUseUserData(); }; @@ -240,13 +240,13 @@ private: SfxDocumentInfoItem* m_pInfoItem; protected: - SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); + SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; // class SfxDocumentInfoDialog ------------------------------------------- @@ -259,7 +259,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; public: - SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); + SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& ); void AddFontTabPage(); }; @@ -274,7 +274,7 @@ private: public: inline CustomPropertiesEdit( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -287,7 +287,7 @@ private: public: inline CustomPropertiesTypeBox( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ListBox( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -302,7 +302,7 @@ public: ::boost::optional<sal_Int16> m_TZ; inline CustomPropertiesDateField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : DateField( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -316,7 +316,7 @@ public: bool m_isUTC; inline CustomPropertiesTimeField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : TimeField( pParent, rResId ), m_pLine( pLine ), m_isUTC(false) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -328,7 +328,7 @@ class CustomPropertiesDurationField : public Edit protected: virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; public: - CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesDurationField(); void SetDuration( const com::sun::star::util::Duration& rDuration ); @@ -340,7 +340,7 @@ class CustomPropertiesEditButton : public PushButton CustomPropertyLine* m_pLine; public: - CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesEditButton(); DECL_LINK(ClickHdl, void *); @@ -353,7 +353,7 @@ private: public: inline CustomPropertiesRemoveButton( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ImageButton( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -366,7 +366,7 @@ private: RadioButton m_aNoButton; public: - CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ); + CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ); virtual void Resize() SAL_OVERRIDE; @@ -394,14 +394,14 @@ struct CustomPropertyLine bool m_bIsRemoved; bool m_bTypeLostFocus; - CustomPropertyLine( Window* pParent ); + CustomPropertyLine( vcl::Window* pParent ); void SetRemoved(); }; // class CustomPropertiesWindow ------------------------------------------ -class CustomPropertiesWindow : public Window +class CustomPropertiesWindow : public vcl::Window { private: FixedText* m_pHeaderAccName; @@ -441,7 +441,7 @@ private: void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); public: - CustomPropertiesWindow(Window* pParent, + CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue); @@ -479,7 +479,7 @@ private: DECL_LINK( RemovedHdl, void* ); public: - CustomPropertiesControl(Window* pParent); + CustomPropertiesControl(vcl::Window* pParent); virtual ~CustomPropertiesControl(); void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); @@ -505,21 +505,21 @@ private: using TabPage::DeactivatePage; protected: - SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; struct CmisValue : public VclBuilderContainer { Edit* m_aValueEdit; - CmisValue( Window* pParent, const OUString& aStr ); + CmisValue( vcl::Window* pParent, const OUString& aStr ); }; struct CmisDateTime : public VclBuilderContainer @@ -527,7 +527,7 @@ struct CmisDateTime : public VclBuilderContainer DateField* m_aDateField; TimeField* m_aTimeField; - CmisDateTime( Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); + CmisDateTime( vcl::Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); }; struct CmisYesNo : public VclBuilderContainer @@ -535,7 +535,7 @@ struct CmisYesNo : public VclBuilderContainer RadioButton* m_aYesButton; RadioButton* m_aNoButton; - CmisYesNo( Window* pParent, bool bValue); + CmisYesNo( vcl::Window* pParent, bool bValue); }; // struct CmisPropertyLine --------------------------------------------- @@ -556,7 +556,7 @@ struct CmisPropertyLine : public VclBuilderContainer std::vector< CmisYesNo* > m_aYesNos; sal_Int32 m_nNumValue; long getItemHeight() const; - CmisPropertyLine( Window* pParent ); + CmisPropertyLine( vcl::Window* pParent ); virtual ~CmisPropertyLine(); }; @@ -627,14 +627,14 @@ private: DECL_LINK(UpdateHdl, void *); protected: - SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index 84c59666d31f..f56409a49c6d 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.hxx @@ -29,7 +29,7 @@ class InfoEdit_Impl : public Edit { public: - InfoEdit_Impl( Window* pParent, const ResId& rResId ) : + InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) {} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 2319e8c99e02..eac691e0ad05 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -152,12 +152,12 @@ public: SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; // caller has to clean up the Manager on his own - static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ); + static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ); void ExecutePopup( const ResId &rId, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); static void ExecutePopup( sal_uInt16 nConfigId = 0, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); bool IsAppDispatcher() const; bool IsFlushed() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d90f9bef74c9..4e00ab2cc55e 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -73,11 +73,11 @@ protected: public: SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=0); SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~SfxDockingWindow(); @@ -116,7 +116,7 @@ public: class SfxDockingWrapper : public SfxChildWindow { public: - SfxDockingWrapper( Window* pParent , + SfxDockingWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 96ebdcda01ae..99f77fb76f43 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -35,7 +35,7 @@ #include <boost/utility.hpp> -class Window; +namespace vcl { class Window; } class SfxFilter; class SfxObjectFactory; class SfxMedium; @@ -60,17 +60,17 @@ public: class SfxFrameWindow { - Window* pWindow; + vcl::Window* pWindow; public: - SfxFrameWindow( Window *pWin ) + SfxFrameWindow( vcl::Window *pWin ) : pWindow( pWin ) {} virtual ~SfxFrameWindow() { delete pWindow; } - Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pWin ) + void SetWindow( vcl::Window *pWin ) { pWindow = pWin; } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 000f502a664a..10a2a12b158c 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -55,7 +55,7 @@ namespace com } class SfxItemSet; -class Window; +namespace vcl { class Window; } // the SFXWB constants are for the nFlags parameter of the constructor #define SFXWB_INSERT 0x04000000L // turn Open into Insert dialog @@ -103,7 +103,7 @@ private: public: FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, @@ -126,7 +126,7 @@ public: const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); virtual ~FileDialogHelper(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 7a64d9b2f52d..954846855339 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -63,7 +63,7 @@ namespace com class SvBorder; class SfxWorkWindow; -class Window; +namespace vcl { class Window; } class SfxFrame; class SfxFrame_Impl; class SfxObjectShell; @@ -105,7 +105,7 @@ private: SfxFrame* pParentFrame; SfxFrameArr_Impl* pChildArr; SfxFrame_Impl* pImp; - Window* pWindow; + vcl::Window* pWindow; protected: bool Close(); @@ -114,7 +114,7 @@ protected: SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* ); SfxFrame( ); // not implemented - SAL_DLLPRIVATE SfxFrame( Window& i_rContainerWindow, bool bHidden ); + SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden ); public: TYPEINFO(); @@ -122,9 +122,9 @@ public: static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > CreateBlankFrame(); - static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); + static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ); - Window& GetWindow() const { return *pWindow;} + vcl::Window& GetWindow() const { return *pWindow;} void CancelTransfers( bool bCancelLoadEnv = true ); bool DoClose(); sal_uInt16 GetChildFrameCount() const; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 383ebc868b59..386e4150dfca 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -25,7 +25,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow SfxBindings* m_pBindings; public: - SfxInfoBarContainerChild( Window* pParent, + SfxInfoBarContainerChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -38,7 +38,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow /** Class representing a single InfoBar to be added in a SfxInfoBarContainerWindow. */ -class SfxInfoBarWindow : public Window +class SfxInfoBarWindow : public vcl::Window { private: OUString m_sId; @@ -47,7 +47,7 @@ class SfxInfoBarWindow : public Window std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const OUString& sId, + SfxInfoBarWindow( vcl::Window* parent, const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); virtual ~SfxInfoBarWindow( ); @@ -60,7 +60,7 @@ class SfxInfoBarWindow : public Window DECL_LINK( CloseHandler, void* ); }; -class SfxInfoBarContainerWindow : public Window +class SfxInfoBarContainerWindow : public vcl::Window { private: SfxInfoBarContainerChild* m_pChildWin; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 0a8b5f8a72b0..10ab174bbdbd 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -33,7 +33,7 @@ class SfxInPlaceClient_Impl; class SfxViewShell; class SfxObjectShell; -class Window; +namespace vcl { class Window; } class Fraction; @@ -44,7 +44,7 @@ friend class SfxInPlaceClient_Impl; SfxInPlaceClient_Impl* m_pImp; SfxViewShell* m_pViewSh; - Window* m_pEditWin; + vcl::Window* m_pEditWin; // called after the requested new object area was negotiated SAL_DLLPRIVATE virtual void ObjectAreaChanged(); @@ -59,11 +59,11 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void MakeVisible(); public: - SfxInPlaceClient( SfxViewShell* pViewShell, Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); + SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); virtual ~SfxInPlaceClient(); SfxViewShell* GetViewShell() const { return m_pViewSh; } - Window* GetEditWin() const { return m_pEditWin; } + vcl::Window* GetEditWin() const { return m_pEditWin; } com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() const; void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject ); void SetObjectState( sal_Int32 ); diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index f7e36c7f538b..a0f2eb6d78df 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -286,7 +286,7 @@ class SFX2_DLLPUBLIC DummyItemConnection: public ItemConnectionBase, public DummyWindowWrapper { public: - explicit DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, + explicit DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 2bc866cf5e97..9dc778fe8f76 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -129,7 +129,7 @@ public: void UpdateAllLinks( bool bAskUpdate = true, bool bCallErrHdl = true, bool bUpdateGrfLinks = false, - Window* pParentWin = 0 ); + vcl::Window* pParentWin = 0 ); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 19ad30e8a81c..c39e5310ef67 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; } @@ -85,7 +85,7 @@ public: virtual bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog - virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window *, SvBaseLink *, const Link& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index d57b10533e4e..a68bf499f638 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -144,7 +144,7 @@ public: void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this - virtual void Edit( Window*, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window*, const Link& rEndEditHdl ); // should the link appear in the dialog? (to the left in the link in the...) bool IsVisible() const { return bVisible; } diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index dbf6538cee72..06deead04eae 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -73,10 +73,10 @@ friend class SfxStyleDialog; void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); - SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet ); + SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SfxManageStyleSheetPage(); - static SfxTabPage* Create(Window *pParent, const SfxItemSet *rAttrSet ); + static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rAttrSet ); protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 66c9d6f7dfa7..93106583d6ea 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -93,13 +93,13 @@ private: public: SfxPopupMenuManager( PopupMenu*, SfxBindings& ); ~SfxPopupMenuManager(); - static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow ); + static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, vcl::Window* pWindow ); // @deprecated!! // Don't use this method any longer. The whole class will be removed in the future. // Changing code which relies on Popup would need much more effort. - static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); + static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ); - sal_uInt16 Execute( const Point& rPos, Window *pWindow ); + sal_uInt16 Execute( const Point& rPos, vcl::Window *pWindow ); void RemoveDisabledEntries(); Menu* GetSVMenu(); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index cf9130f97b8a..77ba76675543 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -46,7 +46,7 @@ struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace frame { class XFrame; @@ -86,7 +86,7 @@ public: void RegisterMenuControl(SfxMenuCtrlFactory*); virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 9d40799f40e1..37f7a144dce9 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -27,7 +27,7 @@ class SfxNavigatorWrapper : public SfxChildWindow { public: - SfxNavigatorWrapper( Window* pParent , + SfxNavigatorWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow public: SfxNavigator( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ); virtual void Resize() SAL_OVERRIDE; diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index c817282bed5e..aa53d4ce4ae7 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -56,7 +56,7 @@ private: public: - SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); + SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0); virtual ~SfxNewFileDialog(); // Returns false, when '- No -' is set as Template diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index e6494905b3fe..f0f47e26bb15 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -43,7 +43,7 @@ private: DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * ); public: - SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& ); + SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); virtual ~SfxNewStyleDlg(); OUString GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9b8a01c4a217..d9d4e956e5cd 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -344,7 +344,7 @@ public: void SignScriptingContent(); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet& ); + vcl::Window *pParent, const SfxItemSet& ); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, SbxArray* pArgs = 0, SbxValue* pRet = 0 ); @@ -407,7 +407,7 @@ public: virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); - sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ); + sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); virtual bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); @@ -510,7 +510,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index ed96e330cc18..363e9b9e1c71 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -74,7 +74,7 @@ private: void SetPasswdText(); public: - SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL); + SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = NULL); OUString GetUser() const { diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 5d84648453fd..4857ce4b1235 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -93,15 +93,15 @@ protected: public: - SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SfxCommonPrintOptionsTabPage(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; - virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; #endif // INCLUDED_SFX2_PRINTOPT_HXX diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index eead7a37b489..1468ee81fe82 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -41,7 +41,7 @@ private: SfxTabPage* pPage; public: - SfxPrintOptionsDialog( Window *pParent, + SfxPrintOptionsDialog( vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *rOptions ); virtual ~SfxPrintOptionsDialog(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index c7280672bb42..68176cf8a7eb 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -41,7 +41,7 @@ enum ApplicationType class SFX2_DLLPUBLIC RecentDocsView : public ThumbnailView { public: - RecentDocsView( Window* pParent ); + RecentDocsView( vcl::Window* pParent ); virtual ~RecentDocsView(); void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index dca4430aa094..eecaf318ab0a 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -33,14 +33,14 @@ class SfxSecurityPage : public SfxTabPage std::auto_ptr< SfxSecurityPage_Impl > m_pImpl; protected: - SfxSecurityPage( Window* pParent, const SfxItemSet& ); + SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index fcfd9bb8140e..d5b8352dd062 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxBindings; class SfxItemSet; class ResId; -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; }; @@ -118,43 +118,43 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory(); // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; - virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; - virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const rtl::OUString& rLanguage ) = 0; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; + virtual VclAbstractDialog * CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException ) = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; }; #endif diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index d3ab2cec93bb..84250598312d 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -35,9 +35,9 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword ); SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) SAL_OVERRIDE; SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); @@ -48,7 +48,7 @@ public: inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual OUString GetHelpText( const OUString&, const Window* pWindow ) SAL_OVERRIDE; + virtual OUString GetHelpText( const OUString&, const vcl::Window* pWindow ) SAL_OVERRIDE; static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); static OUString GetDefaultHelpModule(); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index d0a13ddfba55..c574b6f45c8c 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -29,7 +29,7 @@ #include <tools/rtti.hxx> class ResMgr; -class Window; +namespace vcl { class Window; } class ToolBox; class SfxItemPool; class SfxPoolItem; diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index aebb0b348eb4..a078e00c20c2 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -39,9 +39,9 @@ class SFX2_DLLPUBLIC ControlFactory public: /** Create the menu button for the task bar. */ - static CheckBox* CreateMenuButton (Window* pParentWindow); + static CheckBox* CreateMenuButton (vcl::Window* pParentWindow); - static ImageRadioButton* CreateTabItem (Window* pParentWindow); + static ImageRadioButton* CreateTabItem (vcl::Window* pParentWindow); }; diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index a6c65e1a1293..5f482786e7a8 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> #include <com/sun/star/ui/LayoutSize.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx index defc03c75fcf..50caeb6114c0 100644 --- a/include/sfx2/sidebar/SidebarChildWindow.hxx +++ b/include/sfx2/sidebar/SidebarChildWindow.hxx @@ -35,14 +35,14 @@ class SFX2_DLLPUBLIC SidebarChildWindow { public: SidebarChildWindow( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow); - static sal_Int32 GetDefaultWidth (Window* pWindow); + static sal_Int32 GetDefaultWidth (vcl::Window* pWindow); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 537c085280f4..6215f6d03e64 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -35,7 +35,7 @@ #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -61,7 +61,7 @@ public: static css::uno::Reference<css::ui::XUIElement> Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pControl, + vcl::Window* pControl, const css::ui::LayoutSize& rLayoutSize); // XContextChangeEventListener @@ -103,7 +103,7 @@ protected: SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); virtual ~SidebarPanelBase (void); @@ -111,7 +111,7 @@ protected: throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - Window* mpControl; + vcl::Window* mpControl; const ::rtl::OUString msResourceURL; const css::ui::LayoutSize maLayoutSize; }; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 8bcc6be00f82..0a6f37fa8463 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox { public: - SidebarToolBox(Window* pParentWindow); + SidebarToolBox(vcl::Window* pParentWindow); virtual ~SidebarToolBox (void); using ToolBox::InsertItem; diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 41a90204a538..e428d9abe58b 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -37,7 +37,7 @@ protected: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SfxStyleDialog(Window* pParent, const OString& rID, + SfxStyleDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase&); virtual ~SfxStyleDialog(); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index d916df3bb2d1..5e88ed9471cd 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxTabPage; class SfxBindings; -typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet *rAttrSet); +typedef SfxTabPage* (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; @@ -124,10 +124,10 @@ protected: void SavePosAndId(); public: - SfxTabDialog(Window* pParent, + SfxTabDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); - SfxTabDialog(SfxViewFrame *pViewFrame, Window* pParent, + SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); virtual ~SfxTabDialog(); @@ -237,7 +237,7 @@ private: SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } protected: - SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); + SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f7b6ef0d455f..da1f70140728 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -60,7 +60,7 @@ namespace sfx2 { public: TaskPaneWrapper( - Window* i_pParent, + vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo @@ -102,7 +102,7 @@ namespace sfx2 /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective module's configuration */ - class SFX2_DLLPUBLIC ModuleTaskPane : public Window + class SFX2_DLLPUBLIC ModuleTaskPane : public vcl::Window { public: /** creates a new instance @@ -114,7 +114,7 @@ namespace sfx2 responsible for, thus controlling which tool panels are actually available. */ ModuleTaskPane( - Window& i_rParentWindow, + vcl::Window& i_rParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame ); virtual ~ModuleTaskPane(); @@ -186,7 +186,7 @@ namespace sfx2 { public: TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, - Window* i_pParent, WinBits i_nBits ); + vcl::Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 27bcb9e31171..a1c99d1672bc 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -142,13 +142,13 @@ public: const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); - SfxPopupWindow(sal_uInt16 nId, Window *pParent, + SfxPopupWindow(sal_uInt16 nId, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ); virtual ~SfxPopupWindow(); @@ -202,7 +202,7 @@ protected: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); virtual SfxPopupWindow* CreatePopupWindowCascading(); - virtual Window* CreateItemWindow( Window *pParent ); + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ); // Must be called by subclass to set a new popup window instance void SetPopupWindow( SfxPopupWindow* pWindow ); @@ -294,7 +294,7 @@ class SfxDragButton_Impl : public FixedImage { public: - SfxDragButton_Impl( Window *pParent ); + SfxDragButton_Impl( vcl::Window *pParent ); virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -305,7 +305,7 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; }; diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 00ecf03c4cf3..b2a500bae4c9 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -80,8 +80,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView { public: - TemplateAbstractView(Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); - TemplateAbstractView(Window* pParent); + TemplateAbstractView(vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateAbstractView(vcl::Window* pParent); virtual ~TemplateAbstractView (); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index de9dead245c0..984b06a2d16d 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog public: - SfxTemplateManagerDlg (Window *parent = DIALOG_NO_PARENT); + SfxTemplateManagerDlg (vcl::Window *parent = DIALOG_NO_PARENT); virtual ~SfxTemplateManagerDlg (); diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index a38f9817e0ce..9f5d9dfd2965 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -25,7 +25,7 @@ class SfxTemplateInfoDlg : public ModalDialog { public: - SfxTemplateInfoDlg (Window *pParent = NULL); + SfxTemplateInfoDlg (vcl::Window *pParent = NULL); virtual ~SfxTemplateInfoDlg (); @@ -40,7 +40,7 @@ private: PushButton* mpBtnClose; VclBox* mpBox; - Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) + vcl::Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) svtools::ODocumentInfoPreview *mpInfoView; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > m_xFrame; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index a6f4e336b62d..6d2e1d044dcf 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -29,7 +29,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView public: - TemplateLocalView ( Window* pParent ); + TemplateLocalView ( vcl::Window* pParent ); virtual ~TemplateLocalView (); diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index 0b6e9d897e77..6c64e9a6dcaf 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -21,7 +21,7 @@ class TemplateRemoteView : public TemplateAbstractView { public: - TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); virtual ~TemplateRemoteView (); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a15d4e7095af..4bd6ac4292d6 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,7 +45,7 @@ friend class SfxTemplateDialog_Impl; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: - SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* ); + SfxTemplateDialog( SfxBindings*, SfxChildWindow*, vcl::Window* ); virtual ~SfxTemplateDialog(); virtual void Update(); @@ -62,7 +62,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow { public: SfxTemplateDialogWrapper - (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); + (vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper); }; @@ -71,7 +71,7 @@ public: class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow { public: - SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow); + SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); virtual void Update(); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 31faaf7c40b0..298ea3df3157 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -180,7 +180,7 @@ class SFX2_DLLPUBLIC ThumbnailView : public Control { public: - ThumbnailView(Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); + ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); virtual ~ThumbnailView(); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index e1295f948efd..f2fa42dca7f3 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -36,7 +36,7 @@ const int THUMBNAILVIEW_ITEM_CORNER = 5; class CheckBox; namespace vcl { class Font; } -class Window; +namespace vcl { class Window; } class ThumbnailView; namespace basegfx { diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 0b1f4dc5ec77..6e45253c9c02 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -39,11 +39,11 @@ namespace sfx2 public: TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, WinBits i_nStyle = 0 + vcl::Window* i_pParent, WinBits i_nStyle = 0 ); TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, const ResId& i_rResId + vcl::Window* i_pParent, const ResId& i_rResId ); virtual ~TitledDockingWindow(); @@ -81,8 +81,8 @@ namespace sfx2 /** returns the content window, which is to be used as parent window for any content to be displayed in the docking window. */ - ::Window& GetContentWindow() { return m_aContentWindow; } - const ::Window& GetContentWindow() const { return m_aContentWindow; } + vcl::Window& GetContentWindow() { return m_aContentWindow; } + const vcl::Window& GetContentWindow() const { return m_aContentWindow; } ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index 687be03d1b1a..541b18fecb32 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -26,7 +26,7 @@ class SfxViewFrame; class SfxViewShell; -class Window; +namespace vcl { class Window; } typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 919ed9da96a3..1d043fcd2ded 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -117,7 +117,7 @@ public: SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - Window& GetWindow() const; + vcl::Window& GetWindow() const; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b32c78930768..20114cfac991 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -40,7 +40,7 @@ class SfxBaseController; class Size; class Fraction; -class Window; +namespace vcl { class Window; } class KeyEvent; class WorkWindow; class SvBorder; @@ -137,7 +137,7 @@ friend class SfxPrinterController; SfxInPlaceClientList* pIPClientList; SfxViewFrame* pFrame; SfxShell* pSubShell; - Window* pWindow; + vcl::Window* pWindow; bool bNoNewWindow; protected: @@ -176,7 +176,7 @@ public: SfxInPlaceClient* GetIPClient() const; SfxInPlaceClient* GetUIActiveClient() const; - SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, Window *pObjParentWin ) const; + SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const; virtual ErrCode DoVerb(long nVerb); @@ -218,8 +218,8 @@ public: bool Escape(); // Viewing Interface - Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pViewPort ); + vcl::Window* GetWindow() const { return pWindow; } + void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; void SetBorderPixel( const SvBorder &rBorder ); @@ -230,7 +230,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ); virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; |