summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-10 17:23:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-10 17:25:23 +0200
commit4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch)
treea71acd0d466e02c18bf78ffdcfea748135805d21 /cui/source/dialogs
parent2f8fd888b42dc41662b54a16d62575c2b15e844a (diff)
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer references" (apparently in cases where the passed argument was actually unused) Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx2
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx4
-rw-r--r--cui/source/dialogs/iconcdlg.cxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f5f3924d8970..517020ce7610 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -679,7 +679,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
-bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
+bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
{
pData->aEditedTitle = m_pEdtMSName->GetText();
return true;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 8d33cc6ce6d5..45ec57a2c13f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
if ( pCurrentPage->AskApply() )
{
- pCurrentPage->FillItemSet( aItemSet );
+ pCurrentPage->FillItemSet( &aItemSet );
SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
aItemSet.GetItem (SID_HYPERLINK_SETLINK);
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f31c0568db27..3423efdd5b87 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -483,7 +483,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
}
// Fill output-ItemSet
-bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
+bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet* rOut)
{
OUString aStrURL, aStrName, aStrIntName, aStrFrame;
SvxLinkInsertMode eMode;
@@ -497,7 +497,7 @@ bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame,
aStrIntName, eMode, nEvents, pTable );
- rOut.Put (aItem);
+ rOut->Put (aItem);
return true;
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index c0d4124b06f1..8fd3ac036509 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -1120,13 +1120,13 @@ short IconChoiceDialog::Ok()
{
SfxItemSet& rSet = (SfxItemSet&)pPage->GetItemSet();
rSet.ClearItem();
- _bModified |= pPage->FillItemSet( rSet );
+ _bModified |= pPage->FillItemSet( &rSet );
}
else if ( pSet && !pPage->HasExchangeSupport() )
{
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
- if ( pPage->FillItemSet( aTmp ) )
+ if ( pPage->FillItemSet( &aTmp ) )
{
_bModified |= true;
pExampleSet->Put( aTmp );