diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:35:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:39:03 +0200 |
| commit | a92e973b6d0a9ad87fe014442e1678af2ce0c7d0 (patch) | |
| tree | b39139c7992a853cc5e4d836fc35cd45c01a3f6d /cui | |
| parent | 88f84eb1b0eebbb7e0a072f1e7001a9207ebbe9e (diff) | |
Change SfxTabPage::Reset param from ref to pointer
...there was a call site that passed undefined "null pointer reference"
(apparently in a case where the passed argument was actually unused)
Change-Id: I663d4264b7a84f44ca69c732f3bc502f614b2b2a
Diffstat (limited to 'cui')
103 files changed, 540 insertions, 540 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 50519d6666b7..3708c8ce650e 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1441,7 +1441,7 @@ bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* ) } -void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) +void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet ) { // open accelerator configs // Note: It initialize some other members too, which are needed here ... @@ -1465,7 +1465,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) RadioHdl(0); const SfxPoolItem* pMacroItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem ) ) { m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem ); m_pGroupLBox->SelectMacro( m_pMacroInfoItem ); @@ -1473,11 +1473,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) else { const SfxPoolItem* pStringItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) ) m_pStringItem = PTR_CAST( SfxStringItem, pStringItem ); const SfxPoolItem* pFontItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) m_pFontItem = PTR_CAST( SfxStringItem, pFontItem ); } } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 10bc1347ee31..c8374d704275 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1545,7 +1545,7 @@ SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet) m_pDescriptionField->EnableCursor( false ); } -void SvxConfigPage::Reset( const SfxItemSet& ) +void SvxConfigPage::Reset( const SfxItemSet* ) { // If we haven't initialised our XMultiServiceFactory reference // then Reset is being called at the opening of the dialog. diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f4117b83fbb..0f486d47e5f0 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -369,7 +369,7 @@ bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) } // the following method clears the bindings in the hashes for both doc & app -void _SvxMacroTabPage::Reset( const SfxItemSet& ) +void _SvxMacroTabPage::Reset( const SfxItemSet* ) { // called once in creation - don't reset the data this time if(!bInitialized) diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index db5b54cb43c6..9a3a1a30c128 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -174,7 +174,7 @@ public: virtual ~SfxAcceleratorConfigPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); }; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 76412fb48911..8ad7b6673d2f 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -63,7 +63,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 652328b5d2b5..9644319d3d53 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -114,7 +114,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -173,7 +173,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -266,7 +266,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -325,7 +325,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); @@ -391,7 +391,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; @@ -441,7 +441,7 @@ public: const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void CopyToClipboard() const; @@ -507,7 +507,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 1fbdb817a0df..f66f5c3553c7 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -50,7 +50,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 47ecbb1a5607..9ec26bd1cb68 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -48,7 +48,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void HideShadowControls(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3da574f89e3d..529b4ea9ce72 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -437,7 +437,7 @@ public: SvTreeListEntry* pTargetEntry ); bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - void Reset( const SfxItemSet& ) SAL_OVERRIDE; + void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual bool DeleteSelectedContent() = 0; virtual void DeleteSelectedTopLevel() = 0; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 8bc60fb4b589..39e5557dec5c 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -155,7 +155,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void SetFontList( const SvxFontListItem& rItem ); @@ -234,7 +234,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; void DisableControls( sal_uInt16 nDisable ); @@ -313,7 +313,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background @@ -356,7 +356,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static const sal_uInt16* GetRanges(); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index c807f21a4ebe..6519ce6b38eb 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -67,7 +67,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index af652510faa7..f55c6e26cd25 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -213,7 +213,7 @@ private: FixedText* m_pFtMSShowChangeDate; ExchangeData* pData; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {} + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -262,7 +262,7 @@ class TPGalleryThemeProperties : public SfxTabPage ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; - virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {} + virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; } OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 9149dd2d5253..8db3409108d4 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_INC_CUIOPTGENRL_HXX diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index e8e5fb63a830..0b0dbade29de 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -166,7 +166,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; @@ -296,7 +296,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -361,7 +361,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; @@ -439,7 +439,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -515,7 +515,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -601,7 +601,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -736,7 +736,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index ed3f09c406b8..a6055b3f7b9c 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -211,7 +211,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -307,7 +307,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -377,7 +377,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 4c5d0ee0546b..ebfb39099660 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -96,7 +96,7 @@ namespace svx static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ebc34ee1ba33..ad54f935ff4d 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet&) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index f4290052766f..2fe1d13f54a7 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -114,7 +114,7 @@ public: 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 Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 633f19a76d35..ccd5d7a543a5 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -79,7 +79,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index c5355f2a9f58..bdb5919cba8b 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -71,7 +71,7 @@ public: // --------- inherit from the base ------------- virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; bool IsReadOnly() const SAL_OVERRIDE; }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cc59a5c2443c..19ee9d2459f1 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -86,7 +86,7 @@ public: void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; void DisplayAppEvents( bool appEvents); void SetReadOnly( bool bSet ); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 89039461bf6b..f97e026ee3a0 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -71,7 +71,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 8520f603e851..2a3a153c1aef 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -75,7 +75,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; void SetInfoItem( const SvxNumberInfoItem& rItem ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index d0fe9418a8b4..7d08a9f617c0 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -116,7 +116,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -152,7 +152,7 @@ class SvxBulletPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;} virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -195,7 +195,7 @@ class SvxNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName) { sNumCharFmtName = rCharName; @@ -240,7 +240,7 @@ class SvxBitmapPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} }; @@ -352,7 +352,7 @@ class SvxNumOptionsTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) { @@ -452,7 +452,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 458965ad18b6..ecbfbf2dc499 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -60,7 +60,7 @@ public: 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; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 20846c516ce1..9128931f0543 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -152,7 +152,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void HideGroups( sal_uInt16 nGrp ); }; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index d87961f34b9b..7ee28ae13f6e 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -76,7 +76,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 37c54ccc57dc..2d8c72afaacc 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -181,7 +181,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; virtual ~SvxPageDescPage(); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index fa15f7dc0e29..245b10da6013 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -103,7 +103,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void SetPageWidth( sal_uInt16 nPageWidth ); @@ -164,7 +164,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void EnableJustifyExt(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -196,7 +196,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void DisablePageBreak(); @@ -276,7 +276,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 03b81ffb9145..95a1b612d3f9 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -129,7 +129,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 6cf3a1dad283..1a11c865ef59 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -54,7 +54,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; void DisableControls( const sal_uInt16 nFlag ); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 7a71b1576f12..d584df68a40a 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -80,7 +80,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; void Construct(); }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index fe8eddd5cd63..ad4c45fd7c10 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -81,7 +81,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 2f44a1552f04..47b8d3340985 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -151,7 +151,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -206,7 +206,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; @@ -250,7 +250,7 @@ public: static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 613c8a4e750a..95402c909d7f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -397,9 +397,9 @@ namespace offapp } - void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) + void ConnectionPoolOptionsPage::Reset(const SfxItemSet* _rSet) { - implInitControls(_rSet, true); + implInitControls(*_rSet, true); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 064999cbb121..f65bb8c027ac 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -57,7 +57,7 @@ namespace offapp virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; protected: diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 151d65457314..666d1b9992fc 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -210,10 +210,10 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) -void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) +void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) { // the settings for the single drivers - SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); + SFX_ITEMSET_GET( *rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); if ( !pRegistrations ) return; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index be2dd1c79481..d140fe876680 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -192,7 +192,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxFontSubstTabPage::Reset( const SfxItemSet& ) +void SvxFontSubstTabPage::Reset( const SfxItemSet* ) { m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index bad9084f829f..b505904f1ffe 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 4b260d36fae1..588d2c9dea73 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -94,7 +94,7 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) +void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* ) { //set controls from aConfig.Get... diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index cd65854ed230..5239470d7e43 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -47,7 +47,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 44d8cbb8dd65..8f578660c00a 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -215,7 +215,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAsianLayoutPage::Reset( const SfxItemSet& ) +void SvxAsianLayoutPage::Reset( const SfxItemSet* ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0; diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 317d52666cb5..a3c6f2227837 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -120,7 +120,7 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) return bModified; } -void SvxBasicIDEOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { LoadConfig(); pCodeCompleteChk->SaveValue(); diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index d065ea6ac006..4727ab72d9f3 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -42,7 +42,7 @@ public: 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 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 74b9b605c55a..799fb0afda25 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -116,7 +116,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) return true; } -void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) +void SvxDefaultColorOptPage::Reset( const SfxItemSet* ) { m_pLbChartColors->SelectEntryPos( 0 ); ListClickedHdl(m_pLbChartColors); diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 7a1bd24337d8..5ec9299deb05 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -60,7 +60,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 9abfde7728a4..df3755b464aa 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1094,7 +1094,7 @@ bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) return true; } -void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) +void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) { if(pColorConfig) { diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index d3553785a686..7df087f8a304 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -53,7 +53,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index e5501136c20a..68936978afbf 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -112,7 +112,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) return bModified; } -void SvxCTLOptionsPage::Reset( const SfxItemSet& ) +void SvxCTLOptionsPage::Reset( const SfxItemSet* ) { SvtCTLOptions aCTLOptions; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index e2396e2e3366..e49a7a1de9a4 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -49,7 +49,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8c5e47160ff4..391a2427c670 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -102,7 +102,7 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaMSFilterTabPage::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage::Reset( const SfxItemSet* ) { const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -223,7 +223,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) return true; } -void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage2::Reset( const SfxItemSet* ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index da22fe558f83..71a6204fcf7a 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -47,7 +47,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -96,7 +96,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6bb145a60b57..980bfa8d0e6d 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -296,7 +296,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) -void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) +void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) { SvtHelpOptions aHelpOptions; m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); @@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) m_pDocStatusCB->SaveValue(); const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) { m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); TwoFigureConfigHdl(m_pYearValueField); @@ -851,7 +851,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) return bModified; } -void OfaViewTabPage::Reset( const SfxItemSet& ) +void OfaViewTabPage::Reset( const SfxItemSet* ) { SvtMiscOptions aMiscOptions; @@ -1416,7 +1416,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) return false; } -void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) +void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); if ( !sLang.isEmpty() ) @@ -1509,21 +1509,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang) eCurLang = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang) eCurLangCJK = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang) @@ -1568,7 +1568,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) // check the box "For the current document only" // set the focus to the Western Language box const SfxPoolItem* pLang = 0; - if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) + if ( SFX_ITEM_SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); m_pCurrentDocCB->Enable(true); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 28a7a581f252..93985aa77d12 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -71,7 +71,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // class OfaViewTabPage -------------------------------------------------- @@ -126,7 +126,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; struct LanguageConfig_Impl; @@ -170,7 +170,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index af517dcdbf17..b3ae874b7134 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -323,15 +323,15 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* ) -void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) +void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) { SetAddress_Impl(); sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS); - if (rSet.GetItemState(nWhich) == SFX_ITEM_SET) + if (rSet->GetItemState(nWhich) == SFX_ITEM_SET) { - if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet.Get(nWhich)).GetValue()) + if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet->Get(nWhich)).GetValue()) { for (unsigned i = 0; i != vFields.size(); ++i) if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId) diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a7a4e3388fec..7d5386c50c8b 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -142,7 +142,7 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaHtmlTabPage::Reset( const SfxItemSet& ) +void OfaHtmlTabPage::Reset( const SfxItemSet* ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); aSize1NF->SetValue(rHtmlOpt.GetFontSize(0)); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index a91a4ed507be..47c8d083ec31 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -60,7 +60,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 ad94515a8cd9..1d71abeae3a8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -375,7 +375,7 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() } } -void SvxProxyTabPage::Reset(const SfxItemSet&) +void SvxProxyTabPage::Reset(const SfxItemSet*) { ReadConfigData_Impl(); @@ -909,7 +909,7 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* ) /*--------------------------------------------------------------------*/ -void SvxSecurityTabPage::Reset( const SfxItemSet& ) +void SvxSecurityTabPage::Reset( const SfxItemSet* ) { } @@ -947,7 +947,7 @@ bool MozPluginTabPage::FillItemSet( SfxItemSet* ) return true; } -void MozPluginTabPage::Reset( const SfxItemSet& ) +void MozPluginTabPage::Reset( const SfxItemSet* ) { m_pWBasicCodeCB->Check( isInstalled()); m_pWBasicCodeCB->SaveValue(); @@ -1248,7 +1248,7 @@ bool SvxEMailTabPage::FillItemSet( SfxItemSet* ) /* -------------------------------------------------------------------------*/ -void SvxEMailTabPage::Reset( const SfxItemSet& ) +void SvxEMailTabPage::Reset( const SfxItemSet* ) { m_pMailerURLED->Enable(true ); m_pMailerURLPB->Enable(true ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 105bce864705..362f84568b2d 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -106,7 +106,7 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -176,7 +176,7 @@ protected: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class MozPluginTabPage : public SfxTabPage @@ -196,7 +196,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -221,7 +221,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 39ec6a3b1f85..15030f1db968 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -749,7 +749,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) -void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); ClearJavaList(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 421c1e49067e..6b9bf7a14179 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -110,7 +110,7 @@ public: 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 Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index b3951b850691..b8f68d98e329 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -160,7 +160,7 @@ sal_Int32 SvxJSearchOptionsPage::GetTransliterationFlags_Impl() } -void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) +void SvxJSearchOptionsPage::Reset( const SfxItemSet* ) { SvtSearchOptions aOpt; diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 9173c24ca156..266790619520 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; bool IsSaveOptions() const { return bSaveOptions; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 3481b7553fd4..ae66374f4887 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1406,7 +1406,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() -void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) +void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) { // if not HideGroups was called with GROUP_MODULES... if (m_pLinguModulesCLB->IsVisible()) @@ -1435,7 +1435,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_AUTO ) >>= bVal; - const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData(); @@ -1479,8 +1479,8 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) const SfxHyphenRegionItem *pHyp = NULL; sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION ); - if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) - pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); + if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET ) + pHyp = &( (const SfxHyphenRegionItem &) rSet->Get( nWhich ) ); pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 1e1a97daa8b0..a3918658d86c 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -207,7 +207,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) -void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) +void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; @@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) (officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects:: get()))); - SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); + SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); if ( SFX_ITEM_SET == eState ) m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() ); else if ( SFX_ITEM_DISABLED == eState ) diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b1564fbaa5f6..327cc541b682 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -62,7 +62,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5b44550ba650..de014e756eb2 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -278,7 +278,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) -void SvxPathTabPage::Reset( const SfxItemSet& ) +void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 42e744fe62fb..9c27762b7fa7 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -379,7 +379,7 @@ bool isODFFormat( const OUString& sFilter ) return bRet; } -void SfxSaveTabPage::Reset( const SfxItemSet& ) +void SfxSaveTabPage::Reset( const SfxItemSet* ) { SvtSaveOptions aSaveOpt; aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings()); diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 189240ca7ad0..7b5158f9e672 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -77,7 +77,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 2ac7d83986bd..a8ab4c63a7d5 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -220,7 +220,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) -void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) +void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* ) { bool bValue = false; m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 525fbcad56f5..996d1b261094 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -57,7 +57,7 @@ public: 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 Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; }; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 57cffe7e2d29..60a77453e386 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -144,7 +144,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) return bModified; } -void SvxPersonalizationTabPage::Reset( const SfxItemSet & ) +void SvxPersonalizationTabPage::Reset( const SfxItemSet * ) { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index b41beca5155a..66d94f262143 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -35,7 +35,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; /// Reset to default settings ([Revert] button). - virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; private: /// Handle the Persona selection diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 95bd35308fc8..23979b4235ff 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -651,9 +651,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)aTreeLB.GetParent( pCurrentPageEntry )->GetUserData(); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); else - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } else if ( pPageInfo->m_pExtPage ) pPageInfo->m_pExtPage->ResetPage(); @@ -1117,12 +1117,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pPageInfo->m_pPage->SetPosPixel( aPagePos ); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) { - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet ); } else { - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } if (::isLayoutEnabled(pPageInfo->m_pPage)) SetPaneSize(pPageInfo->m_pPage); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c7063342ff0a..ecf544d1c318 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -285,7 +285,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) return bChanged; } -void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) +void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs ) { SfxTabPage::Reset( rCoreAttrs ); @@ -293,12 +293,12 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) // method to 'distribute' to distinguish from the normal justification. lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>( - *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs, + *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, *rCoreAttrs, GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD), SVX_HOR_JUSTIFY_BLOCK); lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>( - *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs, + *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, *rCoreAttrs, GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD), SVX_VER_JUSTIFY_BLOCK); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 4b4c816303fd..4d42674dc8f0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -227,7 +227,7 @@ void OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) +void OfaAutocorrOptionsPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); @@ -602,7 +602,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) +void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -1073,7 +1073,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset, } } -void OfaAutocorrReplacePage::Reset( const SfxItemSet& ) +void OfaAutocorrReplacePage::Reset( const SfxItemSet* ) { RefillReplaceBox(true, eLang, eLang); m_pShortED->GrabFocus(); @@ -1606,7 +1606,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(bool bFromReset, } } -void OfaAutocorrExceptPage::Reset( const SfxItemSet& ) +void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); RefillReplaceBoxes(true, eLang, eLang); @@ -1900,7 +1900,7 @@ void OfaQuoteTabPage::ActivatePage( const SfxItemSet& ) ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false); } -void OfaQuoteTabPage::Reset( const SfxItemSet& ) +void OfaQuoteTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); @@ -2205,7 +2205,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) return true; } -void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) +void OfaAutoCompleteTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -2566,7 +2566,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* ) /** Sets the controls based on the current settings at SmartTagMgr. */ -void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet& ) +void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet* ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 58a60f2c4334..1b2314defdd7 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -468,15 +468,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, -void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) +void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) { // os: Such a nonsense! One will always find such an item somewhere, // but it must be existing in the rSet! // const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC ); // if( pX && pX->ISA(SfxWallpaperItem)) - if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) + if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) { - ResetFromWallpaperItem( rSet ); + ResetFromWallpaperItem( *rSet ); return; } @@ -494,7 +494,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; sal_uInt16 nDestValue = USHRT_MAX; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_BACKGRND_DESTINATION, + if ( SFX_ITEM_SET == rSet->GetItemState( SID_BACKGRND_DESTINATION, false, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -513,7 +513,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) break; } } - else if( SFX_ITEM_SET == rSet.GetItemState( + else if( SFX_ITEM_SET == rSet->GetItemState( SID_PARA_BACKGRND_DESTINATION, false, &pItem ) ) { nDestValue = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -541,8 +541,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) nDestValue = 0; sal_uInt16 nWhich = GetWhich( nSlot ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); m_pBtnTile->Check(); @@ -558,7 +558,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) lcl_setFillStyle(m_pLbSelect, XFILL_SOLID); ShowColorUI_Impl(); - const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_BRUSH ); + const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_BRUSH ); if ( pOld ) aBgdColor = ( (SvxBrushItem*)pOld )->GetColor(); @@ -582,23 +582,23 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) pTableBck_Impl->nActPos = nValue; nWhich = GetWhich( SID_ATTR_BRUSH ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pTableBck_Impl->pCellBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nCellWhich = nWhich; - if ( rSet.GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_BRUSH_ROW, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_ROW ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( SID_ATTR_BRUSH_ROW ) ); pTableBck_Impl->pRowBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nRowWhich = SID_ATTR_BRUSH_ROW; - if ( rSet.GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( SID_ATTR_BRUSH_TABLE, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( SID_ATTR_BRUSH_TABLE ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( SID_ATTR_BRUSH_TABLE ) ); pTableBck_Impl->pTableBrush = new SvxBrushItem(*pBgdAttr); } pTableBck_Impl->nTableWhich = SID_ATTR_BRUSH_TABLE; @@ -621,18 +621,18 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) pParaBck_Impl->nActPos = nValue; nWhich = GetWhich( SID_ATTR_BRUSH ); - if ( rSet.GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState( nWhich, false ) >= SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pParaBck_Impl->pParaBrush = new SvxBrushItem(*pBgdAttr); } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - rSet.GetItemState( nWhich, true ); - rSet.GetItemState( nWhich, false ); - if ( rSet.GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE ) + rSet->GetItemState( nWhich, true ); + rSet->GetItemState( nWhich, false ); + if ( rSet->GetItemState( nWhich, true ) > SFX_ITEM_AVAILABLE ) { - pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); + pBgdAttr = (const SvxBrushItem*)&( rSet->Get( nWhich ) ); pParaBck_Impl->pCharBrush = new SvxBrushItem(*pBgdAttr); } else diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 184b72093ff4..120b554bc21d 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -379,7 +379,7 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const -void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) +void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) { SfxTabPage::Reset( rSet ); @@ -388,11 +388,11 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) sal_uInt16 nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER); SfxMapUnit eCoreUnit; - pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER ); + pBoxItem = (const SvxBoxItem*)GetItem( *rSet, SID_ATTR_BORDER_OUTER ); - pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( rSet, SID_ATTR_BORDER_INNER, false ); + pBoxInfoItem = (const SvxBoxInfoItem*)GetItem( *rSet, SID_ATTR_BORDER_INNER, false ); - eCoreUnit = rSet.GetPool()->GetMetric( nWhichBox ); + eCoreUnit = rSet->GetPool()->GetMetric( nWhichBox ); if ( pBoxItem && pBoxInfoItem ) // -> Don't Care { @@ -427,7 +427,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) if ( pBoxInfoItem->IsDist() ) { - if( rSet.GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT ) + if( rSet->GetItemState( nWhichBox, true ) >= SFX_ITEM_DEFAULT ) { bool bIsAnyBorderVisible = m_pFrameSel->IsAnyBorderVisible(); if( !bIsAnyBorderVisible || !pBoxInfoItem->IsMinDist() ) @@ -552,7 +552,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, false, &pItem) || + if(SFX_ITEM_SET == rSet->GetItemState(SID_HTML_MODE, false, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index fc53366be96a..92e8141303ed 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1191,13 +1191,13 @@ const sal_uInt16* SvxCharNamePage::GetRanges() -void SvxCharNamePage::Reset( const SfxItemSet& rSet ) +void SvxCharNamePage::Reset( const SfxItemSet* rSet ) { - Reset_Impl( rSet, Western ); - Reset_Impl( rSet, Asian ); - Reset_Impl( rSet, Ctl ); + Reset_Impl( *rSet, Western ); + Reset_Impl( *rSet, Asian ); + Reset_Impl( *rSet, Ctl ); - SetPrevFontWidthScale( rSet ); + SetPrevFontWidthScale( *rSet ); UpdatePreview_Impl(); } @@ -1738,7 +1738,7 @@ const sal_uInt16* SvxCharEffectsPage::GetRanges() -void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) +void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) { SvxFont& rFont = GetPreviewFont(); SvxFont& rCJKFont = GetPreviewCJKFont(); @@ -1753,7 +1753,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetUnderline( UNDERLINE_NONE ); m_pUnderlineLB->SelectEntryPos( 0 ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1761,7 +1761,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pUnderlineLB->SetNoSelection(); else { - const SvxUnderlineItem& rItem = (SvxUnderlineItem&)rSet.Get( nWhich ); + const SvxUnderlineItem& rItem = (SvxUnderlineItem&)rSet->Get( nWhich ); FontUnderline eUnderline = (FontUnderline)rItem.GetValue(); rFont.SetUnderline( eUnderline ); rCJKFont.SetUnderline( eUnderline ); @@ -1810,7 +1810,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetOverline( UNDERLINE_NONE ); m_pOverlineLB->SelectEntryPos( 0 ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1818,7 +1818,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pOverlineLB->SetNoSelection(); else { - const SvxOverlineItem& rItem = (SvxOverlineItem&)rSet.Get( nWhich ); + const SvxOverlineItem& rItem = (SvxOverlineItem&)rSet->Get( nWhich ); FontUnderline eOverline = (FontUnderline)rItem.GetValue(); rFont.SetOverline( eOverline ); rCJKFont.SetOverline( eOverline ); @@ -1867,7 +1867,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) rCTLFont.SetStrikeout( STRIKEOUT_NONE ); m_pStrikeoutLB->SelectEntryPos( 0 ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { @@ -1875,7 +1875,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_pStrikeoutLB->SetNoSelection(); else { - const SvxCrossedOutItem& rItem = (SvxCrossedOutItem&)rSet.Get( nWhich ); + const SvxCrossedOutItem& rItem = (SvxCrossedOutItem&)rSet->Get( nWhich ); FontStrikeout eStrikeout = (FontStrikeout)rItem.GetValue(); rFont.SetStrikeout( eStrikeout ); rCJKFont.SetStrikeout( eStrikeout ); @@ -1916,7 +1916,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxWordLineModeItem& rItem = (SvxWordLineModeItem&)rSet.Get( nWhich ); + const SvxWordLineModeItem& rItem = (SvxWordLineModeItem&)rSet->Get( nWhich ); rFont.SetWordLineMode( rItem.GetValue() ); rCJKFont.SetWordLineMode( rItem.GetValue() ); rCTLFont.SetWordLineMode( rItem.GetValue() ); @@ -1929,11 +1929,11 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DEFAULT ) { - const SvxEmphasisMarkItem& rItem = (SvxEmphasisMarkItem&)rSet.Get( nWhich ); + const SvxEmphasisMarkItem& rItem = (SvxEmphasisMarkItem&)rSet->Get( nWhich ); FontEmphasisMark eMark = rItem.GetEmphasisMark(); rFont.SetEmphasisMark( eMark ); rCJKFont.SetEmphasisMark( eMark ); @@ -1987,7 +1987,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Effects SvxCaseMap eCaseMap = SVX_CASEMAP_END; nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2008,7 +2008,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCaseMapItem& rItem = (const SvxCaseMapItem&)rSet.Get( nWhich ); + const SvxCaseMapItem& rItem = (const SvxCaseMapItem&)rSet->Get( nWhich ); eCaseMap = (SvxCaseMap)rItem.GetValue(); break; } @@ -2017,7 +2017,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2038,7 +2038,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCharReliefItem& rItem = (const SvxCharReliefItem&)rSet.Get( nWhich ); + const SvxCharReliefItem& rItem = (const SvxCharReliefItem&)rSet->Get( nWhich ); m_pReliefLB->SelectEntryPos(rItem.GetValue()); SelectHdl_Impl(m_pReliefLB); break; @@ -2047,7 +2047,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Outline nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { case SFX_ITEM_UNKNOWN: @@ -2066,7 +2066,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxContourItem& rItem = (SvxContourItem&)rSet.Get( nWhich ); + const SvxContourItem& rItem = (SvxContourItem&)rSet->Get( nWhich ); m_pOutlineBtn->SetState( (TriState)rItem.GetValue() ); m_pOutlineBtn->EnableTriState( false ); break; @@ -2075,7 +2075,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Shadow nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2095,7 +2095,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxShadowedItem& rItem = (SvxShadowedItem&)rSet.Get( nWhich ); + const SvxShadowedItem& rItem = (SvxShadowedItem&)rSet->Get( nWhich ); m_pShadowBtn->SetState( (TriState)rItem.GetValue() ); m_pShadowBtn->EnableTriState( false ); break; @@ -2104,7 +2104,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) // Blinking nWhich = GetWhich( SID_ATTR_FLASH ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2124,7 +2124,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxBlinkItem& rItem = (SvxBlinkItem&)rSet.Get( nWhich ); + const SvxBlinkItem& rItem = (SvxBlinkItem&)rSet->Get( nWhich ); m_pBlinkingBtn->SetState( (TriState)rItem.GetValue() ); m_pBlinkingBtn->EnableTriState( false ); break; @@ -2132,7 +2132,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) } // Hidden nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN ); - eState = rSet.GetItemState( nWhich ); + eState = rSet->GetItemState( nWhich ); switch ( eState ) { @@ -2152,15 +2152,15 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) case SFX_ITEM_DEFAULT: case SFX_ITEM_SET: { - const SvxCharHiddenItem& rItem = (SvxCharHiddenItem&)rSet.Get( nWhich ); + const SvxCharHiddenItem& rItem = (SvxCharHiddenItem&)rSet->Get( nWhich ); m_pHiddenBtn->SetState( (TriState)rItem.GetValue() ); m_pHiddenBtn->EnableTriState( false ); break; } } - SetPrevFontWidthScale( rSet ); - ResetColor_Impl( rSet ); + SetPrevFontWidthScale( *rSet ); + ResetColor_Impl( *rSet ); // preview update m_pPreviewWin->Invalidate(); @@ -2911,7 +2911,7 @@ const sal_uInt16* SvxCharPositionPage::GetRanges() } -void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) +void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) { OUString sUser = GetUserData(); @@ -2957,9 +2957,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) SvxFont& rCTLFont = GetPreviewCTLFont(); sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxEscapementItem& rItem = (SvxEscapementItem&)rSet.Get( nWhich ); + const SvxEscapementItem& rItem = (SvxEscapementItem&)rSet->Get( nWhich ); nEsc = rItem.GetEsc(); nEscProp = rItem.GetProp(); @@ -3028,10 +3028,10 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Kerning nWhich = GetWhich( SID_ATTR_CHAR_KERNING ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxKerningItem& rItem = (SvxKerningItem&)rSet.Get( nWhich ); - SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich ); + const SvxKerningItem& rItem = (SvxKerningItem&)rSet->Get( nWhich ); + SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich ); MapUnit eOrgUnit = (MapUnit)eUnit; MapUnit ePntUnit( MAP_POINT ); long nBig = static_cast<long>(m_pKerningMF->Normalize( static_cast<long>(rItem.GetValue()) )); @@ -3071,9 +3071,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Pair kerning nWhich = GetWhich( SID_ATTR_CHAR_AUTOKERN ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxAutoKernItem& rItem = (SvxAutoKernItem&)rSet.Get( nWhich ); + const SvxAutoKernItem& rItem = (SvxAutoKernItem&)rSet->Get( nWhich ); m_pPairKerningBtn->Check( rItem.GetValue() ); } else @@ -3081,9 +3081,9 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) // Scale Width nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) { - const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet.Get( nWhich ); + const SvxCharScaleWidthItem& rItem = ( SvxCharScaleWidthItem& ) rSet->Get( nWhich ); m_nScaleWidthInitialVal = rItem.GetValue(); m_pScaleWidthMF->SetValue( m_nScaleWidthInitialVal ); } @@ -3091,12 +3091,12 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pScaleWidthMF->SetValue( 100 ); nWhich = GetWhich( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ); - if ( rSet.GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) - m_nScaleWidthItemSetVal = ((SfxUInt16Item&) rSet.Get( nWhich )).GetValue(); + if ( rSet->GetItemState( nWhich ) >= SFX_ITEM_DEFAULT ) + m_nScaleWidthItemSetVal = ((SfxUInt16Item&) rSet->Get( nWhich )).GetValue(); // Rotation nWhich = GetWhich( SID_ATTR_CHAR_ROTATED ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if( SFX_ITEM_UNKNOWN == eState ) { m_pRotationContainer->Hide(); @@ -3114,7 +3114,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) if( eState >= SFX_ITEM_DEFAULT ) { const SvxCharRotateItem& rItem = - (SvxCharRotateItem&) rSet.Get( nWhich ); + (SvxCharRotateItem&) rSet->Get( nWhich ); if (rItem.IsBottomToTop()) m_p90degRB->Check( true ); else if (rItem.IsTopToBotton()) @@ -3143,7 +3143,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_pFitToLineCB->Enable( !m_p0degRB->IsChecked() ); // is this value set? - if( SFX_ITEM_UNKNOWN == rSet.GetItemState( GetWhich( + if( SFX_ITEM_UNKNOWN == rSet->GetItemState( GetWhich( SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ) )) m_pFitToLineCB->Hide(); } @@ -3485,15 +3485,15 @@ const sal_uInt16* SvxCharTwoLinesPage::GetRanges() -void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) +void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet ) { m_pTwoLinesBtn->Check( false ); sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); - SfxItemState eState = rSet.GetItemState( nWhich ); + SfxItemState eState = rSet->GetItemState( nWhich ); if ( eState >= SFX_ITEM_DONTCARE ) { - const SvxTwoLinesItem& rItem = (SvxTwoLinesItem&)rSet.Get( nWhich ); + const SvxTwoLinesItem& rItem = (SvxTwoLinesItem&)rSet->Get( nWhich ); m_pTwoLinesBtn->Check( rItem.GetValue() ); if ( rItem.GetValue() ) @@ -3504,7 +3504,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) } TwoLinesHdl_Impl( NULL ); - SetPrevFontWidthScale( rSet ); + SetPrevFontWidthScale( *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index fcbb583ad32c..8569410eebc0 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -158,10 +158,10 @@ SvxConnectionPage::~SvxConnectionPage() |* \************************************************************************/ -void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) +void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) { - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_EDGENODE1HORZDIST ); - const SfxItemPool* pPool = rAttrs.GetPool(); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1HORZDIST ); + const SfxItemPool* pPool = rAttrs->GetPool(); // SdrEdgeNode1HorzDistItem if( !pItem ) @@ -177,7 +177,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHorz1->SaveValue(); // SdrEdgeNode2HorzDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE2HORZDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2HORZDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2HORZDIST ); if( pItem ) @@ -191,7 +191,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHorz2->SaveValue(); // SdrEdgeNode1VertDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE1VERTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE1VERTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE1VERTDIST ); if( pItem ) @@ -205,7 +205,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldVert1->SaveValue(); // SdrEdgeNode2VertDistItem - pItem = GetItem( rAttrs, SDRATTR_EDGENODE2VERTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_EDGENODE2VERTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGENODE2VERTDIST ); if( pItem ) @@ -219,7 +219,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldVert2->SaveValue(); // SdrEdgeLine1DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE1DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE1DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA ); if( pItem ) @@ -233,7 +233,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine1->SaveValue(); // SdrEdgeLine2DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE2DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE2DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA ); if( pItem ) @@ -247,7 +247,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine2->SaveValue(); // SdrEdgeLine3DeltaItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINE3DELTA ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINE3DELTA ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA ); if( pItem ) @@ -261,7 +261,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLine3->SaveValue(); // SdrEdgeLineDeltaAnzItem - pItem = GetItem( rAttrs, SDRATTR_EDGELINEDELTAANZ ); + pItem = GetItem( *rAttrs, SDRATTR_EDGELINEDELTAANZ ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINEDELTAANZ ); if( pItem ) @@ -288,7 +288,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) } // SdrEdgeKindItem - pItem = GetItem( rAttrs, SDRATTR_EDGEKIND ); + pItem = GetItem( *rAttrs, SDRATTR_EDGEKIND ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_EDGEKIND ); if( pItem ) diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 530da67ed7c8..8a4819652a42 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -91,7 +91,7 @@ void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) |* \************************************************************************/ -void SvxDistributePage::Reset(const SfxItemSet& ) +void SvxDistributePage::Reset(const SfxItemSet* ) { m_pBtnHorNone->SetState(false); m_pBtnHorLeft->SetState(false); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 898315fdbb6f..283d08278c32 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -134,12 +134,12 @@ SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet &rSet) return new SvxGrfCropPage( pParent, rSet ); } -void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) +void SvxGrfCropPage::Reset( const SfxItemSet *rSet ) { const SfxPoolItem* pItem; - const SfxItemPool& rPool = *rSet.GetPool(); + const SfxItemPool& rPool = *rSet->GetPool(); - if(SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( + if(SFX_ITEM_SET == rSet->GetItemState( rPool.GetWhich( SID_ATTR_GRAF_KEEP_ZOOM ), true, &pItem )) { if( ((const SfxBoolItem*)pItem)->GetValue() ) @@ -150,9 +150,9 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) } sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP ); - if( SFX_ITEM_SET == rSet.GetItemState( nW, true, &pItem)) + if( SFX_ITEM_SET == rSet->GetItemState( nW, true, &pItem)) { - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); SvxGrfCrop* pCrop = (SvxGrfCrop*)pItem; @@ -175,10 +175,10 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) } nW = rPool.GetWhich( SID_ATTR_PAGE_SIZE ); - if ( SFX_ITEM_SET == rSet.GetItemState( nW, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( nW, false, &pItem ) ) { // orientation and size from the PageItem - FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); + FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW )); aPageSize = ((const SvxSizeItem*)pItem)->GetSize(); @@ -195,15 +195,15 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) aPageSize = OutputDevice::LogicToLogic( Size( CM_1_TO_TWIP, CM_1_TO_TWIP ), MapMode( MAP_TWIP ), - MapMode( (MapUnit)rSet.GetPool()->GetMetric( nW ) ) ); + MapMode( (MapUnit)rSet->GetPool()->GetMetric( nW ) ) ); } bool bFound = false; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_GRAF_GRAPHIC, false, &pItem ) ) { OUString referer; SfxStringItem const * it = static_cast<SfxStringItem const *>( - rSet.GetItem(SID_REFERER)); + rSet->GetItem(SID_REFERER)); if (it != 0) { referer = it->GetValue(); } @@ -232,7 +232,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) GraphicHasChanged( bFound ); bReset = true; - ActivatePage( rSet ); + ActivatePage( *rSet ); bReset = false; } diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 024fdc70f5b5..57921b5ab6f2 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -219,7 +219,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) -void SvxCaptionTabPage::Reset( const SfxItemSet& ) +void SvxCaptionTabPage::Reset( const SfxItemSet* ) { //------------set metric----------------------------- diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 3178ee8be057..d8b02d3f8d13 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -224,14 +224,14 @@ void _SfxMacroTabPage::PageCreated(const SfxAllItemSet& aSet) } } -void _SfxMacroTabPage::Reset( const SfxItemSet& rSet ) +void _SfxMacroTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; - if( SFX_ITEM_SET == rSet.GetItemState( GetWhich( aPageRg[0] ), true, &pItem )) + if( SFX_ITEM_SET == rSet->GetItemState( GetWhich( aPageRg[0] ), true, &pItem )) aTbl = ((SvxMacroItem*)pItem)->GetMacroTable(); const SfxPoolItem* pEventsItem; - if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) + if( !mpImpl->bGotEvents && SFX_ITEM_SET == rSet->GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) ) { mpImpl->bGotEvents = true; const SfxEventNamesList& rList = ((SfxEventNamesItem*)pEventsItem)->GetEvents(); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 1d6884608d54..2a629cd5ddd5 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -165,13 +165,13 @@ SvxMeasurePage::~SvxMeasurePage() |* \************************************************************************/ -void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) +void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) { - SfxItemPool* pPool = rAttrs.GetPool(); + SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); eUnit = pPool->GetMetric( SDRATTR_MEASURELINEDIST ); - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_MEASURELINEDIST ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_MEASURELINEDIST ); // SdrMeasureLineDistItem if( pItem == NULL ) @@ -188,7 +188,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLineDist->SaveValue(); // SdrMeasureHelplineOverhangItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEOVERHANG ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEOVERHANG ); if( pItem ) @@ -203,7 +203,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelplineOverhang->SaveValue(); // SdrMeasureHelplineDistItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINEDIST ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINEDIST ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINEDIST ); if( pItem ) @@ -218,7 +218,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelplineDist->SaveValue(); // SdrMeasureHelpline1LenItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINE1LEN ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE1LEN ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE1LEN ); if( pItem ) @@ -233,7 +233,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelpline1Len->SaveValue(); // SdrMeasureHelpline2LenItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREHELPLINE2LEN ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREHELPLINE2LEN ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREHELPLINE2LEN ); if( pItem ) @@ -248,9 +248,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldHelpline2Len->SaveValue(); // SdrMeasureBelowRefEdgeItem - if( rAttrs.GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASUREBELOWREFEDGE ) != SFX_ITEM_DONTCARE ) { - m_pTsbBelowRefEdge->SetState( ( ( const SdrMeasureBelowRefEdgeItem& )rAttrs.Get( SDRATTR_MEASUREBELOWREFEDGE ) ). + m_pTsbBelowRefEdge->SetState( ( ( const SdrMeasureBelowRefEdgeItem& )rAttrs->Get( SDRATTR_MEASUREBELOWREFEDGE ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbBelowRefEdge->EnableTriState( false ); } @@ -261,7 +261,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbBelowRefEdge->SaveValue(); // SdrMeasureDecimalPlacesItem - pItem = GetItem( rAttrs, SDRATTR_MEASUREDECIMALPLACES ); + pItem = GetItem( *rAttrs, SDRATTR_MEASUREDECIMALPLACES ); if( pItem == NULL ) pItem = &pPool->GetDefaultItem( SDRATTR_MEASUREDECIMALPLACES ); if( pItem ) @@ -277,9 +277,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) // SdrMeasureTextRota90Item // Attention: negate ! - if( rAttrs.GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASURETEXTROTA90 ) != SFX_ITEM_DONTCARE ) { - m_pTsbParallel->SetState( ( ( const SdrMeasureTextRota90Item& )rAttrs.Get( SDRATTR_MEASURETEXTROTA90 ) ). + m_pTsbParallel->SetState( ( ( const SdrMeasureTextRota90Item& )rAttrs->Get( SDRATTR_MEASURETEXTROTA90 ) ). GetValue() ? TRISTATE_FALSE : TRISTATE_TRUE ); m_pTsbParallel->EnableTriState( false ); } @@ -290,9 +290,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbParallel->SaveValue(); // SdrMeasureShowUnitItem - if( rAttrs.GetItemState( SDRATTR_MEASURESHOWUNIT ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASURESHOWUNIT ) != SFX_ITEM_DONTCARE ) { - m_pTsbShowUnit->SetState( ( ( const SdrMeasureShowUnitItem& )rAttrs.Get( SDRATTR_MEASURESHOWUNIT ) ). + m_pTsbShowUnit->SetState( ( ( const SdrMeasureShowUnitItem& )rAttrs->Get( SDRATTR_MEASURESHOWUNIT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbShowUnit->EnableTriState( false ); } @@ -303,9 +303,9 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pTsbShowUnit->SaveValue(); // SdrMeasureUnitItem - if( rAttrs.GetItemState( SDRATTR_MEASUREUNIT ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_MEASUREUNIT ) != SFX_ITEM_DONTCARE ) { - long nFieldUnit = (long) ( ( const SdrMeasureUnitItem& )rAttrs. + long nFieldUnit = (long) ( ( const SdrMeasureUnitItem& )rAttrs-> Get( SDRATTR_MEASUREUNIT ) ).GetValue(); for( sal_Int32 i = 0; i < m_pLbUnit->GetEntryCount(); ++i ) @@ -324,18 +324,18 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) m_pLbUnit->SaveValue(); // Position - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE ) { SdrMeasureTextVPos eVPos = (SdrMeasureTextVPos) - ( ( const SdrMeasureTextVPosItem& )rAttrs.Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue(); + ( ( const SdrMeasureTextVPosItem& )rAttrs->Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue(); { - if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE ) { m_pTsbAutoPosV->EnableTriState( false ); m_pTsbAutoPosH->EnableTriState( false ); SdrMeasureTextHPos eHPos = (SdrMeasureTextHPos) - ( ( const SdrMeasureTextHPosItem& )rAttrs.Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue(); + ( ( const SdrMeasureTextHPosItem& )rAttrs->Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue(); RECT_POINT eRP = RP_MM; switch( eVPos ) { @@ -408,7 +408,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) // otherwise the control don't know about // the settings of the dialog (#67930) ChangeAttrHdl_Impl( m_pTsbShowUnit ); - m_pCtlPreview->SetAttributes( rAttrs ); + m_pCtlPreview->SetAttributes( *rAttrs ); bPositionModified = false; } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 3c706b0d5cd7..3b75d596159b 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -378,7 +378,7 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, #* #************************************************************************/ -void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) { const SfxUInt32Item* pValFmtAttr = NULL; const SfxPoolItem* pItem = NULL; @@ -392,12 +392,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) double nValDouble = 0; OUString aValString; - SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem); + SfxItemState eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_NOLANGUAGE ),true,&pItem); if(eState==SFX_ITEM_SET) { const SfxBoolItem* pBoolLangItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_NOLANGUAGE); if(pBoolLangItem!=NULL && pBoolLangItem->GetValue()) { @@ -410,7 +410,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_INFO ),true,&pItem); if(eState==SFX_ITEM_SET) { @@ -430,12 +430,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ONE_AREA )); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ONE_AREA )); if(eState==SFX_ITEM_SET) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ONE_AREA); if(pBoolItem!=NULL) { @@ -443,12 +443,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) } } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE ) ); if ( eState == SFX_ITEM_SET ) { const SfxBoolItem* pBoolItem = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_SOURCE ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_SOURCE ); if ( pBoolItem ) m_pCbSourceFormat->Check( pBoolItem->GetValue() ); else @@ -467,11 +467,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // pNumItem must have been set from outside! DBG_ASSERT( pNumItem, "No NumberInfo, no NumberFormatter, good bye.CRASH. :-(" ); - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) ); if ( SFX_ITEM_DONTCARE != eState ) pValFmtAttr = (const SfxUInt32Item*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_VALUE ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_VALUE ); eValType = pNumItem->GetValueType(); @@ -545,10 +545,10 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) { SetCategory(nCatLbSelPos ); } - eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ADD_AUTO ) ); + eState = rSet->GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_ADD_AUTO ) ); if(SFX_ITEM_SET == eState) pAutoEntryAttr = (const SfxBoolItem*) - GetItem( rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ); + GetItem( *rSet, SID_ATTR_NUMBERFORMAT_ADD_AUTO ); // no_NO is an alias for nb_NO and normally isn't listed, we need it for // backwards compatibility, but only if the format passed is of // LanguageType no_NO. diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index c42888c48a88..71be499b17fe 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -283,20 +283,20 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } } @@ -442,19 +442,19 @@ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -639,19 +639,19 @@ int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -886,19 +886,19 @@ bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet ) +void SvxBitmapPickTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -1207,19 +1207,19 @@ bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; }; -void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } @@ -1295,7 +1295,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) } SfxObjectShell* pShell; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_HTML_MODE, false, &pItem ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_HTML_MODE, false, &pItem ) || ( 0 != ( pShell = SfxObjectShell::Current()) && 0 != ( pItem = pShell->GetItem( SID_HTML_MODE ) ) ) ) { @@ -2971,19 +2971,19 @@ bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet ) return bModified; } -void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) +void SvxNumPositionTabPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; // in Draw the item exists as WhichId, in Writer only as SlotId - SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); + SfxItemState eState = rSet->GetItemState(SID_ATTR_NUMBERING_RULE, false, &pItem); if(eState != SFX_ITEM_SET) { - nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); - eState = rSet.GetItemState(nNumItemId, false, &pItem); + nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE); + eState = rSet->GetItemState(nNumItemId, false, &pItem); if( eState != SFX_ITEM_SET ) { - pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) ); + pItem = &static_cast< const SvxNumBulletItem& >( rSet->Get( nNumItemId, true ) ); eState = SFX_ITEM_SET; } diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 1ee2803d319e..bb72fcac935b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -398,14 +398,14 @@ void SvxPageDescPage::Init_Impl() -void SvxPageDescPage::Reset( const SfxItemSet& rSet ) +void SvxPageDescPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) ); // adjust margins (right/left) - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_LRSPACE ); if ( pItem ) { @@ -419,7 +419,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) } // adjust margins (top/bottom) - pItem = GetItem( rSet, SID_ATTR_ULSPACE ); + pItem = GetItem( *rSet, SID_ATTR_ULSPACE ); if ( pItem ) { @@ -436,7 +436,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) SvxNumType eNumType = SVX_ARABIC; bLandscape = ( pImpl->mpDefPrinter->GetOrientation() == ORIENTATION_LANDSCAPE ); sal_uInt16 nUse = (sal_uInt16)SVX_PAGE_ALL; - pItem = GetItem( rSet, SID_ATTR_PAGE ); + pItem = GetItem( *rSet, SID_ATTR_PAGE ); if ( pItem ) { @@ -461,7 +461,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) m_pPaperTrayBox->Clear(); sal_uInt8 nPaperBin = PAPERBIN_PRINTER_SETTINGS; - pItem = GetItem( rSet, SID_ATTR_PAGE_PAPERBIN ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_PAPERBIN ); if ( pItem ) { @@ -483,7 +483,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) m_pPaperTrayBox->SelectEntry( aBinName ); Size aPaperSize = SvxPaperInfo::GetPaperSize( pImpl->mpDefPrinter ); - pItem = GetItem( rSet, SID_ATTR_PAGE_SIZE ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_SIZE ); if ( pItem ) aPaperSize = ( (const SvxSizeItem*)pItem )->GetSize(); @@ -555,12 +555,12 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) DisableVerticalPageDir(); // horizontal alignment - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pHorzBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); // vertical alignment - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT2 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT2 ); m_pVertBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); @@ -576,7 +576,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) { DisableVerticalPageDir(); m_pAdaptBox->Show(); - pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 ); + pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pAdaptBox->Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue() : sal_False ); @@ -591,11 +591,11 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) // display background and border in the example - ResetBackground_Impl( rSet ); + ResetBackground_Impl( *rSet ); //! UpdateExample_Impl(); RangeHdl_Impl( 0 ); - InitHeadFoot_Impl( rSet ); + InitHeadFoot_Impl( *rSet ); bBorderModified = false; SwapFirstValues_Impl( false ); @@ -620,21 +620,21 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) CheckMarginEdits( true ); - if(SFX_ITEM_SET == rSet.GetItemState(SID_SWREGISTER_MODE)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_SWREGISTER_MODE)) { - m_pRegisterCB->Check(((const SfxBoolItem&)rSet.Get( + m_pRegisterCB->Check(((const SfxBoolItem&)rSet->Get( SID_SWREGISTER_MODE)).GetValue()); m_pRegisterCB->SaveValue(); RegisterModify(m_pRegisterCB); } - if(SFX_ITEM_SET == rSet.GetItemState(SID_SWREGISTER_COLLECTION)) + if(SFX_ITEM_SET == rSet->GetItemState(SID_SWREGISTER_COLLECTION)) { m_pRegisterLB->SelectEntry( - ((const SfxStringItem&)rSet.Get(SID_SWREGISTER_COLLECTION)).GetValue()); + ((const SfxStringItem&)rSet->Get(SID_SWREGISTER_COLLECTION)).GetValue()); m_pRegisterLB->SaveValue(); } - SfxItemState eState = rSet.GetItemState( GetWhich( SID_ATTR_FRAMEDIRECTION ), + SfxItemState eState = rSet->GetItemState( GetWhich( SID_ATTR_FRAMEDIRECTION ), true, &pItem ); if( SFX_ITEM_UNKNOWN != eState ) { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 45e3c7d29ecf..9e7302970d1e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -401,15 +401,15 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) +void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool?" ); // adjust metric - FieldUnit eFUnit = GetModuleFieldUnit( rSet ); + FieldUnit eFUnit = GetModuleFieldUnit( *rSet ); - bool bApplyCharUnit = GetApplyCharUnit( rSet ); + bool bApplyCharUnit = GetApplyCharUnit( *rSet ); SvtCJKOptions aCJKOptions; if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) @@ -432,7 +432,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } sal_uInt16 _nWhich = GetWhich( SID_ATTR_LRSPACE ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { @@ -441,7 +441,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) if ( bRelativeMode ) { const SvxLRSpaceItem& rOldItem = - (const SvxLRSpaceItem&)rSet.Get( _nWhich ); + (const SvxLRSpaceItem&)rSet->Get( _nWhich ); if ( rOldItem.GetPropLeft() != 100 ) { @@ -485,7 +485,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) else { const SvxLRSpaceItem& rSpace = - (const SvxLRSpaceItem&)rSet.Get( _nWhich ); + (const SvxLRSpaceItem&)rSet->Get( _nWhich ); SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit ); SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit ); @@ -502,14 +502,14 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_ULSPACE ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { SfxMapUnit eUnit = pPool->GetMetric( _nWhich ); const SvxULSpaceItem& rOldItem = - (const SvxULSpaceItem&)rSet.Get( _nWhich ); + (const SvxULSpaceItem&)rSet->Get( _nWhich ); if ( bRelativeMode ) { @@ -557,20 +557,20 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_PARA_LINESPACE ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) - SetLineSpacing_Impl( (const SvxLineSpacingItem &)rSet.Get( _nWhich ) ); + SetLineSpacing_Impl( (const SvxLineSpacingItem &)rSet->Get( _nWhich ) ); else m_pLineDist->SetNoSelection(); _nWhich = GetWhich( SID_ATTR_PARA_REGISTER ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) - m_pRegisterCB->Check( ((const SfxBoolItem &)rSet.Get( _nWhich )).GetValue()); + m_pRegisterCB->Check( ((const SfxBoolItem &)rSet->Get( _nWhich )).GetValue()); m_pRegisterCB->SaveValue(); - sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet); + sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet); if(nHtmlMode & HTMLMODE_ON) { m_pRegisterFL->Hide(); @@ -1147,15 +1147,15 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) +void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); sal_Int32 nLBSelect = 0; if ( eItemState >= SFX_ITEM_AVAILABLE ) { - const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet.Get( _nWhich ); + const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet->Get( _nWhich ); switch ( rAdj.GetAdjust() /*!!! ask VB rAdj.GetLastBlock()*/ ) { @@ -1193,7 +1193,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) } m_pLastLineLB->SelectEntryPos(nLBSelect); - sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet); + sal_uInt16 nHtmlMode = GetHtmlMode_Impl(*rSet); if(nHtmlMode & HTMLMODE_ON) { m_pLastLineLB->Hide(); @@ -1204,30 +1204,30 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet ) m_pSnapToGridCB->Show(false); } _nWhich = GetWhich(SID_ATTR_PARA_SNAPTOGRID); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { - const SvxParaGridItem& rSnap = (const SvxParaGridItem&)rSet.Get( _nWhich ); + const SvxParaGridItem& rSnap = (const SvxParaGridItem&)rSet->Get( _nWhich ); m_pSnapToGridCB->Check(rSnap.GetValue()); } _nWhich = GetWhich( SID_PARA_VERTALIGN ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { m_pVertAlignFL->Show(); - const SvxParaVertAlignItem& rAlign = (const SvxParaVertAlignItem&)rSet.Get( _nWhich ); + const SvxParaVertAlignItem& rAlign = (const SvxParaVertAlignItem&)rSet->Get( _nWhich ); m_pVertAlignLB->SelectEntryPos(rAlign.GetValue()); } _nWhich = GetWhich( SID_ATTR_FRAMEDIRECTION ); //text direction - if( SFX_ITEM_AVAILABLE <= rSet.GetItemState( _nWhich ) ) + if( SFX_ITEM_AVAILABLE <= rSet->GetItemState( _nWhich ) ) { - const SvxFrameDirectionItem& rFrameDirItem = ( const SvxFrameDirectionItem& ) rSet.Get( _nWhich ); + const SvxFrameDirectionItem& rFrameDirItem = ( const SvxFrameDirectionItem& ) rSet->Get( _nWhich ); m_pTextDirectionLB->SelectEntryValue( (SvxFrameDirection)rFrameDirItem.GetValue() ); m_pTextDirectionLB->SaveValue(); } @@ -1528,17 +1528,17 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) return bModified; } -void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) +void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet ) { sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); - SfxItemState eItemState = rSet.GetItemState( _nWhich ); + SfxItemState eItemState = rSet->GetItemState( _nWhich ); bool bItemAvailable = eItemState >= SFX_ITEM_AVAILABLE; bool bIsHyphen = false; if( !bHtmlMode && bItemAvailable ) { const SvxHyphenZoneItem& rHyphen = - (const SvxHyphenZoneItem&)rSet.Get( _nWhich ); + (const SvxHyphenZoneItem&)rSet->Get( _nWhich ); m_pHyphenBox->EnableTriState( false ); bIsHyphen = rHyphen.IsHyphen(); @@ -1562,10 +1562,10 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) _nWhich = GetWhich( SID_ATTR_PARA_PAGENUM ); - if ( rSet.GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE ) + if ( rSet->GetItemState(_nWhich) >= SFX_ITEM_AVAILABLE ) { const sal_uInt16 nPageNum = - ( (const SfxUInt16Item&)rSet.Get( _nWhich ) ).GetValue(); + ( (const SfxUInt16Item&)rSet->Get( _nWhich ) ).GetValue(); m_pPagenumEdit->SetValue( nPageNum ); } @@ -1574,14 +1574,14 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) // first handle PageModel _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); bool bIsPageModel = false; - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_SET ) { m_pApplyCollBtn->EnableTriState( false ); const SvxPageModelItem& rModel = - (const SvxPageModelItem&)rSet.Get( _nWhich ); + (const SvxPageModelItem&)rSet->Get( _nWhich ); OUString aStr( rModel.GetValue() ); if ( !aStr.isEmpty() && @@ -1628,12 +1628,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) if ( !bIsPageModel ) { _nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxFmtBreakItem& rPageBreak = - (const SvxFmtBreakItem&)rSet.Get( _nWhich ); + (const SvxFmtBreakItem&)rSet->Get( _nWhich ); SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue(); @@ -1699,13 +1699,13 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) } _nWhich = GetWhich( SID_ATTR_PARA_KEEP ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { m_pKeepParaBox->EnableTriState( false ); const SvxFmtKeepItem& rKeep = - (const SvxFmtKeepItem&)rSet.Get( _nWhich ); + (const SvxFmtKeepItem&)rSet->Get( _nWhich ); if ( rKeep.GetValue() ) m_pKeepParaBox->SetState( TRISTATE_TRUE ); @@ -1718,12 +1718,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pKeepParaBox->Enable(false); _nWhich = GetWhich( SID_ATTR_PARA_SPLIT ); - eItemState = rSet.GetItemState( _nWhich ); + eItemState = rSet->GetItemState( _nWhich ); if ( eItemState >= SFX_ITEM_AVAILABLE ) { const SvxFmtSplitItem& rSplit = - (const SvxFmtSplitItem&)rSet.Get( _nWhich ); + (const SvxFmtSplitItem&)rSet->Get( _nWhich ); m_pKeepTogetherBox->EnableTriState( false ); if ( !rSplit.GetValue() ) @@ -1735,12 +1735,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) // widows and orphans m_pWidowBox->Enable(); _nWhich = GetWhich( SID_ATTR_PARA_WIDOWS ); - SfxItemState eTmpState = rSet.GetItemState( _nWhich ); + SfxItemState eTmpState = rSet->GetItemState( _nWhich ); if ( eTmpState >= SFX_ITEM_AVAILABLE ) { const SvxWidowsItem& rWidow = - (const SvxWidowsItem&)rSet.Get( _nWhich ); + (const SvxWidowsItem&)rSet->Get( _nWhich ); m_pWidowBox->EnableTriState( false ); const sal_uInt16 nLines = rWidow.GetValue(); @@ -1758,12 +1758,12 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) m_pOrphanBox->Enable(); _nWhich = GetWhich( SID_ATTR_PARA_ORPHANS ); - eTmpState = rSet.GetItemState( _nWhich ); + eTmpState = rSet->GetItemState( _nWhich ); if ( eTmpState >= SFX_ITEM_AVAILABLE ) { const SvxOrphansItem& rOrphan = - (const SvxOrphansItem&)rSet.Get( _nWhich ); + (const SvxOrphansItem&)rSet->Get( _nWhich ); const sal_uInt16 nLines = rOrphan.GetValue(); m_pOrphanBox->EnableTriState( false ); @@ -2199,13 +2199,13 @@ static void lcl_SetBox(const SfxItemSet& rSet, sal_uInt16 nSlotId, CheckBox& rBo rBox.SaveValue(); } -void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) +void SvxAsianTabPage::Reset( const SfxItemSet* rSet ) { - lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, *m_pForbiddenRulesCB ); - lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, *m_pHangingPunctCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_FORBIDDEN_RULES, *m_pForbiddenRulesCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_HANGPUNCTUATION, *m_pHangingPunctCB ); //character distance not yet available - lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); + lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); } IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 5e34fbf34467..3f93aecc0588 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -882,9 +882,9 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) return bModified; } -void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) +void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) { - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TRANSFORM_ANCHOR ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_ANCHOR ); bool bInvalidateAnchor = false; short nAnchorType = TextContentAnchorType_AT_PARAGRAPH; if(pItem) @@ -914,7 +914,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pToFrameRB->Enable( false ); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_PROTECT_POS ); if ( pItem ) { bool bProtected = ( ( const SfxBoolItem* )pItem )->GetValue(); @@ -929,7 +929,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pPositionCB->SaveValue(); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_PROTECT_SIZE ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_PROTECT_SIZE ); if ( pItem ) { @@ -941,7 +941,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pSizeCB->SetState( TRISTATE_INDET ); m_pSizeCB->SaveValue(); - pItem = GetItem( rSet, SID_HTML_MODE ); + pItem = GetItem( *rSet, SID_HTML_MODE ); if(pItem) { m_bHtmlMode = @@ -949,7 +949,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) != 0; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_IN_VERTICAL_TEXT ); if(pItem && static_cast<const SfxBoolItem*>(pItem)->GetValue()) { OUString sHLabel = m_pHoriFT->GetText(); @@ -957,11 +957,11 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pVertFT->SetText(sHLabel); m_bIsVerticalFrame = true; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_IN_RTL_TEXT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_IN_RTL_TEXT); if(pItem) m_bIsInRightToLeft = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - pItem = GetItem( rSet, SID_SW_FOLLOW_TEXT_FLOW); + pItem = GetItem( *rSet, SID_SW_FOLLOW_TEXT_FLOW); if(pItem) { const bool bFollowTextFlow = @@ -987,52 +987,52 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_pToCharRB->IsChecked() ); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_WIDTH ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_WIDTH ); sal_Int32 nWidth = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 ); m_pWidthMF->SetValue(m_pWidthMF->Normalize(nWidth), FUNIT_TWIP); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HEIGHT ); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HEIGHT ); sal_Int32 nHeight = std::max( pItem ? ( static_cast<const SfxUInt32Item*>(pItem)->GetValue()) : 0, (sal_uInt32)1 ); m_pHeightMF->SetValue(m_pHeightMF->Normalize(nHeight), FUNIT_TWIP); m_fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; if(!m_bPositioningDisabled) { - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_ORIENT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_ORIENT); if(pItem) { short nHoriOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue(); m_nOldH = nHoriOrientation; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_ORIENT); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_ORIENT); if(pItem) { short nVertOrientation = static_cast< const SfxInt16Item*>(pItem)->GetValue(); m_nOldV = nVertOrientation; } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_RELATION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_RELATION); if(pItem) { m_nOldHRel = static_cast< const SfxInt16Item*>(pItem)->GetValue(); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_RELATION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_RELATION); if(pItem) { m_nOldVRel = static_cast< const SfxInt16Item*>(pItem)->GetValue(); } - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_MIRROR); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_MIRROR); if(pItem) m_pHoriMirrorCB->Check(static_cast<const SfxBoolItem*>(pItem)->GetValue()); m_pHoriMirrorCB->SaveValue(); sal_Int32 nHoriPos = 0; sal_Int32 nVertPos = 0; - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_HORI_POSITION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_HORI_POSITION); if(pItem) nHoriPos = static_cast<const SfxInt32Item*>(pItem)->GetValue(); - pItem = GetItem( rSet, SID_ATTR_TRANSFORM_VERT_POSITION); + pItem = GetItem( *rSet, SID_ATTR_TRANSFORM_VERT_POSITION); if(pItem) nVertPos = static_cast<const SfxInt32Item*>(pItem)->GetValue(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index d904bca24e00..518e7203a737 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -268,13 +268,13 @@ SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, -void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) +void SvxTabulatorTabPage::Reset( const SfxItemSet* rSet ) { - SfxItemPool* pPool = rSet.GetPool(); + SfxItemPool* pPool = rSet->GetPool(); MapUnit eUnit = (MapUnit)pPool->GetMetric( GetWhich( SID_ATTR_TABSTOP ) ); // Current tabs - const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_TABSTOP ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_ATTR_TABSTOP ); if ( pItem ) { @@ -298,7 +298,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) // Defaul tab distance nDefDist = SVX_TAB_DEFDIST; - pItem = GetItem( rSet, SID_ATTR_TABSTOP_DEFAULTS ); + pItem = GetItem( *rSet, SID_ATTR_TABSTOP_DEFAULTS ); if ( pItem ) nDefDist = LogicToLogic( @@ -306,7 +306,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet ) // Tab pos currently selected sal_uInt16 nTabPos = 0; - pItem = GetItem( rSet, SID_ATTR_TABSTOP_POS ); + pItem = GetItem( *rSet, SID_ATTR_TABSTOP_POS ); if ( pItem ) nTabPos = ( (const SfxUInt16Item*)pItem )->GetValue(); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 63da943c8071..b3734cf696e7 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -139,12 +139,12 @@ SvxTextAnimationPage::~SvxTextAnimationPage() |* \************************************************************************/ -void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAnimationPage::Reset( const SfxItemSet* rAttrs ) { - const SfxItemPool* pPool = rAttrs.GetPool(); + const SfxItemPool* pPool = rAttrs->GetPool(); // animation type - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIKIND ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIKIND ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIKIND ); @@ -158,7 +158,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pLbEffect->SaveValue(); // animation direction - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDIRECTION ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDIRECTION ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDIRECTION ); if( pItem ) @@ -179,7 +179,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pBtnDown->SaveValue(); // Start inside - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTARTINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTARTINSIDE ); if( pItem ) @@ -196,7 +196,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pTsbStartInside->SaveValue(); // Stop inside - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANISTOPINSIDE ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANISTOPINSIDE ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANISTOPINSIDE ); if( pItem ) @@ -213,7 +213,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pTsbStopInside->SaveValue(); // quantity - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANICOUNT ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANICOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANICOUNT ); if( pItem ) @@ -246,7 +246,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pNumFldCount->SaveValue(); // delay - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDELAY ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIDELAY ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDELAY ); if( pItem ) @@ -271,7 +271,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldDelay->SaveValue(); // step size - pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIAMOUNT ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_ANIAMOUNT ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIAMOUNT ); if( pItem ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 4a80ba77d147..5fd1c77a0364 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -112,13 +112,13 @@ SvxTextAttrPage::~SvxTextAttrPage() |* \************************************************************************/ -void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) +void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) { - SfxItemPool* pPool = rAttrs.GetPool(); + SfxItemPool* pPool = rAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); - const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_LEFTDIST ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SDRATTR_TEXT_LEFTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LEFTDIST ); @@ -131,7 +131,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldLeft->SetText( "" ); m_pMtrFldLeft->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_RIGHTDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_RIGHTDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST ); if( pItem ) @@ -143,7 +143,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldRight->SetText( "" ); m_pMtrFldRight->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_UPPERDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_UPPERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST ); if( pItem ) @@ -155,7 +155,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldTop->SetText( "" ); m_pMtrFldTop->SaveValue(); - pItem = GetItem( rAttrs, SDRATTR_TEXT_LOWERDIST ); + pItem = GetItem( *rAttrs, SDRATTR_TEXT_LOWERDIST ); if( !pItem ) pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST ); if( pItem ) @@ -168,9 +168,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pMtrFldBottom->SaveValue(); // adjust to height - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). + m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowHeight->EnableTriState( false ); } @@ -179,9 +179,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowHeight->SaveValue(); // adjust to width - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowWidth->SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ). + m_pTsbAutoGrowWidth->SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWWIDTH ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowWidth->EnableTriState( false ); } @@ -190,9 +190,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowWidth->SaveValue(); // autogrowsize - if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWSIZE ) != SFX_ITEM_DONTCARE ) { - m_pTsbAutoGrowSize->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). + m_pTsbAutoGrowSize->SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs->Get( SDRATTR_TEXT_AUTOGROWHEIGHT ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbAutoGrowSize->EnableTriState( false ); } @@ -201,9 +201,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbAutoGrowSize->SaveValue(); // wordwrap text - if ( rAttrs.GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE ) { - m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& )rAttrs.Get( SDRATTR_TEXT_WORDWRAP ) ). + m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& )rAttrs->Get( SDRATTR_TEXT_WORDWRAP ) ). GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbWordWrapText->EnableTriState( false ); } @@ -214,14 +214,14 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) // #103516# Do the setup based on states of hor/ver adjust // Setup center field and FullWidth - SfxItemState eVState = rAttrs.GetItemState( SDRATTR_TEXT_VERTADJUST ); - SfxItemState eHState = rAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ); + SfxItemState eVState = rAttrs->GetItemState( SDRATTR_TEXT_VERTADJUST ); + SfxItemState eHState = rAttrs->GetItemState( SDRATTR_TEXT_HORZADJUST ); if(SFX_ITEM_DONTCARE != eVState && SFX_ITEM_DONTCARE != eHState) { // VertAdjust and HorAdjust are unequivocal, thus - SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)rAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); - SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs.Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); + SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)rAttrs->Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); + SdrTextHorzAdjust eTHA = (SdrTextHorzAdjust)((const SdrTextHorzAdjustItem&)rAttrs->Get(SDRATTR_TEXT_HORZADJUST)).GetValue(); RECT_POINT eRP = RP_LB; m_pTsbFullWidth->EnableTriState( false ); @@ -292,10 +292,10 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) } // adjust to border - if ( rAttrs.GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE ) { SdrFitToSizeType eFTS = (SdrFitToSizeType) - ( ( const SdrTextFitToSizeTypeItem& )rAttrs.Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue(); + ( ( const SdrTextFitToSizeTypeItem& )rAttrs->Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue(); m_pTsbFitToSize->SetState( eFTS == SDRTEXTFIT_NONE ? TRISTATE_FALSE : TRISTATE_TRUE ); m_pTsbFitToSize->EnableTriState( false ); } @@ -303,9 +303,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) m_pTsbFitToSize->SetState( TRISTATE_INDET ); m_pTsbFitToSize->SaveValue(); - if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE ) { - bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); + bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs->Get( SDRATTR_TEXT_CONTOURFRAME ) ).GetValue(); m_pTsbContour->SetState( bContour ? TRISTATE_TRUE : TRISTATE_FALSE ); m_pTsbContour->EnableTriState( false ); } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 0084f4c6e853..4bd39942b3d8 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -400,18 +400,18 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) return bModified; } -void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) +void SvxTransparenceTabPage::Reset(const SfxItemSet* rAttrs) { const SfxPoolItem* pGradientItem = NULL; - SfxItemState eStateGradient(rAttrs.GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); + SfxItemState eStateGradient(rAttrs->GetItemState(XATTR_FILLFLOATTRANSPARENCE, true, &pGradientItem)); if(!pGradientItem) - pGradientItem = &rAttrs.Get(XATTR_FILLFLOATTRANSPARENCE); + pGradientItem = &rAttrs->Get(XATTR_FILLFLOATTRANSPARENCE); bool bGradActive = (eStateGradient == SFX_ITEM_SET && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()); const SfxPoolItem* pLinearItem = NULL; - SfxItemState eStateLinear(rAttrs.GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); + SfxItemState eStateLinear(rAttrs->GetItemState(XATTR_FILLTRANSPARENCE, true, &pLinearItem)); if(!pLinearItem) - pLinearItem = &rAttrs.Get(XATTR_FILLTRANSPARENCE); + pLinearItem = &rAttrs->Get(XATTR_FILLTRANSPARENCE); bool bLinearActive = (eStateLinear == SFX_ITEM_SET && ((XFillTransparenceItem*)pLinearItem)->GetValue() != 0); // transparence gradient @@ -461,7 +461,7 @@ void SvxTransparenceTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrTrgrStartValue->SaveValue(); m_pMtrTrgrEndValue->SaveValue(); - bool bActive = InitPreview ( rAttrs ); + bool bActive = InitPreview ( *rAttrs ); InvalidatePreview ( bActive ); } @@ -1435,31 +1435,31 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) { bool isMissingHatching(false); bool isMissingGradient(false); bool isMissingBitmap(false); XFillStyle eXFS; - if( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) { - eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs. + eXFS = (XFillStyle) ( ( ( const XFillStyleItem& ) rAttrs-> Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() ); m_pTypeLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eXFS ) ); - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLCOLOR)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLCOLOR)) { XFillColorItem const& rColorItem(static_cast<const XFillColorItem&>( - rAttrs.Get(XATTR_FILLCOLOR)) ); + rAttrs->Get(XATTR_FILLCOLOR)) ); m_pLbColor->SelectEntry( rColorItem.GetColorValue() ); m_pLbHatchBckgrdColor->SelectEntry( rColorItem.GetColorValue() ); } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLGRADIENT)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLGRADIENT)) { XFillGradientItem const& rGradientItem( static_cast<const XFillGradientItem&>( - rAttrs.Get(XATTR_FILLGRADIENT)) ); + rAttrs->Get(XATTR_FILLGRADIENT)) ); OUString const aString( rGradientItem.GetName() ); XGradient const aGradient( rGradientItem.GetGradientValue() ); @@ -1471,27 +1471,27 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) isMissingGradient = true; } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLHATCH)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLHATCH)) { m_pLbHatching->SelectEntry( static_cast<const XFillHatchItem&>( - rAttrs.Get(XATTR_FILLHATCH)).GetName() ); + rAttrs->Get(XATTR_FILLHATCH)).GetName() ); } if (!m_pLbHatching->GetSelectEntryCount()) { // avoid relying on pool default - cannot export that m_pLbHatching->SelectEntryPos(0); // anything better than nothing isMissingHatching = true; } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBACKGROUND)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLBACKGROUND)) { m_pCbxHatchBckgrd->Check( static_cast<const XFillBackgroundItem&>( - rAttrs.Get(XATTR_FILLBACKGROUND)).GetValue() ); + rAttrs->Get(XATTR_FILLBACKGROUND)).GetValue() ); } - if (SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_FILLBITMAP)) + if (SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_FILLBITMAP)) { XFillBitmapItem const& rBitmapItem( static_cast<const XFillBitmapItem&>( - rAttrs.Get(XATTR_FILLBITMAP))); + rAttrs->Get(XATTR_FILLBITMAP))); m_pLbBitmap->SelectEntry(rBitmapItem.GetName()); } if (!m_pLbBitmap->GetSelectEntryCount()) @@ -1544,11 +1544,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) } // step size - if( ( rAttrs.GetItemState( XATTR_GRADIENTSTEPCOUNT ) != SFX_ITEM_DONTCARE ) || - ( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) ) + if( ( rAttrs->GetItemState( XATTR_GRADIENTSTEPCOUNT ) != SFX_ITEM_DONTCARE ) || + ( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) ) { m_pTsbStepCount->EnableTriState( false ); - sal_uInt16 nValue = ( ( const XGradientStepCountItem& ) rAttrs.Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue(); + sal_uInt16 nValue = ( ( const XGradientStepCountItem& ) rAttrs->Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue(); if( nValue == 0 ) { m_pTsbStepCount->SetState( TRISTATE_TRUE ); @@ -1569,11 +1569,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) // attributes for the bitmap filling - if( rAttrs.GetItemState( XATTR_FILLBMP_TILE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_TILE ) != SFX_ITEM_DONTCARE ) { m_pTsbTile->EnableTriState( false ); - if( ( ( const XFillBmpTileItem& ) rAttrs.Get( XATTR_FILLBMP_TILE ) ).GetValue() ) + if( ( ( const XFillBmpTileItem& ) rAttrs->Get( XATTR_FILLBMP_TILE ) ).GetValue() ) m_pTsbTile->SetState( TRISTATE_TRUE ); else m_pTsbTile->SetState( TRISTATE_FALSE ); @@ -1581,11 +1581,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) else m_pTsbTile->SetState( TRISTATE_INDET ); - if( rAttrs.GetItemState( XATTR_FILLBMP_STRETCH ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SFX_ITEM_DONTCARE ) { m_pTsbStretch->EnableTriState( false ); - if( ( ( const XFillBmpStretchItem& ) rAttrs.Get( XATTR_FILLBMP_STRETCH ) ).GetValue() ) + if( ( ( const XFillBmpStretchItem& ) rAttrs->Get( XATTR_FILLBMP_STRETCH ) ).GetValue() ) m_pTsbStretch->SetState( TRISTATE_TRUE ); else m_pTsbStretch->SetState( TRISTATE_FALSE ); @@ -1595,11 +1595,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aTsbScale - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZELOG ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZELOG ) != SFX_ITEM_DONTCARE ) { m_pTsbScale->EnableTriState( false ); - if( ( ( const XFillBmpSizeLogItem& ) rAttrs.Get( XATTR_FILLBMP_SIZELOG ) ).GetValue() ) + if( ( ( const XFillBmpSizeLogItem& ) rAttrs->Get( XATTR_FILLBMP_SIZELOG ) ).GetValue() ) m_pTsbScale->SetState( TRISTATE_FALSE ); else m_pTsbScale->SetState( TRISTATE_TRUE ); @@ -1614,9 +1614,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) TriState eOriginal = TRISTATE_FALSE; //aMtrFldXSize - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZEX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEX ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpSizeXItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEX ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpSizeXItem& ) rAttrs->Get( XATTR_FILLBMP_SIZEX ) ).GetValue(); if( m_pTsbScale->GetState() == TRISTATE_TRUE ) { // If there's a percentage value in the item, @@ -1642,9 +1642,9 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) } //aMtrFldYSize - if( rAttrs.GetItemState( XATTR_FILLBMP_SIZEY ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_SIZEY ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpSizeYItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEY ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpSizeYItem& ) rAttrs->Get( XATTR_FILLBMP_SIZEY ) ).GetValue(); if( m_pTsbScale->GetState() == TRISTATE_TRUE ) { // If there's a percentage value in the item, @@ -1676,17 +1676,17 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aRbtRow //aRbtColumn //aMtrFldOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETX ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nValue = ( ( const XFillBmpTileOffsetXItem& ) rAttrs.Get( XATTR_FILLBMP_TILEOFFSETX ) ).GetValue(); + sal_uInt16 nValue = ( ( const XFillBmpTileOffsetXItem& ) rAttrs->Get( XATTR_FILLBMP_TILEOFFSETX ) ).GetValue(); if( nValue > 0 ) { m_pMtrFldOffset->SetValue( nValue ); m_pRbtRow->Check(); } - else if( rAttrs.GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_FILLBMP_TILEOFFSETY ) != SFX_ITEM_DONTCARE ) { - nValue = ( ( const XFillBmpTileOffsetYItem& ) rAttrs.Get( XATTR_FILLBMP_TILEOFFSETY ) ).GetValue(); + nValue = ( ( const XFillBmpTileOffsetYItem& ) rAttrs->Get( XATTR_FILLBMP_TILEOFFSETY ) ).GetValue(); if( nValue > 0 ) { m_pMtrFldOffset->SetValue( nValue ); @@ -1701,27 +1701,27 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs ) //aCtlPosition - if( rAttrs.GetItemState( XATTR_FILLBMP_POS ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POS ) != SFX_ITEM_DONTCARE ) { - RECT_POINT eValue = ( ( const XFillBmpPosItem& ) rAttrs.Get( XATTR_FILLBMP_POS ) ).GetValue(); + RECT_POINT eValue = ( ( const XFillBmpPosItem& ) rAttrs->Get( XATTR_FILLBMP_POS ) ).GetValue(); m_pCtlPosition->SetActualRP( eValue ); } else m_pCtlPosition->Reset(); //aMtrFldXOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETX ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpPosOffsetXItem& ) rAttrs.Get( XATTR_FILLBMP_POSOFFSETX ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpPosOffsetXItem& ) rAttrs->Get( XATTR_FILLBMP_POSOFFSETX ) ).GetValue(); m_pMtrFldXOffset->SetValue( nValue ); } else m_pMtrFldXOffset->SetText( "" ); //aMtrFldYOffset - if( rAttrs.GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_FILLBMP_POSOFFSETY ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nValue = ( ( const XFillBmpPosOffsetYItem& ) rAttrs.Get( XATTR_FILLBMP_POSOFFSETY ) ).GetValue(); + sal_Int32 nValue = ( ( const XFillBmpPosOffsetYItem& ) rAttrs->Get( XATTR_FILLBMP_POSOFFSETY ) ).GetValue(); m_pMtrFldYOffset->SetValue( nValue ); } else diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3c488e0f47fb..9fa0db1a9175 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -254,7 +254,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs ) -void SvxBitmapTabPage::Reset( const SfxItemSet& ) +void SvxBitmapTabPage::Reset( const SfxItemSet* ) { // aLbBitmaps.SelectEntryPos( 0 ); @@ -801,7 +801,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) m_pLbBitmaps->Clear(); m_pLbBitmaps->Fill( pBitmapList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pBitmapList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index a81af85dca67..e6dcab28d8ce 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -257,7 +257,7 @@ void SvxColorTabPage::Update(bool bLoaded) m_pLbColor->Clear(); m_pValSetColorList->Clear(); Construct(); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); if( m_pLbColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) m_pLbColor->SelectEntryPos( 0 ); @@ -592,15 +592,15 @@ void SvxColorTabPage::UpdateModified() -void SvxColorTabPage::Reset( const SfxItemSet& rSet ) +void SvxColorTabPage::Reset( const SfxItemSet* rSet ) { - sal_uInt16 nState = rSet.GetItemState( XATTR_FILLCOLOR ); + sal_uInt16 nState = rSet->GetItemState( XATTR_FILLCOLOR ); Color aNewColor; if ( nState >= SFX_ITEM_DEFAULT ) { - XFillColorItem aColorItem( (const XFillColorItem&)rSet.Get( XATTR_FILLCOLOR ) ); + XFillColorItem aColorItem( (const XFillColorItem&)rSet->Get( XATTR_FILLCOLOR ) ); aNewColor = aColorItem.GetColorValue(); m_pLbColor->SelectEntry(aNewColor); m_pValSetColorList->SelectItem( m_pLbColor->GetSelectEntryPos() + 1 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index eba96ba2dae0..92caa87ad7b1 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -345,7 +345,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxGradientTabPage::Reset( const SfxItemSet& ) +void SvxGradientTabPage::Reset( const SfxItemSet* ) { // m_pLbGradients->SelectEntryPos( 0 ); ChangeGradientHdl_Impl( this ); @@ -656,7 +656,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) m_pLbGradients->Clear(); m_pLbGradients->Fill( pGradientList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pGradientList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 8524a6c4f4de..23fb66f2082e 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -314,7 +314,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) +void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) { ChangeHatchHdl_Impl( this ); @@ -332,8 +332,8 @@ void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) m_pBtnSave->Disable(); } - rXFSet.Put ( ( XFillColorItem& ) rSet.Get(XATTR_FILLCOLOR) ); - rXFSet.Put ( ( XFillBackgroundItem&)rSet.Get(XATTR_FILLBACKGROUND) ); + rXFSet.Put ( ( XFillColorItem& ) rSet->Get(XATTR_FILLCOLOR) ); + rXFSet.Put ( ( XFillBackgroundItem&)rSet->Get(XATTR_FILLBACKGROUND) ); m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() ); m_pCtlPreview->Invalidate(); } @@ -695,7 +695,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) m_pLbHatchings->Clear(); m_pLbHatchings->Fill( pHatchingList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pHatchingList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1ac752934993..08db5d41c402 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1086,7 +1086,7 @@ bool SvxLineTabPage::FillXLSet_Impl() -void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) { XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH @@ -1097,7 +1097,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) bool bEnable=true; bool bIgnoreGraphic=false; bool bIgnoreSize=false; - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),true,&pPoolItem) == SFX_ITEM_SET) { nSymType=((const SfxInt32Item *)pPoolItem)->GetValue(); } @@ -1179,7 +1179,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) delete pView; delete pModel; } - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH),true,&pPoolItem) == SFX_ITEM_SET) { const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic(); if( pGraphic ) @@ -1198,7 +1198,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } } - if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),true,&pPoolItem) == SFX_ITEM_SET) + if(rAttrs->GetItemState(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),true,&pPoolItem) == SFX_ITEM_SET) { aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize(); } @@ -1213,9 +1213,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) aSymbolLastSize=aSymbolSize; } - if( rAttrs.GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_DONTCARE ) { - eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs.Get( XATTR_LINESTYLE ) ).GetValue(); + eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs->Get( XATTR_LINESTYLE ) ).GetValue(); switch( eXLS ) { @@ -1228,7 +1228,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) case XLINE_DASH: m_pLbLineStyle->SetNoSelection(); - m_pLbLineStyle->SelectEntry( ( ( const XLineDashItem& ) rAttrs.Get( XATTR_LINEDASH ) ).GetName() ); + m_pLbLineStyle->SelectEntry( ( ( const XLineDashItem& ) rAttrs->Get( XATTR_LINEDASH ) ).GetName() ); break; default: @@ -1241,9 +1241,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line strength - if( rAttrs.GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINEWIDTH ) != SFX_ITEM_DONTCARE ) { - SetMetricValue( *m_pMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs.Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit ); + SetMetricValue( *m_pMtrLineWidth, ( ( const XLineWidthItem& ) rAttrs->Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrLineWidth->SetText( "" ); @@ -1251,9 +1251,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) // Line color m_pLbColor->SetNoSelection(); - if ( rAttrs.GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) + if ( rAttrs->GetItemState( XATTR_LINECOLOR ) != SFX_ITEM_DONTCARE ) { - Color aCol = ( ( const XLineColorItem& ) rAttrs.Get( XATTR_LINECOLOR ) ).GetColorValue(); + Color aCol = ( ( const XLineColorItem& ) rAttrs->Get( XATTR_LINECOLOR ) ).GetColorValue(); m_pLbColor->SelectEntry( aCol ); if( m_pLbColor->GetSelectEntryCount() == 0 ) { @@ -1263,15 +1263,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line start - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTART ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTART ) == SFX_ITEM_DEFAULT ) { m_pLbStartStyle->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string bool bSelected(false); - const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs.Get(XATTR_LINESTART)).GetLineStartValue(); + const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs->Get(XATTR_LINESTART)).GetLineStartValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) { @@ -1295,15 +1295,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line end - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEEND ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEEND ) == SFX_ITEM_DEFAULT ) { m_pLbEndStyle->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE ) { // #86265# select entry using list and polygon, not string bool bSelected(false); - const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs.Get(XATTR_LINEEND)).GetLineEndValue(); + const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs->Get(XATTR_LINEEND)).GetLineEndValue(); for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++) { @@ -1327,43 +1327,43 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Line start strength - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTARTWIDTH ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) == SFX_ITEM_DEFAULT ) { m_pMtrStartWidth->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTARTWIDTH ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTARTWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( *m_pMtrStartWidth, - ( ( const XLineStartWidthItem& ) rAttrs.Get( XATTR_LINESTARTWIDTH ) ).GetValue(), + ( ( const XLineStartWidthItem& ) rAttrs->Get( XATTR_LINESTARTWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrStartWidth->SetText( "" ); // Line end strength - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEENDWIDTH ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEENDWIDTH ) == SFX_ITEM_DEFAULT ) { m_pMtrEndWidth->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEENDWIDTH ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEENDWIDTH ) != SFX_ITEM_DONTCARE ) { SetMetricValue( *m_pMtrEndWidth, - ( ( const XLineEndWidthItem& ) rAttrs.Get( XATTR_LINEENDWIDTH ) ).GetValue(), + ( ( const XLineEndWidthItem& ) rAttrs->Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit ); } else m_pMtrEndWidth->SetText( "" ); // Centered line end (start) - if( bObjSelected && rAttrs.GetItemState( XATTR_LINESTARTCENTER ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINESTARTCENTER ) == SFX_ITEM_DEFAULT ) { m_pTsbCenterStart->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE ) { m_pTsbCenterStart->EnableTriState( false ); - if( ( ( const XLineStartCenterItem& ) rAttrs.Get( XATTR_LINESTARTCENTER ) ).GetValue() ) + if( ( ( const XLineStartCenterItem& ) rAttrs->Get( XATTR_LINESTARTCENTER ) ).GetValue() ) m_pTsbCenterStart->SetState( TRISTATE_TRUE ); else m_pTsbCenterStart->SetState( TRISTATE_FALSE ); @@ -1374,15 +1374,15 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Centered line end (end) - if( bObjSelected && rAttrs.GetItemState( XATTR_LINEENDCENTER ) == SFX_ITEM_DEFAULT ) + if( bObjSelected && rAttrs->GetItemState( XATTR_LINEENDCENTER ) == SFX_ITEM_DEFAULT ) { m_pTsbCenterEnd->Disable(); } - else if( rAttrs.GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE ) + else if( rAttrs->GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE ) { m_pTsbCenterEnd->EnableTriState( false ); - if( ( ( const XLineEndCenterItem& ) rAttrs.Get( XATTR_LINEENDCENTER ) ).GetValue() ) + if( ( ( const XLineEndCenterItem& ) rAttrs->Get( XATTR_LINEENDCENTER ) ).GetValue() ) m_pTsbCenterEnd->SetState( TRISTATE_TRUE ); else m_pTsbCenterEnd->SetState( TRISTATE_FALSE ); @@ -1393,9 +1393,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // Transparency - if( rAttrs.GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs.Get( XATTR_LINETRANSPARENCE ) ).GetValue(); + sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs->Get( XATTR_LINETRANSPARENCE ) ).GetValue(); m_pMtrTransparent->SetValue( nTransp ); ChangeTransparentHdl_Impl( NULL ); } @@ -1419,14 +1419,14 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) m_pCbxSynchronize->Check( aStr.toInt32() != 0 ); // #116827# - if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT)) + if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs->GetItemState(XATTR_LINEJOINT)) { // maFTEdgeStyle.Disable(); m_pLBEdgeStyle->Disable(); } - else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT)) + else if(SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_LINEJOINT)) { - const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue(); + const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs->Get(XATTR_LINEJOINT))).GetValue(); switch(eLineJoint) { @@ -1444,14 +1444,14 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs ) } // fdo#43209 - if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINECAP)) + if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs->GetItemState(XATTR_LINECAP)) { // maFTCapStyle.Disable(); m_pLBCapStyle->Disable(); } - else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINECAP)) + else if(SFX_ITEM_DONTCARE != rAttrs->GetItemState(XATTR_LINECAP)) { - const com::sun::star::drawing::LineCap eLineCap(((const XLineCapItem&)(rAttrs.Get(XATTR_LINECAP))).GetValue()); + const com::sun::star::drawing::LineCap eLineCap(((const XLineCapItem&)(rAttrs->Get(XATTR_LINECAP))).GetValue()); switch(eLineCap) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 2365b0cb2808..96ee9dcb3e44 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -275,11 +275,11 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) { - if( rAttrs.GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( GetWhich( XATTR_LINESTYLE ) ) != SFX_ITEM_DONTCARE ) { - XLineStyle eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs.Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue(); + XLineStyle eXLS = (XLineStyle) ( ( const XLineStyleItem& ) rAttrs->Get( GetWhich( XATTR_LINESTYLE ) ) ).GetValue(); switch( eXLS ) { @@ -290,7 +290,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs ) case XLINE_DASH: { - const XLineDashItem& rDashItem = ( const XLineDashItem& ) rAttrs.Get( XATTR_LINEDASH ); + const XLineDashItem& rDashItem = ( const XLineDashItem& ) rAttrs->Get( XATTR_LINEDASH ); aDash = rDashItem.GetDashValue(); m_pLbLineStyles->SetNoSelection(); @@ -759,7 +759,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) m_pLbLineStyles->Clear(); m_pLbLineStyles->Fill( pDashList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pDashList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 243f43ed73d5..e973209f8e24 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -225,7 +225,7 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) -void SvxLineEndDefTabPage::Reset( const SfxItemSet& ) +void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) { m_pLbLineEnds->SelectEntryPos( 0 ); @@ -578,7 +578,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) ( (SvxLineTabDialog*) GetParentDialog() )->SetNewLineEndList( pLineEndList ); m_pLbLineEnds->Clear(); m_pLbLineEnds->Fill( pLineEndList ); - Reset( rOutAttrs ); + Reset( &rOutAttrs ); pLineEndList->SetName( aURL.getName() ); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 68119d537025..a2ff8285b09f 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -353,7 +353,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs ) -void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) +void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) { if( !bDisable ) { @@ -361,11 +361,11 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) // at the moment there are only 8 possible positions where a shadow can be set // has a shadow been set? - if( rAttrs.GetItemState( SDRATTR_SHADOW ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOW ) != SFX_ITEM_DONTCARE ) { m_pTsbShowShadow->EnableTriState( false ); - if( ( ( const SdrShadowItem& ) rAttrs.Get( SDRATTR_SHADOW ) ).GetValue() ) + if( ( ( const SdrShadowItem& ) rAttrs->Get( SDRATTR_SHADOW ) ).GetValue() ) m_pTsbShowShadow->SetState( TRISTATE_TRUE ); else { @@ -378,11 +378,11 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) // distance (only 8 possible positions), // so there is only one item evaluated - if( rAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE && - rAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE && + rAttrs->GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE ) { - sal_Int32 nX = ( ( const SdrShadowXDistItem& ) rAttrs.Get( SDRATTR_SHADOWXDIST ) ).GetValue(); - sal_Int32 nY = ( ( const SdrShadowYDistItem& ) rAttrs.Get( SDRATTR_SHADOWYDIST ) ).GetValue(); + sal_Int32 nX = ( ( const SdrShadowXDistItem& ) rAttrs->Get( SDRATTR_SHADOWXDIST ) ).GetValue(); + sal_Int32 nY = ( ( const SdrShadowYDistItem& ) rAttrs->Get( SDRATTR_SHADOWYDIST ) ).GetValue(); if( nX != 0 ) SetMetricValue( *m_pMtrDistance, nX < 0L ? -nX : nX, ePoolUnit ); @@ -424,16 +424,16 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs ) m_pCtlPosition->SetActualRP( RP_MM ); } - if( rAttrs.GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE ) { - m_pLbShadowColor->SelectEntry( ( ( const SdrShadowColorItem& ) rAttrs.Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() ); + m_pLbShadowColor->SelectEntry( ( ( const SdrShadowColorItem& ) rAttrs->Get( SDRATTR_SHADOWCOLOR ) ).GetColorValue() ); } else m_pLbShadowColor->SetNoSelection(); - if( rAttrs.GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SFX_ITEM_DONTCARE ) { - sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem& ) rAttrs.Get( SDRATTR_SHADOWTRANSPARENCE ) ).GetValue(); + sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem& ) rAttrs->Get( SDRATTR_SHADOWTRANSPARENCE ) ).GetValue(); m_pMtrTransparent->SetValue( nTransp ); } else diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 6f680cccc34a..c11f012dcd83 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -291,11 +291,11 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet) -void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) +void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) { const double fUIScale(double(pView->GetModel()->GetUIScale())); - const SfxPoolItem* pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ROT_X ); + const SfxPoolItem* pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_ROT_X ); if(pItem) { const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getX()) / fUIScale); @@ -306,7 +306,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrPosX->SetText( OUString() ); } - pItem = GetItem(rAttrs, SID_ATTR_TRANSFORM_ROT_Y); + pItem = GetItem(*rAttrs, SID_ATTR_TRANSFORM_ROT_Y); if(pItem) { const double fTmp(((double)((const SfxInt32Item*)pItem)->GetValue() - maAnchor.getY()) / fUIScale); @@ -317,7 +317,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs) m_pMtrPosY->SetText( OUString() ); } - pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ANGLE ); + pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_ANGLE ); if(pItem) { m_pCtlAngle->SetRotation(((const SfxInt32Item*)pItem)->GetValue()); @@ -511,7 +511,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs) -void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) +void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) { // if the view has selected objects, items with SFX_ITEM_DEFAULT need to be disabled const SfxPoolItem* pItem; @@ -524,7 +524,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) } else { - pItem = GetItem( rAttrs, SDRATTR_ECKENRADIUS ); + pItem = GetItem( *rAttrs, SDRATTR_ECKENRADIUS ); if( pItem ) { @@ -548,7 +548,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs) } else { - pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_SHEAR ); + pItem = GetItem( *rAttrs, SID_ATTR_TRANSFORM_SHEAR ); if( pItem ) { @@ -897,7 +897,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) -void SvxPositionSizeTabPage::Reset( const SfxItemSet& ) +void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) { const SfxPoolItem* pItem; const double fUIScale(double(mpView->GetModel()->GetUIScale())); |