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/viewsh.hxx | |
| 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/viewsh.hxx')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
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; |