fdo#82577: Handle Window

Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.

Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a

40 files changed, 77 insertions, 77 deletions

diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 710475b67e71..c0c35b68e8be 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -24,7 +24,7 @@
 #include <svx/svdmodel.hxx>
 #include <com/sun/star/report/XReportDefinition.hpp>
 
-class Window;
+namespace vcl { class Window; }
 namespace dbaui
 {
     class DBSubComponentController;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index d40a480caacc..217a84cdb793 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -406,7 +406,7 @@ uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static(  ) throw(
 sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException, std::exception)
 {
-    Window*     pFocusWindow = Application::GetFocusWindow();
+    vcl::Window*     pFocusWindow = Application::GetFocusWindow();
     bool    bRet = false;
 
     if( pFocusWindow )
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 686c97f9925c..c572af9c6a90 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -144,7 +144,7 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r
 // class OAddFieldWindow
 
 
-OAddFieldWindow::OAddFieldWindow(Window* pParent
+OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
                                  ,const uno::Reference< beans::XPropertySet >& _xRowSet
                                  )
             :FloatingWindow(pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE))
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 6f73a53e9b22..fcbfbce03bac 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -66,10 +66,10 @@ namespace rptui
 
     class UpdateLocker
     {
-        Window& m_rWindow;
+        vcl::Window& m_rWindow;
 
     public:
-        UpdateLocker( Window& _rWindow )
+        UpdateLocker( vcl::Window& _rWindow )
             :m_rWindow( _rWindow )
         {
             _rWindow.SetUpdateMode( false );
@@ -103,7 +103,7 @@ namespace rptui
 
     // class ConditionalFormattingDialog
     ConditionalFormattingDialog::ConditionalFormattingDialog(
-            Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController )
+            vcl::Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController )
         :ModalDialog( _pParent, "CondFormat", "modules/dbreport/ui/condformatdialog.ui" )
         ,m_rController( _rController )
         ,m_xFormatConditions( _rxFormatConditions )
@@ -496,11 +496,11 @@ namespace rptui
             if ( m_bDeletingCondition )
                 break;
 
-            const Window* pGetFocusWindow( _rNEvt.GetWindow() );
+            const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
 
             // determine whether the new focus window is part of an (currently invisible) condition
-            const Window* pConditionCandidate = pGetFocusWindow->GetParent();
-            const Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL;
+            const vcl::Window* pConditionCandidate = pGetFocusWindow->GetParent();
+            const vcl::Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL;
             while   (   ( pPlaygroundCandidate )
                     &&  ( pPlaygroundCandidate != this )
                     &&  ( pPlaygroundCandidate != m_pConditionPlayground )
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index fe37e1bf2d58..47ea6c0db641 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -100,7 +100,7 @@ class OColorPopup : public FloatingWindow
     Condition* m_pCondition;
     sal_uInt16      m_nSlotId;
 public:
-    OColorPopup(Window* _pParent,Condition* _pCondition);
+    OColorPopup(vcl::Window* _pParent,Condition* _pCondition);
     ValueSet        m_aColorSet;
 
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
@@ -110,7 +110,7 @@ public:
     void SetSlotId(sal_uInt16 _nSlotId);
 };
 
-OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
+OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition)
 :FloatingWindow(_pParent, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ))
 ,m_pCondition(_pCondition)
 ,m_nSlotId(0)
@@ -202,7 +202,7 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl)
 // = Condition
 
 
-Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController )
+Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController )
     :VclHBox(_pParent)
     ,m_rController( _rController )
     ,m_rAction( _rAction )
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index b1270887c654..14fa15fba7cc 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -105,7 +105,7 @@ namespace rptui
         DECL_LINK( OnConditionAction,   Button* );
 
     public:
-        Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
+        Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
         virtual ~Condition();
 
         /** will be called when the id of the image list needs to change.
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 54e3ef47e621..7de87826a339 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -47,7 +47,7 @@ using namespace ::comphelper;
 
 // class ODateTimeDialog
 
-ODateTimeDialog::ODateTimeDialog( Window* _pParent
+ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent
                                            ,const uno::Reference< report::XSection >& _xHoldAlive
                                            ,OReportController* _pController)
     : ModalDialog( _pParent, "DateTimeDialog" , "modules/dbreport/ui/datetimedialog.ui" )
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 5fe7375a6549..5fd26171884f 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -42,7 +42,7 @@ namespace rptui
 //      Initialisierung / gemeinsame Funktionen  fuer Dialog
 
 
-FormulaDialog::FormulaDialog(Window* pParent
+FormulaDialog::FormulaDialog(vcl::Window* pParent
                              , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory
                              , const ::boost::shared_ptr< IFunctionManager >&  _pFunctionMgr
                              , const OUString& _sFormula
@@ -91,7 +91,7 @@ FormulaDialog::~FormulaDialog()
         SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) );
         aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US));
 
-        boost::scoped_ptr<Window> aTemp2(m_pAddField);
+        boost::scoped_ptr<vcl::Window> aTemp2(m_pAddField);
         m_pAddField = NULL;
     }
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 1931592e3730..eea629ba096d 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -95,7 +95,7 @@ class OFieldExpressionControl : public TContainerListenerBase
     bool SaveModified(bool _bAppend);
 
 public:
-    OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, Window *_pParent);
+    OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent);
     virtual ~OFieldExpressionControl();
 
     // XEventListener
@@ -164,7 +164,7 @@ public:
 };
 
 // class OFieldExpressionControl
-OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, Window *_pParent)
+OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent)
     :EditBrowseBox( _pParent, EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
                               BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL)
     ,m_aGroupPositions(GROUPS_START_LEN,-1)
@@ -913,7 +913,7 @@ Size OFieldExpressionControl::GetOptimalSize() const
 }
 
 // class OGroupsSortingDialog
-OGroupsSortingDialog::OGroupsSortingDialog(Window* _pParent, bool _bReadOnly,
+OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnly,
                                            OReportController* _pController)
     : FloatingWindow(_pParent, "FloatingSort", "modules/dbreport/ui/floatingsort.ui")
     , OPropertyChangeListener(m_aMutex)
@@ -935,7 +935,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(Window* _pParent, bool _bReadOnly,
     get(m_pHelpWindow, "helptext");
     m_pHelpWindow->set_height_request(GetTextHeight() * 4);
     get(m_pProperties, "properties");
-    m_pFieldExpression = new OFieldExpressionControl(this, get<Window>("box"));
+    m_pFieldExpression = new OFieldExpressionControl(this, get<vcl::Window>("box"));
     m_pFieldExpression->set_hexpand(true);
     m_pFieldExpression->set_vexpand(true);
 
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 9b8864f79fc7..6b485f5554bf 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -180,7 +180,7 @@ protected:
     void _elementReplaced( const container::ContainerEvent& _rEvent );
 
 public:
-    NavigatorTree(Window* pParent,OReportController& _rController );
+    NavigatorTree(vcl::Window* pParent,OReportController& _rController );
     virtual ~NavigatorTree();
 
     DECL_LINK(OnEntrySelDesel, NavigatorTree*);
@@ -212,7 +212,7 @@ private:
     using SvTreeListBox::ExecuteDrop;
 };
 
-NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
+NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController )
         :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
         ,comphelper::OSelectionChangeListener(m_aMutex)
         ,OPropertyChangeListener(m_aMutex)
@@ -886,7 +886,7 @@ public:
 ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent)
     :m_xReport(_rController.getReportDefinition())
     ,m_rController(_rController)
-    ,m_pNavigatorTree(new NavigatorTree(_pParent->get<Window>("box"),_rController))
+    ,m_pNavigatorTree(new NavigatorTree(_pParent->get<vcl::Window>("box"),_rController))
 {
     reportdesign::OReportVisitor aVisitor(m_pNavigatorTree.get());
     aVisitor.start(m_xReport);
@@ -896,7 +896,7 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar
 }
 
 // class ONavigator
-ONavigator::ONavigator(Window* _pParent ,OReportController& _rController)
+ONavigator::ONavigator(vcl::Window* _pParent ,OReportController& _rController)
     : FloatingWindow( _pParent, "FloatingNavigator", "modules/dbreport/ui/floatingnavigator.ui")
 {
     m_pImpl.reset(new ONavigatorImpl(_rController,this));
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index d1d17c1d835b..bc2419b412f2 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -41,7 +41,7 @@ using namespace ::comphelper;
 
 // class OPageNumberDialog
 
-OPageNumberDialog::OPageNumberDialog( Window* _pParent
+OPageNumberDialog::OPageNumberDialog( vcl::Window* _pParent
                                            ,const uno::Reference< report::XReportDefinition >& _xHoldAlive
                                            ,OReportController* _pController)
     : ModalDialog( _pParent, "PageNumberDialog" , "modules/dbreport/ui/pagenumberdialog.ui" )
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx
index f303c14296ba..821648d6b542 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -37,7 +37,7 @@ namespace rptui
 |*
 \************************************************************************/
 
-ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr, const OString &rDialog)
+ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog)
     : SfxTabDialog (pParent, rDialog, OUString("modules/dbreport/ui/") +
         OStringToOUString(rDialog, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() +
         OUString(".ui"), pAttr)
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index 3c188f925d4c..b598cd4d8cc9 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -76,7 +76,7 @@ class  OAddFieldWindow  :public FloatingWindow
     OAddFieldWindow(const OAddFieldWindow&);
     void operator =(const OAddFieldWindow&);
 public:
-    OAddFieldWindow(Window* pParent
+    OAddFieldWindow(vcl::Window* pParent
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet);
 
     virtual ~OAddFieldWindow();
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index c38b7f492aaa..1dd15ba00f0b 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -27,7 +27,7 @@
 
 namespace rptui
 {
-    class OColorListener : public Window, public SfxListener
+    class OColorListener : public vcl::Window, public SfxListener
     {
         OColorListener(const OColorListener&);
         void operator =(const OColorListener&);
@@ -46,7 +46,7 @@ namespace rptui
     protected:
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
     public:
-        OColorListener(Window* _pParent,const OUString& _sColorEntry);
+        OColorListener(vcl::Window* _pParent,const OUString& _sColorEntry);
         virtual ~OColorListener();
 
         using Window::Notify;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 130caa73367c..254edf95fe3b 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -74,7 +74,7 @@ namespace rptui
         typedef ::std::vector< ConditionPtr >       Conditions;
 
         OModuleClient   m_aModuleClient;
-        Window*         m_pConditionPlayground;
+        vcl::Window*         m_pConditionPlayground;
         Conditions      m_aConditions;
         VclScrolledWindow* m_pScrollWindow;
         ScrollBar*      m_pCondScroll;
@@ -90,7 +90,7 @@ namespace rptui
 
     public:
         ConditionalFormattingDialog(
-            Window* pParent,
+            vcl::Window* pParent,
             const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel>& _xHoldAlive,
             ::rptui::OReportController& _rController
         );
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index c4ae66d6d778..0421f6b25c7d 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -77,7 +77,7 @@ class ODateTimeDialog : public ModalDialog
     // fill methods
     void InsertEntry(sal_Int16 _nNumberFormatId);
 public:
-    ODateTimeDialog( Window* pParent
+    ODateTimeDialog( vcl::Window* pParent
                         ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive
                         ,::rptui::OReportController* _pController);
     virtual ~ODateTimeDialog();
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 18379fed6647..2b219ea3ee63 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -44,7 +44,7 @@
 class KeyEvent;
 class MouseEvent;
 class Timer;
-class Window;
+namespace vcl { class Window; }
 
 namespace rptui
 {
@@ -63,7 +63,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>        m_xReportComponent;
         OReportController&                  m_rReportController;
         OScrollWindowHelper                 m_aScrollWindow;
-        Window*                             m_pTaskPane;
+        vcl::Window*                             m_pTaskPane;
         PropBrw*                            m_pPropWin;
         OAddFieldWindow*                    m_pAddField;
         OSectionView*                       m_pCurrentView;
@@ -95,7 +95,7 @@ namespace rptui
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
     public:
-        ODesignView(Window* pParent,
+        ODesignView(vcl::Window* pParent,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&,
                     OReportController& _rController);
         virtual ~ODesignView();
diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx
index e189585c63ad..78a03b3761c0 100644
--- a/reportdesign/source/ui/inc/EndMarker.hxx
+++ b/reportdesign/source/ui/inc/EndMarker.hxx
@@ -33,7 +33,7 @@ namespace rptui
     protected:
         virtual void ImplInitSettings() SAL_OVERRIDE;
     public:
-        OEndMarker(Window* _pParent,const OUString& _sColorEntry);
+        OEndMarker(vcl::Window* _pParent,const OUString& _sColorEntry);
         virtual ~OEndMarker();
 
         // windows
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index d0643a489bcb..46036de6107a 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -60,7 +60,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
 
     DECL_LINK( OnClickHdl, OAddFieldWindow*);
 public:
-    FormulaDialog( Window* pParent
+    FormulaDialog( vcl::Window* pParent
         , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
         , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
         , const OUString& _sFormula
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 4b9be4c94ad0..17f12fd6c00a 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -143,7 +143,7 @@ protected:
     // OPropertyChangeListener
     virtual void    _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
 public:
-    OGroupsSortingDialog( Window* pParent
+    OGroupsSortingDialog( vcl::Window* pParent
                         ,bool _bReadOnly
                         ,::rptui::OReportController* _pController);
     virtual ~OGroupsSortingDialog();
diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx
index 9f7942aa3bad..66b67de16a03 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -33,7 +33,7 @@ namespace rptui
         ONavigator(const ONavigator&);
         void operator =(const ONavigator&);
     public:
-           ONavigator( Window* pParent
+           ONavigator( vcl::Window* pParent
                     ,OReportController& _rController);
 
         // window
diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx
index f90377b303f7..2e987b0ea321 100644
--- a/reportdesign/source/ui/inc/PageNumber.hxx
+++ b/reportdesign/source/ui/inc/PageNumber.hxx
@@ -53,7 +53,7 @@ class OPageNumberDialog :   public ModalDialog
     OPageNumberDialog(const OPageNumberDialog&);
     void operator =(const OPageNumberDialog&);
 public:
-    OPageNumberDialog( Window* pParent
+    OPageNumberDialog( vcl::Window* pParent
                         ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive
                         ,::rptui::OReportController* _pController);
     virtual ~OPageNumberDialog();
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 8e9b426ad248..cd347f242ab2 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -351,7 +351,7 @@ namespace rptui
         bool                                isFormatCommandEnabled(sal_uInt16 _nCommand
                                                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
 
-        virtual bool                        Construct(Window* pParent) SAL_OVERRIDE;
+        virtual bool                        Construct(vcl::Window* pParent) SAL_OVERRIDE;
         // XEventListener
         virtual void SAL_CALL               disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index 1954f8681f83..14da5b1b5e6e 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -38,7 +38,7 @@ namespace rptui
     class OSectionView;
     class OSectionWindow;
 
-    class OReportSection :   public Window
+    class OReportSection :   public vcl::Window
                         ,   public ::cppu::BaseMutex
                         ,   public ::comphelper::OPropertyChangeListener
                         ,   public DropTargetHelper
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 9b6d234253d5..02439686dc44 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -40,7 +40,7 @@ namespace rptui
     class OSectionView;
     class DlgEdFactory;
 
-    class OReportWindow :    public Window
+    class OReportWindow :    public vcl::Window
                             , public IMarkedSection
                             , public ::cppu::BaseMutex
                             , public ::comphelper::OPropertyChangeListener
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index db8e73e1364e..e62233f84490 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -41,11 +41,11 @@ namespace rptui
     /** This class defines the scrollable area of the report design. It includes
         the h-ruler and the sections, and end marker. Not the start marker.
     */
-    typedef Window OScrollWindowHelper_BASE;
+    typedef ::vcl::Window OScrollWindowHelper_BASE;
     class OScrollWindowHelper :     public ::cppu::BaseMutex
                                 ,   public OScrollWindowHelper_BASE/*TabPage*/
                                 ,   public ::comphelper::OPropertyChangeListener
-                                    , public IMarkedSection
+                                ,   public IMarkedSection
     {
     private:
         ScrollBar           m_aHScroll;
diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx
index 0cfc1ed3a714..11651ab4072a 100644
--- a/reportdesign/source/ui/inc/SectionView.hxx
+++ b/reportdesign/source/ui/inc/SectionView.hxx
@@ -48,7 +48,7 @@ public:
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
     virtual void MarkListHasChanged() SAL_OVERRIDE;
-    virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE;
+    virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE;
 
     inline OReportSection*  getReportSection() const { return m_pSectionWindow; }
 
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 0fd8c2cb44b0..ce8615862cee 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -43,7 +43,7 @@ namespace comphelper
 namespace rptui
 {
     class OViewsWindow;
-    class OSectionWindow :      public Window
+    class OSectionWindow :      public vcl::Window
                             ,   public ::cppu::BaseMutex
                             ,   public ::comphelper::OPropertyChangeListener
     {
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 5f08bb180bee..1471152e99a1 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -126,7 +126,7 @@ namespace rptui
             ::comphelper::mem_fun(&TaskPaneList::AddWindow)
             ::comphelper::mem_fun(&TaskPaneList::RemoveWindow)
     */
-    void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc);
+    void notifySystemWindow(::vcl::Window* _pWindow, ::vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList, ::vcl::Window*> _rMemFunc);
 
 
     const sal_Int16 ISOVER_IGNORE_CUSTOMSHAPES = 1;
@@ -176,7 +176,7 @@ namespace rptui
         @param  _aZoom      the zoom scale
         @param  _rWindow    where to set the map mode
     */
-    void setZoomFactor(const Fraction& _aZoom,Window& _rWindow);
+    void setZoomFactor(const Fraction& _aZoom, ::vcl::Window& _rWindow);
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX
 
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index f4c457728e81..fb8fff7cb894 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -75,24 +75,24 @@ namespace rptui
 
     class OWindowPositionCorrector
     {
-        ::std::vector< ::std::pair<Window*,Point> > m_aChildren;
+        ::std::vector< ::std::pair<vcl::Window*,Point> > m_aChildren;
         long m_nDeltaX;
         long m_nDeltaY;
     public:
-        OWindowPositionCorrector(Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY)
+        OWindowPositionCorrector(vcl::Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY)
         {
             sal_uInt16 nCount = _pWindow->GetChildCount();
             m_aChildren.reserve(nCount);
             while( nCount )
             {
-                Window* pChild = _pWindow->GetChild(--nCount);
-                m_aChildren.push_back(::std::pair<Window*,Point>(pChild,pChild->GetPosPixel()));
+                vcl::Window* pChild = _pWindow->GetChild(--nCount);
+                m_aChildren.push_back(::std::pair<vcl::Window*,Point>(pChild,pChild->GetPosPixel()));
             }
         }
         ~OWindowPositionCorrector()
         {
-            ::std::vector< ::std::pair<Window*,Point> >::iterator aIter = m_aChildren.begin();
-            ::std::vector< ::std::pair<Window*,Point> >::iterator aEnd = m_aChildren.end();
+            ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aIter = m_aChildren.begin();
+            ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aEnd = m_aChildren.end();
             for (; aIter != aEnd; ++aIter)
             {
                 const Point aPos = aIter->first->GetPosPixel();
@@ -102,7 +102,7 @@ namespace rptui
         }
     };
 
-    class OViewsWindow :    public Window
+    class OViewsWindow :    public vcl::Window
                         ,   public utl::ConfigurationListener
                         ,   public IMarkedSection
     {
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index 672207469db0..ff39900f0a64 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -37,7 +37,7 @@ private:
     void operator =(const ORptPageDialog&);
 public:
 
-    ORptPageDialog(Window* pParent, const SfxItemSet* pAttr, const OString &rDialog);
+    ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog);
 };
 
 } // namespace rptui
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 519ccfbcb1cf..60982c678f55 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -2032,7 +2032,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
     try
     {
         uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
-        Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
+        vcl::Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
         WaitObject aWaitCursor( pInspectorWindow );
 
         uno::Reference< sdbc::XPreparedStatement >  xStatement;
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 8c33970dcc9c..c1c330eb7156 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -26,7 +26,7 @@
 namespace rptui
 {
 
-OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
+OColorListener::OColorListener(vcl::Window* _pParent ,const OUString& _sColorEntry)
 : Window(_pParent)
 ,m_sColorEntry(_sColorEntry)
 ,m_nColor(COL_LIGHTBLUE)
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 793b49849d4f..db2f37bc873d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -648,7 +648,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
         { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE },
         { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }
     };
-    Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
+    vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<FontList> pFontList(new FontList( pParent ));
     XColorListRef pColorList( XColorList::CreateStdColorList() );
@@ -752,7 +752,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
 
     ::boost::shared_ptr<rptui::OReportModel> pModel  = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition());
 
-    Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
+    vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow );
 
     bool bSuccess = false;
     try
@@ -843,7 +843,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
 }
 
 
-void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc)
+void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc)
 {
     OSL_ENSURE(_pWindow,"Window can not be null!");
     SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL;
@@ -1001,7 +1001,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo
         rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK);
 }
 
-void setZoomFactor(const Fraction& _aZoom,Window& _rWindow)
+void setZoomFactor(const Fraction& _aZoom, vcl::Window& _rWindow)
 {
     MapMode aMapMode( _rWindow.GetMapMode() );
     aMapMode.SetScaleX(_aZoom);
@@ -1027,7 +1027,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
     {
         xFactory = _xContext->getServiceManager();
         xServiceFactory.set(xFactory,uno::UNO_QUERY);
-        Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow );
+        vcl::Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow );
 
         uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY);
         if ( xMgr.is() )
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 99fd6cba2c44..2659914ad393 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -57,11 +57,11 @@ using namespace container;
 #define REPORT_ID           2
 #define TASKPANE_ID         3
 
-class OTaskWindow : public Window
+class OTaskWindow : public vcl::Window
 {
     PropBrw* m_pPropWin;
 public:
-    OTaskWindow(Window* _pParent) : Window(_pParent),m_pPropWin(NULL){}
+    OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(NULL){}
 
     inline void setPropertyBrowser(PropBrw* _pPropWin)
     {
@@ -80,7 +80,7 @@ public:
 // class ODesignView
 
 
-ODesignView::ODesignView(   Window* pParent,
+ODesignView::ODesignView(   vcl::Window* pParent,
                             const Reference< XComponentContext >& _rxOrb,
                             OReportController& _rController) :
     ODataView( pParent, _rController, _rxOrb, WB_DIALOGCONTROL )
@@ -133,7 +133,7 @@ ODesignView::~ODesignView()
     {
         notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<Window> aTemp2(m_pPropWin);
+        ::std::auto_ptr<vcl::Window> aTemp2(m_pPropWin);
         SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pPropWin = NULL;
     }
@@ -143,7 +143,7 @@ ODesignView::~ODesignView()
         aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
         notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<Window> aTemp2(m_pAddField);
+        ::std::auto_ptr<vcl::Window> aTemp2(m_pAddField);
         SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pAddField = NULL;
     }
@@ -153,13 +153,13 @@ ODesignView::~ODesignView()
         aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US));
         notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<Window> aTemp2(m_pReportExplorer);
+        ::std::auto_ptr<vcl::Window> aTemp2(m_pReportExplorer);
         SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pReportExplorer = NULL;
     }
     {
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<Window> aTemp2(m_pTaskPane);
+        ::std::auto_ptr<vcl::Window> aTemp2(m_pTaskPane);
         SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pTaskPane = NULL;
     }
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index daf41a8e56a1..0621f61cb08b 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -32,7 +32,7 @@
 namespace rptui
 {
 
-OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry)
+OEndMarker::OEndMarker(vcl::Window* _pParent ,const OUString& _sColorEntry)
 : OColorListener(_pParent,_sColorEntry)
 {
     SetUniqueId(HID_RPT_ENDMARKER);
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0a55d3963a93..3aded47f3db2 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1789,7 +1789,7 @@ void OReportController::doOpenHelpAgent()
     }
 }
 
-bool OReportController::Construct(Window* pParent)
+bool OReportController::Construct(vcl::Window* pParent)
 {
     ODesignView* pMyOwnView = new ODesignView( pParent, m_xContext, *this );
     StartListening( *pMyOwnView );
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index d892ef30a5f9..c36108b32ba5 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -71,7 +71,7 @@ void OSectionView::MarkListHasChanged()
 
 
 
-void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin )
+void OSectionView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin )
 {
     // visible area
     MapMode aMap( rWin.GetMapMode() );
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 2fd6bdd88b34..ef15b49d9b30 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -354,13 +354,13 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
     return 0L;
 }
 
-void lcl_scroll(Window& _rWindow,const Point& _aDelta)
+void lcl_scroll(vcl::Window& _rWindow,const Point& _aDelta)
 {
     _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y());
     _rWindow.Invalidate(INVALIDATE_TRANSPARENT);
 }
 
-void lcl_setOrigin(Window& _rWindow,long _nX, long _nY)
+void lcl_setOrigin(vcl::Window& _rWindow,long _nX, long _nY)
 {
     MapMode aMap = _rWindow.GetMapMode();
     aMap.SetOrigin( Point(- _nX, - _nY));
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index bd7be0fe74c2..bb6f92fa10ec 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -92,7 +92,7 @@ namespace
 
 
 
-PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, ODesignView*  _pDesignView)
+PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pParent, ODesignView*  _pDesignView)
           :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE))
           ,m_xORB(_xORB)
           ,m_pDesignView(_pDesignView)