[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source extensions/source filter/source include/sfx2 include/svx sc/source sd/source sfx2/source starmath/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Wed Jun 11 05:39:40 PDT 2014
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 6 +-
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 6 +-
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2
chart2/source/controller/dialogs/tp_DataLabel.cxx | 6 +-
chart2/source/controller/dialogs/tp_DataLabel.hxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 6 +-
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 | 4 -
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 6 +-
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 6 +-
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 6 +-
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 10 +--
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 4 -
chart2/source/controller/dialogs/tp_Trendline.cxx | 6 +-
chart2/source/controller/dialogs/tp_Trendline.hxx | 2
cui/source/customize/acccfg.cxx | 2
cui/source/customize/cfg.cxx | 18 +++---
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 12 ++--
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/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/grfpage.hxx | 2
cui/source/inc/labdlg.hxx | 2
cui/source/inc/macroass.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/cuisrchdlg.cxx | 2
cui/source/options/dbregister.cxx | 8 +-
cui/source/options/fontsubs.cxx | 6 +-
cui/source/options/fontsubs.hxx | 2
cui/source/options/optaccessibility.cxx | 6 +-
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optasian.cxx | 6 +-
cui/source/options/optbasic.cxx | 6 +-
cui/source/options/optbasic.hxx | 2
cui/source/options/optchart.cxx | 6 +-
cui/source/options/optchart.hxx | 2
cui/source/options/optcolor.cxx | 6 +-
cui/source/options/optcolor.hxx | 2
cui/source/options/optctl.cxx | 6 +-
cui/source/options/optctl.hxx | 2
cui/source/options/optfltr.cxx | 12 ++--
cui/source/options/optfltr.hxx | 4 -
cui/source/options/optgdlg.cxx | 18 +++---
cui/source/options/optgdlg.hxx | 6 +-
cui/source/options/optgenrl.cxx | 6 +-
cui/source/options/opthtml.cxx | 6 +-
cui/source/options/opthtml.hxx | 2
cui/source/options/optinet2.cxx | 24 ++++----
cui/source/options/optinet2.hxx | 8 +-
cui/source/options/optjava.cxx | 6 +-
cui/source/options/optjava.hxx | 2
cui/source/options/optjsearch.cxx | 6 +-
cui/source/options/optjsearch.hxx | 2
cui/source/options/optlingu.cxx | 6 +-
cui/source/options/optmemory.cxx | 6 +-
cui/source/options/optmemory.hxx | 2
cui/source/options/optpath.cxx | 6 +-
cui/source/options/optsave.cxx | 6 +-
cui/source/options/optsave.hxx | 2
cui/source/options/optupdt.cxx | 6 +-
cui/source/options/optupdt.hxx | 2
cui/source/options/personalization.cxx | 6 +-
cui/source/options/personalization.hxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/align.cxx | 6 +-
cui/source/tabpages/autocdlg.cxx | 42 +++++++-------
cui/source/tabpages/backgrnd.cxx | 4 -
cui/source/tabpages/border.cxx | 6 +-
cui/source/tabpages/chardlg.cxx | 18 +++---
cui/source/tabpages/connect.cxx | 6 +-
cui/source/tabpages/grfpage.cxx | 6 +-
cui/source/tabpages/labdlg.cxx | 6 +-
cui/source/tabpages/macroass.cxx | 6 +-
cui/source/tabpages/measure.cxx | 4 -
cui/source/tabpages/numfmt.cxx | 6 +-
cui/source/tabpages/numpages.cxx | 36 ++++++------
cui/source/tabpages/page.cxx | 6 +-
cui/source/tabpages/paragrph.cxx | 24 ++++----
cui/source/tabpages/swpossizetabpage.cxx | 6 +-
cui/source/tabpages/tabstpge.cxx | 6 +-
cui/source/tabpages/textanim.cxx | 6 +-
cui/source/tabpages/textattr.cxx | 4 -
cui/source/tabpages/tparea.cxx | 8 +-
cui/source/tabpages/tpbitmap.cxx | 4 -
cui/source/tabpages/tpcolor.cxx | 6 +-
cui/source/tabpages/tpgradnt.cxx | 6 +-
cui/source/tabpages/tphatch.cxx | 4 -
cui/source/tabpages/tpline.cxx | 4 -
cui/source/tabpages/tplnedef.cxx | 6 +-
cui/source/tabpages/tplneend.cxx | 6 +-
cui/source/tabpages/tpshadow.cxx | 4 -
cui/source/tabpages/transfrm.cxx | 12 ++--
dbaccess/source/ui/dlg/ConnectionPage.cxx | 4 -
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/DriverSettings.hxx | 26 ++++----
dbaccess/source/ui/dlg/UserAdmin.cxx | 4 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 22 +++----
dbaccess/source/ui/dlg/detailpages.cxx | 50 ++++++++---------
extensions/source/propctrlr/formcomponenthandler.cxx | 2
filter/source/pdf/impdialog.cxx | 36 ++++++------
filter/source/pdf/impdialog.hxx | 12 ++--
include/sfx2/dinfdlg.hxx | 8 +-
include/sfx2/mgetempl.hxx | 2
include/sfx2/printopt.hxx | 2
include/sfx2/securitypage.hxx | 2
include/sfx2/tabdlg.hxx | 4 -
include/svx/dlgctrl.hxx | 2
include/svx/hdft.hxx | 4 -
sc/source/ui/app/scmod.cxx | 18 +++---
sc/source/ui/attrdlg/tabpages.cxx | 6 +-
sc/source/ui/dbgui/tpsort.cxx | 12 ++--
sc/source/ui/dbgui/tpsubt.cxx | 20 +++---
sc/source/ui/dbgui/validate.cxx | 18 +++---
sc/source/ui/docshell/tpstat.cxx | 6 +-
sc/source/ui/inc/opredlin.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 8 +-
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 | 4 -
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 | 6 +-
sc/source/ui/optdlg/tpcalc.cxx | 6 +-
sc/source/ui/optdlg/tpcompatibility.cxx | 6 +-
sc/source/ui/optdlg/tpdefaults.cxx | 6 +-
sc/source/ui/optdlg/tpformula.cxx | 6 +-
sc/source/ui/optdlg/tpprint.cxx | 6 +-
sc/source/ui/optdlg/tpusrlst.cxx | 6 +-
sc/source/ui/optdlg/tpview.cxx | 12 ++--
sc/source/ui/pagedlg/scuitphfedit.cxx | 18 +++---
sc/source/ui/pagedlg/tphf.cxx | 16 ++---
sc/source/ui/pagedlg/tptable.cxx | 6 +-
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 2
sd/source/ui/app/sdmod2.cxx | 10 +--
sd/source/ui/dlg/paragr.cxx | 8 +-
sd/source/ui/dlg/prntopts.cxx | 6 +-
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 16 ++---
sd/source/ui/inc/prntopts.hxx | 2
sd/source/ui/inc/tpoption.hxx | 6 +-
sfx2/source/dialog/dinfdlg.cxx | 24 ++++----
sfx2/source/dialog/documentfontsdialog.cxx | 6 +-
sfx2/source/dialog/mgetempl.cxx | 6 +-
sfx2/source/dialog/printopt.cxx | 6 +-
sfx2/source/dialog/securitypage.cxx | 6 +-
sfx2/source/dialog/tabdlg.cxx | 8 +-
sfx2/source/inc/documentfontsdialog.hxx | 2
starmath/source/dialog.cxx | 2
svx/source/dialog/hdft.cxx | 10 +--
svx/source/dialog/optgrid.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 2
sw/source/ui/chrdlg/chardlg.cxx | 6 +-
sw/source/ui/chrdlg/drpcps.cxx | 8 +-
sw/source/ui/chrdlg/numpara.cxx | 6 +-
sw/source/ui/chrdlg/swuiccoll.cxx | 6 +-
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 8 +-
sw/source/ui/config/optcomp.cxx | 6 +-
sw/source/ui/config/optload.cxx | 14 ++--
sw/source/ui/config/optpage.cxx | 48 ++++++++--------
sw/source/ui/dialog/addrdlg.cxx | 2
sw/source/ui/dialog/docstdlg.cxx | 6 +-
sw/source/ui/dialog/uiregionsw.cxx | 18 +++---
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 | 4 -
sw/source/ui/fldui/flddb.hxx | 2
sw/source/ui/fldui/flddinf.cxx | 4 -
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/flddok.cxx | 4 -
sw/source/ui/fldui/flddok.hxx | 2
sw/source/ui/fldui/fldedt.cxx | 12 ++--
sw/source/ui/fldui/fldfunc.cxx | 4 -
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/fldui/fldref.cxx | 4 -
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldvar.cxx | 4 -
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/frmdlg/column.cxx | 8 +-
sw/source/ui/frmdlg/frmpage.cxx | 24 ++++----
sw/source/ui/frmdlg/pattern.cxx | 2
sw/source/ui/frmdlg/uiborder.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 8 +-
sw/source/ui/index/cnttab.cxx | 18 +++---
sw/source/ui/misc/docfnote.cxx | 10 +--
sw/source/ui/misc/impfnote.hxx | 4 -
sw/source/ui/misc/num.cxx | 6 +-
sw/source/ui/misc/outline.cxx | 6 +-
sw/source/ui/misc/pgfnote.cxx | 6 +-
sw/source/ui/misc/pggrid.cxx | 6 +-
sw/source/ui/table/tabledlg.cxx | 18 +++---
sw/source/uibase/app/appopt.cxx | 16 ++---
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 +-
sw/source/uibase/uiview/viewprt.cxx | 2
267 files changed, 860 insertions(+), 860 deletions(-)
New commits:
commit bb761be472ea9a590837dc6c1ca295387ac4c0b7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jun 11 14:34:46 2014 +0200
Change SfxTabPage ctor SfxItemSet param from ref to pointer
...and also corresponding param of CreateTabPage function type and corresponding
Craete functions. There were some call sites that passed undefined "null
pointer references" and SfxTabPage internally uses a pointer member pSet that is
checked for null anyway.
Change-Id: I4eb3636155eac46c9c9d26e6e6e842e85d7e95af
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 332fcfe..100af27 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -38,7 +38,7 @@ NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
if ( fnCreatePage )
{
- SfxTabPage* pTabPage = (*fnCreatePage)( get_content_area(), rSet );
+ SfxTabPage* pTabPage = (*fnCreatePage)( get_content_area(), &rSet );
pTabPage->PageCreated(rSet);
SetTabPage(pTabPage);
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 9883b64..711e09f 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -32,7 +32,7 @@ namespace chart
{
SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", rInAttrs ),
+ SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", &rInAttrs ),
m_bShowStaggeringControls( true ),
@@ -80,9 +80,9 @@ void SchAxisLabelTabPage::Construct()
{
}
-SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAttrs )
+SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet* rAttrs )
{
- return new SchAxisLabelTabPage( pParent, rAttrs );
+ return new SchAxisLabelTabPage( pParent, *rAttrs );
}
bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 838ea1b..be28343 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -74,7 +74,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index a43a104..afa5f87 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -46,7 +46,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn
: SfxTabPage(pWindow
,"tp_AxisPositions"
,"modules/schart/ui/tp_AxisPositions.ui"
- , rInAttrs)
+ , &rInAttrs)
, m_pNumFormatter(NULL)
, m_bCrossingAxisIsCategoryAxis(false)
, m_aCategories()
@@ -85,9 +85,9 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn
m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() );
}
-SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
+SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
{
- return new AxisPositionsTabPage(pWindow, rOutAttrs);
+ return new AxisPositionsTabPage(pWindow, *rOutAttrs);
}
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index d05bbab..78ce532 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -34,7 +34,7 @@ class AxisPositionsTabPage : public SfxTabPage
public:
AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 5c77535..f40eb3e 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -29,7 +29,7 @@ DataLabelsTabPage::DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs
: SfxTabPage(pWindow
, "tp_DataLabel"
, "modules/schart/ui/tp_DataLabel.ui"
- , rInAttrs)
+ , &rInAttrs)
, m_aDataLabelResources(this, this, rInAttrs)
{
}
@@ -38,9 +38,9 @@ DataLabelsTabPage::~DataLabelsTabPage()
{
}
-SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet& rOutAttrs)
+SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs)
{
- return new DataLabelsTabPage(pWindow, rOutAttrs);
+ return new DataLabelsTabPage(pWindow, *rOutAttrs);
}
bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 32981ce..5e14a41 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -36,7 +36,7 @@ public:
DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs);
virtual ~DataLabelsTabPage();
- static SfxTabPage* Create(Window* pWindow, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pWindow, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 225c607..0c17984 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -32,7 +32,7 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs
SfxTabPage( pParent
,"tp_ErrorBars"
,"modules/schart/ui/tp_ErrorBars.ui"
- , rInAttrs ),
+ , &rInAttrs ),
m_aErrorBarResources(
this,
// the parent is the tab control, of which the parent is the dialog
@@ -42,9 +42,9 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
SfxTabPage* ErrorBarsTabPage::Create(
- Window* pParent, const SfxItemSet& rOutAttrs )
+ Window* pParent, const SfxItemSet* rOutAttrs )
{
- return new ErrorBarsTabPage( pParent, rOutAttrs );
+ return new ErrorBarsTabPage( pParent, *rOutAttrs );
}
bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 96b14dc..05f2e59 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -37,7 +37,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index b932a53..6a0beef 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -33,7 +33,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInA
: SfxTabPage( pWindow
,"tp_LegendPosition"
,"modules/schart/ui/tp_LegendPosition.ui"
- , rInAttrs )
+ , &rInAttrs )
, m_aLegendPositionResources(*this)
{
get(m_pLbTextDirection,"LB_LEGEND_TEXTDIR");
@@ -41,9 +41,9 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInA
m_pLbTextDirection->SetDropDownLineCount(3);
}
-SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutAttrs)
+SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs)
{
- return new SchLegendPosTabPage(pWindow, rOutAttrs);
+ return new SchLegendPosTabPage(pWindow, *rOutAttrs);
}
bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 2c4a855..0c767d8 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -38,7 +38,7 @@ private:
public:
SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs);
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
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 03b2214..42420d7 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -43,9 +43,9 @@ SchLayoutTabPage::~SchLayoutTabPage()
}
SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
- const SfxItemSet& rOutAttrs)
+ const SfxItemSet* rOutAttrs)
{
- return new SchLayoutTabPage(pWindow, rOutAttrs);
+ return new SchLayoutTabPage(pWindow, *rOutAttrs);
}
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index fda04f3..f0424bc 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -31,7 +31,7 @@ public:
SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index f273160..fe3db2a 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -32,7 +32,7 @@ PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet& rInA
SfxTabPage( pWindow
,"tp_PolarOptions"
,"modules/schart/ui/tp_PolarOptions.ui"
- ,rInAttrs)
+ ,&rInAttrs)
{
get(m_pCB_Clockwise, "CB_CLOCKWISE");
get(m_pFL_StartingAngle, "frameANGLE");
@@ -48,9 +48,9 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
{
}
-SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutAttrs )
+SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet* rOutAttrs )
{
- return new PolarOptionsTabPage( pWindow, rOutAttrs );
+ return new PolarOptionsTabPage( pWindow, *rOutAttrs );
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index dbdb157..d0cbe2e 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -35,7 +35,7 @@ public:
PolarOptionsTabPage(Window* pParent, const SfxItemSet& rInAttrs );
virtual ~PolarOptionsTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 0f3a8ce..bff207a 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -55,7 +55,7 @@ ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
SfxTabPage(pWindow
, "tp_Scale"
, "modules/schart/ui/tp_Scale.ui"
- , rInAttrs),
+ , &rInAttrs),
fMin(0.0),
fMax(0.0),
fStepMain(0.0),
@@ -233,9 +233,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl)
return 0;
}
-SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
+SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
{
- return new ScaleTabPage(pWindow, rOutAttrs);
+ return new ScaleTabPage(pWindow, *rOutAttrs);
}
bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 9e754f7..a1adfec 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -34,7 +34,7 @@ class ScaleTabPage : public SfxTabPage
public:
ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index b2c5cbb..76142ad 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -36,7 +36,7 @@ SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs)
: SfxTabPage(pWindow,
"TP_OPTIONS",
"modules/schart/ui/tp_SeriesToAxis.ui",
- rInAttrs)
+ &rInAttrs)
, m_nAllSeriesAxisIndex(0)
, m_bProvidesSecondaryYAxis(true)
, m_bProvidesOverlapAndGapWidth(false)
@@ -76,9 +76,9 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl)
return 0;
}
-SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
+SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs)
{
- return new SchOptionTabPage(pWindow, rOutAttrs);
+ return new SchOptionTabPage(pWindow, *rOutAttrs);
}
bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index af969f7..56de1da 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -33,7 +33,7 @@ public:
SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs);
virtual ~SchOptionTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 06e0ba1..bfad013 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -33,7 +33,7 @@ namespace chart
SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
const SfxItemSet& rInAttrs, bool bWithRotation) :
- SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", rInAttrs)
+ SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", &rInAttrs)
{
get(m_pCtrlDial,"dialCtrl");
get(m_pFtRotate,"degreeL");
@@ -61,15 +61,15 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
}
SfxTabPage* SchAlignmentTabPage::Create(Window* pParent,
- const SfxItemSet& rInAttrs)
+ const SfxItemSet* rInAttrs)
{
- return new SchAlignmentTabPage(pParent, rInAttrs);
+ return new SchAlignmentTabPage(pParent, *rInAttrs);
}
SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
- const SfxItemSet& rInAttrs)
+ const SfxItemSet* rInAttrs)
{
- return new SchAlignmentTabPage(pParent, rInAttrs, false);
+ return new SchAlignmentTabPage(pParent, *rInAttrs, false);
}
bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 4ec3900..86f49e9 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -45,8 +45,8 @@ public:
SchAlignmentTabPage(Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
virtual ~SchAlignmentTabPage();
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs);
+ static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet* rInAttrs);
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 d375330..074aef5 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -26,7 +26,7 @@ namespace chart
{
TrendlineTabPage::TrendlineTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage( pParent, "TP_TRENDLINE", "modules/schart/ui/tp_Trendline.ui", rInAttrs ),
+ SfxTabPage( pParent, "TP_TRENDLINE", "modules/schart/ui/tp_Trendline.ui", &rInAttrs ),
m_aTrendlineResources( this, rInAttrs )
{
}
@@ -36,9 +36,9 @@ TrendlineTabPage::~TrendlineTabPage()
}
SfxTabPage* TrendlineTabPage::Create(
- Window* pParent, const SfxItemSet& rOutAttrs )
+ Window* pParent, const SfxItemSet* rOutAttrs )
{
- return new TrendlineTabPage( pParent, rOutAttrs );
+ return new TrendlineTabPage( pParent, *rOutAttrs );
}
bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 580dcc8..c18ceb7 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -32,7 +32,7 @@ public:
TrendlineTabPage ( Window* pParent, const SfxItemSet& rInAttrs );
virtual ~TrendlineTabPage ();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 3708c8c..311804c 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -730,7 +730,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
- : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", aSet)
+ : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet)
, m_pMacroInfoItem()
, m_pStringItem()
, m_pFontItem()
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c8374d7..d88c071 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -733,24 +733,24 @@ ConvertToolbarEntry(
return aPropSeq;
}
-SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet* rSet )
{
- return new SvxMenuConfigPage( pParent, rSet );
+ return new SvxMenuConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet* rSet )
{
- return new SfxAcceleratorConfigPage( pParent, rSet );
+ return new SfxAcceleratorConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet* rSet )
{
- return new SvxToolbarConfigPage( pParent, rSet );
+ return new SvxToolbarConfigPage( pParent, *rSet );
}
-SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet* rSet )
{
- return new SvxEventConfigPage( pParent, rSet, SvxEventConfigPage::EarlyInit() );
+ return new SvxEventConfigPage( pParent, *rSet, SvxEventConfigPage::EarlyInit() );
}
namespace {
@@ -1516,7 +1516,7 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
*
*****************************************************************************/
SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", rSet)
+ : SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", &rSet)
, bInitialised(false)
, pCurrentSaveInData(0)
, m_pContentsListBox(0)
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0f486d4..20a5c2c 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -214,7 +214,7 @@ void _SvxMacroTabPage::EnableButtons()
_SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
- : SfxTabPage( pParent, rID, rUIXMLDescription, rAttrSet ),
+ : SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ),
m_xAppEvents(0),
m_xDocEvents(0),
bReadOnly(false),
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 68124b5..38bb116 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -499,7 +499,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
aSet.Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
SfxSingleTabDialog* pDlg =
new SfxSingleTabDialog(this, aSet, "SpellOptionsDialog", "cui/ui/spelloptionsdialog.ui");
- SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), aSet );
+ SfxTabPage* pPage = SvxLinguTabPage::Create( pDlg->get_content_area(), &aSet );
( (SvxLinguTabPage*)pPage )->HideGroups( GROUP_MODULES );
pDlg->SetTabPage( pPage );
if(RET_OK == pDlg->Execute())
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 517020c..cc2daab 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -610,7 +610,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
// - TPGalleryThemeGeneral -
TPGalleryThemeGeneral::TPGalleryThemeGeneral(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage(pParent, "GalleryGeneralPage",
- "cui/ui/gallerygeneralpage.ui", rSet)
+ "cui/ui/gallerygeneralpage.ui", &rSet)
, pData(NULL)
{
get(m_pFiMSImage, "image");
@@ -687,14 +687,14 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
-SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new TPGalleryThemeGeneral( pParent, rSet );
+ return new TPGalleryThemeGeneral( pParent, *rSet );
}
// - TPGalleryThemeProperties -
TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet )
- : SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", rSet)
+ : SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
, pData(NULL)
, nCurFilterPos(0)
, nFirstExtFilterPos(0)
@@ -771,9 +771,9 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
-SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new TPGalleryThemeProperties( pParent, rSet );
+ return new TPGalleryThemeProperties( pParent, *rSet );
}
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 8ad7b66..3aa641c 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -59,7 +59,7 @@ class AlignmentTabPage : public SfxTabPage
public:
virtual ~AlignmentTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 9644319..eb3ea5b 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -111,7 +111,7 @@ public:
OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet);
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -171,7 +171,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -263,7 +263,7 @@ public:
OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaAutocorrReplacePage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -322,7 +322,7 @@ public:
virtual ~OfaAutocorrExceptPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -388,7 +388,7 @@ public:
virtual ~OfaQuoteTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -438,7 +438,7 @@ public:
virtual ~OfaAutoCompleteTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -504,7 +504,7 @@ public:
virtual ~OfaSmartTagOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index f66f5c3..0402ecb 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -46,7 +46,7 @@ class SvxBackgroundTabPage : public SvxTabPage
{
using TabPage::DeactivatePage;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 9ec26bd..dc906dd 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -44,7 +44,7 @@ class SvxBorderTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 39e5557..ab28416 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -152,7 +152,7 @@ public:
public:
virtual ~SvxCharNamePage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -231,7 +231,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -310,7 +310,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -353,7 +353,7 @@ public:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 6519ce6..b0e034e 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -63,7 +63,7 @@ public:
SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxConnectionPage();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index f55c6e2..8106bc7 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -225,7 +225,7 @@ public:
void SetXChgData( ExchangeData* pData );
const ExchangeData* GetXChgData() const { return pData; }
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
};
typedef ::std::vector< FilterEntry* > FilterEntryList_impl;
@@ -292,7 +292,7 @@ public:
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 8db3409..49a3f06 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -67,7 +67,7 @@ public:
SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxGeneralTabPage ();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
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 0b0dbad..adc998a 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -162,7 +162,7 @@ public:
SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
void Construct();
- static SfxTabPage* Create(Window*, const SfxItemSet&);
+ static SfxTabPage* Create(Window*, const SfxItemSet*);
static const sal_uInt16* GetRanges();
virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
@@ -292,7 +292,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -357,7 +357,7 @@ public:
SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs );
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -437,7 +437,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -513,7 +513,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -599,7 +599,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -734,7 +734,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index a6055b3..83aac99 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -207,7 +207,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -305,7 +305,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
@@ -375,7 +375,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index ebfb390..37cf8b5 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -92,7 +92,7 @@ namespace svx
DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet );
virtual ~DbRegistrationOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 2fe1d13..e10d09b 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -111,7 +111,7 @@ class SvxGrfCropPage : public SfxTabPage
Size GetGrfOrigSize( const Graphic& ) const;
public:
- static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
+ static SfxTabPage *Create( Window *pParent, const SfxItemSet *rSet );
virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index ccd5d7a..1b73b59 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -75,7 +75,7 @@ private:
public:
SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index bdb5919..988ff02 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -96,7 +96,7 @@ public:
);
// --------- inherit from the base -------------
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index f97e026e..2609377 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -67,7 +67,7 @@ public:
SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxMeasurePage();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 2a3a153..10c311c 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -71,7 +71,7 @@ public:
virtual ~SvxNumberFormatTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 7d08a9f..6c56ed0 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -111,7 +111,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
virtual ~SvxSingleNumPickTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
@@ -147,7 +147,7 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual ~SvxBulletPickTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
@@ -190,7 +190,7 @@ class SvxNumPickTabPage : public SfxTabPage
virtual ~SvxNumPickTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
@@ -235,7 +235,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
virtual ~SvxBitmapPickTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
@@ -347,7 +347,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual ~SvxNumOptionsTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
@@ -455,7 +455,7 @@ public:
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet);
+ const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
void SetModified(bool bRepaint = true);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index ecbfbf2..be96555 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -57,7 +57,7 @@ public:
virtual ~SvxAsianLayoutPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
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 9128931..8d31b7b 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -148,7 +148,7 @@ private:
public:
virtual ~SvxLinguTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 7ee28ae..0d4de78 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -72,7 +72,7 @@ public:
SvxPathTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxPathTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 2d8c72a..a64ca32 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -177,7 +177,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 245b10d..08a370a 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -99,7 +99,7 @@ protected:
public:
DECL_LINK(ELRLoseFocusHdl, void *);
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -160,7 +160,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -192,7 +192,7 @@ public:
virtual ~SvxExtParagraphTabPage();
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rSet );
+ const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -272,7 +272,7 @@ public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rSet );
+ const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 95a1b61..315fb57 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -125,7 +125,7 @@ public:
SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxSwPosSizeTabPage();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 1a11c86..e5b64a6 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -50,7 +50,7 @@ class SvxTabulatorTabPage : public SfxTabPage
public:
virtual ~SvxTabulatorTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index d584df6..f043b85 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -76,7 +76,7 @@ public:
SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxTextAnimationPage();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index ad4c45f..1cac8d7 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -77,7 +77,7 @@ public:
SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs );
virtual ~SvxTextAttrPage();
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 47b8d33..6e38815 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -147,7 +147,7 @@ private:
public:
SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -202,7 +202,7 @@ private:
public:
SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
@@ -246,7 +246,7 @@ private:
public:
SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs );
- static SfxTabPage* Create( Window*, const SfxItemSet& );
+ static SfxTabPage* Create( Window*, const SfxItemSet* );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 95402c9..9adf2b5 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -301,7 +301,7 @@ namespace offapp
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
- : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", _rAttrSet)
+ : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet)
{
get(m_pEnablePooling, "connectionpooling");
get(m_pDriversLabel, "driverslabel");
@@ -326,9 +326,9 @@ namespace offapp
}
- SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet)
+ SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet)
{
- return new ConnectionPoolOptionsPage(_pParent, _rAttrSet);
+ return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet);
}
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index f65bb8c..f865438 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -51,7 +51,7 @@ namespace offapp
ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet);
public:
- static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet);
+ static SfxTabPage* Create(Window* _pParent, const SfxItemSet* _rAttrSet);
protected:
virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 9050f49..eb552d6 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -55,7 +55,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent,
// pPage will be implicitly destroyed by the
// SfxSingleTabDialog destructor
pPage = (SvxJSearchOptionsPage *)
- SvxJSearchOptionsPage::Create(get_content_area(), rOptionsSet );
+ SvxJSearchOptionsPage::Create(get_content_area(), &rOptionsSet );
SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
pPage->EnableSaveOptions(false);
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 666d1b9..dd380e7 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -78,7 +78,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const S
: RegistrationItemSetHolder(rInAttrs)
, SfxSingleTabDialog(pParent, getRegistrationItems())
{
- SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), getRegistrationItems());
+ SfxTabPage* page = DbRegistrationOptionsPage::Create(get_content_area(), &getRegistrationItems());
SetTabPage(page);
SetText(page->get<VclFrame>("frame1")->get_label());
}
@@ -103,7 +103,7 @@ short DatabaseRegistrationDialog::Execute()
DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", rSet ),
+ SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ),
aTypeText ( CUI_RES( RID_SVXSTR_TYPE ) ),
aPathText ( CUI_RES( RID_SVXSTR_PATH ) ),
@@ -175,9 +175,9 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) );
+ return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index d140fe8..2a2cc40 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -39,7 +39,7 @@
SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", rSet)
+ : SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet)
, pConfig(new SvtFontSubstConfig)
, pCheckButtonData(0)
{
@@ -145,9 +145,9 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
}
SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet)
+ const SfxItemSet* rAttrSet)
{
- return new SvxFontSubstTabPage(pParent, rAttrSet);
+ return new SvxFontSubstTabPage(pParent, *rAttrSet);
}
bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index b505904..91f87d7 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -95,7 +95,7 @@ class SvxFontSubstTabPage : public SfxTabPage
virtual ~SvxFontSubstTabPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet);
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 588d2c9..f63e7ae 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -34,7 +34,7 @@ struct SvxAccessibilityOptionsTabPage_Impl
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "OptAccessibilityPage",
- "cui/ui/optaccessibilitypage.ui", rSet)
+ "cui/ui/optaccessibilitypage.ui", &rSet)
, m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
{
get(m_pAccessibilityTool, "acctool");
@@ -61,9 +61,9 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
delete m_pImpl;
}
-SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
+ return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet);
}
bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 5239470..c253160 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -45,7 +45,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
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 8f57866..a29ec7e 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -123,7 +123,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", rSet),
+ SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet),
pImpl(new SvxAsianLayoutPage_Impl)
{
get(m_pCharKerningRB, "charkerning");
@@ -155,9 +155,9 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
delete pImpl;
}
-SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxAsianLayoutPage(pParent, rAttrSet);
+ return new SvxAsianLayoutPage(pParent, *rAttrSet);
}
bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index a3c6f22..826ac04 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -26,7 +26,7 @@
#include <cuires.hrc>
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet )
-: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", rSet)
+: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet)
{
SvtMiscOptions aMiscOpt;
if( ! aMiscOpt.IsExperimentalMode() )
@@ -136,9 +136,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
pUseExtendedTypesChk->SaveValue();
}
-SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new SvxBasicIDEOptionsPage( pParent, rAttrSet ) );
+ return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) );
}
void SvxBasicIDEOptionsPage::FillUserData()
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 4727ab7..a843a4e 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -40,7 +40,7 @@ public:
SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxBasicIDEOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
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 799fb0a..d2494df 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -40,7 +40,7 @@ namespace
}
SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", rInAttrs)
+ : SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", &rInAttrs)
{
get(m_pPBRemove, "delete");
get(m_pPBAdd, "add");
@@ -103,9 +103,9 @@ void SvxDefaultColorOptPage::Construct()
}
-SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& rAttrs )
+SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet* rAttrs )
{
- return new SvxDefaultColorOptPage( pParent, rAttrs );
+ return new SvxDefaultColorOptPage( pParent, *rAttrs );
}
bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 5ec9299..610e297 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -58,7 +58,7 @@ public:
void Construct();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs );
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 df3755b..2fea001 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1030,7 +1030,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
Window* pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", rCoreSet)
+ : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet)
, bFillItemSetCalled(false)
, pColorConfig(0)
, pExtColorConfig(0)
@@ -1074,9 +1074,9 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
delete pExtColorConfig;
}
-SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
+ return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) );
}
bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 7df087f..d19c6c6 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -50,7 +50,7 @@ public:
SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxColorOptionsTabPage( );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 6893697..92ff2a7 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -40,7 +40,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl)
SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", rSet )
+ SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", &rSet )
{
get( m_pSequenceCheckingCB, "sequencechecking");
@@ -61,9 +61,9 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
{
}
-SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxCTLOptionsPage( pParent, rAttrSet );
+ return new SvxCTLOptionsPage( pParent, *rAttrSet );
}
bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index e49a7a1..b61cf56 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -47,7 +47,7 @@ public:
virtual ~SvxCTLOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
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 391a242..1749c0a 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -39,7 +39,7 @@ enum MSFltrPg2_CheckBoxEntries {
OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", rSet )
+ : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet )
{
get( aWBasicCodeCB , "wo_basic" );
get( aWBasicWbctblCB , "wo_exec" );
@@ -71,9 +71,9 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
}
SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return new OfaMSFilterTabPage( pParent, rAttrSet );
+ return new OfaMSFilterTabPage( pParent, *rAttrSet );
}
bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@@ -129,7 +129,7 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
}
OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", rSet ),
+ SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ),
sHeader1(CUI_RES(RID_SVXSTR_HEADER1)),
sHeader2(CUI_RES(RID_SVXSTR_HEADER2)),
sChgToFromMath(CUI_RES(RID_SVXSTR_CHG_MATH)),
@@ -164,9 +164,9 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
}
SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return new OfaMSFilterTabPage2( pParent, rAttrSet );
+ return new OfaMSFilterTabPage2( pParent, *rAttrSet );
}
bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 71a6204..0f4ed12 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -44,7 +44,7 @@ class OfaMSFilterTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -93,7 +93,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
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 980bfa8..b083e68 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -184,7 +184,7 @@ namespace
OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", rSet)
+ : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet)
{
get(m_pToolTipsCB, "tooltips");
get(m_pExtHelpCB, "exthelp");
@@ -236,9 +236,9 @@ OfaMiscTabPage::~OfaMiscTabPage()
-SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new OfaMiscTabPage( pParent, rAttrSet );
+ return new OfaMiscTabPage( pParent, *rAttrSet );
}
@@ -536,7 +536,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const
// class OfaViewTabPage --------------------------------------------------
OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet)
+ : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet)
, nSizeLB_InitialSelection(0)
, nStyleLB_InitialSelection(0)
, pAppearanceCfg(new SvtTabAppearanceCfg)
@@ -647,9 +647,9 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN )
return 0;
}
-SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new OfaViewTabPage(pParent, rAttrSet);
+ return new OfaViewTabPage(pParent, *rAttrSet);
}
bool OfaViewTabPage::FillItemSet( SfxItemSet* )
@@ -998,7 +998,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal
}
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", rSet ),
+ SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ),
pLangConfig(new LanguageConfig_Impl)
{
get(m_pUserInterfaceLB, "userinterface");
@@ -1149,9 +1149,9 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
delete pLangConfig;
}
-SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new OfaLanguagesTabPage(pParent, rAttrSet);
+ return new OfaLanguagesTabPage(pParent, *rAttrSet);
}
static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 93985aa..9610eff 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -68,7 +68,7 @@ public:
OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMiscTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -123,7 +123,7 @@ public:
OfaViewTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaViewTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -167,7 +167,7 @@ public:
OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaLanguagesTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index b3ae874..33177c6 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -212,7 +212,7 @@ public:
SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", rCoreSet)
+ : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet)
{
get(m_pUseDataCB, "usefordocprop");
InitControls();
@@ -297,9 +297,9 @@ void SvxGeneralTabPage::SetLinks ()
-SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new SvxGeneralTabPage( pParent, rAttrSet ) );
+ return ( new SvxGeneralTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 7d5386c..0f3d5125 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -43,7 +43,7 @@ const sal_uInt16 aExportToPosArr[] =
OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
-SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet )
+SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet )
{
get(aSize1NF,"size1");
get(aSize2NF,"size2");
@@ -89,9 +89,9 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
}
SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return new OfaHtmlTabPage(pParent, rAttrSet);
+ return new OfaHtmlTabPage(pParent, *rAttrSet);
}
bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 47c8d08..1405249 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -57,7 +57,7 @@ class OfaHtmlTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
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 1d71abe..9fad8b6 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -153,7 +153,7 @@ bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue)
/********************************************************************/
SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", rSet)
+ : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet)
, aProxyModePN("ooInetProxyType")
, aHttpProxyPN("ooInetHTTPProxyName")
, aHttpPortPN("ooInetHTTPProxyPort")
@@ -214,9 +214,9 @@ SvxProxyTabPage::~SvxProxyTabPage()
{
}
-SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxProxyTabPage(pParent, rAttrSet);
+ return new SvxProxyTabPage(pParent, *rAttrSet);
}
void SvxProxyTabPage::ReadConfigData_Impl()
@@ -575,7 +575,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt )
/********************************************************************/
SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", rSet)
+ : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet)
, mpSecOptions(new SvtSecurityOptions)
, mpSecOptDlg(NULL)
, mpCertPathDlg(NULL)
@@ -853,9 +853,9 @@ void SvxSecurityTabPage::InitControls()
}
}
-SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxSecurityTabPage(pParent, rAttrSet);
+ return new SvxSecurityTabPage(pParent, *rAttrSet);
}
void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
@@ -914,7 +914,7 @@ void SvxSecurityTabPage::Reset( const SfxItemSet* )
}
MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptBrowserPage", "cui/ui/optbrowserpage.ui", rSet)
+ : SfxTabPage(pParent, "OptBrowserPage", "cui/ui/optbrowserpage.ui", &rSet)
{
get(m_pWBasicCodeCB, "display");
}
@@ -924,9 +924,9 @@ MozPluginTabPage::~MozPluginTabPage()
}
SfxTabPage* MozPluginTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return new MozPluginTabPage( pParent, rAttrSet );
+ return new MozPluginTabPage( pParent, *rAttrSet );
}
bool MozPluginTabPage::FillItemSet( SfxItemSet* )
@@ -1205,7 +1205,7 @@ struct SvxEMailTabPage_Impl
};
SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", rSet)
+ : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet)
, pImpl(new SvxEMailTabPage_Impl)
{
get(m_pMailContainer, "OptEmailPage");
@@ -1225,9 +1225,9 @@ SvxEMailTabPage::~SvxEMailTabPage()
/* -------------------------------------------------------------------------*/
-SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxEMailTabPage(pParent, rAttrSet);
+ return new SvxEMailTabPage(pParent, *rAttrSet);
}
/* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 362f845..540bb3d 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -104,7 +104,7 @@ private:
virtual ~SvxProxyTabPage();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
@@ -174,7 +174,7 @@ protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
};
@@ -193,7 +193,7 @@ class MozPluginTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -218,7 +218,7 @@ public:
SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxEMailTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
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 15030f1..548c8c6 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -132,7 +132,7 @@ public:
// class SvxJavaOptionsPage ----------------------------------------------
SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet )
- : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", rSet)
+ : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet)
, m_pParamDlg(NULL)
, m_pPathDlg(NULL)
#if HAVE_FEATURE_JAVA
@@ -635,9 +635,9 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
-SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new SvxJavaOptionsPage( pParent, rAttrSet ) );
+ return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 6b9bf7a..ab9a937 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -107,7 +107,7 @@ public:
SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxJavaOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index b8f68d9..e313e89 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -29,7 +29,7 @@ using namespace com::sun::star::i18n;
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", rSet )
+ SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet )
{
get( m_pMatchCase, "matchcase");
get( m_pMatchFullHalfWidth, "matchfullhalfwidth");
@@ -62,9 +62,9 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
}
-SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new SvxJSearchOptionsPage( pParent, rSet );
+ return new SvxJSearchOptionsPage( pParent, *rSet );
}
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 2667906..8a8bf0e 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -64,7 +64,7 @@ protected:
public:
virtual ~SvxJSearchOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index ae66374..7ab82dd 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1033,7 +1033,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
// class SvxLinguTabPage -------------------------------------------------
SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
- SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", rSet),
+ SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet),
sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)),
sWordsWithDigits(CUI_RES(RID_SVXSTR_WORDS_WITH_DIGITS)),
@@ -1149,9 +1149,9 @@ const sal_uInt16* SvxLinguTabPage::GetRanges()
SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return ( new SvxLinguTabPage( pParent, rAttrSet ) );
+ return ( new SvxLinguTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index a391865..34f8a17 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -112,7 +112,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", rSet)
+ : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet)
{
get(m_pUndoEdit, "undo");
get(m_pNfGraphicCache, "graphiccache");
@@ -148,9 +148,9 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
-SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new OfaMemoryOptionsPage( pParent, rAttrSet );
+ return new OfaMemoryOptionsPage( pParent, *rAttrSet );
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 327cc54..b1bf582 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -59,7 +59,7 @@ public:
OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMemoryOptionsPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index de014e7..b392869 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -197,7 +197,7 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex )
// class SvxPathTabPage --------------------------------------------------
SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet)
- :SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", rSet)
+ :SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet)
, xDialogListener ( new ::svt::DialogClosedListener() )
{
pImpl = new OptPath_Impl(get<FixedImage>("lock")->GetImage(),
@@ -257,9 +257,9 @@ SvxPathTabPage::~SvxPathTabPage()
SfxTabPage* SvxPathTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return ( new SvxPathTabPage( pParent, rAttrSet ) );
+ return ( new SvxPathTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 9c27762..c2b8d2a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -82,7 +82,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl()
// class SvxSaveTabPage --------------------------------------------------
SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
- SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", rCoreSet ),
+ SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ),
pImpl ( new SvxSaveTabPage_Impl )
{
get(aLoadUserSettingsCB, "load_settings");
@@ -206,9 +206,9 @@ SfxSaveTabPage::~SfxSaveTabPage()
SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
+ const SfxItemSet* rAttrSet )
{
- return ( new SfxSaveTabPage( pParent, rAttrSet ) );
+ return ( new SfxSaveTabPage( pParent, *rAttrSet ) );
}
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 7b5158f..97f49b7 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -74,7 +74,7 @@ public:
SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxSaveTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index a8ab4c6..6de31e2 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star;
// class SvxOnlineUpdateTabPage --------------------------------------------------
SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", rSet)
+ : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", &rSet)
{
m_aNeverChecked = get<FixedText>("neverchecked")->GetText();
get(m_pAutoCheckCheckBox, "autocheck");
@@ -149,9 +149,9 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
SfxTabPage*
-SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new SvxOnlineUpdateTabPage( pParent, rAttrSet );
+ return new SvxOnlineUpdateTabPage( pParent, *rAttrSet );
}
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 996d1b2..a9d3973 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -54,7 +54,7 @@ public:
SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~SvxOnlineUpdateTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 60a7745..334d377 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -86,7 +86,7 @@ IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
}
SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet )
- : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", rSet )
+ : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", &rSet )
{
// persona
get( m_pNoPersona, "no_persona" );
@@ -103,9 +103,9 @@ SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
{
}
-SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet &rSet )
+SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet *rSet )
{
- return new SvxPersonalizationTabPage( pParent, rSet );
+ return new SvxPersonalizationTabPage( pParent, *rSet );
}
bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 66d94f2..c1d77ff 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -29,7 +29,7 @@ public:
SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet );
virtual ~SvxPersonalizationTabPage();
- static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
+ static SfxTabPage* Create( Window *pParent, const SfxItemSet *rSet );
/// Apply the settings ([OK] button).
virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 23979b4..1420c3a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -327,7 +327,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
#endif
}
- SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
+ SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, &rSet ) : NULL;
return pRet;
}
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index ecf544d..7532118 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -154,7 +154,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const
AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
- SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", rCoreAttrs )
+ SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs )
{
// text alignment
@@ -255,9 +255,9 @@ AlignmentTabPage::~AlignmentTabPage()
delete m_pOrientHlp;
}
-SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new AlignmentTabPage( pParent, rAttrSet );
+ return new AlignmentTabPage( pParent, *rAttrSet );
}
const sal_uInt16* AlignmentTabPage::GetRanges()
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 4d42674..57ae3a7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -178,7 +178,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
}
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", rSet)
+ : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet)
, m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
, m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
, m_sStartCap(CUI_RESSTR(RID_SVXSTR_CPTL_STT_SENT))
@@ -192,9 +192,9 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet
}
SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
- const SfxItemSet& rSet)
+ const SfxItemSet* rSet)
{
- return new OfaAutocorrOptionsPage(pParent, rSet);
+ return new OfaAutocorrOptionsPage(pParent, *rSet);
}
bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
@@ -387,7 +387,7 @@ enum OfaAutoFmtOptions
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", rSet)
+ : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet)
, sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA))
, sUseReplaceTbl(CUI_RESSTR(RID_SVXSTR_USE_REPLACE))
, sCptlSttWord(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD))
@@ -476,9 +476,9 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
}
SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet)
+ const SfxItemSet* rAttrSet)
{
- return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet);
+ return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet);
}
bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
@@ -832,7 +832,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", rSet)
+ : SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", &rSet)
, eLang(eLastDialogLanguage)
, bHasSelectionText(false)
, bFirstSelect(true)
@@ -904,9 +904,9 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
delete pCharClass;
}
-SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet& rSet)
+SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet* rSet)
{
- return new OfaAutocorrReplacePage(pParent, rSet);
+ return new OfaAutocorrReplacePage(pParent, *rSet);
}
void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
@@ -1361,7 +1361,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
}
OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", rSet)
+ : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", &rSet)
, eLang(eLastDialogLanguage)
{
get(m_pAbbrevED, "abbrev");
@@ -1405,9 +1405,9 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
}
SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent,
- const SfxItemSet& rSet)
+ const SfxItemSet* rSet)
{
- return new OfaAutocorrExceptPage(pParent, rSet);
+ return new OfaAutocorrExceptPage(pParent, *rSet);
}
void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
@@ -1740,7 +1740,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol)
}
OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", rSet)
+ : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet)
, sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE))
, sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL))
, pCheckButtonData(NULL)
@@ -1822,9 +1822,9 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
}
SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet)
+ const SfxItemSet* rAttrSet)
{
- return new OfaQuoteTabPage(pParent, rAttrSet);
+ return new OfaQuoteTabPage(pParent, *rAttrSet);
}
bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
@@ -2088,7 +2088,7 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent,
const SfxItemSet& rSet)
: SfxTabPage(pParent, "WordCompletionPage",
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list