Fix accidental mis-uses of VclPtr address-of operator

Change-Id: I3a82423378d3198a25f90ddfbf42af55d85c96fb

9 files changed, 88 insertions, 9 deletions

diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 60849f150659..b16f85284b35 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const
     pFtDescription->SetText( rDesc );
     pEdtName->SetText( rName );
     pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-    ModifyHdl(&pEdtName);
+    ModifyHdl(pEdtName.get());
     pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
 }
 
@@ -82,7 +82,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
 
     // activate name
     pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-    ModifyHdl(&pEdtName);
+    ModifyHdl(pEdtName.get());
     pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
 }
 
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 05f9a06fc459..d3654738e329 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -118,7 +118,7 @@ void OApplicationSwapWindow::clearSelection()
     SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos);
     if ( pEntry )
         m_aIconControl->InvalidateEntry(pEntry);
-    m_aIconControl->GetClickHdl().Call(&m_aIconControl);
+    m_aIconControl->GetClickHdl().Call(m_aIconControl.get());
 }
 
 void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics )
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 9e16a6fc3324..e6cc7e3a03df 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -338,7 +338,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
 void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
 {
     m_aTabCtrl->SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
-    ActivatePageHdl( &m_aTabCtrl );
+    ActivatePageHdl( m_aTabCtrl.get() );
 }
 
 void FwkTabWindow::RemovePage( sal_Int32 nIndex )
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 9ef1f83f6312..309885809b2f 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -118,7 +118,7 @@ void CellLineStyleControl::SetAllNoSel()
 
 IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
 {
-    if(pControl == &maCellLineStyleValueSet)
+    if(pControl == maCellLineStyleValueSet.get())
     {
         const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId());
         SvxLineItem aLineItem(SID_FRAME_LINESTYLE);
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index ab520bf4730b..4482cf4b8ab9 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -246,7 +246,7 @@ void FileControl::ImplBrowseFile( )
                 if ( aObj.GetProtocol() == INetProtocol::File )
                     aNewText = aObj.PathToFileName();
                 SetText( aNewText );
-                maEdit->GetModifyHdl().Call( &maEdit );
+                maEdit->GetModifyHdl().Call( maEdit.get() );
             }
         }
     }
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 45137f2fd24e..70acce26f4af 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -308,7 +308,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
 {
     mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
 
-    if(pControl == &maVSSpacing)
+    if(pControl == maVSSpacing.get())
     {
         sal_uInt16 iPos = maVSSpacing->GetSelectItemId();
         short nKern = 0;
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 690578bf71e4..b861debfb198 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -214,7 +214,7 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine)
 
 IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
 {
-    if ( pControl == &maVSUnderline )
+    if ( pControl == maVSUnderline.get() )
     {
         const sal_uInt16 iPos = maVSUnderline->GetSelectItemId();
         const FontUnderline eUnderline = ( iPos == 0 )
diff --git a/sw/htmlexport-swobjects.patch b/sw/htmlexport-swobjects.patch
new file mode 100644
index 000000000000..35e440ae5a48
--- /dev/null
+++ b/sw/htmlexport-swobjects.patch
@@ -0,0 +1,79 @@
+diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
+index 23cdef1..69803cd 100644
+--- a/sw/CppunitTest_sw_htmlexport.mk
++++ b/sw/CppunitTest_sw_htmlexport.mk
+@@ -15,23 +15,48 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_htmlexport, \
+     sw/qa/extras/htmlexport/htmlexport \
+ ))
+ 
++$(eval $(call gb_CppunitTest_set_componentfile,sw_htmlexport,sw/util/sw))
++
++$(eval $(call gb_CppunitTest_use_library_objects,sw_htmlexport,sw))
++
+ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
++    $(call gb_Helper_optional,AVMEDIA,avmedia) \
++    basegfx \
+     comphelper \
+     cppu \
+ 	cppuhelper \
++    drawinglayer \
++    editeng \
+ 	i18nlangtag \
++    i18nutil \
++    lng \
+     sal \
+-    sw \
++    salhelper \
++	sax \
++    sb \
++    sfx \
++    sot \
++    svl \
++    svt \
++    svx \
++    svxcore \
+     test \
++    tk \
+ 	tl \
++    ucbhelper \
+     unotest \
+     utl \
++    $(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
++        vbahelper) \
+     vcl \
++    xmlreader \
++    xo \
+ 	$(gb_UWINAPI) \
+ ))
+ 
+ $(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\
+ 	boost_headers \
++	icuuc \
+     libxml2 \
+ ))
+ 
+@@ -71,7 +96,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
+ 	sc/util/scfilt \
+     package/util/package2 \
+     sax/source/expatwrap/expwrap \
+-    sw/util/sw \
+     sw/util/swd \
+     sw/util/msword \
+     sfx2/util/sfx \
+diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
+index 2db20ef..d9a8d15 100644
+--- a/sw/qa/extras/htmlexport/htmlexport.cxx
++++ b/sw/qa/extras/htmlexport/htmlexport.cxx
+@@ -32,6 +32,12 @@ public:
+         m_eUnit(FUNIT_NONE)
+     {}
+ 
++    void setUp() SAL_OVERRIDE
++    {
++        SwModelTestBase::setUp();
++        SwGlobals::ensure();
++    }
++
+ private:
+     bool mustCalcLayoutOf(const char* filename) SAL_OVERRIDE
+     {
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 5424a43c0d19..06937b723b41 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -191,7 +191,7 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ )
 
     m_pReplyToED->SetText(m_pConfigItem->GetMailReplyTo()) ;
     m_pReplyToCB->Check(m_pConfigItem->IsMailReplyTo());
-    m_pReplyToCB->GetClickHdl().Call(&m_pReplyToCB);
+    m_pReplyToCB->GetClickHdl().Call(m_pReplyToCB.get());
 
     m_pServerED->SetText(m_pConfigItem->GetMailServer());
     m_pPortNF->SetValue(m_pConfigItem->GetMailPort());