Merge remote-tracking branch 'origin/feature/vclptr'

Resolve several thousand lines of conflicts.

Conflicts:
accessibility/source/extended/accessiblelistbox.cxx
accessibility/source/standard/vclxaccessiblecombobox.cxx
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
accessibility/source/standard/vclxaccessiblelistbox.cxx
accessibility/source/standard/vclxaccessibletextfield.cxx
basctl/source/basicide/basidesh.cxx
cui/source/inc/chardlg.hxx
cui/source/tabpages/tpbitmap.cxx
dbaccess/source/ui/dlg/UserAdmin.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
extensions/source/propctrlr/propertyeditor.hxx
extensions/source/scanner/sanedlg.cxx
filter/source/pdf/impdialog.cxx
include/sfx2/mgetempl.hxx
include/sfx2/sidebar/SidebarToolBox.hxx
include/sfx2/viewsh.hxx
include/svtools/brwbox.hxx
include/svtools/filectrl.hxx
include/svtools/scrwin.hxx
include/svx/dlgctrl.hxx
include/svx/sidebar/Popup.hxx
include/svx/sidebar/PopupContainer.hxx
include/svx/sidebar/PopupControl.hxx
include/svx/sidebar/SidebarDialControl.hxx
include/svx/sidebar/ValueSetWithTextControl.hxx
sc/source/ui/condformat/condformatdlgentry.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/sidebar/CellBorderStyleControl.hxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/Ruler.hxx
sd/source/ui/inc/SlideSorter.hxx
sd/source/ui/inc/ViewTabBar.hxx
sd/source/ui/inc/Window.hxx
sd/source/ui/inc/morphdlg.hxx
sd/source/ui/inc/sdpreslt.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/NavigatorWrapper.hxx
sd/source/ui/sidebar/PanelBase.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
sd/source/ui/slideshow/showwindow.hxx
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drviewsa.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/opengrf.cxx
sfx2/source/control/thumbnailviewacc.hxx
sfx2/source/dialog/securitypage.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/doc/docinsert.cxx
sfx2/source/doc/guisaveas.cxx
sfx2/source/inc/alienwarn.hxx
sfx2/source/sidebar/Deck.cxx
sfx2/source/sidebar/Deck.hxx
sfx2/source/sidebar/DeckTitleBar.cxx
sfx2/source/sidebar/DeckTitleBar.hxx
sfx2/source/sidebar/MenuButton.cxx
sfx2/source/sidebar/MenuButton.hxx
sfx2/source/sidebar/Panel.cxx
sfx2/source/sidebar/Panel.hxx
sfx2/source/sidebar/PanelTitleBar.hxx
sfx2/source/sidebar/SidebarDockingWindow.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
sfx2/source/sidebar/TabBar.hxx
sfx2/source/sidebar/TabItem.cxx
sfx2/source/sidebar/TabItem.hxx
sfx2/source/sidebar/TitleBar.hxx
sfx2/source/toolbox/imgmgr.cxx
starmath/inc/edit.hxx
starmath/inc/smmod.hxx
starmath/qa/cppunit/test_starmath.cxx
starmath/source/edit.cxx
starmath/source/smmod.cxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/simptabl.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/valueimp.hxx
svx/inc/GalleryControl.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/swframeexample.cxx
svx/source/fmcomp/fmgridif.cxx
svx/source/gallery2/GalleryControl.cxx
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/area/AreaPropertyPanel.hxx
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanel.hxx
svx/source/sidebar/line/LineWidthControl.cxx
svx/source/sidebar/line/LineWidthControl.hxx
svx/source/sidebar/line/LineWidthValueSet.hxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
svx/source/sidebar/possize/SidebarDialControl.cxx
svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/tools/PopupContainer.cxx
svx/source/sidebar/tools/PopupControl.cxx
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
svx/source/svdraw/svdfmtf.hxx
svx/source/svdraw/svdibrow.cxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/index/cnttab.cxx
sw/source/uibase/inc/drpcps.hxx
sw/source/uibase/sidebar/PageColumnControl.hxx
sw/source/uibase/sidebar/PageMarginControl.hxx
sw/source/uibase/sidebar/PageOrientationControl.hxx
sw/source/uibase/sidebar/PagePropertyPanel.hxx
sw/source/uibase/sidebar/PageSizeControl.hxx
sw/source/uibase/uiview/view2.cxx
sw/source/uibase/utlui/navipi.cxx
vcl/inc/svdata.hxx
vcl/source/control/combobox.cxx
vcl/source/control/lstbox.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/winproc.cxx

Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95

4 files changed, 55 insertions, 29 deletions

diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index f973411b850f..0a0f9f6c33d5 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -248,7 +248,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString
                         SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
                         SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
                         0 );
-            SfxPrinter* pPrinter = new SfxPrinter( pSet );
+            VclPtr<SfxPrinter> pPrinter = VclPtr<SfxPrinter>::Create( pSet );
 
             // and append it to the document.
             xDocSh->GetDoc()->getIDocumentDeviceAccess().setPrinter( pPrinter, true, true );
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx
index 33361a478546..8f8264e0bc3c 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -63,7 +63,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwNumberingTypeListBox
 
 SwNumberingTypeListBox::~SwNumberingTypeListBox()
 {
+    disposeOnce();
+}
+
+void SwNumberingTypeListBox::dispose()
+{
     delete pImpl;
+    ListBox::dispose();
 }
 
 void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 1db1ec86d86b..e0ba28d8874e 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -67,9 +67,9 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( vcl::Window* _pParent,
                                             SfxChildWinInfo* pInfo ) :
     SwChildWinWrapper( _pParent, nId )
 {
-    pWindow = new SwModelessRedlineAcceptDlg( pBindings, this, _pParent);
+    pWindow = VclPtr<SwModelessRedlineAcceptDlg>::Create( pBindings, this, _pParent);
 
-    static_cast<SwModelessRedlineAcceptDlg *>(pWindow)->Initialize(pInfo);
+    static_cast<SwModelessRedlineAcceptDlg *>(pWindow.get())->Initialize(pInfo);
 }
 
 // newly initialise dialog after document switch
@@ -137,13 +137,19 @@ void SwModelessRedlineAcceptDlg::FillInfo(SfxChildWinInfo& rInfo) const
 
 SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg()
 {
+    disposeOnce();
+}
+
+void SwModelessRedlineAcceptDlg::dispose()
+{
     delete pImplDlg;
+    SfxModelessDialog::dispose();
 }
 
 SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder,
                                        vcl::Window *pContentArea, bool bAutoFmt) :
     pParentDlg      (pParent),
-    aTabPagesCTRL   (pContentArea, pBuilder),
+    aTabPagesCTRL   (VclPtr<SvxAcceptChgCtr>::Create(pContentArea, pBuilder)),
     aPopup          (SW_RES(MN_REDLINE_POPUP)),
     sInserted       (SW_RES(STR_REDLINE_INSERTED)),
     sDeleted        (SW_RES(STR_REDLINE_DELETED)),
@@ -156,8 +162,8 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
     bRedlnAutoFmt   (bAutoFmt),
     bInhibitActivate( false )
 {
-    aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL);
-    pTPView = aTabPagesCTRL.GetViewPage();
+    aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL);
+    pTPView = aTabPagesCTRL->GetViewPage();
 
     pTable = pTPView->GetTableControl();
 
@@ -173,9 +179,9 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
     pTPView->EnableAcceptAll(false);
     pTPView->EnableRejectAll(false);
 
-    aTabPagesCTRL.GetFilterPage()->SetReadyHdl(LINK(this, SwRedlineAcceptDlg, FilterChangedHdl));
+    aTabPagesCTRL->GetFilterPage()->SetReadyHdl(LINK(this, SwRedlineAcceptDlg, FilterChangedHdl));
 
-    ListBox *pActLB = aTabPagesCTRL.GetFilterPage()->GetLbAction();
+    ListBox *pActLB = aTabPagesCTRL->GetFilterPage()->GetLbAction();
     pActLB->InsertEntry(sInserted);
     pActLB->InsertEntry(sDeleted);
     pActLB->InsertEntry(sFormated);
@@ -215,6 +221,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
 
 SwRedlineAcceptDlg::~SwRedlineAcceptDlg()
 {
+    aTabPagesCTRL.disposeAndClear();
 }
 
 void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
@@ -247,7 +254,7 @@ void SwRedlineAcceptDlg::InitAuthors()
 {
     SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
 
-    SvxTPFilter *pFilterPage = aTabPagesCTRL.GetFilterPage();
+    SvxTPFilter *pFilterPage = aTabPagesCTRL->GetFilterPage();
 
     std::vector<OUString> aStrings;
     OUString sOldAuthor(pFilterPage->GetSelectedAuthor());
@@ -911,7 +918,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, UndoHdl)
 
 IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl)
 {
-    SvxTPFilter *pFilterTP = aTabPagesCTRL.GetFilterPage();
+    SvxTPFilter *pFilterTP = aTabPagesCTRL->GetFilterPage();
 
     if (pFilterTP->IsAction())
         sFilterAction = pFilterTP->GetLbAction()->GetSelectEntry();
@@ -1242,7 +1249,13 @@ SwRedlineAcceptPanel::SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno:
 
 SwRedlineAcceptPanel::~SwRedlineAcceptPanel()
 {
+    disposeOnce();
+}
+
+void SwRedlineAcceptPanel::dispose()
+{
     delete mpImplDlg;
+    PanelLayout::dispose();
 }
 
 void SwRedlineAcceptPanel::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index b9d43d094ec1..db2adb767018 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -41,7 +41,7 @@ SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEd
 , mpSwWin(pWin)
 , mbIsHighlighted(false)
 , mnFadeRate(0)
-, maVirDev( *this )
+, maVirDev( VclPtr<VirtualDevice>::Create(*this) )
 {
     // Set fading timeout: 5 x 40ms = 200ms
     maFadeTimer.SetTimeout(40);
@@ -51,6 +51,13 @@ SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEd
 // Destructor
 SwCommentRuler::~SwCommentRuler()
 {
+    disposeOnce();
+}
+
+void SwCommentRuler::dispose()
+{
+    mpSwWin.clear();
+    SvxRuler::dispose();
 }
 
 void SwCommentRuler::Paint( const Rectangle& rRect )
@@ -68,25 +75,25 @@ void SwCommentRuler::DrawCommentControl()
     bool bIsCollapsed = ! mpViewShell->GetPostItMgr()->ShowNotes();
 
     Rectangle aControlRect = GetCommentControlRegion();
-    maVirDev.SetOutputSizePixel( aControlRect.GetSize() );
+    maVirDev->SetOutputSizePixel( aControlRect.GetSize() );
 
     // Paint comment control background
     // TODO Check if these are best colors to be used
     Color aBgColor = GetFadedColor( rStyleSettings.GetDarkShadowColor(), rStyleSettings.GetWorkspaceColor() );
-    maVirDev.SetFillColor( aBgColor );
+    maVirDev->SetFillColor( aBgColor );
 
     if ( mbIsHighlighted || !bIsCollapsed )
     {
         // Draw borders
-        maVirDev.SetLineColor( rStyleSettings.GetShadowColor() );
+        maVirDev->SetLineColor( rStyleSettings.GetShadowColor() );
     }
     else
     {
         // No borders
-        maVirDev.SetLineColor();
+        maVirDev->SetLineColor();
     }
 
-    maVirDev.DrawRect( Rectangle( Point(), aControlRect.GetSize() ) );
+    maVirDev->DrawRect( Rectangle( Point(), aControlRect.GetSize() ) );
 
     // Label and arrow tip
     OUString aLabel( SW_RESSTR ( STR_COMMENTS_LABEL ) );
@@ -135,9 +142,9 @@ void SwCommentRuler::DrawCommentControl()
 
     // Draw label
     Color aTextColor = GetFadedColor( rStyleSettings.GetButtonTextColor(), rStyleSettings.GetDarkShadowColor() );
-    maVirDev.SetTextColor( aTextColor );
+    maVirDev->SetTextColor( aTextColor );
     // FIXME Expected font size?
-    maVirDev.DrawText( aLabelPos, aLabel );
+    maVirDev->DrawText( aLabelPos, aLabel );
 
     // Draw arrow
     // FIXME consistence of button colors. http://opengrok.libreoffice.org/xref/core/vcl/source/control/button.cxx#785
@@ -145,26 +152,26 @@ void SwCommentRuler::DrawCommentControl()
     ImplDrawArrow ( aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight );
 
     // Blit comment control
-    DrawOutDev( aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), maVirDev );
+    DrawOutDev( aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev.get() );
 }
 
 void SwCommentRuler::ImplDrawArrow(long nX, long nY, const Color& rColor, bool bPointRight)
 {
-    maVirDev.SetLineColor();
-    maVirDev.SetFillColor( rColor );
+    maVirDev->SetLineColor();
+    maVirDev->SetFillColor( rColor );
     if ( bPointRight )
     {
-        maVirDev.DrawRect( Rectangle( nX+0, nY+0, nX+0, nY+6 ) );
-        maVirDev.DrawRect( Rectangle( nX+1, nY+1, nX+1, nY+5 ) );
-        maVirDev.DrawRect( Rectangle( nX+2, nY+2, nX+2, nY+4 ) );
-        maVirDev.DrawRect( Rectangle( nX+3, nY+3, nX+3, nY+3 ) );
+        maVirDev->DrawRect( Rectangle( nX+0, nY+0, nX+0, nY+6 ) );
+        maVirDev->DrawRect( Rectangle( nX+1, nY+1, nX+1, nY+5 ) );
+        maVirDev->DrawRect( Rectangle( nX+2, nY+2, nX+2, nY+4 ) );
+        maVirDev->DrawRect( Rectangle( nX+3, nY+3, nX+3, nY+3 ) );
     }
     else
     {
-        maVirDev.DrawRect( Rectangle( nX+0, nY+3, nX+0, nY+3 ) );
-        maVirDev.DrawRect( Rectangle( nX+1, nY+2, nX+1, nY+4 ) );
-        maVirDev.DrawRect( Rectangle( nX+2, nY+1, nX+2, nY+5 ) );
-        maVirDev.DrawRect( Rectangle( nX+3, nY+0, nX+3, nY+6 ) );
+        maVirDev->DrawRect( Rectangle( nX+0, nY+3, nX+0, nY+3 ) );
+        maVirDev->DrawRect( Rectangle( nX+1, nY+2, nX+1, nY+4 ) );
+        maVirDev->DrawRect( Rectangle( nX+2, nY+1, nX+2, nY+5 ) );
+        maVirDev->DrawRect( Rectangle( nX+3, nY+0, nX+3, nY+6 ) );
     }
 }