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 /cui/source/customize/selector.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 'cui/source/customize/selector.cxx')
-rw-r--r-- | cui/source/customize/selector.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2b3b995f19ee..5541697f4380 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nStyle) +SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP) , pCurEntry(0) , m_pDraggingEntry(0) @@ -86,7 +86,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nSty LINK( this, SvxConfigFunctionListBox, TimerHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -193,7 +193,7 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) +SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP) , m_bShowSlots(false) @@ -214,7 +214,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) */ SvxScriptSelectorDialog::SvxScriptSelectorDialog( - Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) + vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) : ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui") , m_bShowSlots(bShowSlots) { |