[Libreoffice-commits] core.git: 4 commits - chart2/source cui/source dbaccess/source include/sfx2 include/svx sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Jun 10 08:25:54 PDT 2014
chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 26 +--
chart2/source/controller/dialogs/res_DataLabel.hxx | 2
chart2/source/controller/dialogs/res_Trendline.cxx | 22 +-
chart2/source/controller/dialogs/res_Trendline.hxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 16 -
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 16 -
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2
chart2/source/controller/dialogs/tp_DataLabel.cxx | 2
chart2/source/controller/dialogs/tp_DataLabel.hxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 4
chart2/source/controller/dialogs/tp_ErrorBars.hxx | 2
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 6
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 2
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 6
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 8
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 40 ++--
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 22 +-
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 8
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 2
chart2/source/controller/dialogs/tp_Trendline.cxx | 2
chart2/source/controller/dialogs/tp_Trendline.hxx | 2
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 2
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/eventdlg.hxx | 2
cui/source/customize/macropg.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 2
cui/source/dialogs/cuihyperdlg.cxx | 2
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/iconcdlg.cxx | 4
cui/source/inc/acccfg.hxx | 2
cui/source/inc/align.hxx | 2
cui/source/inc/autocdlg.hxx | 14 -
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/border.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 8
cui/source/inc/connect.hxx | 2
cui/source/inc/cuigaldlg.hxx | 4
cui/source/inc/cuioptgenrl.hxx | 2
cui/source/inc/cuitabarea.hxx | 14 -
cui/source/inc/cuitabline.hxx | 6
cui/source/inc/dbregister.hxx | 2
cui/source/inc/dstribut.hxx | 2
cui/source/inc/grfpage.hxx | 2
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/iconcdlg.hxx | 2
cui/source/inc/labdlg.hxx | 2
cui/source/inc/macroass.hxx | 2
cui/source/inc/macropg.hxx | 2
cui/source/inc/measure.hxx | 2
cui/source/inc/numfmt.hxx | 2
cui/source/inc/numpages.hxx | 12 -
cui/source/inc/optasian.hxx | 2
cui/source/inc/optlingu.hxx | 2
cui/source/inc/optpath.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/inc/paragrph.hxx | 8
cui/source/inc/swpossizetabpage.hxx | 2
cui/source/inc/tabstpge.hxx | 2
cui/source/inc/textanim.hxx | 2
cui/source/inc/textattr.hxx | 2
cui/source/inc/transfrm.hxx | 6
cui/source/options/connpooloptions.cxx | 6
cui/source/options/connpooloptions.hxx | 2
cui/source/options/dbregister.cxx | 4
cui/source/options/fontsubs.cxx | 2
cui/source/options/fontsubs.hxx | 2
cui/source/options/optaccessibility.cxx | 2
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optasian.cxx | 2
cui/source/options/optbasic.cxx | 2
cui/source/options/optbasic.hxx | 2
cui/source/options/optchart.cxx | 4
cui/source/options/optchart.hxx | 2
cui/source/options/optcolor.cxx | 4
cui/source/options/optcolor.hxx | 2
cui/source/options/optctl.cxx | 2
cui/source/options/optctl.hxx | 2
cui/source/options/optfltr.cxx | 4
cui/source/options/optfltr.hxx | 4
cui/source/options/optgdlg.cxx | 20 +-
cui/source/options/optgdlg.hxx | 6
cui/source/options/optgenrl.cxx | 4
cui/source/options/opthtml.cxx | 2
cui/source/options/opthtml.hxx | 2
cui/source/options/optinet2.cxx | 10 -
cui/source/options/optinet2.hxx | 8
cui/source/options/optjava.cxx | 2
cui/source/options/optjava.hxx | 2
cui/source/options/optjsearch.cxx | 2
cui/source/options/optjsearch.hxx | 2
cui/source/options/optlingu.cxx | 8
cui/source/options/optmemory.cxx | 6
cui/source/options/optmemory.hxx | 2
cui/source/options/optpath.cxx | 2
cui/source/options/optsave.cxx | 18 +-
cui/source/options/optsave.hxx | 2
cui/source/options/optupdt.cxx | 2
cui/source/options/optupdt.hxx | 2
cui/source/options/personalization.cxx | 2
cui/source/options/personalization.hxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/align.cxx | 12 -
cui/source/tabpages/autocdlg.cxx | 14 -
cui/source/tabpages/backgrnd.cxx | 50 +++---
cui/source/tabpages/border.cxx | 20 +-
cui/source/tabpages/chardlg.cxx | 118 +++++++-------
cui/source/tabpages/connect.cxx | 18 +-
cui/source/tabpages/dstribut.cxx | 2
cui/source/tabpages/grfpage.cxx | 20 +-
cui/source/tabpages/labdlg.cxx | 20 +-
cui/source/tabpages/macroass.cxx | 4
cui/source/tabpages/measure.cxx | 34 ++--
cui/source/tabpages/numfmt.cxx | 14 -
cui/source/tabpages/numpages.cxx | 52 +++---
cui/source/tabpages/page.cxx | 44 ++---
cui/source/tabpages/paragrph.cxx | 94 +++++------
cui/source/tabpages/swpossizetabpage.cxx | 40 ++--
cui/source/tabpages/tabstpge.cxx | 16 -
cui/source/tabpages/textanim.cxx | 16 -
cui/source/tabpages/textattr.cxx | 32 +--
cui/source/tabpages/tparea.cxx | 124 +++++++--------
cui/source/tabpages/tpbitmap.cxx | 10 -
cui/source/tabpages/tpcolor.cxx | 8
cui/source/tabpages/tpgradnt.cxx | 8
cui/source/tabpages/tphatch.cxx | 8
cui/source/tabpages/tpline.cxx | 76 ++++-----
cui/source/tabpages/tplnedef.cxx | 8
cui/source/tabpages/tplneend.cxx | 8
cui/source/tabpages/tpshadow.cxx | 26 +--
cui/source/tabpages/transfrm.cxx | 54 +++---
dbaccess/source/ui/dlg/ConnectionPage.cxx | 12 -
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 4
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 48 ++---
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 18 +-
dbaccess/source/ui/dlg/admincontrols.cxx | 12 -
dbaccess/source/ui/dlg/admincontrols.hxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 16 -
dbaccess/source/ui/dlg/advancedsettings.hxx | 4
dbaccess/source/ui/dlg/dbwiz.cxx | 4
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 54 +++---
dbaccess/source/ui/dlg/detailpages.hxx | 16 -
dbaccess/source/ui/dlg/generalpage.cxx | 10 -
dbaccess/source/ui/dlg/generalpage.hxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 6
dbaccess/source/ui/dlg/tablespage.hxx | 2
include/sfx2/dinfdlg.hxx | 8
include/sfx2/mgetempl.hxx | 2
include/sfx2/printopt.hxx | 2
include/sfx2/securitypage.hxx | 2
include/sfx2/tabdlg.hxx | 2
include/svx/hdft.hxx | 2
include/svx/optgrid.hxx | 2
sc/source/core/tool/cellform.cxx | 11 -
sc/source/ui/attrdlg/tabpages.cxx | 10 -
sc/source/ui/dbgui/tpsort.cxx | 12 -
sc/source/ui/dbgui/tpsubt.cxx | 12 -
sc/source/ui/dbgui/validate.cxx | 32 +--
sc/source/ui/docshell/tpstat.cxx | 2
sc/source/ui/inc/opredlin.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/tabpages.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 2
sc/source/ui/inc/tpcompatibility.hxx | 2
sc/source/ui/inc/tpdefaults.hxx | 2
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/inc/tpprint.hxx | 2
sc/source/ui/inc/tpsort.hxx | 4
sc/source/ui/inc/tpstat.hxx | 2
sc/source/ui/inc/tpsubt.hxx | 8
sc/source/ui/inc/tptable.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/tpview.hxx | 4
sc/source/ui/inc/validate.hxx | 6
sc/source/ui/optdlg/opredlin.cxx | 2
sc/source/ui/optdlg/tpcalc.cxx | 6
sc/source/ui/optdlg/tpcompatibility.cxx | 4
sc/source/ui/optdlg/tpdefaults.cxx | 4
sc/source/ui/optdlg/tpformula.cxx | 4
sc/source/ui/optdlg/tpprint.cxx | 10 -
sc/source/ui/optdlg/tpusrlst.cxx | 6
sc/source/ui/optdlg/tpview.cxx | 36 ++--
sc/source/ui/pagedlg/scuitphfedit.cxx | 4
sc/source/ui/pagedlg/tphf.cxx | 12 -
sc/source/ui/pagedlg/tptable.cxx | 32 +--
sd/source/filter/html/htmlex.cxx | 9 -
sd/source/ui/dlg/paragr.cxx | 8
sd/source/ui/dlg/prntopts.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 12 -
sd/source/ui/dlg/tpoption.cxx | 26 +--
sd/source/ui/inc/prntopts.hxx | 2
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/inc/tpoption.hxx | 6
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 26 +--
sfx2/source/dialog/documentfontsdialog.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 6
sfx2/source/dialog/printopt.cxx | 4
sfx2/source/dialog/securitypage.cxx | 4
sfx2/source/dialog/tabdlg.cxx | 8
sfx2/source/inc/documentfontsdialog.hxx | 2
sfx2/source/view/printer.cxx | 2
starmath/inc/dialog.hxx | 2
starmath/source/dialog.cxx | 16 -
svx/source/dialog/hdft.cxx | 6
svx/source/dialog/optgrid.cxx | 8
svx/source/svdraw/svdmrkv1.cxx | 3
sw/source/ui/chrdlg/chardlg.cxx | 6
sw/source/ui/chrdlg/drpcps.cxx | 4
sw/source/ui/chrdlg/numpara.cxx | 16 -
sw/source/ui/chrdlg/swuiccoll.cxx | 6
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 10 -
sw/source/ui/config/optpage.cxx | 36 ++--
sw/source/ui/dialog/docstdlg.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 12 -
sw/source/ui/envelp/envfmt.cxx | 6
sw/source/ui/envelp/envfmt.hxx | 2
sw/source/ui/envelp/envlop1.cxx | 6
sw/source/ui/envelp/envprt.cxx | 6
sw/source/ui/envelp/envprt.hxx | 2
sw/source/ui/envelp/label1.cxx | 24 +-
sw/source/ui/envelp/labfmt.cxx | 6
sw/source/ui/envelp/labfmt.hxx | 2
sw/source/ui/envelp/labprt.cxx | 6
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/swuilabimp.hxx | 8
sw/source/ui/fldui/flddb.cxx | 2
sw/source/ui/fldui/flddb.hxx | 2
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/flddok.cxx | 2
sw/source/ui/fldui/flddok.hxx | 2
sw/source/ui/fldui/fldedt.cxx | 4
sw/source/ui/fldui/fldfunc.cxx | 2
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldref.cxx | 2
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 2
sw/source/ui/fldui/fldvar.cxx | 2
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/frmdlg/column.cxx | 16 -
sw/source/ui/frmdlg/frmpage.cxx | 60 +++----
sw/source/ui/frmdlg/wrap.cxx | 22 +-
sw/source/ui/index/cnttab.cxx | 6
sw/source/ui/misc/docfnote.cxx | 6
sw/source/ui/misc/impfnote.hxx | 2
sw/source/ui/misc/num.cxx | 8
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 8
sw/source/ui/misc/pggrid.cxx | 4
sw/source/ui/table/tabledlg.cxx | 36 ++--
sw/source/uibase/inc/chrdlg.hxx | 2
sw/source/uibase/inc/column.hxx | 2
sw/source/uibase/inc/docstdlg.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 2
sw/source/uibase/inc/envlop.hxx | 2
sw/source/uibase/inc/frmpage.hxx | 8
sw/source/uibase/inc/mailconfigpage.hxx | 2
sw/source/uibase/inc/num.hxx | 2
sw/source/uibase/inc/numpara.hxx | 2
sw/source/uibase/inc/optcomp.hxx | 2
sw/source/uibase/inc/optload.hxx | 4
sw/source/uibase/inc/optpage.hxx | 16 -
sw/source/uibase/inc/outline.hxx | 2
sw/source/uibase/inc/pgfnote.hxx | 2
sw/source/uibase/inc/pggrid.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 6
sw/source/uibase/inc/swuiccoll.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 6
sw/source/uibase/inc/wrap.hxx | 2
sw/source/uibase/table/tablepg.hxx | 6
285 files changed, 1265 insertions(+), 1280 deletions(-)
New commits:
commit 4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jun 10 17:23:12 2014 +0200
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
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 3625ef5..f68e4ae 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -45,7 +45,7 @@ void DataLabelsDialog::Reset()
void DataLabelsDialog::FillItemSet(SfxItemSet& rOutAttrs)
{
- m_apDataLabelResources->FillItemSet(rOutAttrs);
+ m_apDataLabelResources->FillItemSet(&rOutAttrs);
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index a775e72..86cbe1f 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -266,49 +266,49 @@ void DataLabelResources::EnableControls()
m_pBxOrientation->Enable( bEnableRotation );
}
-bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
+bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
{
if( m_pCBNumber->IsChecked() )
{
if( !m_bNumberFormatMixedState )
- rOutAttrs.Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, m_nNumberFormatForValue ));
+ rOutAttrs->Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, m_nNumberFormatForValue ));
if( !m_bSourceFormatMixedState )
- rOutAttrs.Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, m_bSourceFormatForValue ));
+ rOutAttrs->Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, m_bSourceFormatForValue ));
}
if( m_pCBPercent->IsChecked() )
{
if( !m_bPercentFormatMixedState )
- rOutAttrs.Put( SfxUInt32Item( SCHATTR_PERCENT_NUMBERFORMAT_VALUE, m_nNumberFormatForPercent ));
+ rOutAttrs->Put( SfxUInt32Item( SCHATTR_PERCENT_NUMBERFORMAT_VALUE, m_nNumberFormatForPercent ));
if( !m_bPercentSourceMixedState )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_bSourceFormatForPercent ));
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, m_bSourceFormatForPercent ));
}
if( m_pCBNumber->GetState()!= TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_NUMBER, m_pCBNumber->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_NUMBER, m_pCBNumber->IsChecked() ) );
if( m_pCBPercent->GetState()!= TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_PERCENTAGE, m_pCBPercent->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_PERCENTAGE, m_pCBPercent->IsChecked() ) );
if( m_pCBCategory->GetState()!= TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_CATEGORY, m_pCBCategory->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_CATEGORY, m_pCBCategory->IsChecked() ) );
if( m_pCBSymbol->GetState()!= TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_pCBSymbol->IsChecked()) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_pCBSymbol->IsChecked()) );
OUString aSep = m_aEntryMap[m_pLB_Separator->GetSelectEntryPos()];
- rOutAttrs.Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
+ rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
::std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) );
if(aIt!=m_aListBoxToPlacementMap.end())
{
sal_Int32 nValue = aIt->second;
- rOutAttrs.Put( SfxInt32Item( SCHATTR_DATADESCR_PLACEMENT, nValue ) );
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_DATADESCR_PLACEMENT, nValue ) );
}
if( m_pLB_TextDirection->GetSelectEntryCount() > 0 )
- rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLB_TextDirection->GetSelectEntryValue() ) );
+ rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLB_TextDirection->GetSelectEntryValue() ) );
if( m_pDC_Dial->IsVisible() )
{
sal_Int32 nDegrees = m_pDC_Dial->GetRotation();
- rOutAttrs.Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
+ rOutAttrs->Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
}
return true;
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 8875136..b6d2789 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -40,7 +40,7 @@ public:
DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs );
virtual ~DataLabelResources();
- bool FillItemSet(SfxItemSet& rOutAttrs) const;
+ bool FillItemSet(SfxItemSet* rOutAttrs) const;
void Reset(const SfxItemSet& rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 2ec92e5..d2ac636 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -243,41 +243,41 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
}
-bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
+bool TrendlineResources::FillItemSet(SfxItemSet* rOutAttrs) const
{
if( m_bTrendLineUnique )
- rOutAttrs.Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE ));
+ rOutAttrs->Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE ));
if( m_pCB_ShowEquation->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_EQUATION, m_pCB_ShowEquation->IsChecked() ));
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_EQUATION, m_pCB_ShowEquation->IsChecked() ));
if( m_pCB_ShowCorrelationCoeff->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_COEFF, m_pCB_ShowCorrelationCoeff->IsChecked() ));
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SHOW_COEFF, m_pCB_ShowCorrelationCoeff->IsChecked() ));
OUString aName = m_pEE_Name->GetText();
- rOutAttrs.Put(SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, aName));
+ rOutAttrs->Put(SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, aName));
sal_Int32 aDegree = m_pNF_Degree->GetValue();
- rOutAttrs.Put(SfxInt32Item( SCHATTR_REGRESSION_DEGREE, aDegree ) );
+ rOutAttrs->Put(SfxInt32Item( SCHATTR_REGRESSION_DEGREE, aDegree ) );
sal_Int32 aPeriod = m_pNF_Period->GetValue();
- rOutAttrs.Put(SfxInt32Item( SCHATTR_REGRESSION_PERIOD, aPeriod ) );
+ rOutAttrs->Put(SfxInt32Item( SCHATTR_REGRESSION_PERIOD, aPeriod ) );
sal_uInt32 nIndex = 0;
double aValue = 0.0;
m_pNumFormatter->IsNumberFormat(m_pFmtFld_ExtrapolateForward->GetText(),nIndex,aValue);
- rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) );
+ rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) );
aValue = 0.0;
m_pNumFormatter->IsNumberFormat(m_pFmtFld_ExtrapolateBackward->GetText(),nIndex,aValue);
- rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) );
+ rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) );
if( m_pCB_SetIntercept->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SET_INTERCEPT, m_pCB_SetIntercept->IsChecked() ));
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_REGRESSION_SET_INTERCEPT, m_pCB_SetIntercept->IsChecked() ));
aValue = 0.0;
m_pNumFormatter->IsNumberFormat(m_pFmtFld_InterceptValue->GetText(),nIndex,aValue);
- rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) );
+ rOutAttrs->Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) );
return true;
}
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 4e51ecf..128d436 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -38,7 +38,7 @@ public:
virtual ~TrendlineResources();
void Reset(const SfxItemSet& rInAttrs);
- bool FillItemSet(SfxItemSet& rOutAttrs) const;
+ bool FillItemSet(SfxItemSet* rOutAttrs) const;
void FillValueSets();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index efa7aa4..2c9a466 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -85,21 +85,21 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt
return new SchAxisLabelTabPage( pParent, rAttrs );
}
-bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
bool bStacked = false;
if( m_pOrientHlp->GetStackedState() != TRISTATE_INDET )
{
bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE;
if( !m_bHasInitialStacking || (bStacked != m_bInitialStacking) )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
}
if( m_pCtrlDial->HasRotation() )
{
sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation();
if( !m_bHasInitialDegrees || (nDegrees != m_nInitialDegrees) )
- rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
}
if( m_bShowStaggeringControls )
@@ -119,18 +119,18 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
bRadioButtonChecked = false;
if( bRadioButtonChecked )
- rOutAttrs.Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER ));
+ rOutAttrs->Put( SvxChartTextOrderItem( eOrder, SCHATTR_AXIS_LABEL_ORDER ));
}
if( m_pCbTextOverlap->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, m_pCbTextOverlap->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_LABEL_OVERLAP, m_pCbTextOverlap->IsChecked() ) );
if( m_pCbTextBreak->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, m_pCbTextBreak->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_LABEL_BREAK, m_pCbTextBreak->IsChecked() ) );
if( m_pCbShowDescription->GetState() != TRISTATE_INDET )
- rOutAttrs.Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_AXIS_SHOWDESCR, m_pCbShowDescription->IsChecked() ) );
if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
- rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
+ rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 0013a0b..115da27 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -75,7 +75,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
void ShowStaggeringControls( bool bShowStaggeringControls );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 1dfe618..461ba55 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -90,23 +90,23 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA
return new AxisPositionsTabPage(pWindow, rOutAttrs);
}
-bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
// axis line
sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
- rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 ));
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 ));
if( 2==nPos )
{
double fCrossover = m_pED_CrossesAt->GetValue();
if( m_bCrossingAxisIsCategoryAxis )
fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1;
- rOutAttrs.Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE));
+ rOutAttrs->Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE));
}
// labels
sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos();
if( nLabelPos != LISTBOX_ENTRY_NOTFOUND )
- rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos ));
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos ));
// tick marks
long nTicks=0;
@@ -121,12 +121,12 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
if(m_pCB_TicksOuter->IsChecked())
nTicks|=CHAXIS_MARK_OUTER;
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks));
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks));
sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos();
if( nMarkPos != LISTBOX_ENTRY_NOTFOUND )
- rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
return true;
}
@@ -256,7 +256,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet)
{
if( pItemSet )
- FillItemSet( *pItemSet );
+ FillItemSet( pItemSet );
return LEAVE_PAGE;
}
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 21c92f0..d34997b 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -35,7 +35,7 @@ public:
AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index f139f28..417544d 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -43,7 +43,7 @@ SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet& rOutAtt
return new DataLabelsTabPage(pWindow, rOutAttrs);
}
-bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
return m_aDataLabelResources.FillItemSet(rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 72d46d7..7494677 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -41,7 +41,7 @@ public:
void SetNumberFormatter( SvNumberFormatter* pFormatter );
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
private:
DataLabelResources m_aDataLabelResources;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index e775921..f0fc68d 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -47,9 +47,9 @@ SfxTabPage* ErrorBarsTabPage::Create(
return new ErrorBarsTabPage( pParent, rOutAttrs );
}
-bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
- return m_aErrorBarResources.FillItemSet( rOutAttrs );
+ return m_aErrorBarResources.FillItemSet( *rOutAttrs );
}
void ErrorBarsTabPage::Reset( const SfxItemSet& rInAttrs )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 3f3fa08..838310c 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -38,7 +38,7 @@ public:
::com::sun::star::chart2::XChartDocument > & xChartDocument );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 64868b5..eba17ae 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -46,12 +46,12 @@ SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutA
return new SchLegendPosTabPage(pWindow, rOutAttrs);
}
-bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
- m_aLegendPositionResources.writeToItemSet(rOutAttrs);
+ m_aLegendPositionResources.writeToItemSet(*rOutAttrs);
if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
- rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
+ rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index c870e40..091f639 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -39,7 +39,7 @@ public:
SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs);
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 68a20d9..cbdd532 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -48,7 +48,7 @@ SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
return new SchLayoutTabPage(pWindow, rOutAttrs);
}
-bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount())
@@ -59,8 +59,8 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
if(nShape==CHART_SHAPE3D_PYRAMID)
nSegs=4;
- rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape));
- rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape));
+ rOutAttrs->Put(Svx3DHorizontalSegmentsItem(nSegs));
}
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index b4098a7..69139520 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -32,7 +32,7 @@ public:
virtual ~SchLayoutTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
private:
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 1c30d3b..566ac73 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -53,19 +53,19 @@ SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutA
return new PolarOptionsTabPage( pWindow, rOutAttrs );
}
-bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( m_pAngleDial->IsVisible() )
{
- rOutAttrs.Put(SfxInt32Item(SCHATTR_STARTING_ANGLE,
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_STARTING_ANGLE,
static_cast< sal_Int32 >(m_pAngleDial->GetRotation()/100)));
}
if( m_pCB_Clockwise->IsVisible() )
- rOutAttrs.Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise->IsChecked()));
if (m_pCB_IncludeHiddenCells->IsVisible())
- rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked()));
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 3d39046..3af8f46 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,7 +36,7 @@ public:
virtual ~PolarOptionsTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
private:
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index a3df39f..7f4b17a 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -238,37 +238,37 @@ SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
return new ScaleTabPage(pWindow, rOutAttrs);
}
-bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
OSL_PRECOND( pNumFormatter, "No NumberFormatter available" );
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType));
if(m_bAllowDateAxis)
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_pLB_AxisType->GetSelectEntryPos()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, TYPE_AUTO==m_pLB_AxisType->GetSelectEntryPos()));
bool bAutoScale = false;
if( m_nAxisType==chart2::AxisType::CATEGORY )
bAutoScale = true;//reset scaling for category charts
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,bAutoScale || m_pCbxAutoMin->IsChecked()));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,bAutoScale || m_pCbxAutoMax->IsChecked()));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || m_pCbxAutoStepHelp->IsChecked()));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,bAutoScale || m_pCbxAutoOrigin->IsChecked()));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,m_pCbxLogarithm->IsChecked()));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,m_pCbxReverse->IsChecked()));
- rOutAttrs.Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX));
- rOutAttrs.Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN));
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp));
- rOutAttrs.Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MIN ,bAutoScale || m_pCbxAutoMin->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_MAX ,bAutoScale || m_pCbxAutoMax->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_HELP,bAutoScale || m_pCbxAutoStepHelp->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_ORIGIN ,bAutoScale || m_pCbxAutoOrigin->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_LOGARITHM ,m_pCbxLogarithm->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_REVERSE ,m_pCbxReverse->IsChecked()));
+ rOutAttrs->Put(SvxDoubleItem(fMax , SCHATTR_AXIS_MAX));
+ rOutAttrs->Put(SvxDoubleItem(fMin , SCHATTR_AXIS_MIN));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_STEP_HELP, nStepHelp));
+ rOutAttrs->Put(SvxDoubleItem(fOrigin , SCHATTR_AXIS_ORIGIN));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || m_pCbxAutoStepMain->IsChecked()));
- rOutAttrs.Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_STEP_MAIN,bAutoScale || m_pCbxAutoStepMain->IsChecked()));
+ rOutAttrs->Put(SvxDoubleItem(fStepMain,SCHATTR_AXIS_STEP_MAIN));
- rOutAttrs.Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_pCbx_AutoTimeResolution->IsChecked()));
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,bAutoScale || m_pCbx_AutoTimeResolution->IsChecked()));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TIME_RESOLUTION,m_nTimeResolution));
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit));
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit));
return true;
}
@@ -493,7 +493,7 @@ int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
return KEEP_PAGE;
if( pItemSet )
- FillItemSet( *pItemSet );
+ FillItemSet( pItemSet );
return LEAVE_PAGE;
}
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 6839c09..b4980c3 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -35,7 +35,7 @@ public:
ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index c358597..d981cbc 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -81,36 +81,36 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs
return new SchOptionTabPage(pWindow, rOutAttrs);
}
-bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
if(m_pRbtAxis2->IsChecked())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y));
else
- rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y));
if(m_pMTGap->IsVisible())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_pMTGap->GetValue())));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_pMTGap->GetValue())));
if(m_pMTOverlap->IsVisible())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_pMTOverlap->GetValue())));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_pMTOverlap->GetValue())));
if(m_pCBConnect->IsVisible())
- rOutAttrs.Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_pCBConnect->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_pCBConnect->IsChecked()));
// model property is "group bars per axis", UI feature is the other way
// round: "show bars side by side"
if(m_pCBAxisSideBySide->IsVisible())
- rOutAttrs.Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked()));
if(m_pRB_DontPaint->IsChecked())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP));
else if(m_pRB_AssumeZero->IsChecked())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO));
else if(m_pRB_ContinueLine->IsChecked())
- rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE));
+ rOutAttrs->Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE));
if (m_pCBIncludeHiddenCells->IsVisible())
- rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked()));
+ rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked()));
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 2336eb5..04f59dc 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -34,7 +34,7 @@ public:
virtual ~SchOptionTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors );
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index ab0dc4c..5b9d404 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -72,17 +72,17 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
return new SchAlignmentTabPage(pParent, rInAttrs, false);
}
-bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
{
//Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES
bool bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE;
- rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
+ rOutAttrs->Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation();
- rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
+ rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() );
- rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) );
+ rOutAttrs->Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) );
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 14fff72..dc46819 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -47,7 +47,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs);
- virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index a08f895..b95acf9 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -41,7 +41,7 @@ SfxTabPage* TrendlineTabPage::Create(
return new TrendlineTabPage( pParent, rOutAttrs );
}
-bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
return m_aTrendlineResources.FillItemSet( rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index b11c7d7..b50a7d0 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -33,7 +33,7 @@ public:
virtual ~TrendlineTabPage ();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ea56730..50519d6 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1425,7 +1425,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
}
-bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
+bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* )
{
Apply(m_xAct);
try
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 36029954..10bc134 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1823,7 +1823,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X
return sModuleID;
}
-bool SvxConfigPage::FillItemSet( SfxItemSet& )
+bool SvxConfigPage::FillItemSet( SfxItemSet* )
{
bool result = false;
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 9f2a5cf..8d2111f 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -206,7 +206,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
return sal_True;
}
-bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet )
+bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet )
{
return _SvxMacroTabPage::FillItemSet( rSet );
}
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index dd14a12..b883ab2 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -53,7 +53,7 @@ public:
void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame );
protected:
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
private:
void ImplInitDocument();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 881f5a5..5f4117b 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -314,7 +314,7 @@ void _SvxMacroTabPage::InitResources()
// the following method is called when the user clicks OK
// We use the contents of the hashes to replace the settings
-bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
{
try
{
@@ -888,7 +888,7 @@ AssignComponentDialog::~AssignComponentDialog()
IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
{
(void)pButton; //unused
- GetTabPage()->FillItemSet( *(SfxItemSet*)0 );
+ GetTabPage()->FillItemSet( 0 );
EndDialog( RET_OK );
return 0;
}
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f5f3924..517020c 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 8d33cc6..45ec57a 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 f31c056..3423efd 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 c0d4124..8fd3ac0 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 );
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 825f79b..db5b54c 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -173,7 +173,7 @@ public:
SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
virtual ~SfxAcceleratorConfigPage();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index c9f61c6..76412fb 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -62,7 +62,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 644a8c7..652328b 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -113,7 +113,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
@@ -265,7 +265,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -324,7 +324,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -390,7 +390,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
@@ -440,7 +440,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -506,7 +506,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 709e4ea..1fbdb81 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -49,7 +49,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index a8eb384..47ecbb1 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -47,7 +47,7 @@ public:
const SfxItemSet& rAttrSet);
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
void HideShadowControls();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index d72f5db..3da574f 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -436,7 +436,7 @@ public:
bool MoveEntryData( SvTreeListEntry* pSourceEntry,
SvTreeListEntry* pTargetEntry );
- bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
void Reset( const SfxItemSet& ) SAL_OVERRIDE;
virtual bool DeleteSelectedContent() = 0;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 69b46c8..8bc60fb 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -156,7 +156,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
void SetFontList( const SvxFontListItem& rItem );
void EnableRelativeMode();
@@ -235,7 +235,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
void DisableControls( sal_uInt16 nDisable );
void EnableFlash();
@@ -314,7 +314,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
/// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
@@ -357,7 +357,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
/// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index b5763e9..c807f21 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -66,7 +66,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 3458d5d..af65251 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -214,7 +214,7 @@ private:
ExchangeData* pData;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {}
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
public:
@@ -263,7 +263,7 @@ class TPGalleryThemeProperties : public SfxTabPage
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {}
- virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) SAL_OVERRIDE { return true; }
+ virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; }
OUString addExtension( const OUString&, const OUString& );
void FillFilterList();
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 09f90c8..9149dd2 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -69,7 +69,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4358fc4..e8e5fb6 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -165,7 +165,7 @@ public:
static SfxTabPage* Create(Window*, const SfxItemSet&);
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
@@ -295,7 +295,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -360,7 +360,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -438,7 +438,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -514,7 +514,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -600,7 +600,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -735,7 +735,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 7384ec3..ed3f09c 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -210,7 +210,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -306,7 +306,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -376,7 +376,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 3e42795..4c5d0ee 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -95,7 +95,7 @@ namespace svx
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index e2d6b07..ebc34ee 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -47,7 +47,7 @@ public:
static SfxTabPage* Create(Window*, const SfxItemSet&,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
- virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index d530141..f429005 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -113,7 +113,7 @@ class SvxGrfCropPage : public SfxTabPage
public:
static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
- virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index dad7e1f..cba59a5 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -141,7 +141,7 @@ public:
virtual void SetInitFocus();
virtual void SetMarkStr ( const OUString& aStrMark );
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index bc59ec3..7728d74 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -96,7 +96,7 @@ public :
const SfxItemSet& GetItemSet() const { return *pSet; }
- virtual bool FillItemSet( SfxItemSet& ) = 0;
+ virtual bool FillItemSet( SfxItemSet* ) = 0;
virtual void Reset( const SfxItemSet& ) = 0;
bool HasExchangeSupport() const { return bHasExchangeSupport; }
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 9970c14..633f19a 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -78,7 +78,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView )
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a7a8cf9..c5355f2 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -70,7 +70,7 @@ public:
void LaunchFillGroup();
// --------- inherit from the base -------------
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
bool IsReadOnly() const SAL_OVERRIDE;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 24ee564..cc59a5c 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -84,7 +84,7 @@ public:
void InitResources();
void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index e8fb794..8903946 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -70,7 +70,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index bb7bbe8..8520f60 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -74,7 +74,7 @@ public:
const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5e115fd..d0fe941 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -115,7 +115,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
@@ -151,7 +151,7 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
@@ -194,7 +194,7 @@ class SvxNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
@@ -239,7 +239,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
@@ -351,7 +351,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
@@ -451,7 +451,7 @@ public:
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
static SfxTabPage* Create( Window* pParent,
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 1efd15c..458965a 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -59,7 +59,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 57ac9f3..20846c51 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -151,7 +151,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void HideGroups( sal_uInt16 nGrp );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 0df9828..d87961f 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -75,7 +75,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 56b7bef..37c54cc 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -180,7 +180,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 81dc391..fa15f7d 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -102,7 +102,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -163,7 +163,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void EnableJustifyExt();
@@ -195,7 +195,7 @@ public:
const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void DisablePageBreak();
@@ -275,7 +275,7 @@ public:
const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 48907f1..03b81ff 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -128,7 +128,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 2f8a384..6cf3a1d 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -53,7 +53,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void DisableControls( const sal_uInt16 nFlag );
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 0e986a1..7a71b15 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -79,7 +79,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 24c3605..fe8eddd 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -80,7 +80,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 72a4e3d..2f44a15 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -150,7 +150,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -205,7 +205,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -249,7 +249,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index fcb0ca9..613c8a4 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -367,7 +367,7 @@ namespace offapp
}
- bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+ bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet* _rSet)
{
commitTimeoutField();
@@ -375,14 +375,14 @@ namespace offapp
// the enabled flag
if (m_pEnablePooling->IsValueChangedFromSaved())
{
- _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
+ _rSet->Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
bModified = true;
}
// the settings for the single drivers
if (m_pDriverList->isModified())
{
- _rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
+ _rSet->Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
bModified = true;
}
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index cd80ccf..064999c 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -56,7 +56,7 @@ namespace offapp
protected:
virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
- virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 7af151d..151d654 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -182,7 +182,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
-bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
{
// the settings for the single drivers
bool bModified = false;
@@ -201,7 +201,7 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
}
if ( m_nOldCount != aRegistrations.size() || m_bModified )
{
- rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
+ rCoreSet->Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
bModified = true;
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index efe9f71..be2dd1c 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -150,7 +150,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
return new SvxFontSubstTabPage(pParent, rAttrSet);
}
-bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
{
pConfig->ClearSubstitutions();// remove all entries
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 415f59c..bad9084 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index d8f062d..4b260d3 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt
return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
}
-bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
{
//aConfig.Set... from controls
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 97bd44e..cd65854 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -46,7 +46,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index d79a954..44d8cbb 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
return new SvxAsianLayoutPage(pParent, rAttrSet);
}
-bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
{
if(m_pCharKerningRB->IsValueChangedFromSaved())
{
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 27a983c..317d526 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -66,7 +66,7 @@ void SvxBasicIDEOptionsPage::LoadConfig()
pUseExtendedTypesChk->Check( bExtended );
}
-bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index ac46d81..d065ea6 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
virtual ~SvxBasicIDEOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 673a08f..74b9b60 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -108,10 +108,10 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r
return new SvxDefaultColorOptPage( pParent, rAttrs );
}
-bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( pColorConfig )
- rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
+ rOutAttrs->Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
return true;
}
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 5590d5a..7a1bd24 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -59,7 +59,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 77108e8..9abfde7 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1079,7 +1079,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
}
-bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
{
bFillItemSetCalled = true;
if(m_pColorSchemeLB->IsValueChangedFromSaved())
@@ -1131,7 +1131,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return( LEAVE_PAGE );
}
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index b3033ba..d355378 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,7 +52,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 3d51979..e550113 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
return new SvxCTLOptionsPage( pParent, rAttrSet );
}
-bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvtCTLOptions aCTLOptions;
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 326718b..e2396e2 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -48,7 +48,7 @@ public:
virtual ~SvxCTLOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index bf877b6..8c5e471 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
return new OfaMSFilterTabPage( pParent, rAttrSet );
}
-bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
@@ -169,7 +169,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 30b58f0..da22fe5 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -46,7 +46,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -95,7 +95,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7b6f947..6bb145a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -106,7 +106,7 @@ using namespace ::utl;
int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
@@ -243,7 +243,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
-bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -283,12 +283,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
}
const SfxUInt16Item* pUInt16Item =
- PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
+ PTR_CAST( SfxUInt16Item, GetOldItem( *rSet, SID_ATTR_YEAR2000 ) );
sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32();
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
bModified = true;
- rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
+ rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
return bModified;
@@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
return new OfaViewTabPage(pParent, rAttrSet);
}
-bool OfaViewTabPage::FillItemSet( SfxItemSet& )
+bool OfaViewTabPage::FillItemSet( SfxItemSet* )
{
SvtFontOptions aFontOpt;
SvtMenuOptions aMenuOpt;
@@ -1177,7 +1177,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
}
}
-bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
{
// lock configuration broadcasters so that we can coordinate the notifications
pLangConfig->aSysLocaleOptions.BlockBroadcasts( true );
@@ -1270,7 +1270,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// this will happen after releasing the lock on the ConfigurationBroadcaster at
// the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
- rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
+ rSet->Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale );
bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0;
@@ -1324,7 +1324,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
SID_ATTR_LANGUAGE));
}
}
@@ -1344,7 +1344,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
SID_ATTR_CHAR_CJK_LANGUAGE));
}
}
@@ -1364,7 +1364,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
SID_ATTR_CHAR_CTL_LANGUAGE));
}
}
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 61b2228..28a7a58 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -125,7 +125,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -169,7 +169,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 1cff7c1..af517dc 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -304,7 +304,7 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS
-bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
+bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
{
// remove leading and trailing whitespaces
for (unsigned i = 0; i != vFields.size(); ++i)
@@ -435,7 +435,7 @@ void SvxGeneralTabPage::SetAddress_Impl()
int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index c6c724c..a7a4e33 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -94,7 +94,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
return new OfaHtmlTabPage(pParent, rAttrSet);
}
-bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
+bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
{
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
if(aSize1NF->IsValueChangedFromSaved())
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 1bab77f..a91a4ed 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -59,7 +59,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 8938483..ad94515 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -391,7 +391,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
}
-bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
+bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
{
bool bModified = false;
@@ -865,7 +865,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -888,7 +888,7 @@ namespace
}
}
-bool SvxSecurityTabPage::FillItemSet( SfxItemSet& )
+bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
@@ -929,7 +929,7 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent,
return new MozPluginTabPage( pParent, rAttrSet );
}
-bool MozPluginTabPage::FillItemSet( SfxItemSet& )
+bool MozPluginTabPage::FillItemSet( SfxItemSet* )
{
bool hasInstall = isInstalled();
bool hasChecked = m_pWBasicCodeCB->IsChecked();
@@ -1232,7 +1232,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
/* -------------------------------------------------------------------------*/
-bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
+bool SvxEMailTabPage::FillItemSet( SfxItemSet* )
{
bool bMailModified = false;
if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved())
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index c76a8eb..105bce8 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -105,7 +105,7 @@ private:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -175,7 +175,7 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -195,7 +195,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -220,7 +220,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index b54f710..39ec6a3 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -642,7 +642,7 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr
-bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index a6b4d52..421c1e4 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -109,7 +109,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 8fbf05f..b3951b8 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -211,7 +211,7 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
}
-bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* )
{
sal_Int32 nOldVal = nTransliterationFlags;
nTransliterationFlags = GetTransliterationFlags_Impl();
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 4c20a5c..9173c24 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -67,7 +67,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
bool IsSaveOptions() const { return bSaveOptions; }
void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6168506..3481b755 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1156,7 +1156,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
-bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
bool bModified = true; // !!!!
@@ -1301,17 +1301,17 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
SfxHyphenRegionItem aHyp( GetWhich( SID_ATTR_HYPHENREGION ) );
aHyp.GetMinLead() = (sal_uInt8) aPreBreakData.GetNumericValue();
aHyp.GetMinTrail() = (sal_uInt8) aPostBreakData.GetNumericValue();
- rCoreSet.Put( aHyp );
+ rCoreSet->Put( aHyp );
}
}
// automatic spell checking
bool bNewAutoCheck = m_pLinguOptionsCLB->IsChecked( (sal_uLong) EID_SPELL_AUTO );
- const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK );
+ const SfxPoolItem* pOld = GetOldItem( *rCoreSet, SID_AUTOSPELL_CHECK );
if ( !pOld || ( (SfxBoolItem*)pOld )->GetValue() != bNewAutoCheck )
{
- rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
+ rCoreSet->Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
bNewAutoCheck ) );
bModified |= true;
}
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 72bda7a..1e1a97d 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -105,7 +105,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes
int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -155,7 +155,7 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt
-bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -198,7 +198,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
if( m_pQuickLaunchCB->IsValueChangedFromSaved())
{
- rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
+ rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
bModified = true;
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 0e5fb8b..b1564fb 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -61,7 +61,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list