diff options
Diffstat (limited to 'reportdesign/source/ui/inc')
19 files changed, 31 insertions, 31 deletions
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 |