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

1 files changed, 24 insertions, 36 deletions

diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index a49035773b2b..ed1dd0f235ef 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -71,18 +71,18 @@ private:
 
 ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter(
     ViewShell& rViewShell,
-    const ::boost::shared_ptr<sd::Window>& rpContentWindow,
-    const ::boost::shared_ptr<ScrollBar>& rpHorizontalScrollBar,
-    const ::boost::shared_ptr<ScrollBar>& rpVerticalScrollBar,
-    const ::boost::shared_ptr<ScrollBarBox>& rpScrollBarBox)
+    sd::Window* pContentWindow,
+    ScrollBar* pHorizontalScrollBar,
+    ScrollBar* pVerticalScrollBar,
+    ScrollBarBox* pScrollBarBox)
 {
     ::boost::shared_ptr<SlideSorter> pSlideSorter(
         new SlideSorter(
             rViewShell,
-            rpContentWindow,
-            rpHorizontalScrollBar,
-            rpVerticalScrollBar,
-            rpScrollBarBox));
+            pContentWindow,
+            pHorizontalScrollBar,
+            pVerticalScrollBar,
+            pScrollBarBox));
     pSlideSorter->Init();
     return pSlideSorter;
 }
@@ -103,10 +103,10 @@ private:
 
 SlideSorter::SlideSorter (
     ViewShell& rViewShell,
-    const ::boost::shared_ptr<sd::Window>& rpContentWindow,
-    const ::boost::shared_ptr<ScrollBar>& rpHorizontalScrollBar,
-    const ::boost::shared_ptr<ScrollBar>& rpVerticalScrollBar,
-    const ::boost::shared_ptr<ScrollBarBox>& rpScrollBarBox)
+    sd::Window* pContentWindow,
+    ScrollBar* pHorizontalScrollBar,
+    ScrollBar* pVerticalScrollBar,
+    ScrollBarBox* pScrollBarBox)
     : mbIsValid(false),
       mpSlideSorterController(),
       mpSlideSorterModel(),
@@ -114,11 +114,11 @@ SlideSorter::SlideSorter (
       mxControllerWeak(),
       mpViewShell(&rViewShell),
       mpViewShellBase(&rViewShell.GetViewShellBase()),
-      mpContentWindow(rpContentWindow),
+      mpContentWindow(pContentWindow),
       mbOwnesContentWindow(false),
-      mpHorizontalScrollBar(rpHorizontalScrollBar),
-      mpVerticalScrollBar(rpVerticalScrollBar),
-      mpScrollBarBox(rpScrollBarBox),
+      mpHorizontalScrollBar(pHorizontalScrollBar),
+      mpVerticalScrollBar(pVerticalScrollBar),
+      mpScrollBarBox(pScrollBarBox),
       mbLayoutPending(true),
       mpProperties(new controller::Properties()),
       mpTheme(new view::Theme(mpProperties))
@@ -136,11 +136,11 @@ SlideSorter::SlideSorter (
       mxControllerWeak(),
       mpViewShell(pViewShell),
       mpViewShellBase(&rBase),
-      mpContentWindow(new ContentWindow(rParentWindow,*this )),
+      mpContentWindow(VclPtr<ContentWindow>::Create(rParentWindow,*this )),
       mbOwnesContentWindow(true),
-      mpHorizontalScrollBar(new ScrollBar(&rParentWindow,WinBits(WB_HSCROLL | WB_DRAG))),
-      mpVerticalScrollBar(new ScrollBar(&rParentWindow,WinBits(WB_VSCROLL | WB_DRAG))),
-      mpScrollBarBox(new ScrollBarBox(&rParentWindow)),
+      mpHorizontalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_HSCROLL | WB_DRAG))),
+      mpVerticalScrollBar(VclPtr<ScrollBar>::Create(&rParentWindow,WinBits(WB_VSCROLL | WB_DRAG))),
+      mpScrollBarBox(VclPtr<ScrollBarBox>::Create(&rParentWindow)),
       mbLayoutPending(true),
       mpProperties(new controller::Properties()),
       mpTheme(new view::Theme(mpProperties))
@@ -170,7 +170,7 @@ void SlideSorter::Init()
     SetupListeners ();
 
     // Initialize the window.
-    SharedSdWindow pContentWindow (GetContentWindow());
+    sd::Window *pContentWindow (GetContentWindow());
     if (pContentWindow)
     {
         ::vcl::Window* pParentWindow = pContentWindow->GetParent();
@@ -211,18 +211,6 @@ SlideSorter::~SlideSorter()
     mpHorizontalScrollBar.reset();
     mpVerticalScrollBar.reset();
     mpScrollBarBox.reset();
-
-    if (mbOwnesContentWindow)
-    {
-        OSL_ASSERT(mpContentWindow.unique());
-    }
-    else
-    {
-        // Assume that outside this class only the owner holds a reference
-        // to the content window.
-        OSL_ASSERT(mpContentWindow.use_count()==2);
-    }
-    mpContentWindow.reset();
 }
 
 model::SlideSorterModel& SlideSorter::GetModel() const
@@ -253,7 +241,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea)
 {
     GetController().Paint(
         rRepaintArea,
-        GetContentWindow().get());
+        GetContentWindow());
 }
 
 void SlideSorter::SetupControls (::vcl::Window* )
@@ -263,7 +251,7 @@ void SlideSorter::SetupControls (::vcl::Window* )
 
 void SlideSorter::SetupListeners()
 {
-    SharedSdWindow pWindow (GetContentWindow());
+    sd::Window *pWindow (GetContentWindow());
     if (pWindow)
     {
         ::vcl::Window* pParentWindow = pWindow->GetParent();
@@ -292,7 +280,7 @@ void SlideSorter::ReleaseListeners()
 {
     mpSlideSorterController->GetScrollBarManager().Disconnect();
 
-    SharedSdWindow pWindow (GetContentWindow());
+    sd::Window *pWindow (GetContentWindow());
     if (pWindow)
     {
         pWindow->RemoveEventListener(