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