summaryrefslogtreecommitdiff
path: root/sfx2/source/sidebar/TabBar.hxx
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 /sfx2/source/sidebar/TabBar.hxx
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 'sfx2/source/sidebar/TabBar.hxx')
-rw-r--r--sfx2/source/sidebar/TabBar.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index ffef7729759a..b9cdc556f9a5 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -45,7 +45,7 @@ class TabItem;
/** The tab bar is the container for the individual tabs.
*/
class TabBar
- : public Window
+ : public vcl::Window
{
public:
/** DeckMenuData has entries for display name, deck id, and a flag:
@@ -65,7 +65,7 @@ public:
const Rectangle&,
const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider;
TabBar (
- Window* pParentWindow,
+ vcl::Window* pParentWindow,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor,
const PopupMenuProvider& rPopupMenuProvider);