Kaydet (Commit) c986e271 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix accidental mis-uses of VclPtr address-of operator

Change-Id: I3a82423378d3198a25f90ddfbf42af55d85c96fb
(cherry picked from commit 668408fa, w/o the
accidentally included sw/htmlexport-swobjects.patch)
üst 3cd822d9
...@@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const ...@@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const
pFtDescription->SetText( rDesc ); pFtDescription->SetText( rDesc );
pEdtName->SetText( rName ); pEdtName->SetText( rName );
pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
ModifyHdl(&pEdtName); ModifyHdl(pEdtName.get());
pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl)); pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
} }
...@@ -82,7 +82,7 @@ SvxObjectNameDialog::SvxObjectNameDialog( ...@@ -82,7 +82,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
// activate name // activate name
pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
ModifyHdl(&pEdtName); ModifyHdl(pEdtName.get());
pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl)); pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
} }
......
...@@ -118,7 +118,7 @@ void OApplicationSwapWindow::clearSelection() ...@@ -118,7 +118,7 @@ void OApplicationSwapWindow::clearSelection()
SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos); SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos);
if ( pEntry ) if ( pEntry )
m_aIconControl->InvalidateEntry(pEntry); m_aIconControl->InvalidateEntry(pEntry);
m_aIconControl->GetClickHdl().Call(&m_aIconControl); m_aIconControl->GetClickHdl().Call(m_aIconControl.get());
} }
void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics ) void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& _rMnemonics )
......
...@@ -338,7 +338,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea ...@@ -338,7 +338,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
void FwkTabWindow::ActivatePage( sal_Int32 nIndex ) void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
{ {
m_aTabCtrl->SetCurPageId( static_cast< sal_uInt16 >( nIndex ) ); m_aTabCtrl->SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
ActivatePageHdl( &m_aTabCtrl ); ActivatePageHdl( m_aTabCtrl.get() );
} }
void FwkTabWindow::RemovePage( sal_Int32 nIndex ) void FwkTabWindow::RemovePage( sal_Int32 nIndex )
......
...@@ -118,7 +118,7 @@ void CellLineStyleControl::SetAllNoSel() ...@@ -118,7 +118,7 @@ void CellLineStyleControl::SetAllNoSel()
IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
{ {
if(pControl == &maCellLineStyleValueSet) if(pControl == maCellLineStyleValueSet.get())
{ {
const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId()); const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId());
SvxLineItem aLineItem(SID_FRAME_LINESTYLE); SvxLineItem aLineItem(SID_FRAME_LINESTYLE);
......
...@@ -246,7 +246,7 @@ void FileControl::ImplBrowseFile( ) ...@@ -246,7 +246,7 @@ void FileControl::ImplBrowseFile( )
if ( aObj.GetProtocol() == INetProtocol::File ) if ( aObj.GetProtocol() == INetProtocol::File )
aNewText = aObj.PathToFileName(); aNewText = aObj.PathToFileName();
SetText( aNewText ); SetText( aNewText );
maEdit->GetModifyHdl().Call( &maEdit ); maEdit->GetModifyHdl().Call( maEdit.get() );
} }
} }
} }
......
...@@ -308,7 +308,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl) ...@@ -308,7 +308,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
{ {
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON; mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
if(pControl == &maVSSpacing) if(pControl == maVSSpacing.get())
{ {
sal_uInt16 iPos = maVSSpacing->GetSelectItemId(); sal_uInt16 iPos = maVSSpacing->GetSelectItemId();
short nKern = 0; short nKern = 0;
......
...@@ -214,7 +214,7 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine) ...@@ -214,7 +214,7 @@ void TextUnderlineControl::Rearrange(FontUnderline eLine)
IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
{ {
if ( pControl == &maVSUnderline ) if ( pControl == maVSUnderline.get() )
{ {
const sal_uInt16 iPos = maVSUnderline->GetSelectItemId(); const sal_uInt16 iPos = maVSUnderline->GetSelectItemId();
const FontUnderline eUnderline = ( iPos == 0 ) const FontUnderline eUnderline = ( iPos == 0 )
......
...@@ -191,7 +191,7 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) ...@@ -191,7 +191,7 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ )
m_pReplyToED->SetText(m_pConfigItem->GetMailReplyTo()) ; m_pReplyToED->SetText(m_pConfigItem->GetMailReplyTo()) ;
m_pReplyToCB->Check(m_pConfigItem->IsMailReplyTo()); 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_pServerED->SetText(m_pConfigItem->GetMailServer());
m_pPortNF->SetValue(m_pConfigItem->GetMailPort()); m_pPortNF->SetValue(m_pConfigItem->GetMailPort());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment