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/tabdlg.hxx | |
parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip |
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/tabdlg.hxx')
-rw-r--r-- | include/sfx2/tabdlg.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 ); } |