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 /sw/source/uibase/inc/optload.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 'sw/source/uibase/inc/optload.hxx')
| -rw-r--r-- | sw/source/uibase/inc/optload.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 20a8fd110cf5..451b30c6b9b5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -63,9 +63,9 @@ private: DECL_LINK(StandardizedPageCountCheckHdl, void *); public: - SwLoadOptPage(Window* pParent, const SfxItemSet& rSet); + SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -75,7 +75,7 @@ public: class SwCaptionOptDlg : public SfxSingleTabDialog { public: - SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet); + SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; class CaptionComboBox : public SwComboBox @@ -84,18 +84,18 @@ protected: virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; public: - CaptionComboBox(Window* pParent, WinBits nStyle) + CaptionComboBox(vcl::Window* pParent, WinBits nStyle) : SwComboBox(pParent, nStyle) {} }; -class SwCaptionPreview : public Window +class SwCaptionPreview : public vcl::Window { private: OUString maText; Point maDrawPos; public: - SwCaptionPreview( Window* pParent, WinBits nStyle ); + SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -162,11 +162,11 @@ private: void DrawSample(); public: - SwCaptionOptPage( Window* pParent, + SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; |