vcl: VclPtr conversion in reportdesign

Change-Id: Iadbd90bfe2cdf6afff3d745ac488036c3d031963

reportdesign/source/ui/dlg/AddField.cxx

@@ -151,11 +151,11 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
             ,::comphelper::OPropertyChangeListener(m_aMutex)
             ,::comphelper::OContainerListener(m_aMutex)
             ,m_xRowSet(_xRowSet)
-            ,m_aActions(this,ModuleRes(RID_TB_SORTING))
+            ,m_aActions(new ToolBox(this,ModuleRes(RID_TB_SORTING)))
             ,m_pListBox(new OAddFieldWindowListBox( this ))
-            ,m_aFixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) )
-            ,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) )
-            ,m_aInsertButton(this, WB_TABSTOP|WB_CENTER)
+            ,m_aFixedLine(new FixedLine(this, ModuleRes(ADDFIELD_FL_HELP_SEPARATOR) ))
+            ,m_aHelpText(new FixedText(this, ModuleRes(ADDFIELD_HELP_FIELD) ))
+            ,m_aInsertButton(new PushButton(this, WB_TABSTOP|WB_CENTER))
             ,m_nCommandType(0)
             ,m_bEscapeProcessing(false)
             ,m_pChangeListener(NULL)
@@ -165,13 +165,13 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
     SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
     SetMinOutputSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
 
-    m_aActions.SetStyle(m_aActions.GetStyle()|WB_LINESPACING);
-    m_aActions.SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
+    m_aActions->SetStyle(m_aActions->GetStyle()|WB_LINESPACING);
+    m_aActions->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
 
-    m_aActions.SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction));
-    setToolBox(&m_aActions);
-    m_aActions.CheckItem(SID_FM_SORTUP);
-    m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, false);
+    m_aActions->SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction));
+    setToolBox(m_aActions.get());
+    m_aActions->CheckItem(SID_FM_SORTUP);
+    m_aActions->EnableItem(SID_ADD_CONTROL_PAIR, false);
 
     m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
     m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) );
@@ -179,12 +179,12 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
     m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
     m_pListBox->Show();
     const OUString sTitle(ModuleRes(RID_STR_INSERT));
-    m_aInsertButton.SetText(sTitle);
-    m_aInsertButton.SetClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
-    m_aInsertButton.Show();
+    m_aInsertButton->SetText(sTitle);
+    m_aInsertButton->SetClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) );
+    m_aInsertButton->Show();
 
-    m_aFixedLine.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
-    m_aHelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
+    m_aFixedLine->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
+    m_aHelpText->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
 
     SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
 
@@ -208,6 +208,11 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent
 
 
 OAddFieldWindow::~OAddFieldWindow()
+{
+    dispose();
+}
+
+void OAddFieldWindow::dispose()
 {
     if ( m_pListBox.get() )
     {
@@ -222,6 +227,12 @@ OAddFieldWindow::~OAddFieldWindow()
         m_pChangeListener->dispose();
     if ( m_pContainerListener.is() )
         m_pContainerListener->dispose();
+
+    m_aActions.disposeAndClear();
+    m_aFixedLine.disposeAndClear();
+    m_aHelpText.disposeAndClear();
+    m_aInsertButton.disposeAndClear();
+    FloatingWindow::dispose();
 }
 
 
@@ -307,10 +318,10 @@ void OAddFieldWindow::Update()
     {
         // ListBox loeschen
         m_pListBox->Clear();
-        const sal_uInt16 nItemCount = m_aActions.GetItemCount();
+        const sal_uInt16 nItemCount = m_aActions->GetItemCount();
         for (sal_uInt16 j = 0; j< nItemCount; ++j)
         {
-            m_aActions.EnableItem(m_aActions.GetItemId(j),false);
+            m_aActions->EnableItem(m_aActions->GetItemId(j),false);
         }
 
         OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION));
@@ -356,7 +367,7 @@ void OAddFieldWindow::Update()
             {
                 for (sal_uInt16 i = 0; i < nItemCount; ++i)
                 {
-                    m_aActions.EnableItem(m_aActions.GetItemId(i));
+                    m_aActions->EnableItem(m_aActions->GetItemId(i));
                 }
             }
                 OnSelectHdl(NULL);
@@ -380,15 +391,15 @@ void OAddFieldWindow::Resize()
     const Size aFixedTextSize(LogicToPixel( Size( FIXEDTEXT_WIDTH, FIXEDTEXT_HEIGHT ), MAP_APPFONT ));
 
     // ToolBar
-    Size aToolbarSize( m_aActions.GetSizePixel() );
+    Size aToolbarSize( m_aActions->GetSizePixel() );
     Point aToolbarPos( aRelated.Width(), aRelated.Height());
-    m_aActions.SetPosPixel(Point(aToolbarPos.X(), aToolbarPos.Y()));
+    m_aActions->SetPosPixel(Point(aToolbarPos.X(), aToolbarPos.Y()));
 
     Size aLBSize( aWindowSize );
     aLBSize.Width()  -= ( 2 * aRelated.Width() );
 
     // help text
-    const Size aHelpTextSize = m_aHelpText.CalcMinimumSize(aLBSize.Width());
+    const Size aHelpTextSize = m_aHelpText->CalcMinimumSize(aLBSize.Width());
 
     // ListBox
     Point aLBPos( aRelated.Width(), aRelated.Height() + aToolbarSize.Height() + aRelated.Height() );
@@ -402,11 +413,11 @@ void OAddFieldWindow::Resize()
     // FixedLine
     Size aFLSize( aLBSize.Width(),aFixedTextSize.Height() );
     Point aFLPos( aRelated.Width(), aLBPos.Y() + aLBSize.Height() + aRelated.Height());
-    m_aFixedLine.SetPosSizePixel( aFLPos, aFLSize );
+    m_aFixedLine->SetPosSizePixel( aFLPos, aFLSize );
 
     // Help text
     Point aFTPos( aRelated.Width(), aFLPos.Y() + aFLSize.Height() + aRelated.Height() );
-    m_aHelpText.SetPosSizePixel( aFTPos, aHelpTextSize );
+    m_aHelpText->SetPosSizePixel( aFTPos, aHelpTextSize );
 }
 
 uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const
@@ -477,7 +488,7 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve
 
 IMPL_LINK( OAddFieldWindow, OnSelectHdl, void* ,/*_pAddFieldDlg*/)
 {
-    m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
+    m_aActions->EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
 
     return 0L;
 }
@@ -495,7 +506,7 @@ void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet)
     sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
     if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
         nN = IMG_ADDFIELD_DLG_LC;
-    m_aActions.SetImageList(ImageList(ModuleRes(nN)));
+    m_aActions->SetImageList(ImageList(ModuleRes(nN)));
 }
 
 void OAddFieldWindow::resizeControls(const Size& _rDiff)
@@ -509,27 +520,27 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff)
 
 IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
 {
-    const sal_uInt16 nCurItem = m_aActions.GetCurItemId();
+    const sal_uInt16 nCurItem = m_aActions->GetCurItemId();
     if ( SID_ADD_CONTROL_PAIR == nCurItem )
         OnDoubleClickHdl(NULL);
     else
     {
-        if ( SID_FM_REMOVE_FILTER_SORT == nCurItem || !m_aActions.IsItemChecked(nCurItem) )
+        if ( SID_FM_REMOVE_FILTER_SORT == nCurItem || !m_aActions->IsItemChecked(nCurItem) )
         {
-            const sal_uInt16 nItemCount = m_aActions.GetItemCount();
+            const sal_uInt16 nItemCount = m_aActions->GetItemCount();
             for (sal_uInt16 j = 0; j< nItemCount; ++j)
             {
-                const sal_uInt16 nItemId = m_aActions.GetItemId(j);
+                const sal_uInt16 nItemId = m_aActions->GetItemId(j);
                 if ( nCurItem != nItemId )
-                    m_aActions.CheckItem(nItemId,false);
+                    m_aActions->CheckItem(nItemId,false);
             }
             SvSortMode eSortMode = SortNone;
             if ( SID_FM_REMOVE_FILTER_SORT != nCurItem )
             {
-                m_aActions.CheckItem(nCurItem,!m_aActions.IsItemChecked(nCurItem));
-                if ( m_aActions.IsItemChecked(SID_FM_SORTUP) )
+                m_aActions->CheckItem(nCurItem,!m_aActions->IsItemChecked(nCurItem));
+                if ( m_aActions->IsItemChecked(SID_FM_SORTUP) )
                     eSortMode = SortAscending;
-                else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) )
+                else if ( m_aActions->IsItemChecked(SID_FM_SORTDOWN) )
                     eSortMode = SortDescending;
             }
 

reportdesign/source/ui/dlg/Condition.cxx

@@ -97,11 +97,13 @@ IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton )
 class OColorPopup : public FloatingWindow
 {
     DECL_LINK( SelectHdl, void * );
-    Condition* m_pCondition;
+    Condition*      m_pCondition;
     sal_uInt16      m_nSlotId;
 public:
     OColorPopup(vcl::Window* _pParent,Condition* _pCondition);
-    ValueSet        m_aColorSet;
+    virtual ~OColorPopup();
+    virtual void dispose() SAL_OVERRIDE;
+    VclPtr<ValueSet>        m_aColorSet;
 
     virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void Resize() SAL_OVERRIDE;
@@ -114,9 +116,9 @@ OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition)
 :FloatingWindow(_pParent, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ))
 ,m_pCondition(_pCondition)
 ,m_nSlotId(0)
-,m_aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) )
+,m_aColorSet( new ValueSet(this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT)) )
 {
-    m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
+    m_aColorSet->SetHelpId( HID_RPT_POPUP_COLOR_CTRL );
     SetHelpId( HID_RPT_POPUP_COLOR );
     const Size aSize12( 13, 13 );
     short i = 0;
@@ -127,34 +129,45 @@ OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition)
 
     if ( nCount > PALETTE_SIZE )
         // Show scrollbar if more than PALLETTE_SIZE colors are available
-        m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_VSCROLL );
+        m_aColorSet->SetStyle( m_aColorSet->GetStyle() | WB_VSCROLL );
 
     for ( i = 0; i < nCount; i++ )
     {
         XColorEntry* pEntry = pColorList->GetColor(i);
-        m_aColorSet.InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
+        m_aColorSet->InsertItem( i+1, pEntry->GetColor(), pEntry->GetName() );
     }
 
     while ( i < PALETTE_SIZE )
     {
         // fill empty elements if less then PALLETTE_SIZE colors are available
-        m_aColorSet.InsertItem( i+1, aColWhite, aStrWhite );
+        m_aColorSet->InsertItem( i+1, aColWhite, aStrWhite );
         i++;
     }
 
-    m_aColorSet.SetSelectHdl( LINK( this, OColorPopup, SelectHdl ) );
-    m_aColorSet.SetColCount( PALETTE_X );
-    m_aColorSet.SetLineCount( PALETTE_Y );
-    Size aSize = m_aColorSet.CalcWindowSizePixel( aSize12 );
+    m_aColorSet->SetSelectHdl( LINK( this, OColorPopup, SelectHdl ) );
+    m_aColorSet->SetColCount( PALETTE_X );
+    m_aColorSet->SetLineCount( PALETTE_Y );
+    Size aSize = m_aColorSet->CalcWindowSizePixel( aSize12 );
     aSize.Width()  += 4;
     aSize.Height() += 4;
     SetOutputSizePixel( aSize );
-    m_aColorSet.Show();
+    m_aColorSet->Show();
+}
+
+OColorPopup::~OColorPopup()
+{
+    dispose();
+}
+
+void OColorPopup::dispose()
+{
+    m_aColorSet.disposeAndClear();
+    FloatingWindow::dispose();
 }
 
 void OColorPopup::KeyInput( const KeyEvent& rKEvt )
 {
-    m_aColorSet.KeyInput(rKEvt);
+    m_aColorSet->KeyInput(rKEvt);
 }
 
 void OColorPopup::Resize()
@@ -162,12 +175,12 @@ void OColorPopup::Resize()
     Size aSize = GetOutputSizePixel();
     aSize.Width()  -= 4;
     aSize.Height() -= 4;
-    m_aColorSet.SetPosSizePixel( Point(2,2), aSize );
+    m_aColorSet->SetPosSizePixel( Point(2,2), aSize );
 }
 
 void OColorPopup::StartSelection()
 {
-    m_aColorSet.StartSelection();
+    m_aColorSet->StartSelection();
 }
 
 void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
@@ -175,20 +188,20 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
     m_nSlotId = _nSlotId;
     if ( SID_ATTR_CHAR_COLOR_BACKGROUND == _nSlotId || SID_BACKGROUND_COLOR == _nSlotId )
     {
-        m_aColorSet.SetStyle( m_aColorSet.GetStyle() | WB_NONEFIELD );
-        m_aColorSet.SetText( OUString(ModuleRes( STR_TRANSPARENT )) );
+        m_aColorSet->SetStyle( m_aColorSet->GetStyle() | WB_NONEFIELD );
+        m_aColorSet->SetText( OUString(ModuleRes( STR_TRANSPARENT )) );
     }
 }
 
 IMPL_LINK_NOARG(OColorPopup, SelectHdl)
 {
-    sal_uInt16 nItemId = m_aColorSet.GetSelectItemId();
-    Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet.GetItemColor( nItemId ) );
+    sal_uInt16 nItemId = m_aColorSet->GetSelectItemId();
+    Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet->GetItemColor( nItemId ) );
 
     /*  #i33380# Moved the following line above the Dispatch() calls.
         This instance may be deleted in the meantime (i.e. when a dialog is opened
         while in Dispatch()), accessing members will crash in this case. */
-    m_aColorSet.SetNoSelection();
+    m_aColorSet->SetNoSelection();
 
     if ( IsInPopupMode() )
         EndPopupMode();
@@ -293,6 +306,11 @@ sal_uInt16 Condition::mapToolbarItemToSlotId(sal_uInt16 nItemId) const
 }
 
 Condition::~Condition()
+{
+    dispose();
+}
+
+void Condition::dispose()
 {
     m_bInDestruction = true;
 
@@ -301,6 +319,7 @@ Condition::~Condition()
     delete m_pCondLHS;
     delete m_pCondRHS;
     delete m_pBtnUpdaterBackgroundColor;
+    VclHBox::dispose();
 }
 
 IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )

reportdesign/source/ui/dlg/Condition.hxx

@@ -107,6 +107,7 @@ namespace rptui
     public:
         Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
         virtual ~Condition();
+        virtual void dispose() SAL_OVERRIDE;
 
         /** will be called when the id of the image list needs to change.
             @param  _eBitmapSet

reportdesign/source/ui/dlg/Formula.cxx

@@ -86,6 +86,11 @@ void FormulaDialog::fill()
 }
 
 FormulaDialog::~FormulaDialog()
+{
+    dispose();
+}
+
+void FormulaDialog::dispose()
 {
     if ( m_pAddField )
     {
@@ -97,6 +102,7 @@ FormulaDialog::~FormulaDialog()
     }
 
     StoreFormEditData( m_pFormulaData );
+    formula::FormulaModalDialog::dispose();
 }
 
 

reportdesign/source/ui/dlg/GroupsSorting.cxx

@@ -97,6 +97,7 @@ class OFieldExpressionControl : public TContainerListenerBase
 public:
     OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent);
     virtual ~OFieldExpressionControl();
+    virtual void dispose() 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;
@@ -181,6 +182,12 @@ OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentD
 
 
 OFieldExpressionControl::~OFieldExpressionControl()
+{
+    dispose();
+}
+
+
+void OFieldExpressionControl::dispose()
 {
     WeakImplHelper1::acquire();
     uno::Reference< report::XGroups > xGroups = m_pParent->getGroups();
@@ -193,6 +200,7 @@ OFieldExpressionControl::~OFieldExpressionControl()
         Application::RemoveUserEvent( m_nDeleteEvent );
 
     delete m_pComboCell;
+    OFieldExpressionControl_Base::dispose();
 }
 
 uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
@@ -969,12 +977,18 @@ OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnl
 }
 
 OGroupsSortingDialog::~OGroupsSortingDialog()
+{
+    dispose();
+}
+
+void OGroupsSortingDialog::dispose()
 {
     delete m_pFieldExpression;
     m_xColumns.clear();
     m_pReportListener->dispose();
     if ( m_pCurrentGroupListener.is() )
         m_pCurrentGroupListener->dispose();
+    FloatingWindow::dispose();
 }
 
 void OGroupsSortingDialog::UpdateData( )

reportdesign/source/ui/dlg/Navigator.cxx

@@ -182,6 +182,7 @@ protected:
 public:
     NavigatorTree(vcl::Window* pParent,OReportController& _rController );
     virtual ~NavigatorTree();
+    virtual void dispose() SAL_OVERRIDE;
 
     DECL_LINK(OnEntrySelDesel, NavigatorTree*);
     DECL_LINK( OnDropActionTimer, void* );
@@ -254,6 +255,11 @@ NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rControll
 }
 
 NavigatorTree::~NavigatorTree()
+{
+    dispose();
+}
+
+void NavigatorTree::dispose()
 {
     SvTreeListEntry* pCurrent = First();
     while ( pCurrent )
@@ -263,6 +269,7 @@ NavigatorTree::~NavigatorTree()
     }
     m_pReportListener->dispose();
     m_pSelectionListener->dispose();
+    SvTreeListBox::dispose();
 }
 
 void NavigatorTree::Command( const CommandEvent& rEvt )

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<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;

reportdesign/source/ui/inc/DesignView.hxx

@@ -59,12 +59,12 @@ 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;
+        VclPtr<OScrollWindowHelper>         m_aScrollWindow;
+        vcl::Window*                        m_pTaskPane;
         PropBrw*                            m_pPropWin;
         OAddFieldWindow*                    m_pAddField;
         OSectionView*                       m_pCurrentView;
@@ -72,8 +72,8 @@ namespace rptui
         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;

reportdesign/source/ui/inc/Formula.hxx

@@ -68,6 +68,7 @@ public:
         , svl::SharedStringPool& rStrPool );
 
     virtual ~FormulaDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     // IFormulaEditorHelper
     virtual void notifyChange() SAL_OVERRIDE;

reportdesign/source/ui/inc/GroupsSorting.hxx

@@ -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

reportdesign/source/ui/inc/ReportSection.hxx

@@ -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;

reportdesign/source/ui/inc/ReportWindow.hxx

@@ -45,10 +45,10 @@ namespace rptui
                             , public ::cppu::BaseMutex
                             , public ::comphelper::OPropertyChangeListener
     {
-        Ruler                   m_aHRuler;
+        VclPtr<Ruler>           m_aHRuler;
         ODesignView*            m_pView;
         OScrollWindowHelper*    m_pParent;
-        OViewsWindow            m_aViewsWindow;
+        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
         */

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;
+        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 );

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;
+        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);

reportdesign/source/ui/inc/StartMarker.hxx

@@ -31,9 +31,9 @@ namespace rptui
     class OStartMarker : public OColorListener
     {
 
-        Ruler                       m_aVRuler;
-        FixedText                   m_aText;
-        FixedImage                  m_aImage;
+        VclPtr<Ruler>               m_aVRuler;
+        VclPtr<FixedText>           m_aText;
+        VclPtr<FixedImage>          m_aImage;
         OSectionWindow*             m_pParent;
         static Image*               s_pDefCollapsed;
         static Image*               s_pDefExpanded;
@@ -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;

reportdesign/source/ui/inc/ViewsWindow.hxx

@@ -153,6 +153,7 @@ namespace rptui
         OViewsWindow(
             OReportWindow* _pReportWindow);
         virtual ~OViewsWindow();
+        virtual void dispose() SAL_OVERRIDE;
 
         // Window overrides
         virtual void Resize() SAL_OVERRIDE;

reportdesign/source/ui/inc/propbrw.hxx

@@ -90,6 +90,7 @@ public:
             ,Window* pParent
             ,ODesignView*  _pDesignView);
     virtual ~PropBrw();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void LoseFocus() SAL_OVERRIDE;
 

reportdesign/source/ui/report/ReportSection.cxx

@@ -110,6 +110,11 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
 }
 
 OReportSection::~OReportSection()
+{
+    dispose();
+}
+
+void OReportSection::dispose()
 {
     m_pPage = NULL;
     if ( m_pMulti.is() )
@@ -125,6 +130,7 @@ OReportSection::~OReportSection()
             m_pView->EndListening( *m_pModel );
         m_pView = NULL;
     }
+    vcl::Window::dispose();
 }
 
 void OReportSection::Paint( const Rectangle& rRect )

reportdesign/source/ui/report/StartMarker.cxx

@@ -48,9 +48,9 @@ oslInterlockedCount OStartMarker::s_nImageRefCount  = 0;
 
 OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry)
 : OColorListener(_pParent,_sColorEntry)
-,m_aVRuler(this,WB_VERT)
-,m_aText(this,WB_HYPHENATION)
-,m_aImage(this,WB_LEFT|WB_TOP|WB_SCALE)
+,m_aVRuler(new Ruler(this,WB_VERT))
+,m_aText(new FixedText(this,WB_HYPHENATION))
+,m_aImage(new FixedImage(this,WB_LEFT|WB_TOP|WB_SCALE))
 ,m_pParent(_pParent)
 ,m_bShowRuler(true)
 {
@@ -59,39 +59,48 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
     osl_atomic_increment(&s_nImageRefCount);
     initDefaultNodeImages();
     ImplInitSettings();
-    m_aText.SetHelpId(HID_RPT_START_TITLE);
-    m_aText.SetPaintTransparent(true);
-    m_aImage.SetHelpId(HID_RPT_START_IMAGE);
-    m_aText.Show();
-    m_aImage.Show();
-    m_aVRuler.Show();
-    m_aVRuler.Activate();
-    m_aVRuler.SetPagePos(0);
-    m_aVRuler.SetBorders();
-    m_aVRuler.SetIndents();
-    m_aVRuler.SetMargin1();
-    m_aVRuler.SetMargin2();
+    m_aText->SetHelpId(HID_RPT_START_TITLE);
+    m_aText->SetPaintTransparent(true);
+    m_aImage->SetHelpId(HID_RPT_START_IMAGE);
+    m_aText->Show();
+    m_aImage->Show();
+    m_aVRuler->Show();
+    m_aVRuler->Activate();
+    m_aVRuler->SetPagePos(0);
+    m_aVRuler->SetBorders();
+    m_aVRuler->SetIndents();
+    m_aVRuler->SetMargin1();
+    m_aVRuler->SetMargin2();
     const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
-    m_aVRuler.SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH);
+    m_aVRuler->SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH);
     EnableChildTransparentMode( true );
     SetParentClipMode( PARENTCLIPMODE_NOCLIP );
     SetPaintTransparent( true );
 }
 
 OStartMarker::~OStartMarker()
+{
+    dispose();
+}
+
+void OStartMarker::dispose()
 {
     if ( osl_atomic_decrement(&s_nImageRefCount) == 0 )
     {
         DELETEZ(s_pDefCollapsed);
         DELETEZ(s_pDefExpanded);
     }
+    m_aVRuler.disposeAndClear();
+    m_aText.disposeAndClear();
+    m_aImage.disposeAndClear();
+    OColorListener::dispose();
 }
 
 sal_Int32 OStartMarker::getMinHeight() const
 {
     Fraction aExtraWidth(long(2*REPORT_EXTRA_SPACE));
     aExtraWidth *= GetMapMode().GetScaleX();
-    return LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() + (long)aExtraWidth;
+    return LogicToPixel(Size(0,m_aText->GetTextHeight())).Height() + (long)aExtraWidth;
 }
 
 void OStartMarker::Paint( const Rectangle& rRect )
@@ -107,7 +116,7 @@ void OStartMarker::Paint( const Rectangle& rRect )
     }
     else
     {
-        const long nVRulerWidth = m_aVRuler.GetSizePixel().Width();
+        const long nVRulerWidth = m_aVRuler->GetSizePixel().Width();
         nSize = aSize.Width() - nVRulerWidth;
         aSize.Width() += nCornerWidth;
         SetClipRegion(vcl::Region(PixelToLogic(Rectangle(Point(),Size(nSize,aSize.Height())))));
@@ -148,8 +157,8 @@ void OStartMarker::setColor()
     Color aTextColor = GetTextColor();
     if ( aColor.GetLuminance() < 128 )
         aTextColor = COL_WHITE;
-    m_aText.SetTextColor(aTextColor);
-    m_aText.SetLineColor(m_nColor);
+    m_aText->SetTextColor(aTextColor);
+    m_aText->SetLineColor(m_nColor);
 }
 
 void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
@@ -162,14 +171,14 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
     const Size aOutputSize = GetOutputSizePixel();
     if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() )
         return;
-    Rectangle aRect(m_aImage.GetPosPixel(),m_aImage.GetSizePixel());
+    Rectangle aRect(m_aImage->GetPosPixel(),m_aImage->GetSizePixel());
     if ( rMEvt.GetClicks() == 2 || aRect.IsInside( aPos ) )
     {
         m_bCollapsed = !m_bCollapsed;
 
         changeImage();
 
-        m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
+        m_aVRuler->Show(!m_bCollapsed && m_bShowRuler);
         if ( m_aCollapsedLink.IsSet() )
             m_aCollapsedLink.Call(this);
     }
@@ -180,7 +189,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 void OStartMarker::changeImage()
 {
     Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
-    m_aImage.SetImage(*pImage);
+    m_aImage->SetImage(*pImage);
 }
 
 void OStartMarker::initDefaultNodeImages()
@@ -192,11 +201,11 @@ void OStartMarker::initDefaultNodeImages()
     }
 
     Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
-    m_aImage.SetImage(*pImage);
-    m_aImage.SetMouseTransparent(true);
-    m_aImage.SetBackground();
-    m_aText.SetBackground();
-    m_aText.SetMouseTransparent(true);
+    m_aImage->SetImage(*pImage);
+    m_aImage->SetMouseTransparent(true);
+    m_aImage->SetBackground();
+    m_aText->SetBackground();
+    m_aText->SetMouseTransparent(true);
 }
 
 void OStartMarker::ImplInitSettings()
@@ -212,11 +221,11 @@ void OStartMarker::Resize()
     const long nOutputWidth  = aOutputSize.Width();
     const long nOutputHeight = aOutputSize.Height();
 
-    const long nVRulerWidth = m_aVRuler.GetSizePixel().Width();
+    const long nVRulerWidth = m_aVRuler->GetSizePixel().Width();
     const Point aRulerPos(nOutputWidth - nVRulerWidth,0);
-    m_aVRuler.SetPosSizePixel(aRulerPos,Size(nVRulerWidth,nOutputHeight));
+    m_aVRuler->SetPosSizePixel(aRulerPos,Size(nVRulerWidth,nOutputHeight));
 
-    Size aImageSize = m_aImage.GetImage().GetSizePixel();
+    Size aImageSize = m_aImage->GetImage().GetSizePixel();
     const MapMode& rMapMode = GetMapMode();
     aImageSize.Width() = long(aImageSize.Width() * (double)rMapMode.GetScaleX());
     aImageSize.Height() = long(aImageSize.Height() * (double)rMapMode.GetScaleY());
@@ -225,17 +234,17 @@ void OStartMarker::Resize()
     aExtraWidth *= rMapMode.GetScaleX();
 
     Point aPos(aImageSize.Width() + (long)(aExtraWidth + aExtraWidth), aExtraWidth);
-    const long nHeight = ::std::max<sal_Int32>(nOutputHeight - 2*aPos.Y(),LogicToPixel(Size(0,m_aText.GetTextHeight())).Height());
-    m_aText.SetPosSizePixel(aPos,Size(aRulerPos.X() - aPos.X(),nHeight));
+    const long nHeight = ::std::max<sal_Int32>(nOutputHeight - 2*aPos.Y(),LogicToPixel(Size(0,m_aText->GetTextHeight())).Height());
+    m_aText->SetPosSizePixel(aPos,Size(aRulerPos.X() - aPos.X(),nHeight));
 
     aPos.X() = aExtraWidth;
-    aPos.Y() += static_cast<sal_Int32>((LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() - aImageSize.Height()) * 0.5) ;
-    m_aImage.SetPosSizePixel(aPos,aImageSize);
+    aPos.Y() += static_cast<sal_Int32>((LogicToPixel(Size(0,m_aText->GetTextHeight())).Height() - aImageSize.Height()) * 0.5) ;
+    m_aImage->SetPosSizePixel(aPos,aImageSize);
 }
 
 void OStartMarker::setTitle(const OUString& _sTitle)
 {
-    m_aText.SetText(_sTitle);
+    m_aText->SetText(_sTitle);
 }
 
 void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
@@ -252,12 +261,12 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
 void OStartMarker::showRuler(bool _bShow)
 {
     m_bShowRuler = _bShow;
-    m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
+    m_aVRuler->Show(!m_bCollapsed && m_bShowRuler);
 }
 
 void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
 {
-    if( !m_aText.GetText().isEmpty())
+    if( !m_aText->GetText().isEmpty())
     {
         // Hilfe anzeigen
         Rectangle aItemRect(rHEvt.GetMousePosPixel(),Size(GetSizePixel().Width(),getMinHeight()));
@@ -268,9 +277,9 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
         aItemRect.Right()  = aPt.X();
         aItemRect.Bottom() = aPt.Y();
         if( rHEvt.GetMode() == HelpEventMode::BALLOON )
-            Help::ShowBalloon( this, aItemRect.Center(), aItemRect, m_aText.GetText());
+            Help::ShowBalloon( this, aItemRect.Center(), aItemRect, m_aText->GetText());
         else
-            Help::ShowQuickHelp( this, aItemRect, m_aText.GetText() );
+            Help::ShowQuickHelp( this, aItemRect, m_aText->GetText() );
     }
 }
 
@@ -284,8 +293,8 @@ void OStartMarker::setCollapsed(bool _bCollapsed)
 void OStartMarker::zoom(const Fraction& _aZoom)
 {
     setZoomFactor(_aZoom,*this);
-    m_aVRuler.SetZoom(_aZoom);
-    setZoomFactor(_aZoom,m_aText);
+    m_aVRuler->SetZoom(_aZoom);
+    setZoomFactor(_aZoom, *m_aText.get());
     Resize();
     Invalidate();
 }

reportdesign/source/ui/report/ViewsWindow.cxx

@@ -184,9 +184,15 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
 }
 
 OViewsWindow::~OViewsWindow()
+{
+    dispose();
+}
+
+void OViewsWindow::dispose()
 {
     m_aColorConfig.RemoveListener(this);
     m_aSections.clear();
+    vcl::Window::dispose();
 }
 
 void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet)

reportdesign/source/ui/report/propbrw.cxx

@@ -184,6 +184,11 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare
 
 
 PropBrw::~PropBrw()
+{
+    dispose();
+}
+
+void PropBrw::dispose()
 {
     if (m_xBrowserController.is())
         implDetachController();
@@ -204,6 +209,7 @@ PropBrw::~PropBrw()
     {}
 
     ::rptui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+    DockingWindow::dispose();
 }
 
 void PropBrw::setCurrentPage(const OUString& _sLastActivePage)