cui/source/dialogs/dlgname.cxx | 4 ++--
dbaccess/source/ui/app/AppSwapWindow.cxx | 2 +-
framework/source/classes/fwktabwindow.cxx | 2 +-
sc/source/ui/sidebar/CellLineStyleControl.cxx | 2 +-
svtools/source/control/filectrl.cxx | 2 +-
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2 +-
svx/source/sidebar/text/TextUnderlineControl.cxx | 2 +-
sw/source/ui/config/mailconfigpage.cxx | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit c986e271adcc0a3d3feffade6f0191f1c155640f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 27 11:40:22 2015 +0200
Fix accidental mis-uses of VclPtr address-of operator
Change-Id: I3a82423378d3198a25f90ddfbf42af55d85c96fb
(cherry picked from commit 668408fa1c69eaf0f0a37f24e2ec8b4a38fe3db7, w/o the
accidentally included sw/htmlexport-swobjects.patch)
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 60849f1..b16f852 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 05f9a06..d365473 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 9e16a6f..e6cc7e3 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 9ef1f83..3098858 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 ab07a4a..53291cd 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 45137f2..70acce2 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 690578b..b861deb 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/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index 3c16c99..c39a19c 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());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
