diff options
Diffstat (limited to 'reportdesign/source/ui/inc')
20 files changed, 116 insertions, 104 deletions
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index fba3c7abf59c..6a30ee88da2e 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -54,18 +54,18 @@ class OAddFieldWindow :public FloatingWindow ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xRowSet; - ToolBox m_aActions; + VclPtr<ToolBox> m_aActions; - ::std::unique_ptr<OAddFieldWindowListBox> m_pListBox; - FixedLine m_aFixedLine; - FixedText m_aHelpText; + VclPtr<OAddFieldWindowListBox> m_pListBox; + VclPtr<FixedLine> m_aFixedLine; + VclPtr<FixedText> m_aHelpText; - PushButton m_aInsertButton; + VclPtr<PushButton> m_aInsertButton; Link m_aCreateLink; - OUString m_aCommandName; - OUString m_sFilter; + OUString m_aCommandName; + OUString m_sFilter; sal_Int32 m_nCommandType; - bool m_bEscapeProcessing; + bool m_bEscapeProcessing; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; @@ -80,6 +80,7 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet); virtual ~OAddFieldWindow(); + virtual void dispose() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index 7a26c606e05b..247863a03211 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -27,7 +27,7 @@ namespace rptui class ColorChanger { protected: - OutputDevice* m_pDev; + VclPtr<OutputDevice> m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor) diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index e85da835e3df..c0ebffb83922 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -48,6 +48,7 @@ namespace rptui public: OColorListener(vcl::Window* _pParent,const OUString& _sColorEntry); virtual ~OColorListener(); + virtual void dispose() SAL_OVERRIDE; using Window::Notify; // SfxListener diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 19c3cc24440e..e0ebc887027d 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -70,14 +70,13 @@ namespace rptui class ConditionalFormattingDialog :public ModalDialog ,public IConditionalFormatAction { - typedef ::boost::shared_ptr< Condition > ConditionPtr; - typedef ::std::vector< ConditionPtr > Conditions; + typedef ::std::vector< VclPtr<Condition> > Conditions; - OModuleClient m_aModuleClient; - vcl::Window* m_pConditionPlayground; - Conditions m_aConditions; - VclScrolledWindow* m_pScrollWindow; - ScrollBar* m_pCondScroll; + OModuleClient m_aModuleClient; + VclPtr<vcl::Window> m_pConditionPlayground; + Conditions m_aConditions; + VclPtr<VclScrolledWindow> m_pScrollWindow; + VclPtr<ScrollBar> m_pCondScroll; ::rptui::OReportController& m_rController; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel > @@ -95,7 +94,7 @@ namespace rptui ::rptui::OReportController& _rController ); virtual ~ConditionalFormattingDialog(); - + virtual void dispose() SAL_OVERRIDE; // Dialog overridables virtual short Execute() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index e03f3ed2b41c..66639a9cafd8 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -40,13 +40,13 @@ class OReportController; \************************************************************************/ class ODateTimeDialog : public ModalDialog { - CheckBox* m_pDate; - FixedText* m_pFTDateFormat; - ListBox* m_pDateListBox; - CheckBox* m_pTime; - FixedText* m_pFTTimeFormat; - ListBox* m_pTimeListBox; - OKButton* m_pPB_OK; + VclPtr<CheckBox> m_pDate; + VclPtr<FixedText> m_pFTDateFormat; + VclPtr<ListBox> m_pDateListBox; + VclPtr<CheckBox> m_pTime; + VclPtr<FixedText> m_pFTTimeFormat; + VclPtr<ListBox> m_pTimeListBox; + VclPtr<OKButton> m_pPB_OK; svt::ControlDependencyManager m_aDateControlling; svt::ControlDependencyManager m_aTimeControlling; @@ -81,6 +81,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~ODateTimeDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 0faeb693bd84..90faf2d78595 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -59,21 +59,21 @@ namespace rptui class ODesignView : public dbaui::ODataView, public SfxBroadcaster, public IMarkedSection { private: - SplitWindow m_aSplitWin; + VclPtr<SplitWindow> m_aSplitWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; OReportController& m_rReportController; - OScrollWindowHelper m_aScrollWindow; - vcl::Window* m_pTaskPane; - PropBrw* m_pPropWin; - OAddFieldWindow* m_pAddField; + VclPtr<OScrollWindowHelper> m_aScrollWindow; + VclPtr<vcl::Window> m_pTaskPane; + VclPtr<PropBrw> m_pPropWin; + VclPtr<OAddFieldWindow> m_pAddField; OSectionView* m_pCurrentView; - ONavigator* m_pReportExplorer; + VclPtr<ONavigator> m_pReportExplorer; Idle m_aMarkIdle; Point m_aScrollOffset; DlgEdMode m_eMode; - sal_uInt16 m_nCurrentPosition; - sal_uInt16 m_eActObj; + sal_uInt16 m_nCurrentPosition; + sal_uInt16 m_eActObj; bool m_bFirstDraw; Size m_aGridSizeCoarse; Size m_aGridSizeFine; @@ -100,6 +100,7 @@ namespace rptui const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OReportController& _rController); virtual ~ODesignView(); + virtual void dispose() SAL_OVERRIDE; // Window overrides virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -212,8 +213,8 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent > getCurrentControlModel() const; // IMarkedSection - ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; + OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) SAL_OVERRIDE; /** fills the positions of all collapsed sections. diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index f6d686747f1e..499525178a25 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -46,12 +46,12 @@ class FormulaDialog : public formula::FormulaModalDialog, public formula::IControlReferenceHandler { ::boost::shared_ptr< formula::IFunctionManager > m_aFunctionManager; - formula::FormEditData* m_pFormulaData; - OAddFieldWindow* m_pAddField; + formula::FormEditData* m_pFormulaData; + VclPtr<OAddFieldWindow> m_pAddField; ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > m_xRowSet; ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFormulaParser> m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; - formula::RefEdit* m_pEdit; + VclPtr<formula::RefEdit> m_pEdit; OUString m_sFormula; sal_Int32 m_nStart; sal_Int32 m_nEnd; @@ -68,6 +68,7 @@ public: , svl::SharedStringPool& rStrPool ); virtual ~FormulaDialog(); + virtual void dispose() SAL_OVERRIDE; // IFormulaEditorHelper virtual void notifyChange() SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 49b6ad0843a7..b67c1285ba98 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -60,21 +60,21 @@ class OGroupsSortingDialog : public FloatingWindow { friend class OFieldExpressionControl; - ToolBox* m_pToolBox; + VclPtr<ToolBox> m_pToolBox; sal_uInt16 m_nMoveUpId; sal_uInt16 m_nMoveDownId; sal_uInt16 m_nDeleteId; - VclContainer* m_pProperties; - ListBox* m_pOrderLst; - ListBox* m_pHeaderLst; - ListBox* m_pFooterLst; - ListBox* m_pGroupOnLst; - NumericField* m_pGroupIntervalEd; - ListBox* m_pKeepTogetherLst; - FixedText* m_pHelpWindow; + VclPtr<VclContainer> m_pProperties; + VclPtr<ListBox> m_pOrderLst; + VclPtr<ListBox> m_pHeaderLst; + VclPtr<ListBox> m_pFooterLst; + VclPtr<ListBox> m_pGroupOnLst; + VclPtr<NumericField> m_pGroupIntervalEd; + VclPtr<ListBox> m_pKeepTogetherLst; + VclPtr<FixedText> m_pHelpWindow; - OFieldExpressionControl* m_pFieldExpression; + VclPtr<OFieldExpressionControl> m_pFieldExpression; ::rptui::OReportController* m_pController; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pCurrentGroupListener; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; @@ -145,6 +145,7 @@ public: ,bool _bReadOnly ,::rptui::OReportController* _pController); virtual ~OGroupsSortingDialog(); + virtual void dispose() SAL_OVERRIDE; /** sets the newe columns at the groups dialog. @param _xColumns the new columns diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index 52ee1d3f62e8..84f9258809a2 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -38,7 +38,7 @@ namespace rptui public: /** returns the section which is currently marked. */ - virtual ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa) const =0; + virtual OSectionWindow* getMarkedSection(NearSectionAccess nsa) const =0; /** mark the section on the given position . * diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index fcf6d6b24fe0..43a1915d8e81 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -37,14 +37,14 @@ class OReportController; \************************************************************************/ class OPageNumberDialog : public ModalDialog { - RadioButton* m_pPageN; - RadioButton* m_pPageNofM; + VclPtr<RadioButton> m_pPageN; + VclPtr<RadioButton> m_pPageNofM; - RadioButton* m_pTopPage; - RadioButton* m_pBottomPage; - ListBox* m_pAlignmentLst; + VclPtr<RadioButton> m_pTopPage; + VclPtr<RadioButton> m_pBottomPage; + VclPtr<ListBox> m_pAlignmentLst; - CheckBox* m_pShowNumberOnFirstPage; + VclPtr<CheckBox> m_pShowNumberOnFirstPage; ::rptui::OReportController* m_pController; ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition> @@ -57,6 +57,7 @@ public: ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~OPageNumberDialog(); + virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; }; diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index aa749e833fd8..a902da39ccb2 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -93,7 +93,7 @@ namespace rptui TransferableDataHelper m_aSystemClipboard; // content of the clipboard TransferableClipboardListener* m_pClipbordNotifier; /// notifier for changes in the clipboard - OGroupsSortingDialog* m_pGroupsFloater; + VclPtr<OGroupsSortingDialog> m_pGroupsFloater; OXReportControllerObserver* m_pReportControllerObserver; @@ -457,7 +457,7 @@ namespace rptui // cppu::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const; OUString getColumnLabel_throw(const OUString& i_sColumnName) const; diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index bef2ae1e2ea4..a34a4fc98322 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -45,7 +45,7 @@ namespace rptui { OReportPage* m_pPage; OSectionView* m_pView; - OSectionWindow* m_pParent; + VclPtr<OSectionWindow> m_pParent; ::std::unique_ptr<DlgEdFunc> m_pFunc; ::boost::shared_ptr<OReportModel> m_pModel; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pMulti; @@ -81,6 +81,7 @@ namespace rptui public: OReportSection(OSectionWindow* _pParent,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); virtual ~OReportSection(); + virtual void dispose() SAL_OVERRIDE; // window overrides virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index a416b74a94bd..7c974bd0ad58 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -45,10 +45,10 @@ namespace rptui , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener { - Ruler m_aHRuler; - ODesignView* m_pView; - OScrollWindowHelper* m_pParent; - OViewsWindow m_aViewsWindow; + VclPtr<Ruler> m_aHRuler; + VclPtr<ODesignView> m_pView; + VclPtr<OScrollWindowHelper> m_pParent; + VclPtr<OViewsWindow> m_aViewsWindow; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::std::unique_ptr<DlgEdFactory> m_pObjFac; @@ -67,6 +67,7 @@ namespace rptui public: OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView); virtual ~OReportWindow(); + virtual void dispose() SAL_OVERRIDE; // Window overrides virtual void Resize() SAL_OVERRIDE; @@ -136,7 +137,7 @@ namespace rptui */ void showRuler(bool _bShow); - inline sal_Int32 getRulerHeight() const { return m_aHRuler.GetSizePixel().Height(); } + inline sal_Int32 getRulerHeight() const { return m_aHRuler->GetSizePixel().Height(); } /** returns the total width of the first section */ @@ -179,8 +180,8 @@ namespace rptui void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection - ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; + OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index ec5cc90d2439..e45d9daac713 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -48,14 +48,14 @@ namespace rptui , public IMarkedSection { private: - ScrollBar m_aHScroll; - ScrollBar m_aVScroll; - ScrollBarBox m_aCornerWin; // window in the bottom right corner - Size m_aTotalPixelSize; - ODesignView* m_pParent; - OReportWindow m_aReportWindow; + VclPtr<ScrollBar> m_aHScroll; + VclPtr<ScrollBar> m_aVScroll; + VclPtr<ScrollBarBox> m_aCornerWin; // window in the bottom right corner + Size m_aTotalPixelSize; + VclPtr<ODesignView> m_pParent; + VclPtr<OReportWindow> m_aReportWindow; ::rtl::Reference<comphelper::OPropertyChangeMultiplexer > - m_pReportDefintionMultiPlexer; // listener for property changes + m_pReportDefintionMultiPlexer; // listener for property changes DECL_LINK( ScrollHdl, ScrollBar*); Size ResizeScrollBars(); @@ -74,17 +74,18 @@ namespace rptui public: OScrollWindowHelper( ODesignView* _pReportDesignView); virtual ~OScrollWindowHelper(); + virtual void dispose() SAL_OVERRIDE; /** late ctor */ void initialize(); - inline Point getThumbPos() const { return Point(m_aHScroll.GetThumbPos(),m_aVScroll.GetThumbPos())/*m_aScrollOffset*/; } - inline const OReportWindow& getReportWindow() const { return m_aReportWindow; } + inline Point getThumbPos() const { return Point(m_aHScroll->GetThumbPos(),m_aVScroll->GetThumbPos())/*m_aScrollOffset*/; } + inline const OReportWindow& getReportWindow() const { return *m_aReportWindow.get(); } void setTotalSize(sal_Int32 _nWidth, sal_Int32 _nHeight); inline Size getTotalSize() const { return m_aTotalPixelSize; } - inline ScrollBar& GetHScroll() { return m_aHScroll; } - inline ScrollBar& GetVScroll() { return m_aVScroll; } + inline ScrollBar& GetHScroll() { return *m_aHScroll.get(); } + inline ScrollBar& GetVScroll() { return *m_aVScroll.get(); } // forwards void SetMode( DlgEdMode _eMode ); @@ -173,8 +174,8 @@ namespace rptui void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection - ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; + OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; virtual void markSection(const sal_uInt16 _nPos) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 14de81adc63e..c8f14e26ee4b 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -34,8 +34,8 @@ class OReportSection; class OSectionView : public SdrView { private: - OReportWindow* m_pReportWindow; - OReportSection* m_pSectionWindow; + VclPtr<OReportWindow> m_pReportWindow; + VclPtr<OReportSection> m_pSectionWindow; void ObjectRemovedInAliveMode( const SdrObject* pObject ); OSectionView(const OSectionView&) SAL_DELETED_FUNCTION; diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 79e184cb9d0b..166c25cd6a48 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -47,11 +47,11 @@ namespace rptui , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener { - OViewsWindow* m_pParent; - OStartMarker m_aStartMarker; - OReportSection m_aReportSection; - Splitter m_aSplitter; - OEndMarker m_aEndMarker; + VclPtr<OViewsWindow> m_pParent; + VclPtr<OStartMarker> m_aStartMarker; + VclPtr<OReportSection> m_aReportSection; + VclPtr<Splitter> m_aSplitter; + VclPtr<OEndMarker> m_aEndMarker; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pSectionMulti; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pGroupMulti; @@ -98,10 +98,11 @@ namespace rptui ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection ,const OUString& _sColorEntry); virtual ~OSectionWindow(); + virtual void dispose() SAL_OVERRIDE; - inline OStartMarker& getStartMarker() { return m_aStartMarker; } - inline OReportSection& getReportSection() { return m_aReportSection; } - inline OEndMarker& getEndMarker() { return m_aEndMarker; } + inline OStartMarker& getStartMarker() { return *m_aStartMarker.get(); } + inline OReportSection& getReportSection() { return *m_aReportSection.get(); } + inline OEndMarker& getEndMarker() { return *m_aEndMarker.get(); } inline OViewsWindow* getViewsWindow() { return m_pParent; } void setCollapsed(bool _bCollapsed); diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index e390024f51a9..270939c266d0 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -31,10 +31,10 @@ namespace rptui class OStartMarker : public OColorListener { - Ruler m_aVRuler; - FixedText m_aText; - FixedImage m_aImage; - OSectionWindow* m_pParent; + VclPtr<Ruler> m_aVRuler; + VclPtr<FixedText> m_aText; + VclPtr<FixedImage> m_aImage; + VclPtr<OSectionWindow> m_pParent; static Image* s_pDefCollapsed; static Image* s_pDefExpanded; static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed @@ -50,6 +50,7 @@ namespace rptui public: OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry); virtual ~OStartMarker(); + virtual void dispose() SAL_OVERRIDE; // SfxListener virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 8acd960804d1..f16fd59f2f77 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -32,7 +32,6 @@ #include <unotools/options.hxx> #include <list> #include <vector> -#include <boost/shared_ptr.hpp> #include "MarkedSection.hxx" #include "SectionWindow.hxx" @@ -75,7 +74,7 @@ namespace rptui class OWindowPositionCorrector { - ::std::vector< ::std::pair<vcl::Window*,Point> > m_aChildren; + ::std::vector< ::std::pair<VclPtr<vcl::Window>,Point> > m_aChildren; long m_nDeltaX; long m_nDeltaY; public: @@ -91,8 +90,8 @@ namespace rptui } ~OWindowPositionCorrector() { - ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aIter = m_aChildren.begin(); - ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aEnd = m_aChildren.end(); + auto aIter = m_aChildren.begin(); + auto aEnd = m_aChildren.end(); for (; aIter != aEnd; ++aIter) { const Point aPos = aIter->first->GetPosPixel(); @@ -108,7 +107,7 @@ namespace rptui { typedef ::std::multimap<Rectangle,::std::pair<SdrObject*,OSectionView*>,RectangleLess> TRectangleMap; public: - typedef ::std::vector< ::boost::shared_ptr<OSectionWindow> > TSectionsMap; + typedef ::std::vector< VclPtr<OSectionWindow> > TSectionsMap; struct TReportPairHelper : public ::std::unary_function< TSectionsMap::value_type, OReportSection > { @@ -127,9 +126,9 @@ namespace rptui private: TSectionsMap m_aSections; svtools::ColorConfig m_aColorConfig; - OReportWindow* m_pParent; - OUString m_sShapeType; - bool m_bInUnmark; + VclPtr<OReportWindow> m_pParent; + OUString m_sShapeType; + bool m_bInUnmark; void ImplInitSettings(); /** returns the iterator at pos _nPos or the end() @@ -153,6 +152,7 @@ namespace rptui OViewsWindow( OReportWindow* _pReportWindow); virtual ~OViewsWindow(); + virtual void dispose() SAL_OVERRIDE; // Window overrides virtual void Resize() SAL_OVERRIDE; @@ -181,7 +181,7 @@ namespace rptui * \param _nPos * \return the section at this pos or an empty section */ - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const sal_uInt16 _nPos) const; + OSectionWindow* getSectionWindow(const sal_uInt16 _nPos) const; /** turns the grid on or off * @@ -235,7 +235,7 @@ namespace rptui /** returns the report section window for the given xsection @param _xSection the section */ - ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; + OSectionWindow* getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; /** checks if the keycode is known by the child windows @param _rCode the keycode @@ -252,7 +252,7 @@ namespace rptui void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape, bool _bMark); // IMarkedSection - ::boost::shared_ptr<OSectionWindow> getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; + OSectionWindow* getMarkedSection(NearSectionAccess nsa = CURRENT) const SAL_OVERRIDE; virtual void markSection(const sal_uInt16 _nPos) SAL_OVERRIDE; /** align all marked objects in all sections diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index b9d0275ce673..8f8938b6f545 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -41,7 +41,7 @@ class DlgEdFunc /* : public LinkHdl */ DlgEdFunc(const DlgEdFunc&) SAL_DELETED_FUNCTION; void operator =(const DlgEdFunc&) SAL_DELETED_FUNCTION; protected: - OReportSection* m_pParent; + VclPtr<OReportSection> m_pParent; OSectionView& m_rView; Timer aScrollTimer; Point m_aMDPos; diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index 43ec71c790b2..67a48b248691 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -58,7 +58,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xLastSection; /// is the previously displayed section OUString m_sLastActivePage; - ODesignView* m_pDesignView; + VclPtr<ODesignView> m_pDesignView; OSectionView* m_pView; bool m_bInitialStateChange; @@ -90,6 +90,7 @@ public: ,Window* pParent ,ODesignView* _pDesignView); virtual ~PropBrw(); + virtual void dispose() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; |