summaryrefslogtreecommitdiff
path: root/svx/source/sidebar/area
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /svx/source/sidebar/area
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'svx/source/sidebar/area')
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.hxx4
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientControl.hxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx2
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index ee9eca71f4b2..2081fcad61b8 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -60,7 +60,7 @@ const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0;
AreaPropertyPanel::AreaPropertyPanel(
- Window* pParent,
+ vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
: PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame),
@@ -578,7 +578,7 @@ void AreaPropertyPanel::SetupIcons(void)
AreaPropertyPanel* AreaPropertyPanel::Create (
- Window* pParent,
+ vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings)
{
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index e1b34c402ddd..b0c2b0ea1deb 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -57,7 +57,7 @@ class AreaPropertyPanel
{
public:
static AreaPropertyPanel* Create(
- Window* pParent,
+ vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
@@ -167,7 +167,7 @@ private:
// constructor/destuctor
AreaPropertyPanel(
- Window* pParent,
+ vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
SfxBindings* pBindings);
virtual ~AreaPropertyPanel(void);
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 9b5a94648b61..6d6690c77d84 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -53,7 +53,7 @@ namespace svx { namespace sidebar {
AreaTransparencyGradientControl::AreaTransparencyGradientControl (
- Window* pParent,
+ vcl::Window* pParent,
AreaPropertyPanel& rPanel)
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)),
maFtTrgrCenterX(this, SVX_RES(FT_TRGR_CENTER_X)),
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 628e13825a1f..1a8d31b16573 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -38,7 +38,7 @@ class AreaTransparencyGradientControl : public PopupControl
{
public:
AreaTransparencyGradientControl (
- Window* pParent,
+ vcl::Window* pParent,
AreaPropertyPanel& rPanel);
virtual ~AreaTransparencyGradientControl (void);
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
index e6998756fedc..f2d1390580a2 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
@@ -23,7 +23,7 @@
namespace svx { namespace sidebar {
AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
- Window* pParent,
+ vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
: Popup(
pParent,
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
index 01fd47671520..5d6ac9e8ec7c 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
@@ -34,7 +34,7 @@ class AreaTransparencyGradientPopup
{
public :
AreaTransparencyGradientPopup (
- Window* pParent,
+ vcl::Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
virtual ~AreaTransparencyGradientPopup (void);