From 827c46e7d75000cb03b0ce21759f9d0825f0c096 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 23 Sep 2014 11:20:40 +0200 Subject: fdo#82577: Handle Window Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a --- sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 4 ++-- sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 4 ++-- sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 4 ++-- sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 4 ++-- sc/source/ui/sidebar/CellBorderStyleControl.cxx | 2 +- sc/source/ui/sidebar/CellBorderStyleControl.hxx | 2 +- sc/source/ui/sidebar/CellBorderStylePopup.cxx | 2 +- sc/source/ui/sidebar/CellBorderStylePopup.hxx | 2 +- sc/source/ui/sidebar/CellLineStyleControl.cxx | 2 +- sc/source/ui/sidebar/CellLineStyleControl.hxx | 2 +- sc/source/ui/sidebar/CellLineStylePopup.cxx | 2 +- sc/source/ui/sidebar/CellLineStylePopup.hxx | 2 +- sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 2 +- sc/source/ui/sidebar/CellLineStyleValueSet.hxx | 2 +- sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 4 ++-- sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 4 ++-- sc/source/ui/sidebar/ScPanelFactory.cxx | 6 +++--- 17 files changed, 25 insertions(+), 25 deletions(-) (limited to 'sc/source/ui/sidebar') diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 03432bec2530..3e59aea864ca 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -36,7 +36,7 @@ using namespace css::uno; namespace sc { namespace sidebar { AlignmentPropertyPanel::AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "AlignmentPropertyPanel", "modules/scalc/ui/sidebaralignment.ui", rxFrame), @@ -186,7 +186,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) } AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 1f0649c276cf..32c705ba2c02 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -40,7 +40,7 @@ class AlignmentPropertyPanel { public: static AlignmentPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); @@ -92,7 +92,7 @@ private: // constructor/destuctor AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); virtual ~AlignmentPropertyPanel(); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 49bfa73a0570..8d2ade9ab010 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -139,7 +139,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } CellAppearancePropertyPanel::CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame), @@ -339,7 +339,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) } CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 6538a70c5b3c..90cb2012d4df 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -49,7 +49,7 @@ private: public: static CellAppearancePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); @@ -172,7 +172,7 @@ private: // constructor/destuctor CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); virtual ~CellAppearancePropertyPanel(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index ab45a9236a87..31b10db7dad2 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -42,7 +42,7 @@ namespace sc { namespace sidebar { #define FRM_VALID_OUTER 0x0f #define FRM_VALID_ALL 0xff -CellBorderStyleControl::CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)), mrCellAppearancePropertyPanel(rPanel), maTBBorder1(this, ScResId(TB_BORDER1)), diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 3c353cba8781..7cf04e2d68fd 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(TB3SelectHdl, ToolBox *); public: - CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); virtual ~CellBorderStyleControl(void); }; diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index 972b7762bcbf..ae491f611005 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellBorderStylePopup::CellBorderStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function& rControlCreator) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) { diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 2cc6d43bb19e..de5b3727cafd 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -28,7 +28,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup { public : CellBorderStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function& rControlCreator); virtual ~CellBorderStylePopup(void); }; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 32455bfb0467..fcb00dfd1510 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -33,7 +33,7 @@ namespace sc { namespace sidebar { -CellLineStyleControl::CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)), mrCellAppearancePropertyPanel(rPanel), maPushButtonMoreOptions(this, ScResId(PB_OPTIONS)), diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 78efddac6995..a00079ac8dbd 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -45,7 +45,7 @@ private: DECL_LINK(PBClickHdl, PushButton*); public: - CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); void GetFocus() SAL_OVERRIDE; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 528bce04c395..fa56a7700824 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellLineStylePopup::CellLineStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function& rControlCreator) : Popup(pParent, rControlCreator, OUString("CellLineStyle")) { diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index 82c1a794a963..cfca1afe76b7 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -28,7 +28,7 @@ class CellLineStylePopup : public svx::sidebar::Popup { public : CellLineStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function& rControlCreator); virtual ~CellLineStylePopup(void); diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index ee2b9a7ec514..fc0d3e472dcb 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { -CellLineStyleValueSet::CellLineStyleValueSet( Window* pParent, const ResId& rResId) +CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), pVDev(NULL), nSelItem(0) diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index ad35fdc94873..969f346005d4 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -33,7 +33,7 @@ private: sal_uInt16 nSelItem; OUString maStrUnit[CELL_LINE_STYLE_ENTRIES]; public: - CellLineStyleValueSet( Window* pParent, const ResId& rResId); + CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId); virtual ~CellLineStyleValueSet(); void SetUnit(const OUString* str); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index a63f065182e7..f19d78e3a503 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -46,7 +46,7 @@ const char UNO_INSERTFIXEDTEXT[] = ".uno:InsertFixedText"; namespace sc { namespace sidebar { NumberFormatPropertyPanel::NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame), @@ -167,7 +167,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG ) } NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 3c34b375694b..984257e92256 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -38,7 +38,7 @@ class NumberFormatPropertyPanel public: public: static NumberFormatPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); @@ -80,7 +80,7 @@ private: // constructor/destuctor NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings); virtual ~NumberFormatPropertyPanel(); diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index cd0e946ae389..cb7a91a5b6c8 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -93,7 +93,7 @@ Reference SAL_CALL ScPanelFactory::createUIElement ( const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast(nBindingsValue); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -137,7 +137,7 @@ Reference SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/NavigatorPanel")) { - Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); + vcl::Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, @@ -146,7 +146,7 @@ Reference SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/FunctionsPanel")) { - Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); + vcl::Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, -- cgit