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 /cui/source | |
| 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
Diffstat (limited to 'cui/source')
101 files changed, 312 insertions, 312 deletions
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 ) ); } |