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 /formula/source/ui/dlg/structpg.cxx | |
| 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 'formula/source/ui/dlg/structpg.cxx')
| -rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 74a9de07f7d4..ea3cd2af9663 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -32,7 +32,7 @@ namespace formula { -StructListBox::StructListBox(Window* pParent, WinBits nBits ): +StructListBox::StructListBox(vcl::Window* pParent, WinBits nBits ): SvTreeListBox(pParent, nBits) { bActiveFlag=false; @@ -77,12 +77,12 @@ void StructListBox::LoseFocus() SvTreeListBox::LoseFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeStructListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStructListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new StructListBox(pParent, WB_BORDER); } -StructPage::StructPage(Window* pParent): +StructPage::StructPage(vcl::Window* pParent): TabPage(pParent, "StructPage", "formula/ui/structpage.ui"), maImgEnd ( ModuleRes( BMP_STR_END ) ), maImgError ( ModuleRes( BMP_STR_ERROR ) ), |