diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:34:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:39:04 +0200 |
| commit | bb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch) | |
| tree | 178b4187effe2a05f3d77660ad83eea97144a287 | |
| parent | 4d120b6ab181f530d3fedc963b1c6ec777f2608a (diff) | |
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
267 files changed, 860 insertions, 860 deletions
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 332fcfee6b33..100af2798467 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 9883b6496dca..711e09fad34d 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 838ea1bf131a..be28343340c9 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 a43a104bdedb..afa5f87ce13d 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 d05bbabeed1b..78ce532c13fc 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 5c77535cbe79..f40eb3ef4fe7 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 32981ce59a0c..5e14a412fb67 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 225c607735b3..0c1798429634 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 96b14dc0199c..05f2e59607d8 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 b932a53eca3c..6a0beef344d9 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 2c4a855d539f..0c767d81f44b 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 03b221426ad8..42420d76a07d 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 fda04f3c95e1..f0424bc57133 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 f2731602d169..fe3db2a7b587 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 dbdb15795afd..d0cbe2e0e98b 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 0f3a8ceeff51..bff207a99b37 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 9e754f7456a1..a1adfec47539 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 b2c5cbb73335..76142ad074af 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 af969f7164fb..56de1da3d449 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 06e0ba13de09..bfad0132c365 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 4ec390093741..86f49e9402de 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 d3753307c2ef..074aef5e576a 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 580dcc8fbc23..c18ceb74922c 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 3708c8ce650e..311804cfd6c2 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 c8374d704275..d88c0714ad28 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 0f486d47e5f0..20a5c2c3c7cb 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 68124b579af9..38bb11671f40 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 517020ce7610..cc2daab99e94 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 8ad7b6673d2f..3aa641cbe318 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 9644319d3d53..eb3ea5b9cc95 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 f66f5c3553c7..0402ecb85c0d 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 9ec26bd1cb68..dc906dd8cbe5 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 39e5557dec5c..ab2841623eba 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 6519ce6b38eb..b0e034ea16f3 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 f55c6e26cd25..8106bc725973 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 8db3409108d4..49a3f0637016 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 0b0dbade29de..adc998ad08cc 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 a6055b3f7b9c..83aac99004f3 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 ebfb39099660..37cf8b5e8c3b 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 2fe1d13f54a7..e10d09bfedf0 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 ccd5d7a543a5..1b73b594c2eb 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 bdb5919cba8b..988ff02abd9e 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 f97e026ee3a0..260937710207 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 2a3a153c1aef..10c311c2c8d5 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 7d08a9f617c0..6c56ed05b3ce 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 ecbfbf2dc499..be965554cfcc 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 9128931f0543..8d31b7b3fb18 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 7ee28ae13f6e..0d4de78e4e61 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 2d8c72afaacc..a64ca325d271 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 245b10da6013..08a370acd4ef 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 95a1b612d3f9..315fb57654a4 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 1a11c865ef59..e5b64a687335 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 d584df68a40a..f043b8583c97 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 ad4c45fd7c10..1cac8d762b6a 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 47b8d3340985..6e388159673a 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 95402c909d7f..9adf2b546413 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 f65bb8c027ac..f865438cf50b 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 9050f49eed3f..eb552d63ef9a 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 666d1b9992fc..dd380e7800ed 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 d140fe876680..2a2cc403830a 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 b505904f1ffe..91f87d74e9cd 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 588d2c9dea73..f63e7aee11b0 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 5239470d7e43..c25316008654 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 8f578660c00a..a29ec7e9dd3d 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 a3c6f2227837..826ac04c4706 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 4727ab72d9f3..a843a4eb4925 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 799fb0afda25..d2494df015c2 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 5ec9299deb05..610e29743208 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 df3755b464aa..2fea001c4337 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 7df087f8a304..d19c6c628875 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 68936978afbf..92ff2a7b81e6 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 e49a7a1de9a4..b61cf56bc3c9 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 391a2427c670..1749c0ae84e0 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 71a6204fcf7a..0f4ed12634c1 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 980bfa8d0e6d..b083e68574fb 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 93985aa77d12..9610eff0e89a 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 b3ae874b7134..33177c67fc3c 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 7d5386c50c8b..0f3d5125dc03 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 47c8d083ec31..14052496703f 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 1d71abeae3a8..9fad8b6b802b 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 362f84568b2d..540bb3de5894 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 15030f1db968..548c8c65aae6 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 6b9bf7a14179..ab9a9376ceec 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 b8f68d98e329..e313e896e7a2 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 266790619520..8a8bf0e96110 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 ae66374f4887..7ab82dd221fe 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 a3918658d86c..34f8a177498f 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 327cc541b682..b1bf5826a769 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 de014e756eb2..b39286939c8a 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 9c27762b7fa7..c2b8d2a1bbc2 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 7b5158f9e672..97f49b72c310 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 a8ab4c63a7d5..6de31e2bb4da 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 996d1b261094..a9d397305c74 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 60a77453e386..334d377a10aa 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 66d94f262143..c1d77ff0c4b2 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 23979b4235ff..1420c3ae2811 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 ecf544d1c318..75321182c407 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 4d42674dc8f0..57ae3a7f2748 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", - "cui/ui/wordcompletionpage.ui", rSet) + "cui/ui/wordcompletionpage.ui", &rSet) , m_pAutoCompleteList(0) , m_nAutoCmpltListCnt(0) { @@ -2147,9 +2147,9 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() } SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, - const SfxItemSet& rSet) + const SfxItemSet* rSet) { - return new OfaAutoCompleteTabPage( pParent, rSet ); + return new OfaAutoCompleteTabPage( pParent, *rSet ); } bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) @@ -2361,7 +2361,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", rSet) + : SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", &rSet) { get(m_pMainCB, "main"); get(m_pSmartTagTypesLB, "list"); @@ -2385,9 +2385,9 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) { - return new OfaSmartTagOptionsTabPage( pParent, rSet ); + return new OfaSmartTagOptionsTabPage( pParent, *rSet ); } /** This struct is used to associate list box entries with smart tag data diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 1b2314defdd7..fba635332ad8 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -455,7 +455,7 @@ const sal_uInt16* SvxBackgroundTabPage::GetRanges() SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) /* [Description] @@ -463,7 +463,7 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, */ { - return ( new SvxBackgroundTabPage( pParent, rAttrSet ) ); + return ( new SvxBackgroundTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 120b554bc21d..a9cbdd3244e9 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -86,7 +86,7 @@ static void lcl_SetDecimalDigitsTo1(MetricField& rField) SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) - : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", rCoreAttrs) + : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", &rCoreAttrs) , @@ -350,9 +350,9 @@ const sal_uInt16* SvxBorderTabPage::GetRanges() SfxTabPage* SvxBorderTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SvxBorderTabPage( pParent, rAttrSet ) ); + return ( new SvxBorderTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 92e8141303ed..554d977725fd 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) - : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) + : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( false ) { @@ -1177,9 +1177,9 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharNamePage( pParent, rSet ); + return new SvxCharNamePage( pParent, *rSet ); } @@ -1724,9 +1724,9 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharEffectsPage( pParent, rSet ); + return new SvxCharEffectsPage( pParent, *rSet ); } @@ -2898,9 +2898,9 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharPositionPage( pParent, rSet ); + return new SvxCharPositionPage( pParent, *rSet ); } @@ -3471,9 +3471,9 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxCharTwoLinesPage( pParent, rSet ); + return new SvxCharTwoLinesPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 8569410eebc0..97cc1c282704 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -82,7 +82,7 @@ SvxConnectionDialog::~SvxConnectionDialog() SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage(pWindow ,"ConnectorTabPage" ,"cui/ui/connectortabpage.ui" - ,rInAttrs) + ,&rInAttrs) , rOutAttrs(rInAttrs) , aAttrSet(*rInAttrs.GetPool()) , pView(NULL) @@ -390,9 +390,9 @@ void SvxConnectionPage::Construct() \************************************************************************/ SfxTabPage* SvxConnectionPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxConnectionPage( pWindow, rAttrs ) ); + return( new SvxConnectionPage( pWindow, *rAttrs ) ); } const sal_uInt16* SvxConnectionPage::GetRanges() diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 283d08278c32..f0db0ef43078 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -49,7 +49,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) --------------------------------------------------------------------*/ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) - : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", rSet) + : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet) , pLastCropField(0) , nOldWidth(0) , nOldHeight(0) @@ -129,9 +129,9 @@ SvxGrfCropPage::~SvxGrfCropPage() aTimer.Stop(); } -SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SvxGrfCropPage( pParent, rSet ); + return new SvxGrfCropPage( pParent, *rSet ); } void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 57921b5ab6f2..dbefb1576f4a 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -72,7 +72,7 @@ static const sal_uInt16 pCaptionRanges[] = }; SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", rInAttrs) + : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", &rInAttrs) , nCaptionType(0) , nGap(0) , nEscDir(0) @@ -338,9 +338,9 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, - const SfxItemSet& rOutAttrs ) + const SfxItemSet* rOutAttrs ) { - return( new SvxCaptionTabPage( pWindow, rOutAttrs ) ); + return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index d8b02d3f8d13..84088afecf1e 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -136,7 +136,7 @@ void _SfxMacroTabPage::EnableButtons() } _SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) - : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", rAttrSet) + : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet) { mpImpl = new _SfxMacroTabPage_Impl; } @@ -462,9 +462,9 @@ namespace } } -SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return CreateSfxMacroTabPage(pParent, rAttrSet); + return CreateSfxMacroTabPage(pParent, *rAttrSet); } SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent, diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 2a629cd5ddd5..bf9370486d05 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -595,9 +595,9 @@ void SvxMeasurePage::Construct() \************************************************************************/ SfxTabPage* SvxMeasurePage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxMeasurePage( pWindow, rAttrs ) ); + return( new SvxMeasurePage( pWindow, *rAttrs ) ); } const sal_uInt16* SvxMeasurePage::GetRanges() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 3b75d596159b..452866736904 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -225,7 +225,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", - "cui/ui/numberingformatpage.ui", rCoreAttrs) + "cui/ui/numberingformatpage.ui", &rCoreAttrs) , pNumItem(NULL) , pNumFmtShell(NULL) , nInitFormat(ULONG_MAX) @@ -360,9 +360,9 @@ const sal_uInt16* SvxNumberFormatTabPage::GetRanges() #************************************************************************/ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SvxNumberFormatTabPage( pParent, rAttrSet ) ); + return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 71be499b17fe..70644d8a24af 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -175,7 +175,7 @@ static Font& lcl_GetDefaultBulletFont() SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", rSet) + : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , nActNumLvl(SAL_MAX_UINT16) @@ -224,9 +224,9 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() } SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxSingleNumPickTabPage(pParent, rAttrSet); + return new SvxSingleNumPickTabPage(pParent, *rAttrSet); } bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -363,7 +363,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", rSet) + : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , nActNumLvl(SAL_MAX_UINT16) @@ -385,9 +385,9 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage() } SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxBulletPickTabPage(pParent, rAttrSet); + return new SvxBulletPickTabPage(pParent, *rAttrSet); } bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -526,7 +526,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", rSet) + : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) , pActNum(0) , pSaveNum(0) , nActNumLvl(SAL_MAX_UINT16) @@ -582,9 +582,9 @@ SvxNumPickTabPage::~SvxNumPickTabPage() } SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxNumPickTabPage(pParent, rAttrSet); + return new SvxNumPickTabPage(pParent, *rAttrSet); } bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -774,7 +774,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", rSet) + : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , nActNumLvl(SAL_MAX_UINT16) @@ -823,9 +823,9 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage() } SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxBitmapPickTabPage(pParent, rAttrSet); + return new SvxBitmapPickTabPage(pParent, *rAttrSet); } void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) @@ -1023,7 +1023,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR // tabpage numbering options SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", rSet) + : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) , pActNum(0) , pSaveNum(0) , bLastWidthModified(false) @@ -1142,9 +1142,9 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) } SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxNumOptionsTabPage(pParent, rAttrSet); + return new SvxNumOptionsTabPage(pParent, *rAttrSet); }; void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) @@ -2585,7 +2585,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) //merged SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", rSet) + : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , nActNumLvl(SAL_MAX_UINT16) @@ -3097,9 +3097,9 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() } SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SvxNumPositionTabPage(pParent, rAttrSet); + return new SvxNumPositionTabPage(pParent, *rAttrSet); } void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index bb72fcac935b..d9018026ec39 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -165,16 +165,16 @@ const sal_uInt16* SvxPageDescPage::GetRanges() -SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxPageDescPage( pParent, rSet ); + return new SvxPageDescPage( pParent, *rSet ); } SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : - SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", rAttr ), + SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", &rAttr ), bLandscape ( false ), eMode ( SVX_PAGE_MODE_STANDARD ), diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 9e7302970d1e..3b059ed069a4 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -193,9 +193,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) return 0; } -SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet* rSet) { - return new SvxStdParagraphTabPage( pParent, rSet ); + return new SvxStdParagraphTabPage( pParent, *rSet ); } bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -619,7 +619,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) } SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : - SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", rAttr ), + SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", &rAttr ), nAbst ( MAX_DURCH ), nWidth ( 11905 /*567 * 50*/ ), @@ -966,7 +966,7 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",rSet) + : SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",&rSet) { get(m_pLeft,"radioBTN_LEFTALIGN"); get(m_pRight,"radioBTN_RIGHTALIGN"); @@ -1046,9 +1046,9 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxParaAlignTabPage(pParent, rSet); + return new SvxParaAlignTabPage(pParent, *rSet); } const sal_uInt16* SvxParaAlignTabPage::GetRanges() @@ -1321,9 +1321,9 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) } SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, - const SfxItemSet& rSet ) + const SfxItemSet* rSet ) { - return new SvxExtParagraphTabPage( pParent, rSet ); + return new SvxExtParagraphTabPage( pParent, *rSet ); } bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1826,7 +1826,7 @@ void SvxExtParagraphTabPage::DisablePageBreak() } SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : - SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", rAttr ), + SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", &rAttr ), bPageBreak ( true ), bHtmlMode ( false ), @@ -2116,7 +2116,7 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) } SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", rSet) + SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", &rSet) { get(m_pForbiddenRulesCB,"checkForbidList"); @@ -2134,9 +2134,9 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxAsianTabPage(pParent, rSet); + return new SvxAsianTabPage(pParent, *rSet); } const sal_uInt16* SvxAsianTabPage::GetRanges() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 3f93aecc0588..666bc0372951 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -502,7 +502,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, } SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", rInAttrs) + : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs) , m_pVMap(0) , m_pHMap(0) , m_pSdrView(0) @@ -692,9 +692,9 @@ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet* rSet) { - return new SvxSwPosSizeTabPage(pParent, rSet); + return new SvxSwPosSizeTabPage(pParent, *rSet); } const sal_uInt16* SvxSwPosSizeTabPage::GetRanges() diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 518e7203a737..dc609443c047 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -99,7 +99,7 @@ void TabWin_Impl::Paint( const Rectangle& ) SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ): - SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", rAttr ), + SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr ), aAktTab ( 0 ), aNewTabs ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ), @@ -261,9 +261,9 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, - const SfxItemSet& rSet) + const SfxItemSet* rSet) { - return ( new SvxTabulatorTabPage( pParent, rSet ) ); + return ( new SvxTabulatorTabPage( pParent, *rSet ) ); } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index b3734cf696e7..ca5ccc431865 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -81,7 +81,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& r SfxTabPage ( pWindow ,"TextAnimation" ,"cui/ui/textanimtabpage.ui" - ,rInAttrs ), + ,&rInAttrs ), rOutAttrs ( rInAttrs ), eAniKind ( SDRTEXTANI_NONE ) { @@ -452,9 +452,9 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() \************************************************************************/ SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxTextAnimationPage( pWindow, rAttrs ) ); + return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 5fd1c77a0364..6b96c2717077 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -522,9 +522,9 @@ void SvxTextAttrPage::Construct() \************************************************************************/ SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxTextAttrPage( pWindow, rAttrs ) ); + return( new SvxTextAttrPage( pWindow, *rAttrs ) ); } const sal_uInt16* SvxTextAttrPage::GetRanges() diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 4bd39942b3d8..20924d00bbf7 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -287,9 +287,9 @@ void SvxTransparenceTabPage::Construct() { } -SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet& rAttrs) +SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet* rAttrs) { - return(new SvxTransparenceTabPage(pWindow, rAttrs)); + return(new SvxTransparenceTabPage(pWindow, *rAttrs)); } const sal_uInt16* SvxTransparenceTabPage::GetRanges() @@ -1755,9 +1755,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxAreaTabPage( pWindow, rAttrs ) ); + return( new SvxAreaTabPage( pWindow, *rAttrs ) ); } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 9fa0db1a9175..4cab426e8d0c 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -290,9 +290,9 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, - const SfxItemSet& rSet ) + const SfxItemSet* rSet ) { - return new SvxBitmapTabPage( pWindow, rSet ); + return new SvxBitmapTabPage( pWindow, *rSet ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index e6dcab28d8ce..add743b89544 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -299,7 +299,7 @@ struct SvxColorTabPageShadow SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", rInAttrs) + : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() ) , mpTopDlg( GetParentDialog() ) @@ -621,9 +621,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) SfxTabPage* SvxColorTabPage::Create( Window* pWindow, - const SfxItemSet& rOutAttrs ) + const SfxItemSet* rOutAttrs ) { - return( new SvxColorTabPage( pWindow, rOutAttrs ) ); + return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); } // is called when the content of the MtrFields is changed for color values diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 92caa87ad7b1..cbdefb300a08 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -47,7 +47,7 @@ SvxGradientTabPage::SvxGradientTabPage Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", rInAttrs ), + SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ), rOutAttrs ( rInAttrs ), @@ -368,9 +368,9 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, - const SfxItemSet& rOutAttrs ) + const SfxItemSet* rOutAttrs ) { - return new SvxGradientTabPage( pWindow, rOutAttrs ); + return new SvxGradientTabPage( pWindow, *rOutAttrs ); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 23fb66f2082e..ae155b0f2ec4 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -341,9 +341,9 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, - const SfxItemSet& rSet ) + const SfxItemSet* rSet ) { - return new SvxHatchTabPage( pWindow, rSet ); + return new SvxHatchTabPage( pWindow, *rSet ); } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 08db5d41c402..4c7fd8250815 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1491,9 +1491,9 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxLineTabPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxLineTabPage( pWindow, rAttrs ) ); + return( new SvxLineTabPage( pWindow, *rAttrs ) ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 96ee9dcb3e44..7dcca4b0e3a2 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -55,7 +55,7 @@ SvxLineDefTabPage::SvxLineDefTabPage SfxTabPage( pParent , "LineStylePage" , "cui/ui/linestyletabpage.ui" - , rInAttrs ), + , &rInAttrs ), rOutAttrs ( rInAttrs ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), @@ -321,9 +321,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) +SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxLineDefTabPage( pWindow, rOutAttrs ) ); + return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e973209f8e24..6cbcce81704f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -57,7 +57,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage SfxTabPage( pParent , "LineEndPage" , "cui/ui/lineendstabpage.ui" - , rInAttrs ), + , &rInAttrs ), rOutAttrs ( rInAttrs ), pPolyObj ( NULL ), @@ -264,9 +264,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet& rSet ) +SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet* rSet ) { - return( new SvxLineEndDefTabPage( pWindow, rSet ) ); + return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index a2ff8285b09f..b623734bba4c 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -457,9 +457,9 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SvxShadowTabPage( pWindow, rAttrs ) ); + return( new SvxShadowTabPage( pWindow, *rAttrs ) ); } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index c11f012dcd83..722d38bfee25 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -331,9 +331,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet& rSet) +SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet* rSet) { - return(new SvxAngleTabPage(pWindow, rSet)); + return(new SvxAngleTabPage(pWindow, *rSet)); } @@ -565,9 +565,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) +SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxSlantTabPage( pWindow, rOutAttrs ) ); + return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); } @@ -1004,9 +1004,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs ) +SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) { - return( new SvxPositionSizeTabPage( pWindow, rOutAttrs ) ); + return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 00648f52da29..a3eb7543ae6b 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -83,9 +83,9 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OConnectionTabPage( pParent, _rAttrSet ) ); + return ( new OConnectionTabPage( pParent, *_rAttrSet ) ); } // OConnectionTabPage OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 8ce9296020dc..2e1c8366f32d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -57,7 +57,7 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 3854bd61616e..a31fd62625fd 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -44,53 +44,53 @@ namespace dbaui /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet* _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index aff54572bba8..4c3eb4df340a 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -182,9 +182,9 @@ void OUserAdmin::FillUserNames() } -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet ) +SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OUserAdmin( pParent, _rAttrSet ) ); + return ( new OUserAdmin( pParent, *_rAttrSet ) ); } IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 698fde194b52..96022dbd8976 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -65,7 +65,7 @@ protected: OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin(); OUString GetUser(); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 238c7fc29bd7..331ac2f3690b 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -70,7 +70,7 @@ namespace dbaui } OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) - :SfxTabPage(_pParent, _rId, _rUIXMLDescription, _rAttrSet) + :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet) ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) ,m_pItemSetHelper(NULL) diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 559e9c373170..c67cd2f8ed28 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -244,39 +244,39 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) } break; case CONNECTION_PAGE: - pPage = OConnectionTabPage::Create(this,*m_pOutSet); + pPage = OConnectionTabPage::Create(this,m_pOutSet); nStringId = STR_PAGETITLE_CONNECTION; break; case ADDITIONAL_PAGE_DBASE: - pPage = ODriversSettings::CreateDbase(this,*m_pOutSet); + pPage = ODriversSettings::CreateDbase(this,m_pOutSet); break; case ADDITIONAL_PAGE_FLAT: - pPage = ODriversSettings::CreateText(this,*m_pOutSet); + pPage = ODriversSettings::CreateText(this,m_pOutSet); break; case ADDITIONAL_PAGE_LDAP: - pPage = ODriversSettings::CreateLDAP(this,*m_pOutSet); + pPage = ODriversSettings::CreateLDAP(this,m_pOutSet); break; case ADDITIONAL_PAGE_MYSQL_JDBC: - pPage = ODriversSettings::CreateMySQLJDBC(this,*m_pOutSet); + pPage = ODriversSettings::CreateMySQLJDBC(this,m_pOutSet); break; case ADDITIONAL_PAGE_MYSQL_NATIVE: - pPage = ODriversSettings::CreateMySQLNATIVE(this,*m_pOutSet); + pPage = ODriversSettings::CreateMySQLNATIVE(this,m_pOutSet); break; case ADDITIONAL_PAGE_MYSQL_ODBC: - pPage = ODriversSettings::CreateMySQLODBC(this,*m_pOutSet); + pPage = ODriversSettings::CreateMySQLODBC(this,m_pOutSet); break; case ADDITIONAL_PAGE_ORACLE_JDBC: - pPage = ODriversSettings::CreateOracleJDBC(this,*m_pOutSet); + pPage = ODriversSettings::CreateOracleJDBC(this,m_pOutSet); break; case ADDITIONAL_PAGE_ADO: - pPage = ODriversSettings::CreateAdo(this,*m_pOutSet); + pPage = ODriversSettings::CreateAdo(this,m_pOutSet); break; case ADDITIONAL_PAGE_ODBC: - pPage = ODriversSettings::CreateODBC(this,*m_pOutSet); + pPage = ODriversSettings::CreateODBC(this,m_pOutSet); break; case ADDITIONAL_USERDEFINED: - pPage = ODriversSettings::CreateUser(this,*m_pOutSet); + pPage = ODriversSettings::CreateUser(this,m_pOutSet); break; default: OSL_FAIL("Wrong state!"); diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 7786afd89990..629239337f56 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -224,9 +224,9 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new ODbaseDetailsPage( pParent, _rAttrSet ) ); + return ( new ODbaseDetailsPage( pParent, *_rAttrSet ) ); } void ODbaseDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) @@ -302,9 +302,9 @@ namespace dbaui { } - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OAdoDetailsPage( pParent, _rAttrSet ) ); + return ( new OAdoDetailsPage( pParent, *_rAttrSet ) ); } // OOdbcDetailsPage @@ -325,9 +325,9 @@ namespace dbaui pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND); } - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); + return ( new OOdbcDetailsPage( pParent, *_rAttrSet ) ); } bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -373,9 +373,9 @@ namespace dbaui FreeResource(); } - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); + return ( new OUserDriverDetailsPage( pParent, *_rAttrSet ) ); } bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -430,9 +430,9 @@ namespace dbaui { } - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) ); + return ( new OMySQLODBCDetailsPage( pParent, *_rAttrSet ) ); } // OMySQLJDBCDetailsPage @@ -675,18 +675,18 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ) ); + return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new MySQLNativePage( pParent, _rAttrSet ) ); + return ( new MySQLNativePage( pParent, *_rAttrSet ) ); } - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); + return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, *_rAttrSet,DSID_ORACLE_PORTNUMBER) ); } // OLDAPDetailsPage @@ -713,9 +713,9 @@ namespace dbaui FreeResource(); } - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); + return ( new OLDAPDetailsPage( pParent, *_rAttrSet ) ); } bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -800,9 +800,9 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OTextDetailsPage( pParent, _rAttrSet ) ); + return ( new OTextDetailsPage( pParent, *_rAttrSet ) ); } void OTextDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) { @@ -838,16 +838,16 @@ namespace dbaui return m_pTextConnectionHelper->prepareLeave(); } - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ) { - return new GeneratedValuesPage( _pParent, _rAttrSet ); + return new GeneratedValuesPage( _pParent, *_rAttrSet ); } - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ) { - OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet ); + OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet ); DataSourceMetaData aMetaData( eType ); - return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData ); + return new SpecialSettingsPage( _pParent, *_rAttrSet, aMetaData ); } } // namespace dbaui diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 16b681d23e12..7f487a607092 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2728,7 +2728,7 @@ namespace pcr if ( !fnCreatePage ) throw RuntimeException(); // caught below - SfxTabPage* pPage = (*fnCreatePage)( xDialog->get_content_area(), aCoreSet ); + SfxTabPage* pPage = (*fnCreatePage)( xDialog->get_content_area(), &aCoreSet ); xDialog->SetTabPage( pPage ); _rClearBeforeDialog.clear(); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 6ee28e190c07..9149a8a3add6 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -511,7 +511,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", rCoreSet) + : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", &rCoreSet) , mbTaggedPDFUserSelection(false) , mbExportFormFieldsUserSelection(false) , mbIsPresentation(false) @@ -705,9 +705,9 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabGeneralPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabGeneralPage( pParent, *rAttrSet ) ); } @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) // the option features tab page ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", rCoreSet) + : SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", &rCoreSet) , mbUseCTLFont(false) { get(mpRbOpnPageOnly, "pageonly"); @@ -856,9 +856,9 @@ ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage() SfxTabPage* ImpPDFTabOpnFtrPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabOpnFtrPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabOpnFtrPage( pParent, *rAttrSet ) ); } @@ -986,7 +986,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, const SfxItemSet& rCoreSet ) - : SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", rCoreSet) + : SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet) , mbIsPresentation(false) { get(m_pCbResWinInit,"resize"); @@ -1016,9 +1016,9 @@ IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, ) } SfxTabPage* ImpPDFTabViewerPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabViewerPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabViewerPage( pParent, *rAttrSet ) ); } @@ -1065,7 +1065,7 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent // The Security preferences tab page ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet& i_rCoreSet) - : SfxTabPage(i_pParent, "PdfSecurityPage","filter/ui/pdfsecuritypage.ui", i_rCoreSet) + : SfxTabPage(i_pParent, "PdfSecurityPage","filter/ui/pdfsecuritypage.ui", &i_rCoreSet) , msUserPwdTitle( PDFFilterResId( STR_PDF_EXPORT_UDPWD ) ) , mbHaveOwnerPassword( false ) , mbHaveUserPassword( false ) @@ -1108,9 +1108,9 @@ ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage() SfxTabPage* ImpPDFTabSecurityPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabSecurityPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabSecurityPage( pParent, *rAttrSet ) ); } @@ -1308,7 +1308,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity ) ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, const SfxItemSet& rCoreSet ) : - SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",rCoreSet ), + SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",&rCoreSet ), mbOpnLnksDefaultUserState( false ), mbOpnLnksLaunchUserState( false ), @@ -1329,9 +1329,9 @@ ImpPDFTabLinksPage::~ImpPDFTabLinksPage() SfxTabPage* ImpPDFTabLinksPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabLinksPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabLinksPage( pParent, *rAttrSet ) ); } @@ -1528,7 +1528,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) // The digital signatures tab page ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", rCoreSet) + : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", &rCoreSet) , maSignCertificate() { get(mpEdSignCert, "cert"); @@ -1586,9 +1586,9 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) SfxTabPage* ImpPDFTabSigningPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return ( new ImpPDFTabSigningPage( pParent, rAttrSet ) ); + return ( new ImpPDFTabSigningPage( pParent, *rAttrSet ) ); } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index c8a317b2b920..9dbd624fb28f 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -243,7 +243,7 @@ public: virtual ~ImpPDFTabGeneralPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); void GetFilterConfigItem(ImpPDFTabDialog* paParent); void SetFilterConfigItem(const ImpPDFTabDialog* paParent); @@ -282,7 +282,7 @@ public: virtual ~ImpPDFTabOpnFtrPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -315,7 +315,7 @@ public: virtual ~ImpPDFTabViewerPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -370,7 +370,7 @@ public: virtual ~ImpPDFTabSecurityPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -401,7 +401,7 @@ public: virtual ~ImpPDFTabLinksPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -430,7 +430,7 @@ public: virtual ~ImpPDFTabSigningPage(); static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 932b0c2486e9..945fcd05d320 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -223,7 +223,7 @@ protected: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); void EnableUseUserData(); }; @@ -246,7 +246,7 @@ protected: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); }; // class SfxDocumentInfoDialog ------------------------------------------- @@ -511,7 +511,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); }; struct CmisValue : public VclBuilderContainer @@ -633,7 +633,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); }; #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 4cbbfaf2825e..dbf6538cee72 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -76,7 +76,7 @@ friend class SfxStyleDialog; SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SfxManageStyleSheetPage(); - static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); + static SfxTabPage* Create(Window *pParent, const SfxItemSet *rAttrSet ); protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 3678d7bced67..5d84648453fd 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -101,7 +101,7 @@ public: virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); }; #endif // INCLUDED_SFX2_PRINTOPT_HXX diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 5544b9f932a4..dca4430aa094 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -40,7 +40,7 @@ protected: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); }; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 118698991285..ffc9358ce3e8 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxTabPage; class SfxBindings; -typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); +typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; @@ -242,7 +242,7 @@ private: protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); - SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); + SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 7a74c33ba447..0580d7164647 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -47,7 +47,7 @@ public: { } SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet) + : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) { } virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0; diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 5333af98a717..fcf59b5439be 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -100,7 +100,7 @@ private: class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: @@ -112,7 +112,7 @@ private: class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 951b43fb0d1b..a64d075b2541 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2120,14 +2120,14 @@ SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const Sfx { ::CreateTabPage ScTpLayoutOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_LAYOUT ); if ( ScTpLayoutOptionsCreate ) - pRet = (*ScTpLayoutOptionsCreate) (pParent, rSet); + pRet = (*ScTpLayoutOptionsCreate) (pParent, &rSet); } break; case SID_SC_TP_CONTENT: { ::CreateTabPage ScTpContentOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SCPAGE_CONTENT); if ( ScTpContentOptionsCreate ) - pRet = (*ScTpContentOptionsCreate)(pParent, rSet); + pRet = (*ScTpContentOptionsCreate)(pParent, &rSet); } break; case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break; @@ -2135,49 +2135,49 @@ SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const Sfx { ::CreateTabPage ScTpUserListsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_USERLISTS ); if ( ScTpUserListsCreate ) - pRet = (*ScTpUserListsCreate)( pParent, rSet); + pRet = (*ScTpUserListsCreate)( pParent, &rSet); } break; case SID_SC_TP_CALC: { ::CreateTabPage ScTpCalcOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_CALC ); if ( ScTpCalcOptionsCreate ) - pRet = (*ScTpCalcOptionsCreate)(pParent, rSet); + pRet = (*ScTpCalcOptionsCreate)(pParent, &rSet); } break; case SID_SC_TP_FORMULA: { ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA); if (ScTpFormulaOptionsCreate) - pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet); + pRet = (*ScTpFormulaOptionsCreate)(pParent, &rSet); } break; case SID_SC_TP_COMPATIBILITY: { ::CreateTabPage ScTpCompatOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_COMPATIBILITY); if (ScTpCompatOptionsCreate) - pRet = (*ScTpCompatOptionsCreate)(pParent, rSet); + pRet = (*ScTpCompatOptionsCreate)(pParent, &rSet); } break; case SID_SC_TP_CHANGES: { ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE ); if ( ScRedlineOptionsTabPageCreate ) - pRet =(*ScRedlineOptionsTabPageCreate)(pParent, rSet); + pRet =(*ScRedlineOptionsTabPageCreate)(pParent, &rSet); } break; case RID_SC_TP_PRINT: { ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) - pRet = (*ScTpPrintOptionsCreate)( pParent, rSet); + pRet = (*ScTpPrintOptionsCreate)( pParent, &rSet); } break; case RID_SC_TP_DEFAULTS: { ::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_DEFAULTS ); if ( ScTpDefaultsOptionsCreate ) - pRet = (*ScTpDefaultsOptionsCreate)( pParent, rSet); + pRet = (*ScTpDefaultsOptionsCreate)( pParent, &rSet); } break; } diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 2df9dedf9e06..8c728c512d19 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -44,7 +44,7 @@ static const sal_uInt16 pProtectionRanges[] = ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", - "modules/scalc/ui/cellprotectionpage.ui", rCoreAttrs) + "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs) { get(m_pBtnHideCell,"checkHideAll"); get(m_pBtnProtect,"checkProtected"); @@ -68,9 +68,9 @@ const sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } -SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new ScTabPageProtection( pParent, rAttrSet ) ); + return ( new ScTabPageProtection( pParent, *rAttrSet ) ); } void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index aec819c06a9e..d10ed8ae545f 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; ScTabPageSortFields::ScTabPageSortFields(Window* pParent, const SfxItemSet& rArgSet) : SfxTabPage(pParent, "SortCriteriaPage", - "modules/scalc/ui/sortcriteriapage.ui", rArgSet) + "modules/scalc/ui/sortcriteriapage.ui", &rArgSet) , aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ), @@ -137,9 +137,9 @@ void ScTabPageSortFields::Init() } SfxTabPage* ScTabPageSortFields::Create( Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet* rArgSet ) { - return ( new ScTabPageSortFields( pParent, rArgSet ) ); + return ( new ScTabPageSortFields( pParent, *rArgSet ) ); } void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) @@ -486,7 +486,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", - "modules/scalc/ui/sortoptionspage.ui", rArgSet) + "modules/scalc/ui/sortoptionspage.ui", &rArgSet) , aStrRowLabel(SC_RESSTR(SCSTR_ROW_LABEL)) , aStrColLabel(SC_RESSTR(SCSTR_COL_LABEL)) , aStrUndefined(SC_RESSTR(SCSTR_UNDEFINED)) @@ -616,9 +616,9 @@ void ScTabPageSortOptions::Init() SfxTabPage* ScTabPageSortOptions::Create( Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet* rArgSet ) { - return ( new ScTabPageSortOptions( pParent, rArgSet ) ); + return ( new ScTabPageSortOptions( pParent, *rArgSet ) ); } void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 086c3c794eb4..d1e7d10c5d17 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -38,7 +38,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, "SubTotalGrpPage", "modules/scalc/ui/subtotalgrppage.ui", - rArgSet ), + &rArgSet ), aStrNone ( SC_RESSTR( SCSTR_NONE ) ), aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ), pViewData ( NULL ), @@ -383,16 +383,16 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, - const SfxItemSet& rArgSet ) - { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } + const SfxItemSet* rArgSet ) + { return ( new ScTpSubTotalGroup1( pParent, *rArgSet ) ); } SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, - const SfxItemSet& rArgSet ) - { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } + const SfxItemSet* rArgSet ) + { return ( new ScTpSubTotalGroup2( pParent, *rArgSet ) ); } SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, - const SfxItemSet& rArgSet ) - { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } + const SfxItemSet* rArgSet ) + { return ( new ScTpSubTotalGroup3( pParent, *rArgSet ) ); } ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) @@ -427,7 +427,7 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, : SfxTabPage ( pParent, "SubTotalOptionsPage", "modules/scalc/ui/subtotaloptionspage.ui" , - rArgSet ), + &rArgSet ), pViewData ( NULL ), pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), @@ -469,9 +469,9 @@ void ScTpSubTotalOptions::Init() } SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet* rArgSet ) { - return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); + return ( new ScTpSubTotalOptions( pParent, *rArgSet ) ); } void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index c59155ec8e66..99b757d5b541 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -311,7 +311,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ValidationCriteriaPage", - "modules/scalc/ui/validationcriteriapage.ui", rArgSet) + "modules/scalc/ui/validationcriteriapage.ui", &rArgSet) , maStrMin(ScResId(SCSTR_VALID_MINIMUM)) , maStrMax(ScResId(SCSTR_VALID_MAXIMUM)) , maStrValue(ScResId(SCSTR_VALID_VALUE)) @@ -375,9 +375,9 @@ void ScTPValidationValue::Init() CheckHdl( NULL ); } -SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet& rArgSet ) +SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet* rArgSet ) { - return( new ScTPValidationValue( pParent, rArgSet ) ); + return( new ScTPValidationValue( pParent, *rArgSet ) ); } const sal_uInt16* ScTPValidationValue::GetRanges() @@ -652,7 +652,7 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, : SfxTabPage ( pParent, "ValidationHelpTabPage" , "modules/scalc/ui/validationhelptabpage.ui" , - rArgSet ) + &rArgSet ) { get(pTsbHelp,"tsbhelp"); get(pEdtTitle,"title"); @@ -672,9 +672,9 @@ void ScTPValidationHelp::Init() } SfxTabPage* ScTPValidationHelp::Create( Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet* rArgSet ) { - return ( new ScTPValidationHelp( pParent, rArgSet ) ); + return ( new ScTPValidationHelp( pParent, *rArgSet ) ); } void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet ) @@ -713,7 +713,7 @@ ScTPValidationError::ScTPValidationError( Window* pParent, : SfxTabPage ( pParent, "ErrorAlertTabPage" , "modules/scalc/ui/erroralerttabpage.ui" , - rArgSet ) + &rArgSet ) { get(m_pTsbShow,"tsbshow"); get(m_pLbAction,"actionCB"); @@ -742,9 +742,9 @@ void ScTPValidationError::Init() } SfxTabPage* ScTPValidationError::Create( Window* pParent, - const SfxItemSet& rArgSet ) + const SfxItemSet* rArgSet ) { - return ( new ScTPValidationError( pParent, rArgSet ) ); + return ( new ScTPValidationError( pParent, *rArgSet ) ); } void ScTPValidationError::Reset( const SfxItemSet* rArgSet ) diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 35c28f8dcef7..a13a09fa0527 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -29,13 +29,13 @@ // Dokumentinfo-Tabpage: -SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) +SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet ) { - return new ScDocStatPage( pParent, rSet ); + return new ScDocStatPage( pParent, *rSet ); } ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) - : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet ) + : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", &rSet ) { get(m_pFtTables,"nosheets"); get(m_pFtCells,"nocells"); diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 95eebca67341..5cbb52f234e6 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -49,7 +49,7 @@ public: ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage(); - 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/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 58f6eab58a84..f66414175b94 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -105,7 +105,7 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -114,7 +114,7 @@ private: class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -123,7 +123,7 @@ private: class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); @@ -132,7 +132,7 @@ private: class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); private: ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 346489ffb056..5f8087506785 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -28,7 +28,7 @@ class ScTabPageProtection : 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; virtual void Reset ( const SfxItemSet* ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 9ddab8887fc8..7ca20de74cd3 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -34,7 +34,7 @@ class ScTpCalcOptions : public SfxTabPage { public: static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); + const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 9f594a1348d6..07167ce8a31c 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -19,7 +19,7 @@ class ScTpCompatOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); + static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 13340e5edd4d..7da63f45c3e7 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -19,7 +19,7 @@ class ScTpDefaultsOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); + static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index e30c268d5ede..a9bbd9ac5c92 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -33,7 +33,7 @@ class ScTpFormulaOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); + static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 7469cf52a852..995ab4524140 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -60,7 +60,7 @@ private: class ScHeaderPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: @@ -70,7 +70,7 @@ private: class ScFooterPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index c99f7b032b32..35f5a68f3769 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -33,7 +33,7 @@ class ScTpPrintOptions : public SfxTabPage virtual ~ScTpPrintOptions(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 77533f8712d2..8f6c794c2aee 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -53,7 +53,7 @@ public: virtual ~ScTabPageSortFields(); static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -115,7 +115,7 @@ public: #undef SfxTabPage #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index fb1fa0d3a011..b91179e1c88a 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -30,7 +30,7 @@ class ScDocStatPage: public SfxTabPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); private: ScDocStatPage( Window *pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 794cb9f7786c..24a6e3670d15 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -83,7 +83,7 @@ public: virtual ~ScTpSubTotalGroup1(); static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -98,7 +98,7 @@ public: virtual ~ScTpSubTotalGroup2(); static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -113,7 +113,7 @@ public: virtual ~ScTpSubTotalGroup3(); static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -128,7 +128,7 @@ public: virtual ~ScTpSubTotalOptions(); static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index d342b00e8d47..5053babb0f9e 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -29,7 +29,7 @@ class ScTablePage : public SfxTabPage { public: static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); + const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index e5d2aff788d8..8345335966c3 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -34,7 +34,7 @@ class ScTpUserLists : public SfxTabPage { public: static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rAttrSet ); + const SfxItemSet* rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 8f115e3c5f1d..41248196d03b 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -70,7 +70,7 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); + const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; @@ -118,7 +118,7 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, - const SfxItemSet& rCoreSet ); + const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e496d779e771..76f00c0b49a8 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -179,7 +179,7 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage public: explicit ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); + static SfxTabPage* Create( Window* pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -275,7 +275,7 @@ public: ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationHelp(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -300,7 +300,7 @@ public: ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationError(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); + static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 7bf8636ffbc6..42c259d03581 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -41,7 +41,7 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", rSet), + : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", &rSet), aAuthorStr (ScResId(SCSTR_AUTHOR)) { get(m_pContentColorLB, "changes"); @@ -60,9 +60,9 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() { } -SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new ScRedlineOptionsTabPage( pParent, rSet ); + return new ScRedlineOptionsTabPage( pParent, *rSet ); } bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 27337df0a914..85edefbe3805 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -37,7 +37,7 @@ ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", - "modules/scalc/ui/optcalculatepage.ui", rCoreAttrs) + "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs) , pOldOptions(new ScDocOptions( ((const ScTpCalcItem&)rCoreAttrs.Get( GetWhich(SID_SCDOCOPTIONS))).GetDocOptions())) @@ -79,9 +79,9 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } -SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new ScTpCalcOptions( pParent, rAttrSet ) ); + return ( new ScTpCalcOptions( pParent, *rAttrSet ) ); } void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 709faaddc696..9dc16bacc7fe 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -16,7 +16,7 @@ #include "appoptio.hxx" ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet &rCoreAttrs) : - SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", rCoreAttrs) + SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs) { get(m_pLbKeyBindings,"keybindings"); } @@ -25,9 +25,9 @@ ScTpCompatOptions::~ScTpCompatOptions() { } -SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAttrs) +SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) { - return new ScTpCompatOptions(pParent, rCoreAttrs); + return new ScTpCompatOptions(pParent, *rCoreAttrs); } bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index a20f1c21e24b..1d7fd90c2324 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -19,7 +19,7 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : - SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", rCoreSet) + SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet) { get( m_pEdNSheets, "sheetsnumber"); @@ -34,9 +34,9 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions() { } -SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet &rCoreAttrs) +SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) { - return new ScTpDefaultsOptions(pParent, rCoreAttrs); + return new ScTpDefaultsOptions(pParent, *rCoreAttrs); } bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index b2aaff2aa24c..87aa63918b35 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : - SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", rCoreAttrs), + SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", &rCoreAttrs), mnDecSep(0) { get(mpLbFormulaSyntax, "formulasyntax"); @@ -220,9 +220,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit ) return 0; } -SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet) +SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet* rCoreSet) { - return new ScTpFormulaOptions(pParent, rCoreSet); + return new ScTpFormulaOptions(pParent, *rCoreSet); } bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index f96e88b3fcb9..015165530dc1 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -33,7 +33,7 @@ ScTpPrintOptions::ScTpPrintOptions( Window* pParent, : SfxTabPage ( pParent, "optCalcPrintPage", "modules/scalc/ui/optdlg.ui", - rCoreAttrs ) + &rCoreAttrs ) { get( m_pSkipEmptyPagesCB , "suppressCB" ); get( m_pSelectedSheetsCB , "printCB" ); @@ -44,9 +44,9 @@ ScTpPrintOptions::~ScTpPrintOptions() { } -SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new ScTpPrintOptions( pParent, rAttrSet ); + return new ScTpPrintOptions( pParent, *rAttrSet ); } int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index dd8bb5070793..71515ca1916d 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -51,7 +51,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent, : SfxTabPage ( pParent, "OptSortLists", "modules/scalc/ui/optsortlists.ui", - rCoreAttrs ), + &rCoreAttrs ), aStrQueryRemove ( ScGlobal::GetRscString( STR_QUERYREMOVE ) ), aStrCopyList ( ScGlobal::GetRscString( STR_COPYLIST ) ), aStrCopyFrom ( ScGlobal::GetRscString( STR_COPYFROM ) ), @@ -137,9 +137,9 @@ void ScTpUserLists::Init() } -SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return ( new ScTpUserLists( pParent, rAttrSet ) ); + return ( new ScTpUserLists( pParent, *rAttrSet ) ); } void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 1c0b23a862e7..9c74b954f0d9 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -41,7 +41,7 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent, const SfxItemSet& rArgSet ) : - SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet), + SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet), pLocalOptions(0) { get(pGridLB,"grid"); @@ -101,9 +101,9 @@ ScTpContentOptions::~ScTpContentOptions() } SfxTabPage* ScTpContentOptions::Create( Window* pParent, - const SfxItemSet& rCoreSet ) + const SfxItemSet* rCoreSet ) { - return new ScTpContentOptions(pParent, rCoreSet); + return new ScTpContentOptions(pParent, *rCoreSet); } bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) @@ -353,7 +353,7 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb ) ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ScGeneralPage", - "modules/scalc/ui/scgeneralpage.ui", rArgSet), + "modules/scalc/ui/scgeneralpage.ui", &rArgSet), aUnitArr( ScResId(SCSTR_UNIT )), pDoc(NULL) { @@ -413,9 +413,9 @@ ScTpLayoutOptions::~ScTpLayoutOptions() } SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, - const SfxItemSet& rCoreSet ) + const SfxItemSet* rCoreSet ) { - ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, rCoreSet); + ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, *rCoreSet); ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); if(pDocSh!=NULL) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 8cd771a35fd3..70eaac6545f0 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -62,7 +62,7 @@ ScHFEditPage::ScHFEditPage( Window* pParent, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichId, bool bHeader ) - : SfxTabPage( pParent, "HeaderFooterContent", "modules/scalc/ui/headerfootercontent.ui", rCoreAttrs ) + : SfxTabPage( pParent, "HeaderFooterContent", "modules/scalc/ui/headerfootercontent.ui", &rCoreAttrs ) , nWhich( nWhichId ) { get(m_pWndLeft,"textviewWND_LEFT"); @@ -843,8 +843,8 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& true ) {} -SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) - { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; +SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) + { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScLeftHeaderEditPage @@ -857,8 +857,8 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r true ) {} -SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) - { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; +SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) + { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScRightFooterEditPage @@ -871,8 +871,8 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& false ) {} -SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) - { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; +SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) + { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); }; // class ScLeftFooterEditPage @@ -885,7 +885,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r false ) {} -SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) - { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); }; +SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) + { return ( new ScLeftFooterEditPage( pParent, *rCoreSet ) ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index d0a0af54cd45..e819be7a9dac 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -207,17 +207,17 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) { aText = ScGlobal::GetRscString( STR_PAGEHEADER ); if ( bRightPage ) - pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId ); + pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId ); else - pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId ); + pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId ); } else { aText = ScGlobal::GetRscString( STR_PAGEFOOTER ); if ( bRightPage ) - pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId ); + pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId ); else - pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId ); + pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId ); } SvxNumType eNumType = ((const SvxPageItem&)aDataSet.Get(ATTR_PAGE)).GetNumType(); @@ -246,9 +246,9 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) { } -SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { - return ( new ScHeaderPage( pParent, rCoreSet ) ); + return ( new ScHeaderPage( pParent, *rCoreSet ) ); } const sal_uInt16* ScHeaderPage::GetRanges() @@ -265,9 +265,9 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) { } -SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { - return ( new ScFooterPage( pParent, rCoreSet ) ); + return ( new ScFooterPage( pParent, *rCoreSet ) ); } const sal_uInt16* ScFooterPage::GetRanges() diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 227e07979b1a..51ad4c9e3110 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -84,7 +84,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : - SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", rCoreAttrs ) + SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs ) { get(m_pBtnTopDown,"radioBTN_TOPDOWN"); get(m_pBtnLeftRight,"radioBTN_LEFTRIGHT"); @@ -135,9 +135,9 @@ const sal_uInt16* ScTablePage::GetRanges() return pPageTableRanges; } -SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet ) +SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { - return ( new ScTablePage( pParent, rCoreSet ) ); + return ( new ScTablePage( pParent, *rCoreSet ) ); } void ScTablePage::Reset( const SfxItemSet* rCoreSet ) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 18eb3a79fa0c..2fe8b19669ef 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -543,7 +543,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) - return (*ScTpPrintOptionsCreate)( pParent, rOptions); + return (*ScTpPrintOptionsCreate)( pParent, &rOptions); return 0; } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 14ed4aec4bb7..1e583b4bc4ac 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1142,7 +1142,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) - return (*ScTpPrintOptionsCreate)( pParent, rOptions); + return (*ScTpPrintOptionsCreate)( pParent, &rOptions); return 0; } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 928b05577cb0..b26d86a26e69 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -726,14 +726,14 @@ SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI case SID_SI_TP_CONTENTS: { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc(); if( fnCreatePage ) - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); } break; case SID_SD_TP_SNAP: case SID_SI_TP_SNAP: { ::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc(); if( fnCreatePage ) - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); } break; case SID_SD_TP_PRINT: @@ -742,7 +742,7 @@ SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI ::CreateTabPage fnCreatePage = pFact->GetSdPrintOptionsTabPageCreatorFunc(); if( fnCreatePage ) { - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); if(SID_SD_TP_PRINT == nId) aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE)); pRet->PageCreated(aSet); @@ -755,7 +755,7 @@ SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI ::CreateTabPage fnCreatePage = pFact->GetSdOptionsMiscTabPageCreatorFunc(); if( fnCreatePage ) { - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); if(SID_SD_TP_MISC == nId) aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE)); else @@ -771,7 +771,7 @@ SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { ::CreateTabPage fnCreatePage = pSfxFact->GetTabPageCreatorFunc( nId ); if ( fnCreatePage ) - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); } } break; diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index c6642099c98c..069fb40a7fb4 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -40,7 +40,7 @@ public: SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); virtual ~SdParagraphNumTabPage(); - 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; @@ -59,7 +59,7 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(Window* pParent, const SfxItemSet& : SfxTabPage(pParent, "DrawParaNumbering", "modules/sdraw/ui/paranumberingtab.ui", - rAttr), + &rAttr), mbModified(false) { get(m_pNewStartCB,"checkbuttonCB_NEW_START"); @@ -74,9 +74,9 @@ SdParagraphNumTabPage::~SdParagraphNumTabPage() { } -SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rAttrSet) +SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet * rAttrSet) { - return new SdParagraphNumTabPage( pParent, rAttrSet ); + return new SdParagraphNumTabPage( pParent, *rAttrSet ); } const sal_uInt16* SdParagraphNumTabPage::GetRanges() diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index e54400c1dac2..5f4ffa2de9a9 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -29,7 +29,7 @@ * dialog to adjust print options */ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , rInAttrs ), + SfxTabPage ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs ), rOutAttrs ( rInAttrs ) { get( m_pFrmContent , "contentframe" ); @@ -191,9 +191,9 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdPrintOptions::Create( Window* pWindow, - const SfxItemSet& rOutAttrs ) + const SfxItemSet* rOutAttrs ) { - return( new SdPrintOptions( pWindow, rOutAttrs ) ); + return( new SdPrintOptions( pWindow, *rOutAttrs ) ); } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2c4084aca333..c5977b916e5c 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -98,7 +98,7 @@ SdActionDlg::SdActionDlg ( */ SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "InteractionPage", - "modules/simpress/ui/interactionpage.ui", rInAttrs) + "modules/simpress/ui/interactionpage.ui", &rInAttrs) , rOutAttrs(rInAttrs) , mpView(NULL) , mpDoc(NULL) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 44aced815aeb..254a13d0f7d1 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -108,9 +108,9 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SdTpOptionsSnap( pWindow, rAttrs ) ); + return( new SdTpOptionsSnap( pWindow, *rAttrs ) ); } /************************************************************************* @@ -120,7 +120,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, \************************************************************************/ SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ) : - SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", rInAttrs ) + SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", &rInAttrs ) { get( m_pCbxRuler, "ruler"); get( m_pCbxDragStripes, "dragstripes"); @@ -182,9 +182,9 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SdTpOptionsContents( pWindow, rAttrs ) ); + return( new SdTpOptionsContents( pWindow, *rAttrs ) ); } /************************************************************************* @@ -196,7 +196,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, #define TOKEN ':' SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs) - : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", rInAttrs) + : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", &rInAttrs) , nWidth(0) , nHeight(0) { @@ -514,9 +514,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, - const SfxItemSet& rAttrs ) + const SfxItemSet* rAttrs ) { - return( new SdTpOptionsMisc( pWindow, rAttrs ) ); + return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); } diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 550a0a4efc36..0b3dc7a12920 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -64,7 +64,7 @@ public: SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); virtual ~SdPrintOptions(); - 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/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index f94b06a99483..ea787eff7c88 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -39,7 +39,7 @@ public: SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsSnap(); - 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; @@ -61,7 +61,7 @@ public: SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsContents(); - 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; }; @@ -134,7 +134,7 @@ public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsMisc(); - 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/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index fbfe1211394d..38f9045cdb40 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -619,7 +619,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) } SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) - : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet) + : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", &rItemSet) , m_pInfoItem ( NULL ) { @@ -631,9 +631,9 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16); } -SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItemSet) +SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet *rItemSet) { - return new SfxDocumentDescPage(pParent, rItemSet); + return new SfxDocumentDescPage(pParent, *rItemSet); } @@ -750,7 +750,7 @@ namespace } SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) - : SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", rItemSet) + : SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", &rItemSet) , bEnableUseUserData( false ) , bHandleDelete( false ) { @@ -912,9 +912,9 @@ void SfxDocumentPage::ImplCheckPasswordState() -SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet ) +SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet* rItemSet ) { - return new SfxDocumentPage( pParent, rItemSet ); + return new SfxDocumentPage( pParent, *rItemSet ); } @@ -2029,7 +2029,7 @@ void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bI // class SfxCustomPropertiesPage ----------------------------------------- SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) - : SfxTabPage(pParent, "CustomInfoPage", "sfx/ui/custominfopage.ui", rItemSet) + : SfxTabPage(pParent, "CustomInfoPage", "sfx/ui/custominfopage.ui", &rItemSet) { get(m_pPropertiesCtrl, "properties"); m_pPropertiesCtrl->Init(*this); @@ -2113,9 +2113,9 @@ int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return nRet; } -SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet& rItemSet ) +SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) { - return new SfxCustomPropertiesPage( pParent, rItemSet ); + return new SfxCustomPropertiesPage( pParent, *rItemSet ); } CmisValue::CmisValue( Window* pParent, const OUString& aStr ) @@ -2511,7 +2511,7 @@ void CmisPropertiesControl::AddLine( const OUString& sId, const OUString& sName, // class SfxCmisPropertiesPage ----------------------------------------- SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) - : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", rItemSet) + : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", &rItemSet) , m_pPropertiesCtrl( this ) { } @@ -2610,9 +2610,9 @@ int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet& rItemSet ) +SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) { - return new SfxCmisPropertiesPage( pParent, rItemSet ); + return new SfxCmisPropertiesPage( pParent, *rItemSet ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 20b4a8fb3cd5..69b4fd4d9ec6 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -23,13 +23,13 @@ using namespace ::com::sun::star; -SfxTabPage* SfxDocumentFontsPage::Create( Window* parent, const SfxItemSet& set ) +SfxTabPage* SfxDocumentFontsPage::Create( Window* parent, const SfxItemSet* set ) { - return new SfxDocumentFontsPage( parent, set ); + return new SfxDocumentFontsPage( parent, *set ); } SfxDocumentFontsPage::SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ) - : SfxTabPage( parent, "DocumentFontsPage", "sfx/ui/documentfontspage.ui", set ) + : SfxTabPage( parent, "DocumentFontsPage", "sfx/ui/documentfontspage.ui", &set ) { get( embedFontsCheckbox, "embedFonts" ); } diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index abfccc64c087..14934e683fc0 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -43,7 +43,7 @@ * initializes the list box with the templates */ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemSet& rAttrSet) - : SfxTabPage(pParent, "ManageStylePage", "sfx/ui/managestylepage.ui", rAttrSet) + : SfxTabPage(pParent, "ManageStylePage", "sfx/ui/managestylepage.ui", &rAttrSet) , pStyle(&((SfxStyleDialog*)GetParentDialog())->GetStyleSheet()) , pItem(0) , bModified(false) @@ -469,7 +469,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, - const SfxItemSet &rAttrSet ) + const SfxItemSet *rAttrSet ) /* [Description] @@ -481,7 +481,7 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, */ { - return new SfxManageStyleSheetPage( pParent, rAttrSet ); + return new SfxManageStyleSheetPage( pParent, *rAttrSet ); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 5f7a87b164e7..f13d70d0601f 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -37,7 +37,7 @@ static bool bOutputForPrinter = true; #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ])) SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", rSet) + : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", &rSet) { get(m_pPrinterOutputRB, "printer"); get(m_pPrintFileOutputRB, "file"); @@ -89,9 +89,9 @@ SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage() { } -SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return( new SfxCommonPrintOptionsTabPage( pParent, rAttrSet ) ); + return( new SfxCommonPrintOptionsTabPage( pParent, *rAttrSet ) ); } Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index e75f88dedd1b..f37621e43341 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -421,14 +421,14 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) } -SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet & rItemSet ) +SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet * rItemSet ) { - return new SfxSecurityPage( pParent, rItemSet ); + return new SfxSecurityPage( pParent, *rItemSet ); } SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet ) - : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", rItemSet) + : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", &rItemSet) { m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet )); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 55483d81192b..3bc6a7f828d5 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -181,9 +181,9 @@ SfxTabPage::SfxTabPage( Window *pParent, } -SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) +SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) - , pSet ( &rAttrSet ) + , pSet ( rAttrSet ) , bHasExchangeSupport ( false ) , pImpl ( new TabPageImpl ) { @@ -1195,10 +1195,10 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) } if ( pTmpSet && !pDataObject->bOnDemand ) - pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, *pTmpSet ); + pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, pTmpSet ); else pTabPage = (pDataObject->fnCreatePage) - ( pTabCtrl, *CreateInputItemSet( nId ) ); + ( pTabCtrl, CreateInputItemSet( nId ) ); DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" ); pDataObject->pTabPage = pTabPage; diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 0264b97772c8..39f2d80adea2 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -31,7 +31,7 @@ class SfxDocumentFontsPage: public SfxTabPage { public: SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); - static SfxTabPage* Create( Window* parent, const SfxItemSet& set ); + static SfxTabPage* Create( Window* parent, const SfxItemSet* set ); protected: virtual bool FillItemSet( SfxItemSet* set ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* set ) SAL_OVERRIDE; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 97ec16baef16..06c111549c25 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -158,7 +158,7 @@ IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButt SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions) - : SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", rOptions) + : SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions) { get( m_pTitle, "title"); get( m_pText, "text"); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index dd67155f5233..6e8c26cc1ff8 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -114,9 +114,9 @@ const sal_uInt16* SvxHeaderPage::GetRanges() -SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxHeaderPage( pParent, rSet ); + return new SvxHeaderPage( pParent, *rSet ); } @@ -128,9 +128,9 @@ const sal_uInt16* SvxFooterPage::GetRanges() -SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SvxFooterPage( pParent, rSet ); + return new SvxFooterPage( pParent, *rSet ); } @@ -155,7 +155,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : - SfxTabPage( pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", rSet ), + SfxTabPage( pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet ), nId ( nSetId ), pBBSet ( NULL ), bDisableQueryBox ( false ), diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 86cbc461809b..67bb8b7d56c0 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -128,7 +128,7 @@ SfxItemPresentation SvxGridItem::GetPresentation // TabPage Screen Settings SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : - SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", rCoreSet ), + SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", &rCoreSet ), bAttrModified( false ) { get(pCbxUseGridsnap,"usegridsnap"); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 3a4ab6f29e3d..8d9240ab79e7 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -743,7 +743,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) DBG_ASSERT(pFact, "Dialogdiet error!"); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP ); DBG_ASSERT(fnCreatePage, "Dialogdiet error!"); - SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog.get_content_area(), aCropDlgAttr ); + SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog.get_content_area(), &aCropDlgAttr ); pTabPage->SetText( aCropStr ); aCropDialog.SetTabPage( pTabPage ); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index bd03f177cfc0..c8878e798282 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -134,7 +134,7 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", rCoreSet) + : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", &rCoreSet) , pINetItem(0) , bModified(false) @@ -279,9 +279,9 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) } SfxTabPage* SwCharURLPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwCharURLPage( pParent, rAttrSet ) ); + return ( new SwCharURLPage( pParent, *rAttrSet ) ); } IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl) diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 8b986aee7b44..cb3bbe40050f 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -509,13 +509,13 @@ void SwDropCapsPict::_InitPrinter() SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) : SfxSingleTabDialog(pParent, rSet) { - SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), rSet); + SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), &rSet); pNewPage->SetFormat(false); SetTabPage(pNewPage); } SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", rSet) + : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", &rSet) , bModified(false) , bFormat(true) , rSh(::GetActiveView()->GetWrtShell()) @@ -576,9 +576,9 @@ int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) } SfxTabPage* SwDropCapsPage::Create(Window *pParent, - const SfxItemSet &rSet) + const SfxItemSet *rSet) { - return new SwDropCapsPage(pParent, rSet); + return new SwDropCapsPage(pParent, *rSet); } bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index b4bcde7e5776..68b042dfca19 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -39,7 +39,7 @@ static const sal_uInt16 aPageRg[] = { }; SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) : - SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", rAttr), + SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", &rAttr), msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ), bModified(false), @@ -91,9 +91,9 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage() } SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, - const SfxItemSet& rSet ) + const SfxItemSet* rSet ) { - return new SwParagraphNumTabPage(pParent, rSet); + return new SwParagraphNumTabPage(pParent, *rSet); } const sal_uInt16* SwParagraphNumTabPage::GetRanges() diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 0f80203c7dc2..7822bc863a32 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -52,7 +52,7 @@ static long nTabs[] = SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ConditionPage", - "modules/swriter/ui/conditionpage.ui", rSet) + "modules/swriter/ui/conditionpage.ui", &rSet) , rSh(::GetActiveView()->GetWrtShell()), pCmds( SwCondCollItem::GetCmds() ), @@ -137,9 +137,9 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwCondCollPage(pParent, rSet); + return new SwCondCollPage(pParent, *rSet); } bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 3d21e60fc9ea..4cab3f7c7f4a 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -40,7 +40,7 @@ SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet) if ( fnCreatePage ) { - SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet ); + SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), &rSet ); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put ( SvxNumberInfoItem( (const SvxNumberInfoItem&)pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ))); pNewPage->PageCreated(aSet); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 75402da0d1af..448eca502d41 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -113,7 +113,7 @@ public: }; SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", rSet), + SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", &rSet), m_pConfigItem( new SwMailMergeConfigItem ) { @@ -138,9 +138,9 @@ SwMailConfigPage::~SwMailConfigPage() delete m_pConfigItem; } -SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet* rAttrSet) { - return new SwMailConfigPage(pParent, rAttrSet); + return new SwMailConfigPage(pParent, *rAttrSet); } bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) @@ -355,7 +355,7 @@ SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { // create TabPage - SetTabPage(SwMailConfigPage::Create(get_content_area(), rSet)); + SetTabPage(SwMailConfigPage::Create(get_content_area(), &rSet)); } SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index ce537458eea5..effc5551d3b8 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -93,7 +93,7 @@ struct SwCompatibilityOptPage_Impl SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptCompatPage", - "modules/swriter/ui/optcompatpage.ui", rSet) + "modules/swriter/ui/optcompatpage.ui", &rSet) , m_pWrtShell(NULL) , m_pImpl(new SwCompatibilityOptPage_Impl) , m_nSavedOptions(0) @@ -400,9 +400,9 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new SwCompatibilityOptPage( pParent, rAttrSet ); + return new SwCompatibilityOptPage( pParent, *rAttrSet ); } bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index cf592b71ba7f..d3067ca9c65d 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star; SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", - "modules/swriter/ui/optgeneralpage.ui", rSet) + "modules/swriter/ui/optgeneralpage.ui", &rSet) , m_pWrtShell(NULL) , m_nLastTab(0) , m_nOldLinkMode(MANUAL) @@ -127,9 +127,9 @@ SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) } SfxTabPage* SwLoadOptPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return new SwLoadOptPage(pParent, rAttrSet ); + return new SwLoadOptPage(pParent, *rAttrSet ); } IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl) @@ -356,7 +356,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) "modules/swriter/ui/captiondialog.ui") { // create TabPage - SetTabPage(SwCaptionOptPage::Create(get_content_area(), rSet)); + SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet)); } SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle ) @@ -411,7 +411,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) } SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", rSet) + : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet) , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE)) , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME)) , m_sSWGraphic(SW_RESSTR(STR_CAPTION_GRAPHIC)) @@ -524,9 +524,9 @@ SwCaptionOptPage::~SwCaptionOptPage() } SfxTabPage* SwCaptionOptPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return new SwCaptionOptPage(pParent, rAttrSet ); + return new SwCaptionOptPage(pParent, *rAttrSet ); } bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 03ec363a2df0..22b56c43b669 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -74,7 +74,7 @@ using namespace ::com::sun::star; SwContentOptPage::SwContentOptPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "ViewOptionsPage", - "modules/swriter/ui/viewoptionspage.ui", rCoreSet) + "modules/swriter/ui/viewoptionspage.ui", &rCoreSet) { get (m_pCrossCB, "helplines"); @@ -159,9 +159,9 @@ SwContentOptPage::~SwContentOptPage() } SfxTabPage* SwContentOptPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwContentOptPage(pParent, rAttrSet); + return new SwContentOptPage(pParent, *rAttrSet); } static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet) @@ -287,7 +287,7 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox) SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PrintOptionsPage", - "modules/swriter/ui/printoptionspage.ui", rCoreSet) + "modules/swriter/ui/printoptionspage.ui", &rCoreSet) , sNone(SW_RESSTR(SW_STR_NONE)) , bAttrModified(false) , bPreview(false) @@ -362,9 +362,9 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev) } SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); + return ( new SwAddPrinterTabPage( pParent, *rAttrSet ) ); } bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) @@ -508,7 +508,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) // Tabpage Standardfonts SwStdFontTabPage::SwStdFontTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , rSet), + SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , &rSet), pPrt(0), pFontList(0), pFontConfig(0), @@ -588,9 +588,9 @@ SwStdFontTabPage::~SwStdFontTabPage() } SfxTabPage* SwStdFontTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return new SwStdFontTabPage(pParent, rAttrSet); + return new SwStdFontTabPage(pParent, *rAttrSet); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -1062,7 +1062,7 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) } SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", rSet), + SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", &rSet), pWrtShell(0), bHTMLMode(false) { @@ -1092,9 +1092,9 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() } SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return new SwTableOptionsTabPage(pParent, rAttrSet ); + return new SwTableOptionsTabPage(pParent, *rAttrSet ); } bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -1262,7 +1262,7 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptFormatAidsPage", - "modules/swriter/ui/optformataidspage.ui", rSet), + "modules/swriter/ui/optformataidspage.ui", &rSet), m_pWrtShell( NULL ) { get(m_pParaCB, "paragraph"); @@ -1325,9 +1325,9 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() { } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) { - return new SwShdwCrsrOptionsTabPage( pParent, rSet ); + return new SwShdwCrsrOptionsTabPage( pParent, *rSet ); } void SwShdwCrsrOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) @@ -1656,7 +1656,7 @@ namespace SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptRedLinePage", - "modules/swriter/ui/optredlinepage.ui" , rSet) + "modules/swriter/ui/optredlinepage.ui" , &rSet) , sNone(SW_RESSTR(SW_STR_NONE)) { Size aPreviewSize(getPreviewOptionsSize(this)); @@ -1728,9 +1728,9 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() { } -SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) { - return new SwRedlineOptionsTabPage( pParent, rSet ); + return new SwRedlineOptionsTabPage( pParent, *rSet ); } bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2206,7 +2206,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) } SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) - : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet ) + : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", &rSet ) { get(m_pAutoRB,"auto"); get(m_pWordRB, "byword"); @@ -2228,9 +2228,9 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage() { } -SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new SwCompareOptionsTabPage( pParent, rAttrSet ); + return new SwCompareOptionsTabPage( pParent, *rAttrSet ); } bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2334,7 +2334,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) #ifdef DBG_UTIL SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) - : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", rCoreSet) + : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", &rCoreSet) , bAttrModified( false ) { get(m_pTest1CBox, "unused"); @@ -2353,9 +2353,9 @@ SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) } SfxTabPage* SwTestTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return new SwTestTabPage(pParent, rAttrSet); + return new SwTestTabPage(pParent, *rAttrSet); } bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index 5b6a81a5879d..ae1f83cc479c 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -29,7 +29,7 @@ SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet) ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL ); if ( fnCreatePage ) { - SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), rSet); + SfxTabPage* pPage2 = (*fnCreatePage)(get_content_area(), &rSet); SetTabPage(pPage2); } } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 15fd2dc931bf..e2154bfb38d7 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -35,14 +35,14 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> -SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwDocStatPage(pParent, rSet); + return new SwDocStatPage(pParent, *rSet); } SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", rSet) + : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", &rSet) { get(m_pPageNo, "nopages"); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 4c4216788f28..2396a53570bc 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1491,7 +1491,7 @@ short SwInsertSectionTabDialog::Ok() SwInsertSectionTabPage::SwInsertSectionTabPage( Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "SectionPage", - "modules/swriter/ui/sectionpage.ui", rAttrSet) + "modules/swriter/ui/sectionpage.ui", &rAttrSet) , m_pWrtSh(0) , m_pDocInserter(NULL) , m_pOldDefDlgParent(NULL) @@ -1636,9 +1636,9 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) } SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwInsertSectionTabPage(pParent, rAttrSet); + return new SwInsertSectionTabPage(pParent, *rAttrSet); } IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) @@ -1795,7 +1795,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet) - : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", rAttrSet ) + : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet ) { get(pFtnNtAtTextEndCB,"ftnntattextend"); @@ -1976,9 +1976,9 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet ) } SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwSectionFtnEndTabPage(pParent, rAttrSet); + return new SwSectionFtnEndTabPage(pParent, *rAttrSet); } IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox ) @@ -2084,7 +2084,7 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage } SwSectionIndentTabPage::SwSectionIndentTabPage(Window *pParent, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", rAttrSet) + : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", &rAttrSet) { get(m_pBeforeMF, "before"); get(m_pAfterMF, "after"); @@ -2137,9 +2137,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(0); } -SfxTabPage* SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) { - return new SwSectionIndentTabPage(pParent, rAttrSet); + return new SwSectionIndentTabPage(pParent, *rAttrSet); } void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index c2c547cde2fe..072f619389f8 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -122,7 +122,7 @@ static long lUserH = 5669; // 10 cm SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvFormatPage", - "modules/swriter/ui/envformatpage.ui", rSet) + "modules/swriter/ui/envformatpage.ui", &rSet) { get(m_pAddrLeftField, "leftaddr"); get(m_pAddrTopField, "topaddr"); @@ -442,9 +442,9 @@ void SwEnvFmtPage::SetMinMax() m_pSizeHeightField->Reformat(); } -SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwEnvFmtPage(pParent, rSet); + return new SwEnvFmtPage(pParent, *rSet); } void SwEnvFmtPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index fa2eabec5d32..39cb85d94609 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -60,7 +60,7 @@ class SwEnvFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 9982d5eaa842..a6ca75737946 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -192,7 +192,7 @@ short SwEnvDlg::Ok() SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvAddressPage", - "modules/swriter/ui/envaddresspage.ui", rSet) + "modules/swriter/ui/envaddresspage.ui", &rSet) { get(m_pAddrEdit, "addredit"); get(m_pDatabaseLB, "database"); @@ -307,9 +307,9 @@ void SwEnvPage::InitDatabaseBox() } } -SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwEnvPage(pParent, rSet); + return new SwEnvPage(pParent, *rSet); } void SwEnvPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 246b2692a39c..02b65703f3b3 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -31,7 +31,7 @@ SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvPrinterPage", - "modules/swriter/ui/envprinterpage.ui", rSet) + "modules/swriter/ui/envprinterpage.ui", &rSet) , pPrt(NULL) { get(m_pAlignBox, "alignbox"); @@ -127,9 +127,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) return 0; } -SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwEnvPrtPage(pParent, rSet); + return new SwEnvPrtPage(pParent, *rSet); } void SwEnvPrtPage::ActivatePage(const SfxItemSet&) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 5fa702e218ca..fdd5f1384b60 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -59,7 +59,7 @@ class SwEnvPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 184cb15296d1..784ecdb8c6f9 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -229,7 +229,7 @@ Printer *SwLabDlg::GetPrt() SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardMediumPage", - "modules/swriter/ui/cardmediumpage.ui", rSet) + "modules/swriter/ui/cardmediumpage.ui", &rSet) , pDBManager(NULL) , aItem((const SwLabItem&)rSet.Get(FN_LABEL)) , m_bLabel(false) @@ -460,9 +460,9 @@ void SwLabPage::InitDatabaseBox() } } -SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwLabPage(pParent, rSet); + return new SwLabPage(pParent, *rSet); } void SwLabPage::ActivatePage(const SfxItemSet& rSet) @@ -565,7 +565,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardFormatPage", - "modules/swriter/ui/cardformatpage.ui", rSet) + "modules/swriter/ui/cardformatpage.ui", &rSet) , pExampleFrame(0) { get(m_pAutoTextLB, "treeview"); @@ -596,9 +596,9 @@ SwVisitingCardPage::~SwVisitingCardPage() delete pExampleFrame; } -SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwVisitingCardPage(pParent, rSet); + return new SwVisitingCardPage(pParent, *rSet); } void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) @@ -706,7 +706,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet) SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PrivateUserPage", - "modules/swriter/ui/privateuserpage.ui", rSet) + "modules/swriter/ui/privateuserpage.ui", &rSet) { get(m_pFirstNameED, "firstname"); get(m_pNameED, "lastname"); @@ -730,9 +730,9 @@ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwPrivateDataPage(pParent, rSet); + return new SwPrivateDataPage(pParent, *rSet); } void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) @@ -799,7 +799,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet) SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "BusinessDataPage", - "modules/swriter/ui/businessdatapage.ui", rSet) + "modules/swriter/ui/businessdatapage.ui", &rSet) { get(m_pCompanyED, "company"); get(m_pCompanyExtED, "company2"); @@ -818,9 +818,9 @@ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwBusinessDataPage(pParent, rSet); + return new SwBusinessDataPage(pParent, *rSet); } void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 6af0e42121b7..dda067144928 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -288,7 +288,7 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem) SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelFormatPage", - "modules/swriter/ui/labelformatpage.ui", rSet) + "modules/swriter/ui/labelformatpage.ui", &rSet) , bModified(false) , aItem((const SwLabItem&) rSet.Get(FN_LABEL)) { @@ -464,9 +464,9 @@ void SwLabFmtPage::ChangeMinMax() m_pPHeightField->Reformat(); } -SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwLabFmtPage(pParent, rSet); + return new SwLabFmtPage(pParent, *rSet); } void SwLabFmtPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 547efa5d40c7..0616008ecae8 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -103,7 +103,7 @@ class SwLabFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index d0fb4fbb961c..5518ce8f173a 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -31,7 +31,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelOptionsPage", - "modules/swriter/ui/labeloptionspage.ui", rSet) + "modules/swriter/ui/labeloptionspage.ui", &rSet) , pPrinter(0) { get(m_pPageButton, "entirepage"); @@ -94,9 +94,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) return 0; } -SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet& rSet) +SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet* rSet) { - return new SwLabPrtPage( pParent, rSet ); + return new SwLabPrtPage( pParent, *rSet ); } void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 258cdfeb2f56..9a979586b2bf 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -56,7 +56,7 @@ class SwLabPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 806d302164df..38d5a79d1ae7 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -64,7 +64,7 @@ class SwLabPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -154,7 +154,7 @@ class SwPrivateDataPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -190,7 +190,7 @@ class SwBusinessDataPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 7b09a0ac465a..eee381038623 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -247,9 +247,9 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* ) } SfxTabPage* SwFldDBPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldDBPage( pParent, rAttrSet ) ); + return ( new SwFldDBPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldDBPage::GetGroup() diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index a1de7421bea6..08a7b0b464e3 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -72,7 +72,7 @@ public: virtual ~SwFldDBPage(); - 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/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 256c1d3deb76..3d6aad2d700a 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -451,9 +451,9 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) } SfxTabPage* SwFldDokInfPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldDokInfPage( pParent, rAttrSet ) ); + return ( new SwFldDokInfPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldDokInfPage::GetGroup() diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 60668fa32063..c80e25492904 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -63,7 +63,7 @@ public: virtual ~SwFldDokInfPage(); - 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/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 2ca5876aad56..abf1b45179c3 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -633,9 +633,9 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* ) } SfxTabPage* SwFldDokPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldDokPage( pParent, rAttrSet ) ); + return ( new SwFldDokPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldDokPage::GetGroup() diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index e89d1484d53a..702ebdc5b09c 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -65,7 +65,7 @@ public: virtual ~SwFldDokPage(); - 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/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index c69391281622..794485a51914 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -148,13 +148,13 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) switch (nGroup) { case GRP_DOC: - pTabPage = SwFldDokPage::Create(get_content_area(), *(SfxItemSet*)0); + pTabPage = SwFldDokPage::Create(get_content_area(), 0); break; case GRP_FKT: - pTabPage = SwFldFuncPage::Create(get_content_area(), *(SfxItemSet*)0); + pTabPage = SwFldFuncPage::Create(get_content_area(), 0); break; case GRP_REF: - pTabPage = SwFldRefPage::Create(get_content_area(), *(SfxItemSet*)0); + pTabPage = SwFldRefPage::Create(get_content_area(), 0); break; case GRP_REG: { @@ -169,15 +169,15 @@ SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) ); - pTabPage = SwFldDokInfPage::Create(get_content_area(), *pSet); + pTabPage = SwFldDokInfPage::Create(get_content_area(), pSet); break; } case GRP_DB: - pTabPage = SwFldDBPage::Create(get_content_area(), *(SfxItemSet*)0); + pTabPage = SwFldDBPage::Create(get_content_area(), 0); static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh); break; case GRP_VAR: - pTabPage = SwFldVarPage::Create(get_content_area(), *(SfxItemSet*)0); + pTabPage = SwFldVarPage::Create(get_content_area(), 0); break; } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 8be5ffed1e84..9b9bb40ce69e 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -598,9 +598,9 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro) } SfxTabPage* SwFldFuncPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldFuncPage( pParent, rAttrSet ) ); + return ( new SwFldFuncPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldFuncPage::GetGroup() diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 89c5089f39db..06140a23f7e5 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -87,7 +87,7 @@ public: virtual ~SwFldFuncPage(); - 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/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 108402c47f8b..cd21a1275f2e 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; SwFldPage::SwFldPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet) + : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) , m_pCurFld(0) , m_pWrtShell(0) , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index f992ad6e28da..08b822ff9bf2 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -938,9 +938,9 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* ) } SfxTabPage* SwFldRefPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldRefPage( pParent, rAttrSet ) ); + return ( new SwFldRefPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldRefPage::GetGroup() diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 6d736541d244..93f8c75beb0d 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -78,7 +78,7 @@ public: virtual ~SwFldRefPage(); - 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/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 8c32b5a15b37..a017599c51cd 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1217,9 +1217,9 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* ) } SfxTabPage* SwFldVarPage::Create( Window* pParent, - const SfxItemSet& rAttrSet ) + const SfxItemSet* rAttrSet ) { - return ( new SwFldVarPage( pParent, rAttrSet ) ); + return ( new SwFldVarPage( pParent, *rAttrSet ) ); } sal_uInt16 SwFldVarPage::GetGroup() diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 86fcba3c83af..98ebece0702e 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -94,7 +94,7 @@ public: virtual ~SwFldVarPage(); - 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/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0e71adf72a2d..ce66d33cc966 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -161,7 +161,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) assert(pColPgSet); // create TabPage - pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), *pColPgSet); + pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), pColPgSet); pTabPage->get<Window>("applytoft")->Show(); pTabPage->get(m_pApplyToLB, "applytolb"); m_pApplyToLB->Show(); @@ -394,7 +394,7 @@ void SwColumnPage::ResetColWidth() // Now as TabPage SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", rSet) + : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", &rSet) , pColMgr(0) , nFirstVis(0) , nMinWidth(MINLAY) @@ -622,9 +622,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwColumnPage(pParent, rSet); + return new SwColumnPage(pParent, *rSet); } // stuff attributes into the Set when OK bool SwColumnPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 30a986b72362..6ef28119b7b6 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -598,7 +598,7 @@ namespace SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FrmTypePage", - "modules/swriter/ui/frmtypepage.ui", rSet) + "modules/swriter/ui/frmtypepage.ui", &rSet) , bAtHorzPosModified( false ), bAtVertPosModified( false ), @@ -821,9 +821,9 @@ SwFrmPage::~SwFrmPage() { } -SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwFrmPage( pParent, rSet ); + return new SwFrmPage( pParent, *rSet ); } void SwFrmPage::EnableGraficMode( void ) @@ -2350,7 +2350,7 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable ) SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", - "modules/swriter/ui/picturepage.ui", rSet) + "modules/swriter/ui/picturepage.ui", &rSet) , pGrfDlg(0) , bHtmlMode(false) { @@ -2376,9 +2376,9 @@ SwGrfExtPage::~SwGrfExtPage() delete pGrfDlg; } -SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet &rSet ) +SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet *rSet ) { - return new SwGrfExtPage( pParent, rSet ); + return new SwGrfExtPage( pParent, *rSet ); } void SwGrfExtPage::Reset(const SfxItemSet *rSet) @@ -2695,7 +2695,7 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) // set URL and ImageMap at frames SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) : - SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", rSet) + SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", &rSet) { get(pURLED,"url"); get(pSearchPB,"search"); @@ -2790,9 +2790,9 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwFrmURLPage( pParent, rSet ); + return new SwFrmURLPage( pParent, *rSet ); } IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) @@ -2819,7 +2819,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) } SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", rSet) + : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet) , pWrtSh(0) , bHtmlMode(false) , bFormat(false) @@ -2855,9 +2855,9 @@ SwFrmAddPage::~SwFrmAddPage() { } -SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwFrmAddPage(pParent, rSet); + return new SwFrmAddPage(pParent, *rSet); } void SwFrmAddPage::Reset(const SfxItemSet *rSet ) diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 6aea64ef33bf..29c1fc276f18 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -33,7 +33,7 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); if ( fnCreatePage ) { - SetTabPage((*fnCreatePage)(get_content_area(), rSet)); + SetTabPage((*fnCreatePage)(get_content_area(), &rSet)); } } diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 5ed679f3f570..56f669f4b5b2 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -41,7 +41,7 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : if ( fnCreatePage ) { - SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet ); + SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), &rSet ); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType)); if(SW_BORDER_MODE_TABLE == nType) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 397d1910c91d..746d0fed4bd0 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -56,14 +56,14 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD { // create TabPage - SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), rSet); + SwWrapTabPage* pNewPage = (SwWrapTabPage*) SwWrapTabPage::Create(get_content_area(), &rSet); pNewPage->SetFormatUsed(false, bDrawMode); pNewPage->SetShell(pWrtShell); SetTabPage(pNewPage); } SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", rSet) + : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet) , nOldLeftMargin(0) , nOldRightMargin(0) , nOldUpperMargin(0) @@ -134,9 +134,9 @@ SwWrapTabPage::~SwWrapTabPage() { } -SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwWrapTabPage(pParent, rSet); + return new SwWrapTabPage(pParent, *rSet); } void SwWrapTabPage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index c93ffe92e1fc..79268fdcf006 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -768,7 +768,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", - "modules/swriter/ui/tocindexpage.ui", rAttrSet) + "modules/swriter/ui/tocindexpage.ui", &rAttrSet) , aFromNames(SW_RES(RES_SRCTYPES)) , pIndexRes(0) , sAutoMarkType(SW_RESSTR(STR_AUTOMARK_TYPE)) @@ -1247,9 +1247,9 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) { - return new SwTOXSelectTabPage(pParent, rAttrSet); + return new SwTOXSelectTabPage(pParent, *rAttrSet); } IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox) @@ -1724,7 +1724,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocEntriesPage", - "modules/swriter/ui/tocentriespage.ui", rAttrSet) + "modules/swriter/ui/tocentriespage.ui", &rAttrSet) , sDelimStr(SW_RESSTR(STR_DELIM)) , sNoCharStyle(SW_RESSTR(STR_NO_CHAR_STYLE)) , sNoCharSortKey(SW_RESSTR(STR_NOSORTKEY)) @@ -2077,9 +2077,9 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return LEAVE_PAGE; } -SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet) +SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) { - return new SwTOXEntryTabPage(pParent, rAttrSet); + return new SwTOXEntryTabPage(pParent, *rAttrSet); } IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) @@ -3484,7 +3484,7 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, "TocStylesPage", - "modules/swriter/ui/tocstylespage.ui", rAttrSet) + "modules/swriter/ui/tocstylespage.ui", &rAttrSet) , m_pCurrentForm(0) { get(m_pLevelLB, "levels"); @@ -3593,9 +3593,9 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) } SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwTOXStylesTabPage(pParent, rAttrSet); + return new SwTOXStylesTabPage(pParent, *rAttrSet); } IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 4d0a8ff51bf1..f1cc191491ff 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -74,7 +74,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, : SfxTabPage(pParent, bEN ? OString("EndnotePage") : OString("FootnotePage"), bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), - rSet) + &rSet) , m_pNumCountBox(NULL) , m_pPosFT(NULL) , m_pPosPageBox(NULL) @@ -223,9 +223,9 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage() { } -SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet ) +SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet *rSet ) { - return new SwEndNoteOptionPage( pParent, true, rSet ); + return new SwEndNoteOptionPage( pParent, true, *rSet ); } // Different kinds of numbering; because the Listbox has varying numbers of @@ -399,9 +399,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet ) +SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet *rSet ) { - return new SwFootNoteOptionPage( pParent, rSet ); + return new SwFootNoteOptionPage( pParent, *rSet ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 14f2a2f06e7c..63d227dc41be 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -71,7 +71,7 @@ public: const SfxItemSet &rSet ); virtual ~SwEndNoteOptionPage(); - 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* ) SAL_OVERRIDE; @@ -84,7 +84,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage virtual ~SwFootNoteOptionPage(); public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); + static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index bd05757d7f36..fc4831177d83 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -63,7 +63,7 @@ static bool bLastRelative = false; SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlinePositionPage", - "modules/swriter/ui/outlinepositionpage.ui", rSet) + "modules/swriter/ui/outlinepositionpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , pWrtSh(0) @@ -513,9 +513,9 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() } SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwNumPositionTabPage(pParent, rAttrSet); + return new SwNumPositionTabPage(pParent, *rAttrSet); } void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1fe589e836c6..92e109a7e001 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -405,7 +405,7 @@ short SwOutlineTabDialog::Ok() SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlineNumberingPage", - "modules/swriter/ui/outlinenumberingpage.ui", rSet) + "modules/swriter/ui/outlinenumberingpage.ui", &rSet) , aNoFmtName(SW_RESSTR(SW_STR_NONE)) , pSh(NULL) , pNumRule(NULL) @@ -828,9 +828,9 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) } SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwOutlineSettingsTabPage(pParent, rAttrSet); + return new SwOutlineSettingsTabPage(pParent, *rAttrSet); } void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index a447814121bf..a4b32cbd0111 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl) SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FootnoteAreaPage", - "modules/swriter/ui/footnoteareapage.ui", rSet) + "modules/swriter/ui/footnoteareapage.ui", &rSet) , lMaxHeight(0) { get(m_pMaxHeightPageBtn, "maxheightpage"); @@ -136,9 +136,9 @@ SwFootNotePage::~SwFootNotePage() { } -SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwFootNotePage(pParent, rSet); + return new SwFootNotePage(pParent, *rSet); } void SwFootNotePage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 452be968e796..130a23df89b3 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -41,7 +41,7 @@ #include "view.hxx" SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : - SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet), + SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet), m_nRubyUserValue(0), m_bRubyUserValue(false), m_aPageSize(MM50, MM50), @@ -153,9 +153,9 @@ SwTextGridPage::~SwTextGridPage() { } -SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwTextGridPage(pParent, rSet); + return new SwTextGridPage(pParent, *rSet); } bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index aa2bb48264d8..fa6800b3ff53 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", rSet) + : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) , pTblData(0) , nSaveWidth(0) , nMinTableWidth(MINLAY) @@ -369,9 +369,9 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) } SfxTabPage* SwFormatTablePage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwFormatTablePage( pParent, rAttrSet ); + return new SwFormatTablePage( pParent, *rAttrSet ); } bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) @@ -711,7 +711,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) //Description: Page column configuration SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableColumnPage", - "modules/swriter/ui/tablecolumnpage.ui", rSet) + "modules/swriter/ui/tablecolumnpage.ui", &rSet) , pTblData(0) , nTableWidth(0) , nMinWidth(MINLAY) @@ -755,9 +755,9 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) } SfxTabPage* SwTableColumnPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwTableColumnPage( pParent, rAttrSet ); + return new SwTableColumnPage( pParent, *rAttrSet ); } void SwTableColumnPage::Reset( const SfxItemSet* ) @@ -1245,7 +1245,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableTextFlowPage", - "modules/swriter/ui/tabletextflowpage.ui", rSet) + "modules/swriter/ui/tabletextflowpage.ui", &rSet) , pShell(0) , bPageBreak(true) , bHtmlMode(false) @@ -1316,9 +1316,9 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) } SfxTabPage* SwTextFlowPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwTextFlowPage(pParent, rAttrSet); + return new SwTextFlowPage(pParent, *rAttrSet); } bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 22e1fe1b4edc..24d4d3ddfced 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -424,7 +424,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); break; } case RID_SW_TP_HTML_OPTGRID_PAGE: @@ -438,7 +438,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); if(RID_SW_TP_STD_FONT != nId) { aSet.Put (SfxUInt16Item(SID_FONTMODE_TYPE, RID_SW_TP_STD_FONT_CJK == nId ? FONT_GROUP_CJK : FONT_GROUP_CTL)); @@ -451,7 +451,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); aSet.Put (SfxBoolItem(SID_FAX_LIST, true)); pRet->PageCreated(aSet); } @@ -461,7 +461,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); SwView* pCurrView = GetView(); if(pCurrView) { @@ -486,7 +486,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); if (nId == RID_SW_TP_OPTSHDWCRSR || nId == RID_SW_TP_HTML_OPTSHDWCRSR) { SwView* pCurrView = GetView(); @@ -502,21 +502,21 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); break; } case RID_SW_TP_BACKGROUND: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); break; } case RID_SW_TP_OPTCAPTION_PAGE: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SW_TP_OPTCAPTION_PAGE ); - pRet = (*fnCreatePage)( pParent, rSet ); + pRet = (*fnCreatePage)( pParent, &rSet ); } break; } diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 7fd3f0282f0d..5f4fbe7c7230 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -83,7 +83,7 @@ public: virtual ~SwCharURLPage(); 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/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 000b122c85a9..4f7ca8094b99 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -172,7 +172,7 @@ class SwColumnPage : public SfxTabPage public: virtual ~SwColumnPage(); - 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/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 6c5150603b0b..d19edb2ed7a2 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -33,7 +33,7 @@ public: SwDocStatPage(Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); + static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 9ef6248affb3..966346957c80 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -82,7 +82,7 @@ friend class SwDropCapsPict; 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; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index f1d2447b80e8..7c438dd942c9 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -105,7 +105,7 @@ class SwEnvPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); + static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 5f8941556cf6..d7d27ebb2178 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -185,7 +185,7 @@ class SwFrmPage: public SfxTabPage 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; @@ -232,7 +232,7 @@ class SwGrfExtPage: public SfxTabPage 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; @@ -261,7 +261,7 @@ class SwFrmURLPage : public SfxTabPage 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; @@ -308,7 +308,7 @@ class SwFrmAddPage : public SfxTabPage 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; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index bf38b0462a13..7ba52f24c7f9 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -59,7 +59,7 @@ public: virtual ~SwMailConfigPage(); 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/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index d59679e2184a..57ea8f1d945f 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -125,7 +125,7 @@ public: virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} void SetWrtShell(SwWrtShell* pSh); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 91ed598d4c85..3b3c69c6e275 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -64,7 +64,7 @@ public: virtual ~SwParagraphNumTabPage(); 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/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index a36e7ee3f98a..935f53dc2d8d 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -63,7 +63,7 @@ public: SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); - 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/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index f08a4447738a..20a8fd110cf5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -66,7 +66,7 @@ public: SwLoadOptPage(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; @@ -167,7 +167,7 @@ public: virtual ~SwCaptionOptPage(); 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/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index fd8fb400a91f..5329ac4cf3ec 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -72,7 +72,7 @@ public: virtual ~SwContentOptPage(); 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; @@ -120,7 +120,7 @@ class SwAddPrinterTabPage : 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; @@ -192,7 +192,7 @@ class SwStdFontTabPage : 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; @@ -234,7 +234,7 @@ class SwTableOptionsTabPage : 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; @@ -278,7 +278,7 @@ class SwShdwCrsrOptionsTabPage : 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; @@ -358,7 +358,7 @@ class SwRedlineOptionsTabPage : 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; @@ -375,7 +375,7 @@ public: 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; @@ -418,7 +418,7 @@ class SwCompareOptionsTabPage : 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/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 9eb8181be1a2..bd1f661a4a25 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -130,7 +130,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); }; #endif diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index d704956ee2dc..193c09ca2b1c 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -32,7 +32,7 @@ class SwFootNotePage: public SfxTabPage { 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; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 648df6daf3ba..3bf49e588877 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -84,7 +84,7 @@ class SwTextGridPage: public SfxTabPage using SfxTabPage::DeactivatePage; 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; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 4f8a4d58eaea..1a6ad67c5509 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -191,7 +191,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); }; class SwSectionFtnEndTabPage : public SfxTabPage @@ -233,7 +233,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); }; class SwSectionIndentTabPage : public SfxTabPage @@ -251,7 +251,7 @@ public: virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); }; diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 62cfd3777613..77eff527ac48 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -61,7 +61,7 @@ class SwCondCollPage : public SfxTabPage 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; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 0a776ceeda4d..cee9a5384c76 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -229,7 +229,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc void SetWrtShell(SwWrtShell& rSh); @@ -441,7 +441,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); OUString GetLevelHelp(sal_uInt16 nLevel) const; @@ -488,7 +488,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, - const SfxItemSet& rAttrSet); + const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index d3ace0d122c4..c6f4403a851a 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -97,7 +97,7 @@ class SwWrapTabPage: public SfxTabPage 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/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 432db1499433..7ab02588644e 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -82,7 +82,7 @@ class SwFormatTablePage : public SfxTabPage public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); - 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -132,7 +132,7 @@ public: SwTableColumnPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableColumnPage(); - 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; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -181,7 +181,7 @@ class SwTextFlowPage : public SfxTabPage virtual ~SwTextFlowPage(); 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/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index f821c17c5838..c444040ff071 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -259,7 +259,7 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, if (!fnCreatePage) return NULL; - SfxTabPage* pPage = (*fnCreatePage)(pParent, rOptions); + SfxTabPage* pPage = (*fnCreatePage)(pParent, &rOptions); OSL_ENSURE(pPage, "No page"); if (!pPage) return NULL; |