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, 51 insertions, 50 deletions

diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 5750ca0857da..ec241902877b 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -89,7 +89,7 @@ enum SearchLabel
 class SvxSearchDialog;
 class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
 {
-    SvxSearchDialog *dialog;
+    VclPtr<SvxSearchDialog> dialog;
 public:
     SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId,
                             SfxBindings* pBindings, SfxChildWinInfo* pInfo );
@@ -120,6 +120,7 @@ friend class SvxJSearchOptionsDialog;
 public:
     SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
     virtual ~SvxSearchDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual bool    Close() SAL_OVERRIDE;
 
@@ -150,57 +151,57 @@ public:
     void SetSearchLabel(const OUString& rStr) { m_pSearchLabel->SetText(rStr); }
 
 private:
-    vcl::Window*         mpDocWin;
+    VclPtr<vcl::Window>         mpDocWin;
     bool            mbSuccess;
 
-    VclFrame*       m_pSearchFrame;
-    ComboBox*       m_pSearchLB;
-    ListBox*        m_pSearchTmplLB;
-    FixedText*      m_pSearchAttrText;
-    FixedText*      m_pSearchLabel;
-
-    VclFrame*       m_pReplaceFrame;
-    ComboBox*       m_pReplaceLB;
-    ListBox*        m_pReplaceTmplLB;
-    FixedText*      m_pReplaceAttrText;
-
-    PushButton*     m_pSearchBtn;
-    PushButton*     m_pSearchAllBtn;
-    PushButton*     m_pReplaceBtn;
-    PushButton*     m_pReplaceAllBtn;
-
-    VclFrame*       m_pComponentFrame;
-    PushButton*     m_pSearchComponent1PB;
-    PushButton*     m_pSearchComponent2PB;
-
-    CheckBox*       m_pMatchCaseCB;
-    CheckBox*       m_pWordBtn;
-
-    PushButton*     m_pCloseBtn;
-    CheckBox*       m_pIgnoreDiacritics;
-    CheckBox*       m_pIgnoreKashida;
-    CheckBox*       m_pSelectionBtn;
-    CheckBox*       m_pBackwardsBtn;
-    CheckBox*       m_pRegExpBtn;
-    CheckBox*       m_pSimilarityBox;
-    PushButton*     m_pSimilarityBtn;
-    CheckBox*       m_pLayoutBtn;
-    CheckBox*       m_pNotesBtn;
-    CheckBox*       m_pJapMatchFullHalfWidthCB;
-    CheckBox*       m_pJapOptionsCB;
-    PushButton*     m_pJapOptionsBtn;
-
-    PushButton*     m_pAttributeBtn;
-    PushButton*     m_pFormatBtn;
-    PushButton*     m_pNoFormatBtn;
-
-    VclContainer*   m_pCalcGrid;
-    FixedText*      m_pCalcSearchInFT;
-    ListBox*        m_pCalcSearchInLB;
-    FixedText*      m_pCalcSearchDirFT;
-    RadioButton*    m_pRowsBtn;
-    RadioButton*    m_pColumnsBtn;
-    CheckBox*       m_pAllSheetsCB;
+    VclPtr<VclFrame>       m_pSearchFrame;
+    VclPtr<ComboBox>       m_pSearchLB;
+    VclPtr<ListBox>        m_pSearchTmplLB;
+    VclPtr<FixedText>      m_pSearchAttrText;
+    VclPtr<FixedText>      m_pSearchLabel;
+
+    VclPtr<VclFrame>       m_pReplaceFrame;
+    VclPtr<ComboBox>       m_pReplaceLB;
+    VclPtr<ListBox>        m_pReplaceTmplLB;
+    VclPtr<FixedText>      m_pReplaceAttrText;
+
+    VclPtr<PushButton>    m_pSearchBtn;
+    VclPtr<PushButton>     m_pSearchAllBtn;
+    VclPtr<PushButton>     m_pReplaceBtn;
+    VclPtr<PushButton>     m_pReplaceAllBtn;
+
+    VclPtr<VclFrame>       m_pComponentFrame;
+    VclPtr<PushButton>     m_pSearchComponent1PB;
+    VclPtr<PushButton>     m_pSearchComponent2PB;
+
+    VclPtr<CheckBox>       m_pMatchCaseCB;
+    VclPtr<CheckBox>       m_pWordBtn;
+
+    VclPtr<PushButton>     m_pCloseBtn;
+    VclPtr<CheckBox>       m_pIgnoreDiacritics;
+    VclPtr<CheckBox>       m_pIgnoreKashida;
+    VclPtr<CheckBox>       m_pSelectionBtn;
+    VclPtr<CheckBox>       m_pBackwardsBtn;
+    VclPtr<CheckBox>       m_pRegExpBtn;
+    VclPtr<CheckBox>       m_pSimilarityBox;
+    VclPtr<PushButton>     m_pSimilarityBtn;
+    VclPtr<CheckBox>       m_pLayoutBtn;
+    VclPtr<CheckBox>       m_pNotesBtn;
+    VclPtr<CheckBox>       m_pJapMatchFullHalfWidthCB;
+    VclPtr<CheckBox>       m_pJapOptionsCB;
+    VclPtr<PushButton>     m_pJapOptionsBtn;
+
+    VclPtr<PushButton>     m_pAttributeBtn;
+    VclPtr<PushButton>     m_pFormatBtn;
+    VclPtr<PushButton>     m_pNoFormatBtn;
+
+    VclPtr<VclContainer>   m_pCalcGrid;
+    VclPtr<FixedText>      m_pCalcSearchInFT;
+    VclPtr<ListBox>        m_pCalcSearchInLB;
+    VclPtr<FixedText>      m_pCalcSearchDirFT;
+    VclPtr<RadioButton>    m_pRowsBtn;
+    VclPtr<RadioButton>    m_pColumnsBtn;
+    VclPtr<CheckBox>       m_pAllSheetsCB;
 
     SfxBindings&    rBindings;
     bool            bWriter;