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/options/connpooloptions.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/options/connpooloptions.cxx')
| -rw-r--r-- | cui/source/options/connpooloptions.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 9adf2b546413..dd73fb46be9f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -45,7 +45,7 @@ namespace offapp Link m_aRowChangeHandler; public: - DriverListControl(Window* _pParent); + DriverListControl(vcl::Window* _pParent); virtual void Init() SAL_OVERRIDE; void Update(const DriverPoolingSettings& _rSettings); @@ -87,7 +87,7 @@ namespace offapp }; - DriverListControl::DriverListControl(Window* _pParent) + DriverListControl::DriverListControl(vcl::Window* _pParent) :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(CUI_RES(RID_SVXSTR_YES)) @@ -98,7 +98,7 @@ namespace offapp SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDriverListControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DriverListControl(pParent); } @@ -300,7 +300,7 @@ namespace offapp //= ConnectionPoolOptionsPage - ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) + ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet) : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet) { get(m_pEnablePooling, "connectionpooling"); @@ -326,7 +326,7 @@ namespace offapp } - SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet) + SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) { return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet); } |