summaryrefslogtreecommitdiff
path: root/sc/source/ui/pagedlg/tphf.cxx
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 /sc/source/ui/pagedlg/tphf.cxx
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 'sc/source/ui/pagedlg/tphf.cxx')
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 3d495da48f0b..e1cf1d5d994c 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -87,19 +87,19 @@ void ScHFPage::Reset( const SfxItemSet& rSet )
TurnOnHdl( 0 );
}
-bool ScHFPage::FillItemSet( SfxItemSet& rOutSet )
+bool ScHFPage::FillItemSet( SfxItemSet* rOutSet )
{
bool bResult = SvxHFPage::FillItemSet( rOutSet );
if ( nId == SID_ATTR_PAGE_HEADERSET )
{
- rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) );
- rOutSet.Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) );
+ rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERLEFT ) );
+ rOutSet->Put( aDataSet.Get( ATTR_PAGE_HEADERRIGHT ) );
}
else
{
- rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) );
- rOutSet.Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) );
+ rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERLEFT ) );
+ rOutSet->Put( aDataSet.Get( ATTR_PAGE_FOOTERRIGHT ) );
}
return bResult;
@@ -125,7 +125,7 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP )
{
if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) )
if ( pSetP )
- FillItemSet( *pSetP );
+ FillItemSet( pSetP );
return LEAVE_PAGE;
}