summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-10 17:23:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-10 17:25:23 +0200
commit4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch)
treea71acd0d466e02c18bf78ffdcfea748135805d21 /cui/source
parent2f8fd888b42dc41662b54a16d62575c2b15e844a (diff)
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer references" (apparently in cases where the passed argument was actually unused) Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/cfg.cxx2
-rw-r--r--cui/source/customize/eventdlg.cxx2
-rw-r--r--cui/source/customize/eventdlg.hxx2
-rw-r--r--cui/source/customize/macropg.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx2
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/hltpbase.cxx4
-rw-r--r--cui/source/dialogs/iconcdlg.cxx4
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/inc/align.hxx2
-rw-r--r--cui/source/inc/autocdlg.hxx14
-rw-r--r--cui/source/inc/backgrnd.hxx2
-rw-r--r--cui/source/inc/border.hxx2
-rw-r--r--cui/source/inc/cfg.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx8
-rw-r--r--cui/source/inc/connect.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx4
-rw-r--r--cui/source/inc/cuioptgenrl.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx14
-rw-r--r--cui/source/inc/cuitabline.hxx6
-rw-r--r--cui/source/inc/dbregister.hxx2
-rw-r--r--cui/source/inc/dstribut.hxx2
-rw-r--r--cui/source/inc/grfpage.hxx2
-rw-r--r--cui/source/inc/hltpbase.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx2
-rw-r--r--cui/source/inc/macroass.hxx2
-rw-r--r--cui/source/inc/macropg.hxx2
-rw-r--r--cui/source/inc/measure.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx2
-rw-r--r--cui/source/inc/numpages.hxx12
-rw-r--r--cui/source/inc/optasian.hxx2
-rw-r--r--cui/source/inc/optlingu.hxx2
-rw-r--r--cui/source/inc/optpath.hxx2
-rw-r--r--cui/source/inc/page.hxx2
-rw-r--r--cui/source/inc/paragrph.hxx8
-rw-r--r--cui/source/inc/swpossizetabpage.hxx2
-rw-r--r--cui/source/inc/tabstpge.hxx2
-rw-r--r--cui/source/inc/textanim.hxx2
-rw-r--r--cui/source/inc/textattr.hxx2
-rw-r--r--cui/source/inc/transfrm.hxx6
-rw-r--r--cui/source/options/connpooloptions.cxx6
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/fontsubs.hxx2
-rw-r--r--cui/source/options/optaccessibility.cxx2
-rw-r--r--cui/source/options/optaccessibility.hxx2
-rw-r--r--cui/source/options/optasian.cxx2
-rw-r--r--cui/source/options/optbasic.cxx2
-rw-r--r--cui/source/options/optbasic.hxx2
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx2
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optctl.cxx2
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--cui/source/options/optfltr.cxx4
-rw-r--r--cui/source/options/optfltr.hxx4
-rw-r--r--cui/source/options/optgdlg.cxx20
-rw-r--r--cui/source/options/optgdlg.hxx6
-rw-r--r--cui/source/options/optgenrl.cxx4
-rw-r--r--cui/source/options/opthtml.cxx2
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optinet2.cxx10
-rw-r--r--cui/source/options/optinet2.hxx8
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjsearch.cxx2
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optlingu.cxx8
-rw-r--r--cui/source/options/optmemory.cxx6
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/optsave.cxx18
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/options/personalization.hxx2
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--cui/source/tabpages/align.cxx12
-rw-r--r--cui/source/tabpages/autocdlg.cxx14
-rw-r--r--cui/source/tabpages/backgrnd.cxx50
-rw-r--r--cui/source/tabpages/border.cxx20
-rw-r--r--cui/source/tabpages/chardlg.cxx118
-rw-r--r--cui/source/tabpages/connect.cxx18
-rw-r--r--cui/source/tabpages/dstribut.cxx2
-rw-r--r--cui/source/tabpages/grfpage.cxx20
-rw-r--r--cui/source/tabpages/labdlg.cxx20
-rw-r--r--cui/source/tabpages/macroass.cxx4
-rw-r--r--cui/source/tabpages/measure.cxx34
-rw-r--r--cui/source/tabpages/numfmt.cxx14
-rw-r--r--cui/source/tabpages/numpages.cxx52
-rw-r--r--cui/source/tabpages/page.cxx44
-rw-r--r--cui/source/tabpages/paragrph.cxx94
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx40
-rw-r--r--cui/source/tabpages/tabstpge.cxx16
-rw-r--r--cui/source/tabpages/textanim.cxx16
-rw-r--r--cui/source/tabpages/textattr.cxx32
-rw-r--r--cui/source/tabpages/tparea.cxx124
-rw-r--r--cui/source/tabpages/tpbitmap.cxx10
-rw-r--r--cui/source/tabpages/tpcolor.cxx8
-rw-r--r--cui/source/tabpages/tpgradnt.cxx8
-rw-r--r--cui/source/tabpages/tphatch.cxx8
-rw-r--r--cui/source/tabpages/tpline.cxx76
-rw-r--r--cui/source/tabpages/tplnedef.cxx8
-rw-r--r--cui/source/tabpages/tplneend.cxx8
-rw-r--r--cui/source/tabpages/tpshadow.cxx26
-rw-r--r--cui/source/tabpages/transfrm.cxx54
111 files changed, 627 insertions, 627 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index ea56730811bf..50519d6666b7 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1425,7 +1425,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
}
-bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
+bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* )
{
Apply(m_xAct);
try
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 36029954293f..10bc1347ee31 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1823,7 +1823,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X
return sModuleID;
}
-bool SvxConfigPage::FillItemSet( SfxItemSet& )
+bool SvxConfigPage::FillItemSet( SfxItemSet* )
{
bool result = false;
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 9f2a5cf09e88..8d2111fd5018 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -206,7 +206,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
return sal_True;
}
-bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet )
+bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet )
{
return _SvxMacroTabPage::FillItemSet( rSet );
}
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index dd14a12c30c3..b883ab200f06 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -53,7 +53,7 @@ public:
void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame );
protected:
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
private:
void ImplInitDocument();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 881f5a5e5c83..5f4117b83fbb 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -314,7 +314,7 @@ void _SvxMacroTabPage::InitResources()
// the following method is called when the user clicks OK
// We use the contents of the hashes to replace the settings
-bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
{
try
{
@@ -888,7 +888,7 @@ AssignComponentDialog::~AssignComponentDialog()
IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
{
(void)pButton; //unused
- GetTabPage()->FillItemSet( *(SfxItemSet*)0 );
+ GetTabPage()->FillItemSet( 0 );
EndDialog( RET_OK );
return 0;
}
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index f5f3924d8970..517020ce7610 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -679,7 +679,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
-bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
+bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
{
pData->aEditedTitle = m_pEdtMSName->GetText();
return true;
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 8d33cc6ce6d5..45ec57a2c13f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
if ( pCurrentPage->AskApply() )
{
- pCurrentPage->FillItemSet( aItemSet );
+ pCurrentPage->FillItemSet( &aItemSet );
SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
aItemSet.GetItem (SID_HYPERLINK_SETLINK);
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f31c0568db27..3423efdd5b87 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -483,7 +483,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
}
// Fill output-ItemSet
-bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
+bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet* rOut)
{
OUString aStrURL, aStrName, aStrIntName, aStrFrame;
SvxLinkInsertMode eMode;
@@ -497,7 +497,7 @@ bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame,
aStrIntName, eMode, nEvents, pTable );
- rOut.Put (aItem);
+ rOut->Put (aItem);
return true;
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index c0d4124b06f1..8fd3ac036509 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -1120,13 +1120,13 @@ short IconChoiceDialog::Ok()
{
SfxItemSet& rSet = (SfxItemSet&)pPage->GetItemSet();
rSet.ClearItem();
- _bModified |= pPage->FillItemSet( rSet );
+ _bModified |= pPage->FillItemSet( &rSet );
}
else if ( pSet && !pPage->HasExchangeSupport() )
{
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
- if ( pPage->FillItemSet( aTmp ) )
+ if ( pPage->FillItemSet( &aTmp ) )
{
_bModified |= true;
pExampleSet->Put( aTmp );
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 825f79bc7052..db5b54cb43c6 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -173,7 +173,7 @@ public:
SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
virtual ~SfxAcceleratorConfigPage();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index c9f61c6665a4..76412fb48911 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -62,7 +62,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 644a8c7e84b5..652328b5d2b5 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -113,7 +113,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
@@ -265,7 +265,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -324,7 +324,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -390,7 +390,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
@@ -440,7 +440,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -506,7 +506,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 709e4ea3ebd6..1fbdb817a0df 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -49,7 +49,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index a8eb384753ff..47ecbb1a5607 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -47,7 +47,7 @@ public:
const SfxItemSet& rAttrSet);
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
void HideShadowControls();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index d72f5db88b69..3da574f89e3d 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -436,7 +436,7 @@ public:
bool MoveEntryData( SvTreeListEntry* pSourceEntry,
SvTreeListEntry* pTargetEntry );
- bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
void Reset( const SfxItemSet& ) SAL_OVERRIDE;
virtual bool DeleteSelectedContent() = 0;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 69b46c8fcdfd..8bc60fb4b589 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -156,7 +156,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
void SetFontList( const SvxFontListItem& rItem );
void EnableRelativeMode();
@@ -235,7 +235,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
void DisableControls( sal_uInt16 nDisable );
void EnableFlash();
@@ -314,7 +314,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
/// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
@@ -357,7 +357,7 @@ public:
static const sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
/// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index b5763e941a9f..c807f21a4ebe 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -66,7 +66,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 3458d5d361eb..af652510faa7 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -214,7 +214,7 @@ private:
ExchangeData* pData;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE {}
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
public:
@@ -263,7 +263,7 @@ class TPGalleryThemeProperties : public SfxTabPage
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
virtual void Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {}
- virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) SAL_OVERRIDE { return true; }
+ virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; }
OUString addExtension( const OUString&, const OUString& );
void FillFilterList();
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 09f90c8df7b2..9149dd2d5253 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -69,7 +69,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 4358fc457a21..e8e5fb63a830 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -165,7 +165,7 @@ public:
static SfxTabPage* Create(Window*, const SfxItemSet&);
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
@@ -295,7 +295,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -360,7 +360,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -438,7 +438,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -514,7 +514,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -600,7 +600,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -735,7 +735,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 7384ec32b137..ed3f09c406b8 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -210,7 +210,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -306,7 +306,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -376,7 +376,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 3e42795c8052..4c5d0ee0546b 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -95,7 +95,7 @@ namespace svx
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index e2d6b076e2c3..ebc34ee1ba33 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -47,7 +47,7 @@ public:
static SfxTabPage* Create(Window*, const SfxItemSet&,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
- virtual bool FillItemSet(SfxItemSet&) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index d5301414641e..f4290052766f 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -113,7 +113,7 @@ class SvxGrfCropPage : public SfxTabPage
public:
static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
- virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index dad7e1fb1fc1..cba59a52f887 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -141,7 +141,7 @@ public:
virtual void SetInitFocus();
virtual void SetMarkStr ( const OUString& aStrMark );
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index bc59ec3bb369..7728d740d6a1 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -96,7 +96,7 @@ public :
const SfxItemSet& GetItemSet() const { return *pSet; }
- virtual bool FillItemSet( SfxItemSet& ) = 0;
+ virtual bool FillItemSet( SfxItemSet* ) = 0;
virtual void Reset( const SfxItemSet& ) = 0;
bool HasExchangeSupport() const { return bHasExchangeSupport; }
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 9970c1471f91..633f19a76d35 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -78,7 +78,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
void SetView( const SdrView* pSdrView )
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a7a8cf94f8f5..c5355f2a9f58 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -70,7 +70,7 @@ public:
void LaunchFillGroup();
// --------- inherit from the base -------------
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
bool IsReadOnly() const SAL_OVERRIDE;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 24ee56458dea..cc59a5c2443c 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -84,7 +84,7 @@ public:
void InitResources();
void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index e8fb79426b74..89039461bf6b 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -70,7 +70,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index bb7bbe82e605..8520f603e851 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -74,7 +74,7 @@ public:
const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 5e115fde8a63..d0fe9418a8b4 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -115,7 +115,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
@@ -151,7 +151,7 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
@@ -194,7 +194,7 @@ class SvxNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
@@ -239,7 +239,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
@@ -351,7 +351,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
@@ -451,7 +451,7 @@ public:
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
static SfxTabPage* Create( Window* pParent,
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 1efd15c0b38d..458965ad18b6 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -59,7 +59,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 57ac9f3319bf..20846c516ce1 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -151,7 +151,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void HideGroups( sal_uInt16 nGrp );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 0df98284d99e..d87961f34b9b 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -75,7 +75,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 56b7bef96783..37c54ccc57dc 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -180,7 +180,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 81dc3919eb5d..fa15f7dc0e29 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -102,7 +102,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -163,7 +163,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void EnableJustifyExt();
@@ -195,7 +195,7 @@ public:
const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void DisablePageBreak();
@@ -275,7 +275,7 @@ public:
const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 48907f16c8d4..03b81ffb9145 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -128,7 +128,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 2f8a384039fb..6cf3a1dad283 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -53,7 +53,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
void DisableControls( const sal_uInt16 nFlag );
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 0e986a1cb4c4..7a71b1576f12 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -79,7 +79,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
void Construct();
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 24c360595956..fe8eddd5cd63 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -80,7 +80,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 72a4e3dec2c9..2f44a1552f04 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -150,7 +150,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -205,7 +205,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -249,7 +249,7 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
static const sal_uInt16* GetRanges();
- virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index fcb0ca90288b..613c8a4e750a 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -367,7 +367,7 @@ namespace offapp
}
- bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+ bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet* _rSet)
{
commitTimeoutField();
@@ -375,14 +375,14 @@ namespace offapp
// the enabled flag
if (m_pEnablePooling->IsValueChangedFromSaved())
{
- _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
+ _rSet->Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
bModified = true;
}
// the settings for the single drivers
if (m_pDriverList->isModified())
{
- _rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
+ _rSet->Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
bModified = true;
}
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index cd80ccfc578c..064999cbb121 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -56,7 +56,7 @@ namespace offapp
protected:
virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
- virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 7af151db533d..151d65457314 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -182,7 +182,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
-bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
{
// the settings for the single drivers
bool bModified = false;
@@ -201,7 +201,7 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
}
if ( m_nOldCount != aRegistrations.size() || m_bModified )
{
- rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
+ rCoreSet->Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
bModified = true;
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index efe9f7163483..be2dd1c79481 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -150,7 +150,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
return new SvxFontSubstTabPage(pParent, rAttrSet);
}
-bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
{
pConfig->ClearSubstitutions();// remove all entries
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 415f59c83317..bad9084f829f 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index d8f062de37ee..4b260d36fae1 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt
return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
}
-bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
{
//aConfig.Set... from controls
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 97bd44e21dd4..cd65854ed230 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -46,7 +46,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index d79a954dceea..44d8cbb8dd65 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
return new SvxAsianLayoutPage(pParent, rAttrSet);
}
-bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
{
if(m_pCharKerningRB->IsValueChangedFromSaved())
{
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 27a983c6621b..317d52666cb5 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -66,7 +66,7 @@ void SvxBasicIDEOptionsPage::LoadConfig()
pUseExtendedTypesChk->Check( bExtended );
}
-bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index ac46d81d1132..d065ea6ac006 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
virtual ~SvxBasicIDEOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 673a08f013af..74b9b605c55a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -108,10 +108,10 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r
return new SvxDefaultColorOptPage( pParent, rAttrs );
}
-bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( pColorConfig )
- rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
+ rOutAttrs->Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
return true;
}
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 5590d5ae1a95..7a1bd24337d8 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -59,7 +59,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 77108e8d26a9..9abfde7728a4 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1079,7 +1079,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
}
-bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
{
bFillItemSetCalled = true;
if(m_pColorSchemeLB->IsValueChangedFromSaved())
@@ -1131,7 +1131,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return( LEAVE_PAGE );
}
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index b3033bade873..d3553785a686 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,7 +52,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 3d51979d507d..e5501136c20a 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
return new SvxCTLOptionsPage( pParent, rAttrSet );
}
-bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvtCTLOptions aCTLOptions;
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 326718bee03f..e2396e2e3366 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -48,7 +48,7 @@ public:
virtual ~SvxCTLOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index bf877b692bac..8c5e47160ff4 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
return new OfaMSFilterTabPage( pParent, rAttrSet );
}
-bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
@@ -169,7 +169,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 30b58f011a94..da22fe558f83 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -46,7 +46,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -95,7 +95,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7b6f9478fa7a..6bb145a60b57 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -106,7 +106,7 @@ using namespace ::utl;
int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
@@ -243,7 +243,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
-bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -283,12 +283,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
}
const SfxUInt16Item* pUInt16Item =
- PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
+ PTR_CAST( SfxUInt16Item, GetOldItem( *rSet, SID_ATTR_YEAR2000 ) );
sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32();
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
bModified = true;
- rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
+ rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
return bModified;
@@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
return new OfaViewTabPage(pParent, rAttrSet);
}
-bool OfaViewTabPage::FillItemSet( SfxItemSet& )
+bool OfaViewTabPage::FillItemSet( SfxItemSet* )
{
SvtFontOptions aFontOpt;
SvtMenuOptions aMenuOpt;
@@ -1177,7 +1177,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
}
}
-bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
{
// lock configuration broadcasters so that we can coordinate the notifications
pLangConfig->aSysLocaleOptions.BlockBroadcasts( true );
@@ -1270,7 +1270,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// this will happen after releasing the lock on the ConfigurationBroadcaster at
// the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
- rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
+ rSet->Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale );
bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0;
@@ -1324,7 +1324,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
SID_ATTR_LANGUAGE));
}
}
@@ -1344,7 +1344,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
SID_ATTR_CHAR_CJK_LANGUAGE));
}
}
@@ -1364,7 +1364,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
SID_ATTR_CHAR_CTL_LANGUAGE));
}
}
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 61b22282cddd..28a7a581f252 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -125,7 +125,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -169,7 +169,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 1cff7c16567d..af517dcdbf17 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -304,7 +304,7 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS
-bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
+bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
{
// remove leading and trailing whitespaces
for (unsigned i = 0; i != vFields.size(); ++i)
@@ -435,7 +435,7 @@ void SvxGeneralTabPage::SetAddress_Impl()
int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index c6c724cab33b..a7a4e3388fec 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -94,7 +94,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
return new OfaHtmlTabPage(pParent, rAttrSet);
}
-bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
+bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
{
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
if(aSize1NF->IsValueChangedFromSaved())
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 1bab77f331ed..a91a4ed507be 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -59,7 +59,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 893848327919..ad94515a8cd9 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -391,7 +391,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
}
-bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
+bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
{
bool bModified = false;
@@ -865,7 +865,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -888,7 +888,7 @@ namespace
}
}
-bool SvxSecurityTabPage::FillItemSet( SfxItemSet& )
+bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
@@ -929,7 +929,7 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent,
return new MozPluginTabPage( pParent, rAttrSet );
}
-bool MozPluginTabPage::FillItemSet( SfxItemSet& )
+bool MozPluginTabPage::FillItemSet( SfxItemSet* )
{
bool hasInstall = isInstalled();
bool hasChecked = m_pWBasicCodeCB->IsChecked();
@@ -1232,7 +1232,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
/* -------------------------------------------------------------------------*/
-bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
+bool SvxEMailTabPage::FillItemSet( SfxItemSet* )
{
bool bMailModified = false;
if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved())
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index c76a8eb97a92..105bce864705 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -105,7 +105,7 @@ private:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -175,7 +175,7 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -195,7 +195,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -220,7 +220,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index b54f710b906d..39ec6a3b1f85 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -642,7 +642,7 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr
-bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index a6b4d52c5923..421c1e49067e 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -109,7 +109,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 8fbf05f7c67b..b3951b850691 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -211,7 +211,7 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
}
-bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* )
{
sal_Int32 nOldVal = nTransliterationFlags;
nTransliterationFlags = GetTransliterationFlags_Impl();
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 4c20a5c178a5..9173c24ca156 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -67,7 +67,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
bool IsSaveOptions() const { return bSaveOptions; }
void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6168506a864d..3481b7553fd4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1156,7 +1156,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
-bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
bool bModified = true; // !!!!
@@ -1301,17 +1301,17 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
SfxHyphenRegionItem aHyp( GetWhich( SID_ATTR_HYPHENREGION ) );
aHyp.GetMinLead() = (sal_uInt8) aPreBreakData.GetNumericValue();
aHyp.GetMinTrail() = (sal_uInt8) aPostBreakData.GetNumericValue();
- rCoreSet.Put( aHyp );
+ rCoreSet->Put( aHyp );
}
}
// automatic spell checking
bool bNewAutoCheck = m_pLinguOptionsCLB->IsChecked( (sal_uLong) EID_SPELL_AUTO );
- const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK );
+ const SfxPoolItem* pOld = GetOldItem( *rCoreSet, SID_AUTOSPELL_CHECK );
if ( !pOld || ( (SfxBoolItem*)pOld )->GetValue() != bNewAutoCheck )
{
- rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
+ rCoreSet->Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
bNewAutoCheck ) );
bModified |= true;
}
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 72bda7a569f7..1e1a97daa8b0 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -105,7 +105,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes
int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -155,7 +155,7 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt
-bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -198,7 +198,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
if( m_pQuickLaunchCB->IsValueChangedFromSaved())
{
- rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
+ rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
bModified = true;
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 0e5fb8b1e147..b1564fbaa5f6 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -61,7 +61,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 1b065062d555..5b44550ba650 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -264,7 +264,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent,
-bool SvxPathTabPage::FillItemSet( SfxItemSet& )
+bool SvxPathTabPage::FillItemSet( SfxItemSet* )
{
for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
{
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 59b95b50a8df..42e744fe62fb 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -238,7 +238,7 @@ void SfxSaveTabPage::DetectHiddenControls()
}
-bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
+bool SfxSaveTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
SvtSaveOptions aSaveOpt;
@@ -258,55 +258,55 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
if ( aDocInfoCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
aDocInfoCB->IsChecked() ) );
bModified |= true;
}
if ( aBackupCB->IsEnabled() && aBackupCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
aBackupCB->IsChecked() ) );
bModified |= true;
}
if ( aAutoSaveCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
aAutoSaveCB->IsChecked() ) );
bModified |= true;
}
if ( aWarnAlienFormatCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
aWarnAlienFormatCB->IsChecked() ) );
bModified |= true;
}
if ( aAutoSaveEdit->IsValueChangedFromSaved() )
{
- rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
+ rSet->Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit->GetValue() ) );
bModified |= true;
}
if ( aUserAutoSaveCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
aUserAutoSaveCB->IsChecked() ) );
bModified |= true;
}
// save relatively
if ( aRelativeFsysCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
aRelativeFsysCB->IsChecked() ) );
bModified |= true;
}
if ( aRelativeInetCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
aRelativeInetCB->IsChecked() ) );
bModified |= true;
}
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 810c1af3e3b6..189240ca7ad0 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -76,7 +76,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 127131057620..2ac7d83986bd 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -157,7 +157,7 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
-bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
+bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index c0d61f72b1e4..525fbcad56f5 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -56,7 +56,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 21cb2b4dde41..57cffe7e2d29 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -108,7 +108,7 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet
return new SvxPersonalizationTabPage( pParent, rSet );
}
-bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
+bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
{
// persona
OUString aPersona( "default" );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 40661f83e98a..b41beca5155a 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -32,7 +32,7 @@ public:
static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
/// Apply the settings ([OK] button).
- virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
/// Reset to default settings ([Revert] button).
virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 69f68513a910..95bd35308fc8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -696,7 +696,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
{
OptionsGroupInfo* pGroupInfo =
(OptionsGroupInfo*)aTreeLB.GetParent(pEntry)->GetUserData();
- pPageInfo->m_pPage->FillItemSet(*pGroupInfo->m_pOutItemSet);
+ pPageInfo->m_pPage->FillItemSet(pGroupInfo->m_pOutItemSet);
}
if ( pPageInfo->m_pExtPage )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 3a8b84611309..c7063342ff0a 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -265,7 +265,7 @@ const sal_uInt16* AlignmentTabPage::GetRanges()
return s_pRanges;
}
-bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet )
+bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bChanged = SfxTabPage::FillItemSet(rSet);
@@ -273,14 +273,14 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet )
// method to 'distribute' to distinguish from the normal justification.
sal_uInt16 nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD);
- lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED);
+ lcl_SetJustifyMethodToItemSet(*rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED);
if (!bChanged)
- bChanged = HasAlignmentChanged(rSet, nWhichHorJM);
+ bChanged = HasAlignmentChanged(*rSet, nWhichHorJM);
sal_uInt16 nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD);
- lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED);
+ lcl_SetJustifyMethodToItemSet(*rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED);
if (!bChanged)
- bChanged = HasAlignmentChanged(rSet, nWhichVerJM);
+ bChanged = HasAlignmentChanged(*rSet, nWhichVerJM);
return bChanged;
}
@@ -308,7 +308,7 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1ac62ea42cc0..4b4c816303fd 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -197,7 +197,7 @@ SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent,
return new OfaAutocorrOptionsPage(pParent, rSet);
}
-bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& )
+bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
long nFlags = pAutoCorrect->GetFlags();
@@ -481,7 +481,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent,
return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet);
}
-bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& )
+bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
@@ -921,7 +921,7 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* )
return LEAVE_PAGE;
}
-bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
+bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
@@ -1422,7 +1422,7 @@ int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* )
return LEAVE_PAGE;
}
-bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
+bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
for(StringsTable::reverse_iterator it1 = aStringsTable.rbegin(); it1 != aStringsTable.rend(); ++it1)
@@ -1827,7 +1827,7 @@ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent,
return new OfaQuoteTabPage(pParent, rAttrSet);
}
-bool OfaQuoteTabPage::FillItemSet( SfxItemSet& )
+bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
@@ -2152,7 +2152,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent,
return new OfaAutoCompleteTabPage( pParent, rSet );
}
-bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& )
+bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false, bCheck;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
@@ -2523,7 +2523,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
/** Propagates the current settings to the smart tag manager.
*/
-bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& )
+bool OfaSmartTagOptionsTabPage::FillItemSet( 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 374f79dc19b2..58a60f2c4334 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -717,7 +717,7 @@ void SvxBackgroundTabPage::FillUserData()
-bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() )
{
@@ -729,8 +729,8 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
- if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
- return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC );
+ if(SFX_ITEM_AVAILABLE <= rCoreSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
+ return FillItemSetWithWallpaperItem( *rCoreSet, SID_VIEW_FLD_PIC );
bool bModified = false;
sal_uInt16 nSlot = SID_ATTR_BRUSH;
@@ -764,8 +764,8 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
}
sal_uInt16 nWhich = GetWhich( nSlot );
- const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot );
- SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false);
+ const SfxPoolItem* pOld = GetOldItem( *rCoreSet, nSlot );
+ SfxItemState eOldItemState = rCoreSet->GetItemState(nSlot, false);
const SfxItemSet& rOldSet = GetItemSet();
bool bGraphTransparencyChanged = bGraphTransparency && m_pGraphTransMF->IsValueChangedFromSaved();
@@ -793,10 +793,10 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
(SFX_ITEM_AVAILABLE >= eOldItemState && !m_pBackgroundColorSet->IsNoSelection()))
{
bModified = true;
- rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
+ rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- rCoreSet.ClearItem( nWhich );
+ rCoreSet->ClearItem( nWhich );
}
else
{
@@ -835,17 +835,17 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
nWhich );
lcl_SetTransparency(aTmpBrush, static_cast<long>(m_pGraphTransMF->GetValue()));
- rCoreSet.Put(aTmpBrush);
+ rCoreSet->Put(aTmpBrush);
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- rCoreSet.ClearItem( nWhich );
+ rCoreSet->ClearItem( nWhich );
}
}
else // Brush <-> Bitmap changed!
{
if ( bIsBrush )
{
- rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
+ rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
}
else
{
@@ -870,7 +870,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if(pTmpBrush)
{
lcl_SetTransparency(*pTmpBrush, static_cast<long>(m_pGraphTransMF->GetValue()));
- rCoreSet.Put(*pTmpBrush);
+ rCoreSet->Put(*pTmpBrush);
delete pTmpBrush;
}
}
@@ -879,7 +879,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
}
else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) )
{
- rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
+ rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
bModified = true;
}
@@ -889,11 +889,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( nSlot != SID_ATTR_BRUSH && pTableBck_Impl->pCellBrush)
{
const SfxPoolItem* pOldCell =
- GetOldItem( rCoreSet, SID_ATTR_BRUSH );
+ GetOldItem( *rCoreSet, SID_ATTR_BRUSH );
if ( *pTableBck_Impl->pCellBrush != *pOldCell )
{
- rCoreSet.Put( *pTableBck_Impl->pCellBrush );
+ rCoreSet->Put( *pTableBck_Impl->pCellBrush );
bModified |= true;
}
}
@@ -901,11 +901,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( nSlot != SID_ATTR_BRUSH_ROW && pTableBck_Impl->pRowBrush)
{
const SfxPoolItem* pOldRow =
- GetOldItem( rCoreSet, SID_ATTR_BRUSH_ROW );
+ GetOldItem( *rCoreSet, SID_ATTR_BRUSH_ROW );
if ( *pTableBck_Impl->pRowBrush != *pOldRow )
{
- rCoreSet.Put( *pTableBck_Impl->pRowBrush );
+ rCoreSet->Put( *pTableBck_Impl->pRowBrush );
bModified |= true;
}
}
@@ -913,18 +913,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( nSlot != SID_ATTR_BRUSH_TABLE && pTableBck_Impl->pTableBrush)
{
const SfxPoolItem* pOldTable =
- GetOldItem( rCoreSet, SID_ATTR_BRUSH_TABLE );
+ GetOldItem( *rCoreSet, SID_ATTR_BRUSH_TABLE );
if ( *pTableBck_Impl->pTableBrush != *pOldTable )
{
- rCoreSet.Put( *pTableBck_Impl->pTableBrush );
+ rCoreSet->Put( *pTableBck_Impl->pTableBrush );
bModified |= true;
}
}
if( m_pTblLBox->IsValueChangedFromSaved() )
{
- rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
+ rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
m_pTblLBox->GetSelectEntryPos() ) );
bModified |= true;
}
@@ -935,11 +935,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( nSlot != SID_ATTR_BRUSH && m_pParaLBox->IsVisible()) // not in search format dialog
{
const SfxPoolItem* pOldPara =
- GetOldItem( rCoreSet, SID_ATTR_BRUSH );
+ GetOldItem( *rCoreSet, SID_ATTR_BRUSH );
if ( *pParaBck_Impl->pParaBrush != *pOldPara )
{
- rCoreSet.Put( *pParaBck_Impl->pParaBrush );
+ rCoreSet->Put( *pParaBck_Impl->pParaBrush );
bModified |= true;
}
}
@@ -947,7 +947,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( nSlot != SID_ATTR_BRUSH_CHAR )
{
const SfxPoolItem* pOldChar =
- GetOldItem( rCoreSet, SID_ATTR_BRUSH_CHAR );
+ GetOldItem( *rCoreSet, SID_ATTR_BRUSH_CHAR );
DBG_ASSERT(pParaBck_Impl, "pParaBck_Impl == NULL ?");
if ( pOldChar &&
//#111173# crash report shows that pParaBck_Impl can be NULL, the cause is unknown
@@ -955,14 +955,14 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
(*pParaBck_Impl->pCharBrush != *pOldChar ||
*pParaBck_Impl->pCharBrush != SvxBrushItem(SID_ATTR_BRUSH_CHAR)))
{
- rCoreSet.Put( *pParaBck_Impl->pCharBrush );
+ rCoreSet->Put( *pParaBck_Impl->pCharBrush );
bModified |= true;
}
}
if( m_pParaLBox->IsValueChangedFromSaved() )
{
- rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
+ rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION,
m_pParaLBox->GetSelectEntryPos() ) );
bModified |= true;
}
@@ -1062,7 +1062,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
return KEEP_PAGE;
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 476b7b3e5b40..184b72093ff4 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -586,24 +586,24 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
-bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
+bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
{
bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs );
bool bPut = true;
sal_uInt16 nBoxWhich = GetWhich( SID_ATTR_BORDER_OUTER );
- sal_uInt16 nBoxInfoWhich = rCoreAttrs.GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false );
+ sal_uInt16 nBoxInfoWhich = rCoreAttrs->GetPool()->GetWhich( SID_ATTR_BORDER_INNER, false );
const SfxItemSet& rOldSet = GetItemSet();
SvxBoxItem aBoxItem ( nBoxWhich );
SvxBoxInfoItem aBoxInfoItem ( nBoxInfoWhich );
- SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( rCoreAttrs, SID_ATTR_BORDER_OUTER );
+ SvxBoxItem* pOldBoxItem = (SvxBoxItem*)GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_OUTER );
SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich );
@@ -657,7 +657,7 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
|| m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_RIGHT ) != svx::FRAMESTATE_HIDE )
{
SvxBoxInfoItem* pOldBoxInfoItem = (SvxBoxInfoItem*)GetOldItem(
- rCoreAttrs, SID_ATTR_BORDER_INNER );
+ *rCoreAttrs, SID_ATTR_BORDER_INNER );
if (
!pOldBoxItem ||
m_pLeftMF->IsValueChangedFromSaved() ||
@@ -724,21 +724,21 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
{
if ( !pOldBoxItem || !( *pOldBoxItem == aBoxItem ) )
{
- rCoreAttrs.Put( aBoxItem );
+ rCoreAttrs->Put( aBoxItem );
bAttrsChanged |= true;
}
- const SfxPoolItem* pOld = GetOldItem( rCoreAttrs, SID_ATTR_BORDER_INNER, false );
+ const SfxPoolItem* pOld = GetOldItem( *rCoreAttrs, SID_ATTR_BORDER_INNER, false );
if ( !pOld || !( *(const SvxBoxInfoItem*)pOld == aBoxInfoItem ) )
{
- rCoreAttrs.Put( aBoxInfoItem );
+ rCoreAttrs->Put( aBoxInfoItem );
bAttrsChanged |= true;
}
}
else
{
- rCoreAttrs.ClearItem( nBoxWhich );
- rCoreAttrs.ClearItem( nBoxInfoWhich );
+ rCoreAttrs->ClearItem( nBoxWhich );
+ rCoreAttrs->ClearItem( nBoxInfoWhich );
}
return bAttrsChanged;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 85e6d765ed73..fc53366be96a 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1171,7 +1171,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -1203,11 +1203,11 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet )
-bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet )
+bool SvxCharNamePage::FillItemSet( SfxItemSet* rSet )
{
- bool bModified = FillItemSet_Impl( rSet, Western );
- bModified |= FillItemSet_Impl( rSet, Asian );
- bModified |= FillItemSet_Impl( rSet, Ctl );
+ bool bModified = FillItemSet_Impl( *rSet, Western );
+ bModified |= FillItemSet_Impl( *rSet, Asian );
+ bModified |= FillItemSet_Impl( *rSet, Ctl );
return bModified;
}
@@ -1718,7 +1718,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox )
int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -2185,7 +2185,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
-bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
+bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet )
{
const SfxPoolItem* pOld = 0;
const SfxItemSet& rOldSet = GetItemSet();
@@ -2194,7 +2194,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
// Underline
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_UNDERLINE );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_UNDERLINE );
sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos();
FontUnderline eUnder = (FontUnderline)(sal_uLong)m_pUnderlineLB->GetEntryData( nPos );
@@ -2218,17 +2218,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
{
SvxUnderlineItem aNewItem( eUnder, nWhich );
aNewItem.SetColor( m_pUnderlineColorLB->GetSelectEntryColor() );
- rSet.Put( aNewItem );
+ rSet->Put( aNewItem );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Overline
nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_OVERLINE );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_OVERLINE );
nPos = m_pOverlineLB->GetSelectEntryPos();
FontUnderline eOver = (FontUnderline)(sal_uLong)m_pOverlineLB->GetEntryData( nPos );
@@ -2252,17 +2252,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
{
SvxOverlineItem aNewItem( eOver, nWhich );
aNewItem.SetColor( m_pOverlineColorLB->GetSelectEntryColor() );
- rSet.Put( aNewItem );
+ rSet->Put( aNewItem );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Strikeout
nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_STRIKEOUT );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_STRIKEOUT );
nPos = m_pStrikeoutLB->GetSelectEntryPos();
FontStrikeout eStrike = (FontStrikeout)(sal_uLong)m_pStrikeoutLB->GetEntryData( nPos );
@@ -2283,17 +2283,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
- rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) );
+ rSet->Put( SvxCrossedOutItem( eStrike, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Individual words
nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_WORDLINEMODE );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_WORDLINEMODE );
if ( pOld )
{
@@ -2308,17 +2308,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
- rSet.Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) );
+ rSet->Put( SvxWordLineModeItem( m_pIndividualWordsBtn->IsChecked(), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Emphasis
nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_EMPHASISMARK );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_EMPHASISMARK );
sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectEntryPos();
sal_Int32 nPosPos = m_pPositionLB->GetSelectEntryPos();
FontEmphasisMark eMark = (FontEmphasisMark)nMarkPos;
@@ -2344,17 +2344,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
- rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) );
+ rSet->Put( SvxEmphasisMarkItem( eMark, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Effects
nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_CASEMAP );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP );
SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED;
bool bChecked = false;
sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos();
@@ -2380,11 +2380,11 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && bChecked )
{
- rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) );
+ rSet->Put( SvxCaseMapItem( eCaseMap, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
@@ -2394,13 +2394,13 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
{
m_pReliefLB->SaveValue();
SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectEntryPos(), nWhich);
- rSet.Put(aRelief);
+ rSet->Put(aRelief);
}
// Outline
const SfxItemSet* pExampleSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
nWhich = GetWhich( SID_ATTR_CHAR_CONTOUR );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_CONTOUR );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CONTOUR );
TriState eState = m_pOutlineBtn->GetState();
const SfxPoolItem* pItem;
@@ -2417,17 +2417,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && eState != TRISTATE_INDET )
{
- rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) );
+ rSet->Put( SvxContourItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Shadow
nWhich = GetWhich( SID_ATTR_CHAR_SHADOWED );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_SHADOWED );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_SHADOWED );
eState = m_pShadowBtn->GetState();
if ( pOld )
@@ -2443,17 +2443,17 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && eState != TRISTATE_INDET )
{
- rSet.Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) );
+ rSet->Put( SvxShadowedItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Blinking
nWhich = GetWhich( SID_ATTR_FLASH );
- pOld = GetOldItem( rSet, SID_ATTR_FLASH );
+ pOld = GetOldItem( *rSet, SID_ATTR_FLASH );
eState = m_pBlinkingBtn->GetState();
if ( pOld )
@@ -2469,15 +2469,15 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && eState != TRISTATE_INDET )
{
- rSet.Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) );
+ rSet->Put( SvxBlinkItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
// Hidden
nWhich = GetWhich( SID_ATTR_CHAR_HIDDEN );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_HIDDEN );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_HIDDEN );
eState = m_pHiddenBtn->GetState();
bChanged = true;
@@ -2494,13 +2494,13 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && eState != TRISTATE_INDET )
{
- rSet.Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) );
+ rSet->Put( SvxCharHiddenItem( StateToAttr( eState ), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
- bModified |= FillItemSetColor_Impl( rSet );
+ bModified |= FillItemSetColor_Impl( *rSet );
return bModified;
}
@@ -2892,7 +2892,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet )
int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -3163,13 +3163,13 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
-bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
+bool SvxCharPositionPage::FillItemSet( SfxItemSet* rSet )
{
// Position (high, normal or low)
const SfxItemSet& rOldSet = GetItemSet();
bool bModified = false, bChanged = true;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT );
- const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_ESCAPEMENT );
+ const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_ESCAPEMENT );
const bool bHigh = m_pHighPosBtn->IsChecked();
short nEsc;
sal_uInt8 nEscProp;
@@ -3205,20 +3205,20 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged &&
( m_pHighPosBtn->IsChecked() || m_pNormalPosBtn->IsChecked() || m_pLowPosBtn->IsChecked() ) )
{
- rSet.Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) );
+ rSet->Put( SvxEscapementItem( nEsc, nEscProp, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
// Kerning
nWhich = GetWhich( SID_ATTR_CHAR_KERNING );
- pOld = GetOldItem( rSet, SID_ATTR_CHAR_KERNING );
+ pOld = GetOldItem( *rSet, SID_ATTR_CHAR_KERNING );
sal_Int32 nPos = m_pKerningLB->GetSelectEntryPos();
short nKerning = 0;
- SfxMapUnit eUnit = rSet.GetPool()->GetMetric( nWhich );
+ SfxMapUnit eUnit = rSet->GetPool()->GetMetric( nWhich );
if ( nPos == LW_EXPANDED || nPos == LW_CONDENSED )
{
@@ -3244,11 +3244,11 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND )
{
- rSet.Put( SvxKerningItem( nKerning, nWhich ) );
+ rSet->Put( SvxKerningItem( nKerning, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
bChanged = true;
@@ -3257,21 +3257,21 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( m_pPairKerningBtn->IsValueChangedFromSaved() )
{
- rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) );
+ rSet->Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
// Scale Width
nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
if ( m_pScaleWidthMF->IsValueChangedFromSaved() )
{
- rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
+ rSet->Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
// Rotation
nWhich = GetWhich( SID_ATTR_CHAR_ROTATED );
@@ -3285,11 +3285,11 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
aItem.SetBottomToTop();
else if (m_p270degRB->IsChecked())
aItem.SetTopToBotton();
- rSet.Put( aItem );
+ rSet->Put( aItem );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
return bModified;
}
@@ -3465,7 +3465,7 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet )
int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -3509,12 +3509,12 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet )
-bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
+bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet )
{
const SfxItemSet& rOldSet = GetItemSet();
bool bModified = false, bChanged = true;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
- const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES );
+ const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES );
bool bOn = m_pTwoLinesBtn->IsChecked();
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
? m_pStartBracketLB->GetSelectEntry()[0] : 0;
@@ -3531,11 +3531,11 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
- rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) );
+ rSet->Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) );
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) )
- CLEARTITEM;
+ rSet->InvalidateItem(nWhich);
return bModified;
}
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index dbc40966f05e..fcbb583ad32c 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -307,7 +307,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs )
|*
\************************************************************************/
-bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
+bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs)
{
bool bModified = false;
sal_Int32 nValue;
@@ -315,49 +315,49 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
if( m_pMtrFldHorz1->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHorz1, eUnit );
- rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) );
+ rAttrs->Put( SdrEdgeNode1HorzDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHorz2->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHorz2, eUnit );
- rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) );
+ rAttrs->Put( SdrEdgeNode2HorzDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldVert1->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldVert1, eUnit );
- rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) );
+ rAttrs->Put( SdrEdgeNode1VertDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldVert2->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldVert2, eUnit );
- rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) );
+ rAttrs->Put( SdrEdgeNode2VertDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldLine1->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLine1, eUnit );
- rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) );
+ rAttrs->Put( SdrEdgeLine1DeltaItem( nValue ) );
bModified = true;
}
if( m_pMtrFldLine2->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLine2, eUnit );
- rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) );
+ rAttrs->Put( SdrEdgeLine2DeltaItem( nValue ) );
bModified = true;
}
if( m_pMtrFldLine3->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLine3, eUnit );
- rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) );
+ rAttrs->Put( SdrEdgeLine3DeltaItem( nValue ) );
bModified = true;
}
@@ -367,7 +367,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
{
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- rAttrs.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) );
+ rAttrs->Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) );
bModified = true;
}
}
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 4f177947b3f9..530da67ed7c8 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -130,7 +130,7 @@ void SvxDistributePage::Reset(const SfxItemSet& )
|*
\************************************************************************/
-bool SvxDistributePage::FillItemSet( SfxItemSet& )
+bool SvxDistributePage::FillItemSet( SfxItemSet* )
{
SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone);
SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone);
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index ad4804528ae6..898315fdbb6f 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -236,15 +236,15 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
bReset = false;
}
-bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
+bool SvxGrfCropPage::FillItemSet(SfxItemSet *rSet)
{
- const SfxItemPool& rPool = *rSet.GetPool();
+ const SfxItemPool& rPool = *rSet->GetPool();
bool bModified = false;
if( m_pWidthMF->IsValueChangedFromSaved() ||
m_pHeightMF->IsValueChangedFromSaved() )
{
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE );
- FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
+ FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW ));
SvxSizeItem aSz( nW );
@@ -267,11 +267,11 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
m_pWidthMF->SaveValue();
m_pHeightMF->SaveValue();
- bModified |= 0 != rSet.Put( aSz );
+ bModified |= 0 != rSet->Put( aSz );
if( bSetOrigSize )
{
- bModified |= 0 != rSet.Put( SvxSizeItem( rPool.GetWhich(
+ bModified |= 0 != rSet->Put( SvxSizeItem( rPool.GetWhich(
SID_ATTR_GRAF_FRMSIZE_PERCENT ), Size( 0, 0 )) );
}
}
@@ -279,20 +279,20 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
m_pTopMF->IsModified() || m_pBottomMF->IsModified() )
{
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_CROP );
- FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
- SvxGrfCrop* pNew = (SvxGrfCrop*)rSet.Get( nW ).Clone();
+ FieldUnit eUnit = MapToFieldUnit( rSet->GetPool()->GetMetric( nW ));
+ SvxGrfCrop* pNew = (SvxGrfCrop*)rSet->Get( nW ).Clone();
pNew->SetLeft( lcl_GetValue( *m_pLeftMF, eUnit ) );
pNew->SetRight( lcl_GetValue( *m_pRightMF, eUnit ) );
pNew->SetTop( lcl_GetValue( *m_pTopMF, eUnit ) );
pNew->SetBottom( lcl_GetValue( *m_pBottomMF, eUnit ) );
- bModified |= 0 != rSet.Put( *pNew );
+ bModified |= 0 != rSet->Put( *pNew );
delete pNew;
}
if( m_pZoomConstRB->IsValueChangedFromSaved() )
{
- bModified |= 0 != rSet.Put( SfxBoolItem( rPool.GetWhich(
+ bModified |= 0 != rSet->Put( SfxBoolItem( rPool.GetWhich(
SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) );
}
@@ -385,7 +385,7 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return sal_True;
}
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index bba01e446fa0..024fdc70f5b5 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -147,21 +147,21 @@ void SvxCaptionTabPage::Construct()
-bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
+bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs)
{
- SfxItemPool* pPool = _rOutAttrs.GetPool();
+ SfxItemPool* pPool = _rOutAttrs->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
SfxMapUnit eUnit;
nCaptionType = m_pCT_CAPTTYPE->GetSelectItemId()-1;
- _rOutAttrs.Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) );
+ _rOutAttrs->Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) );
if( m_pMF_ABSTAND->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONGAP ) );
- _rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) );
+ _rOutAttrs->Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) );
}
// special treatment!!! XXX
@@ -174,10 +174,10 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
}
}
- _rOutAttrs.Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) );
+ _rOutAttrs->Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) );
bEscRel = m_pLB_ANSATZ_REL->IsVisible();
- _rOutAttrs.Put( SdrCaptionEscIsRelItem( bEscRel ) );
+ _rOutAttrs->Put( SdrCaptionEscIsRelItem( bEscRel ) );
if( bEscRel )
{
@@ -189,26 +189,26 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
case AT_MITTE: nVal=5000;break;
case AT_UNTEN: nVal=10000;break;
}
- _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) );
+ _rOutAttrs->Put( SdrCaptionEscRelItem( nVal ) );
}
else
{
if( m_pMF_ANSATZ->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONESCABS ) );
- _rOutAttrs.Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) );
+ _rOutAttrs->Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) );
}
}
bFitLineLen = m_pCB_LAENGE->IsChecked();
- _rOutAttrs.Put( SdrCaptionFitLineLenItem( bFitLineLen ) );
+ _rOutAttrs->Put( SdrCaptionFitLineLenItem( bFitLineLen ) );
if( ! bFitLineLen )
{
if( m_pMF_LAENGE->IsValueModified() )
{
eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONLINELEN ) );
- _rOutAttrs.Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) );
+ _rOutAttrs->Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) );
}
}
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index cc180d67f4ba..3178ee8be057 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -172,7 +172,7 @@ void _SfxMacroTabPage::ScriptChanged()
EnableButtons();
}
-bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
+bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet )
{
SvxMacroItem aItem( GetWhich( aPageRg[0] ) );
((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl;
@@ -181,7 +181,7 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet )
if( SFX_ITEM_SET != GetItemSet().GetItemState( aItem.Which(), true, &pItem )
|| aItem != *(SvxMacroItem*)pItem )
{
- rSet.Put( aItem );
+ rSet->Put( aItem );
return true;
}
return false;
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 61b2baac7a26..1d6884608d54 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -419,7 +419,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs )
|*
\************************************************************************/
-bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
+bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs)
{
bool bModified = false;
sal_Int32 nValue;
@@ -428,49 +428,49 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
if( m_pMtrFldLineDist->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLineDist, eUnit );
- rAttrs.Put( SdrMeasureLineDistItem( nValue ) );
+ rAttrs->Put( SdrMeasureLineDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelplineOverhang->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelplineOverhang, eUnit );
- rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) );
+ rAttrs->Put( SdrMeasureHelplineOverhangItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelplineDist->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelplineDist, eUnit );
- rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) );
+ rAttrs->Put( SdrMeasureHelplineDistItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelpline1Len->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelpline1Len, eUnit );
- rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) );
+ rAttrs->Put( SdrMeasureHelpline1LenItem( nValue ) );
bModified = true;
}
if( m_pMtrFldHelpline2Len->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldHelpline2Len, eUnit );
- rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) );
+ rAttrs->Put( SdrMeasureHelpline2LenItem( nValue ) );
bModified = true;
}
eState = m_pTsbBelowRefEdge->GetState();
if( m_pTsbBelowRefEdge->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) );
bModified = true;
}
if( m_pMtrFldDecimalPlaces->IsValueChangedFromSaved() )
{
nValue = static_cast<sal_Int32>(m_pMtrFldDecimalPlaces->GetValue());
- rAttrs.Put(
+ rAttrs->Put(
SdrMeasureDecimalPlacesItem(
sal::static_int_cast< sal_Int16 >( nValue ) ) );
bModified = true;
@@ -479,14 +479,14 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
eState = m_pTsbParallel->GetState();
if( m_pTsbParallel->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) );
+ rAttrs->Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) );
bModified = true;
}
eState = m_pTsbShowUnit->GetState();
if( m_pTsbShowUnit->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -497,7 +497,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
{
sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbUnit->GetEntryData( nPos );
FieldUnit _eUnit = (FieldUnit) nFieldUnit;
- rAttrs.Put( SdrMeasureUnitItem( _eUnit ) );
+ rAttrs->Put( SdrMeasureUnitItem( _eUnit ) );
bModified = true;
}
}
@@ -537,35 +537,35 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE )
eVPos = SDRMEASURE_TEXTVAUTO;
- if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE )
+ if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SFX_ITEM_DONTCARE )
{
eOldVPos = (SdrMeasureTextVPos)
( ( const SdrMeasureTextVPosItem& )rOutAttrs.Get( SDRATTR_MEASURETEXTVPOS ) ).GetValue();
if( eOldVPos != eVPos )
{
- rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) );
+ rAttrs->Put( SdrMeasureTextVPosItem( eVPos ) );
bModified = true;
}
}
else
{
- rAttrs.Put( SdrMeasureTextVPosItem( eVPos ) );
+ rAttrs->Put( SdrMeasureTextVPosItem( eVPos ) );
bModified = true;
}
- if ( rAttrs.GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE )
+ if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTHPOS ) != SFX_ITEM_DONTCARE )
{
eOldHPos = (SdrMeasureTextHPos)
( ( const SdrMeasureTextHPosItem& )rOutAttrs.Get( SDRATTR_MEASURETEXTHPOS ) ).GetValue();
if( eOldHPos != eHPos )
{
- rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) );
+ rAttrs->Put( SdrMeasureTextHPosItem( eHPos ) );
bModified = true;
}
}
else
{
- rAttrs.Put( SdrMeasureTextHPosItem( eHPos ) );
+ rAttrs->Put( SdrMeasureTextHPosItem( eHPos ) );
bModified = true;
}
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ddc08da2482e..3c706b0d5cd7 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -686,7 +686,7 @@ void SvxNumberFormatTabPage::HideLanguage(bool nFlag)
#*
#************************************************************************/
-bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
+bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
{
bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled();
if ( bDataChanged )
@@ -722,11 +722,11 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
if (bDataChanged)
{
- rCoreAttrs.Put( SfxUInt32Item( nWhich, nCurKey ) );
+ rCoreAttrs->Put( SfxUInt32Item( nWhich, nCurKey ) );
}
else if(SFX_ITEM_DEFAULT == eItemState)
{
- rCoreAttrs.ClearItem( nWhich );
+ rCoreAttrs->ClearItem( nWhich );
}
}
@@ -744,7 +744,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
if(bNumItemFlag)
{
- rCoreAttrs.Put( *pNumItem );
+ rCoreAttrs->Put( *pNumItem );
}
else
{
@@ -768,7 +768,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
const SfxBoolItem* pBoolItem = (const SfxBoolItem*)
GetItem( rMyItemSet, SID_ATTR_NUMBERFORMAT_SOURCE );
bool bOld = pBoolItem && pBoolItem->GetValue();
- rCoreAttrs.Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) );
+ rCoreAttrs->Put( SfxBoolItem( _nWhich, m_pCbSourceFormat->IsChecked() ) );
if ( !bDataChanged )
bDataChanged = (bOld != m_pCbSourceFormat->IsChecked() ||
_eItemState != SFX_ITEM_SET);
@@ -779,7 +779,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
pNumFmtShell->ValidateNewEntries();
if(m_pLbLanguage->IsVisible() &&
LISTBOX_ENTRY_NOTFOUND != m_pLbLanguage->GetEntryPos(sAutomaticEntry))
- rCoreAttrs.Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO,
+ rCoreAttrs->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO,
m_pLbLanguage->GetSelectEntry() == sAutomaticEntry));
}
@@ -790,7 +790,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index c57db72b6468..c42888c48a88 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -229,13 +229,13 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent,
return new SvxSingleNumPickTabPage(pParent, rAttrSet);
}
-bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
{
if( (bPreset || bModified) && pSaveNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
}
return bModified;
@@ -279,7 +279,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
return sal_True;
}
@@ -390,13 +390,13 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent,
return new SvxBulletPickTabPage(pParent, rAttrSet);
}
-bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet )
{
if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
}
return bModified;
}
@@ -438,7 +438,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
return sal_True;
}
@@ -587,13 +587,13 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent,
return new SvxNumPickTabPage(pParent, rAttrSet);
}
-bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet )
{
if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
}
return bModified;
}
@@ -635,7 +635,7 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
return sal_True;
}
@@ -866,11 +866,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
return sal_True;
}
-bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet )
{
if ( aGrfNames.empty() )
{
@@ -879,8 +879,8 @@ bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
if( (bPreset || bModified) && pActNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, bPreset));
}
return bModified;
@@ -1191,18 +1191,18 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
{
if(_pSet)
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
return sal_True;
}
-bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet )
{
- rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
+ rSet->Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
if(bModified && pActNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false));
}
return bModified;
};
@@ -2953,20 +2953,20 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
if(m_pDistBorderMF->IsEnabled())
DistanceHdl_Impl(m_pDistBorderMF);
DistanceHdl_Impl(m_pIndentMF);
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
}
return sal_True;
}
-bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet )
{
- rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
+ rSet->Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl));
if(bModified && pActNum)
{
*pSaveNum = *pActNum;
- rSet.Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
- rSet.Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false));
+ rSet->Put(SvxNumBulletItem( *pSaveNum ), nNumItemId);
+ rSet->Put(SfxBoolItem(SID_PARAM_NUM_PRESET, false));
}
return bModified;
}
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 1051d02b78f2..1ee2803d319e 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -659,7 +659,7 @@ void SvxPageDescPage::FillUserData()
-bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
+bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
const SfxItemSet& rOldSet = GetItemSet();
@@ -691,10 +691,10 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
// set left and right margins
if ( bModified )
{
- pOld = GetOldItem( rSet, SID_ATTR_LRSPACE );
+ pOld = GetOldItem( *rSet, SID_ATTR_LRSPACE );
if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) )
- rSet.Put( aMargin );
+ rSet->Put( aMargin );
else
bModified = false;
}
@@ -717,12 +717,12 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
if ( bMod )
{
- pOld = GetOldItem( rSet, SID_ATTR_ULSPACE );
+ pOld = GetOldItem( *rSet, SID_ATTR_ULSPACE );
if ( !pOld || !( *(const SvxULSpaceItem*)pOld == aTopMargin ) )
{
bModified = true;
- rSet.Put( aTopMargin );
+ rSet->Put( aTopMargin );
}
}
@@ -730,11 +730,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN );
sal_Int32 nPos = m_pPaperTrayBox->GetSelectEntryPos();
sal_uInt16 nBin = (sal_uInt16)(sal_uLong)m_pPaperTrayBox->GetEntryData( nPos );
- pOld = GetOldItem( rSet, SID_ATTR_PAGE_PAPERBIN );
+ pOld = GetOldItem( *rSet, SID_ATTR_PAGE_PAPERBIN );
if ( !pOld || ( (const SvxPaperBinItem*)pOld )->GetValue() != nBin )
{
- rSet.Put( SvxPaperBinItem( nWhich, (sal_uInt8)nBin ) );
+ rSet->Put( SvxPaperBinItem( nWhich, (sal_uInt8)nBin ) );
bModified = true;
}
@@ -752,11 +752,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
{
Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ),
GetCoreValue( *m_pPaperHeightEdit, eUnit ) );
- pOld = GetOldItem( rSet, SID_ATTR_PAGE_SIZE );
+ pOld = GetOldItem( *rSet, SID_ATTR_PAGE_SIZE );
if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize )
{
- rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) );
+ rSet->Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) );
bModified = true;
}
}
@@ -770,11 +770,11 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
if ( bChecked )
Swap( aSize );
- pOld = GetOldItem( rSet, SID_ATTR_PAGE_SIZE );
+ pOld = GetOldItem( *rSet, SID_ATTR_PAGE_SIZE );
if ( !pOld || ( (const SvxSizeItem*)pOld )->GetSize() != aSize )
{
- rSet.Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) );
+ rSet->Put( SvxSizeItem( GetWhich(SID_ATTR_PAGE_SIZE), aSize ) );
bModified = true;
}
}
@@ -805,18 +805,18 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
if ( bMod )
{
- pOld = GetOldItem( rSet, SID_ATTR_PAGE );
+ pOld = GetOldItem( *rSet, SID_ATTR_PAGE );
if ( !pOld || !( *(const SvxPageItem*)pOld == aPage ) )
{
- rSet.Put( aPage );
+ rSet->Put( aPage );
bModified = true;
}
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich ) )
- rSet.ClearItem( nWhich );
+ rSet->ClearItem( nWhich );
else
- rSet.Put( rOldSet.Get( nWhich ) );
+ rSet->Put( rOldSet.Get( nWhich ) );
// evaluate mode specific controls
@@ -828,7 +828,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
{
SfxBoolItem aHorz( GetWhich( SID_ATTR_PAGE_EXT1 ),
m_pHorzBox->IsChecked() );
- rSet.Put( aHorz );
+ rSet->Put( aHorz );
bModified = true;
}
@@ -836,7 +836,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
{
SfxBoolItem aVert( GetWhich( SID_ATTR_PAGE_EXT2 ),
m_pVertBox->IsChecked() );
- rSet.Put( aVert );
+ rSet->Put( aVert );
bModified = true;
}
break;
@@ -845,7 +845,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
case SVX_PAGE_MODE_PRESENTATION:
{
// always put so that draw can evaluate this
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ),
m_pAdaptBox->IsChecked() ) );
bModified = true;
break;
@@ -861,12 +861,12 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
SfxBoolItem* pRegItem = (SfxBoolItem*)rRegItem.Clone();
bool bCheck = m_pRegisterCB->IsChecked();
pRegItem->SetValue(bCheck);
- rSet.Put(*pRegItem);
+ rSet->Put(*pRegItem);
bModified = true;
if(bCheck)
{
bModified = true;
- rSet.Put(SfxStringItem(SID_SWREGISTER_COLLECTION,
+ rSet->Put(SfxStringItem(SID_SWREGISTER_COLLECTION,
m_pRegisterLB->GetSelectEntry()));
}
delete pRegItem;
@@ -875,7 +875,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
SvxFrameDirection eDirection = m_pTextFlowBox->GetSelectEntryValue();
if( m_pTextFlowBox->IsVisible() && m_pTextFlowBox->IsValueChangedFromSaved() )
{
- rSet.Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) );
+ rSet->Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) );
bModified = true;
}
@@ -1415,7 +1415,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
if ( _pSet )
{
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
// put portray/landscape if applicable
sal_uInt16 nWh = GetWhich( SID_ATTR_PAGE_SIZE );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0e71f68c8d16..45e3c7d29ecf 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -198,11 +198,11 @@ SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet& r
return new SvxStdParagraphTabPage( pParent, rSet );
}
-bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
+bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
SfxItemState eState = SFX_ITEM_UNKNOWN;
const SfxPoolItem* pOld = 0;
- SfxItemPool* pPool = rOutSet.GetPool();
+ SfxItemPool* pPool = rOutSet->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
bool bModified = false;
@@ -245,12 +245,12 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
break;
}
eState = GetItemSet().GetItemState( nWhich );
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_LINESPACE );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_LINESPACE );
if ( !pOld || !( *(const SvxLineSpacingItem*)pOld == aSpacing ) ||
SFX_ITEM_DONTCARE == eState )
{
- rOutSet.Put( aSpacing );
+ rOutSet->Put( aSpacing );
bModified = true;
}
}
@@ -260,7 +260,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
{
nWhich = GetWhich( SID_ATTR_ULSPACE );
SfxMapUnit eUnit = pPool->GetMetric( nWhich );
- pOld = GetOldItem( rOutSet, SID_ATTR_ULSPACE );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_ULSPACE );
SvxULSpaceItem aMargin( nWhich );
if ( bRelativeMode )
@@ -294,7 +294,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( !pOld || !( *(const SvxULSpaceItem*)pOld == aMargin ) ||
SFX_ITEM_DONTCARE == eState )
{
- rOutSet.Put( aMargin );
+ rOutSet->Put( aMargin );
bModified = true;
}
}
@@ -308,7 +308,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
nWhich = GetWhich( SID_ATTR_LRSPACE );
SfxMapUnit eUnit = pPool->GetMetric( nWhich );
SvxLRSpaceItem aMargin( nWhich );
- pOld = GetOldItem( rOutSet, SID_ATTR_LRSPACE );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_LRSPACE );
if ( bRelativeMode )
{
@@ -351,7 +351,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( !pOld || !( *(const SvxLRSpaceItem*)pOld == aMargin ) ||
SFX_ITEM_DONTCARE == eState )
{
- rOutSet.Put( aMargin );
+ rOutSet->Put( aMargin );
bModified = true;
}
}
@@ -373,14 +373,14 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
SvxTabStopItem aNullTab( rTabItem );
SvxTabStop aNull( 0, SVX_TAB_ADJUST_DEFAULT );
aNullTab.Insert( aNull );
- rOutSet.Put( aNullTab );
+ rOutSet->Put( aNullTab );
}
}
}
if( m_pRegisterCB->IsVisible())
{
const SfxBoolItem* pBoolItem = (SfxBoolItem*)GetOldItem(
- rOutSet, SID_ATTR_PARA_REGISTER);
+ *rOutSet, SID_ATTR_PARA_REGISTER);
if (!pBoolItem)
return bModified;
SfxBoolItem* pRegItem = (SfxBoolItem*)pBoolItem->Clone();
@@ -390,11 +390,11 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if(m_pRegisterCB->IsChecked() != bSet )
{
pRegItem->SetValue(!bSet);
- rOutSet.Put(*pRegItem);
+ rOutSet->Put(*pRegItem);
bModified = true;
}
else if ( SFX_ITEM_DEFAULT == GetItemSet().GetItemState( _nWhich, false ) )
- rOutSet.ClearItem(_nWhich);
+ rOutSet->ClearItem(_nWhich);
delete pRegItem;
}
@@ -614,7 +614,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
ELRLoseFocusHdl( NULL );
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -1042,7 +1042,7 @@ SvxParaAlignTabPage::~SvxParaAlignTabPage()
int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -1056,7 +1056,7 @@ const sal_uInt16* SvxParaAlignTabPage::GetRanges()
return pAlignRanges;
}
-bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
+bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
{
bool bModified = false;
@@ -1093,7 +1093,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( bAdj )
{
- const SvxAdjustItem* pOld = (const SvxAdjustItem*)GetOldItem( rOutSet, SID_ATTR_PARA_ADJUST );
+ const SvxAdjustItem* pOld = (const SvxAdjustItem*)GetOldItem( *rOutSet, SID_ATTR_PARA_ADJUST );
SvxAdjust eOneWord = m_pExpandCB->IsChecked() ? SVX_ADJUST_BLOCK : SVX_ADJUST_LEFT;
@@ -1120,17 +1120,17 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
aAdj.SetAdjust( eAdjust );
aAdj.SetOneWord( eOneWord );
aAdj.SetLastBlock( eLastBlock );
- rOutSet.Put( aAdj );
+ rOutSet->Put( aAdj );
}
}
if(m_pSnapToGridCB->IsValueChangedFromSaved())
{
- rOutSet.Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID )));
+ rOutSet->Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID )));
bModified = true;
}
if(m_pVertAlignLB->IsValueChangedFromSaved())
{
- rOutSet.Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
+ rOutSet->Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN )));
bModified = true;
}
@@ -1139,7 +1139,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
SvxFrameDirection eDir = m_pTextDirectionLB->GetSelectEntryValue();
if( m_pTextDirectionLB->IsValueChangedFromSaved() )
{
- rOutSet.Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) );
+ rOutSet->Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) );
bModified = true;
}
}
@@ -1326,12 +1326,12 @@ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent,
return new SvxExtParagraphTabPage( pParent, rSet );
}
-bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
+bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
bool bModified = false;
sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE );
const TriState eHyphenState = m_pHyphenBox->GetState();
- const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE );
+ const SfxPoolItem* pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_HYPHENZONE );
if ( m_pHyphenBox->IsValueChangedFromSaved() ||
m_pExtHyphenBeforeBox->IsValueModified() ||
@@ -1353,7 +1353,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
!( *(SvxHyphenZoneItem*)pOld == aHyphen ) ||
m_pHyphenBox->IsValueChangedFromSaved())
{
- rOutSet.Put( aHyphen );
+ rOutSet->Put( aHyphen );
bModified = true;
}
}
@@ -1363,11 +1363,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM,
(sal_uInt16)m_pPagenumEdit->GetValue() );
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGENUM );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGENUM );
if ( !pOld || ( (const SfxUInt16Item*)pOld )->GetValue() != aPageNum.GetValue() )
{
- rOutSet.Put( aPageNum );
+ rOutSet->Put( aPageNum );
bModified = true;
}
}
@@ -1388,11 +1388,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
sPage = m_pApplyCollBox->GetSelectEntry();
bIsPageModel = !sPage.isEmpty();
}
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_MODEL );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_MODEL );
if ( !pOld || ( (const SvxPageModelItem*)pOld )->GetValue() != sPage )
{
- rOutSet.Put( SvxPageModelItem( sPage, false, _nWhich ) );
+ rOutSet->Put( SvxPageModelItem( sPage, false, _nWhich ) );
bModified = true;
}
else
@@ -1401,13 +1401,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
else if(TRISTATE_TRUE == eState && m_pApplyCollBtn->IsEnabled())
bIsPageModel = true;
else
- rOutSet.Put( SvxPageModelItem( sPage, false, _nWhich ) );
+ rOutSet->Put( SvxPageModelItem( sPage, false, _nWhich ) );
_nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK );
if ( bIsPageModel )
// if PageModel is turned on, always turn off PageBreak
- rOutSet.Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+ rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
else
{
eState = m_pPageBreakBox->GetState();
@@ -1450,13 +1450,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
break;
default: ; //prevent warning
}
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_PAGEBREAK );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
if ( eState != m_pPageBreakBox->GetSavedValue() ||
!pOld || !( *(const SvxFmtBreakItem*)pOld == aBreak ) )
{
bModified = true;
- rOutSet.Put( aBreak );
+ rOutSet->Put( aBreak );
}
}
}
@@ -1467,12 +1467,12 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( m_pKeepTogetherBox->IsValueChangedFromSaved() )
{
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_SPLIT );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
if ( !pOld || ( (const SvxFmtSplitItem*)pOld )->GetValue() !=
( eState == TRISTATE_FALSE ) )
{
- rOutSet.Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+ rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
bModified = true;
}
}
@@ -1484,7 +1484,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( m_pKeepParaBox->IsValueChangedFromSaved() )
{
// if the status has changed, putting is necessary
- rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+ rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = true;
}
@@ -1497,11 +1497,11 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
{
SvxWidowsItem rItem( eState == TRISTATE_TRUE ?
(sal_uInt8)m_pWidowRowNo->GetValue() : 0, _nWhich );
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_WIDOWS );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_WIDOWS );
if ( m_pWidowBox->IsValueChangedFromSaved() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) )
{
- rOutSet.Put( rItem );
+ rOutSet->Put( rItem );
bModified = true;
}
}
@@ -1514,13 +1514,13 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
{
SvxOrphansItem rItem( eState == TRISTATE_TRUE ?
(sal_uInt8)m_pOrphanRowNo->GetValue() : 0, _nWhich );
- pOld = GetOldItem( rOutSet, SID_ATTR_PARA_ORPHANS );
+ pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_ORPHANS );
if ( m_pOrphanBox->IsValueChangedFromSaved() ||
!pOld ||
!( *(const SvxOrphansItem*)pOld == rItem ) )
{
- rOutSet.Put( rItem );
+ rOutSet->Put( rItem );
bModified = true;
}
}
@@ -1809,7 +1809,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -2149,34 +2149,34 @@ const sal_uInt16* SvxAsianTabPage::GetRanges()
return pRanges;
}
-bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bRet = false;
- SfxItemPool* pPool = rSet.GetPool();
+ SfxItemPool* pPool = rSet->GetPool();
if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsValueChangedFromSaved())
{
- SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
+ SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone();
pNewItem->SetValue(m_pScriptSpaceCB->IsChecked());
- rSet.Put(*pNewItem);
+ rSet->Put(*pNewItem);
delete pNewItem;
bRet = true;
}
if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsValueChangedFromSaved())
{
- SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
+ SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone();
pNewItem->SetValue(m_pHangingPunctCB->IsChecked());
- rSet.Put(*pNewItem);
+ rSet->Put(*pNewItem);
delete pNewItem;
bRet = true;
}
if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsValueChangedFromSaved())
{
- SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
+ SfxBoolItem* pNewItem = (SfxBoolItem*)rSet->Get(
pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone();
pNewItem->SetValue(m_pForbiddenRulesCB->IsChecked());
- rSet.Put(*pNewItem);
+ rSet->Put(*pNewItem);
delete pNewItem;
bRet = true;
}
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 87ce9e5f8363..5e34fbf34467 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -726,22 +726,22 @@ const sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
return pSwPosRanges;
}
-bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
+bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet)
{
bool bAnchorChanged = false;
short nAnchor = GetAnchorType(&bAnchorChanged);
bool bModified = false;
if(bAnchorChanged)
{
- rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor));
+ rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor));
bModified = true;
}
if ( m_pPositionCB->IsValueChangedFromSaved() )
{
if( m_pPositionCB->GetState() == TRISTATE_INDET )
- rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS );
+ rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS );
else
- rSet.Put(
+ rSet->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
m_pPositionCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
bModified = true;
@@ -750,9 +750,9 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
if ( m_pSizeCB->IsValueChangedFromSaved() )
{
if ( m_pSizeCB->GetState() == TRISTATE_INDET )
- rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE );
+ rSet->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE );
else
- rSet.Put(
+ rSet->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
m_pSizeCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
bModified = true;
@@ -779,8 +779,8 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
nHoriByPos += m_aAnchorPos.X();
nVertByPos += m_aAnchorPos.Y();
- rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) );
- rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) );
+ rSet->Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) );
+ rSet->Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) );
bModified = true;
}
@@ -807,15 +807,15 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
(m_pHoriByMF->IsEnabled() && nHoriByPos != rHoriPosition.GetValue())
)
{
- rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign));
- rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel));
+ rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_ORIENT, nAlign));
+ rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel));
if(m_pHoriByMF->IsEnabled())
- rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos));
+ rSet->Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos));
bModified = true;
}
}
if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsValueChangedFromSaved())
- bModified |= 0 != rSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked()));
+ bModified |= 0 != rSet->Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked()));
if ( m_pVMap )
{
@@ -842,10 +842,10 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
( m_pVertByMF->IsEnabled() &&
nVertByPos != rVertPosition.GetValue() ) )
{
- rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_ORIENT, nAlign));
- rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel));
+ rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_ORIENT, nAlign));
+ rSet->Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel));
if(m_pVertByMF->IsEnabled())
- rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos));
+ rSet->Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos));
bModified = true;
}
}
@@ -859,7 +859,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
{
SfxBoolItem* pFollow = static_cast<SfxBoolItem*>(pItem->Clone());
pFollow->SetValue(m_pFollowCB->IsChecked());
- bModified |= 0 != rSet.Put(*pFollow);
+ bModified |= 0 != rSet->Put(*pFollow);
delete pFollow;
}
}
@@ -869,12 +869,12 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
{
sal_uInt32 nWidth = static_cast<sal_uInt32>(m_pWidthMF->Denormalize(m_pWidthMF->GetValue(FUNIT_TWIP)));
sal_uInt32 nHeight = static_cast<sal_uInt32>(m_pHeightMF->Denormalize(m_pHeightMF->GetValue(FUNIT_TWIP)));
- rSet.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ),
+ rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ),
(sal_uInt32) nWidth ) );
- rSet.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ),
+ rSet->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ),
(sal_uInt32) nHeight ) );
//this item is required by SdrEditView::SetGeoAttrToMarked()
- rSet.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) );
+ rSet->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) );
bModified = true;
}
@@ -1050,7 +1050,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 32896237893b..d904bca24e00 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -201,7 +201,7 @@ const sal_uInt16* SvxTabulatorTabPage::GetRanges()
-bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -214,9 +214,9 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
GetFillCharHdl_Impl( m_pFillChar );
FillUpWithDefTabs_Impl( nDefDist, aNewTabs );
- SfxItemPool* pPool = rSet.GetPool();
+ SfxItemPool* pPool = rSet->GetPool();
MapUnit eUnit = (MapUnit)pPool->GetMetric( GetWhich( SID_ATTR_TABSTOP ) );
- const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_TABSTOP );
+ const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_TABSTOP );
if ( MAP_100TH_MM != eUnit )
{
@@ -224,8 +224,8 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
// the TabStopItem needs to have a DefTab at position 0.
const SfxPoolItem* pLRSpace;
// If not in the new set, then maybe in the old one
- if ( SFX_ITEM_SET != rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), true, &pLRSpace ) )
- pLRSpace = GetOldItem( rSet, SID_ATTR_LRSPACE );
+ if ( SFX_ITEM_SET != rSet->GetItemState( GetWhich( SID_ATTR_LRSPACE ), true, &pLRSpace ) )
+ pLRSpace = GetOldItem( *rSet, SID_ATTR_LRSPACE );
if ( pLRSpace && ( (SvxLRSpaceItem*)pLRSpace )->GetTxtFirstLineOfst() < 0 )
{
@@ -246,13 +246,13 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aTmp ) )
{
- rSet.Put( aTmp );
+ rSet->Put( aTmp );
bModified = true;
}
}
else if ( !pOld || !( *( (SvxTabStopItem*)pOld ) == aNewTabs ) )
{
- rSet.Put( aNewTabs );
+ rSet->Put( aNewTabs );
bModified = true;
}
return bModified;
@@ -364,7 +364,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 84cd104103ad..63da943c8071 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -332,7 +332,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
|*
\************************************************************************/
-bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
+bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
{
bool bModified = false;
sal_Int32 nPos;
@@ -343,7 +343,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
m_pLbEffect->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) );
+ rAttrs->Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) );
bModified = true;
}
@@ -354,7 +354,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
m_pBtnDown->IsValueChangedFromSaved() )
{
SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection();
- rAttrs.Put( SdrTextAniDirectionItem( eValue ) );
+ rAttrs->Put( SdrTextAniDirectionItem( eValue ) );
bModified = true;
}
@@ -362,7 +362,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
eState = m_pTsbStartInside->GetState();
if( m_pTsbStartInside->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -370,7 +370,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
eState = m_pTsbStopInside->GetState();
if( m_pTsbStopInside->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) );
bModified = true;
}
@@ -392,7 +392,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
}
}
if( bModified )
- rAttrs.Put( SdrTextAniCountItem( (sal_uInt16) nValue ) );
+ rAttrs->Put( SdrTextAniCountItem( (sal_uInt16) nValue ) );
}
// delay
@@ -413,7 +413,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
}
}
if( bModified )
- rAttrs.Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) );
+ rAttrs->Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) );
}
// step size
@@ -432,7 +432,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
{
nValue = GetCoreValue( *m_pMtrFldAmount, eUnit );
}
- rAttrs.Put( SdrTextAniAmountItem( (sal_Int16) nValue ) );
+ rAttrs->Put( SdrTextAniAmountItem( (sal_Int16) nValue ) );
bModified = true;
}
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index f349198f8ac4..4a80ba77d147 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -322,9 +322,9 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
|*
\************************************************************************/
-bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
+bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
{
- SfxItemPool* pPool = rAttrs.GetPool();
+ SfxItemPool* pPool = rAttrs->GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool" );
SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
@@ -334,55 +334,55 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
if( m_pMtrFldLeft->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldLeft, eUnit );
- rAttrs.Put( SdrTextLeftDistItem( nValue ) );
+ rAttrs->Put( SdrTextLeftDistItem( nValue ) );
}
if( m_pMtrFldRight->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldRight, eUnit );
- rAttrs.Put( SdrTextRightDistItem( nValue ) );
+ rAttrs->Put( SdrTextRightDistItem( nValue ) );
}
if( m_pMtrFldTop->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldTop, eUnit );
- rAttrs.Put( SdrTextUpperDistItem( nValue ) );
+ rAttrs->Put( SdrTextUpperDistItem( nValue ) );
}
if( m_pMtrFldBottom->IsValueChangedFromSaved() )
{
nValue = GetCoreValue( *m_pMtrFldBottom, eUnit );
- rAttrs.Put( SdrTextLowerDistItem( nValue ) );
+ rAttrs->Put( SdrTextLowerDistItem( nValue ) );
}
eState = m_pTsbAutoGrowHeight->GetState();
if( m_pTsbAutoGrowHeight->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbAutoGrowWidth->GetState();
if( m_pTsbAutoGrowWidth->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbAutoGrowSize->GetState();
if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbWordWrapText->GetState();
if( m_pTsbWordWrapText->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbContour->GetState();
if( m_pTsbContour->IsValueChangedFromSaved() )
{
- rAttrs.Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) );
+ rAttrs->Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) );
}
eState = m_pTsbFitToSize->GetState();
@@ -397,7 +397,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
case TRISTATE_FALSE: eFTS = SDRTEXTFIT_NONE; break;
case TRISTATE_TRUE: eFTS = SDRTEXTFIT_AUTOFIT; break;
}
- rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) );
+ rAttrs->Put( SdrTextFitToSizeTypeItem( eFTS ) );
}
// centered
@@ -446,20 +446,20 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
eOldTVA = (SdrTextVertAdjust)
( ( const SdrTextVertAdjustItem& )rOutAttrs.Get( SDRATTR_TEXT_VERTADJUST ) ).GetValue();
if( eOldTVA != eTVA )
- rAttrs.Put( SdrTextVertAdjustItem( eTVA ) );
+ rAttrs->Put( SdrTextVertAdjustItem( eTVA ) );
}
else
- rAttrs.Put( SdrTextVertAdjustItem( eTVA ) );
+ rAttrs->Put( SdrTextVertAdjustItem( eTVA ) );
if ( rOutAttrs.GetItemState( SDRATTR_TEXT_HORZADJUST ) != SFX_ITEM_DONTCARE )
{
eOldTHA = (SdrTextHorzAdjust)
( ( const SdrTextHorzAdjustItem& )rOutAttrs.Get( SDRATTR_TEXT_HORZADJUST ) ).GetValue();
if( eOldTHA != eTHA )
- rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) );
+ rAttrs->Put( SdrTextHorzAdjustItem( eTHA ) );
}
else
- rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) );
+ rAttrs->Put( SdrTextHorzAdjustItem( eTHA ) );
}
return true;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index eb0add42eb74..0084f4c6e853 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -297,7 +297,7 @@ const sal_uInt16* SvxTransparenceTabPage::GetRanges()
return(pTransparenceRanges);
}
-bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
+bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
{
const SfxPoolItem* pGradientItem = NULL;
const SfxPoolItem* pLinearItem = NULL;
@@ -322,11 +322,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
{
XFillTransparenceItem aItem(nPos);
SdrShadowTransparenceItem aShadowItem(nPos);
- const SfxPoolItem* pOld = GetOldItem(rAttrs, XATTR_FILLTRANSPARENCE);
+ const SfxPoolItem* pOld = GetOldItem(*rAttrs, XATTR_FILLTRANSPARENCE);
if(!pOld || !(*(const XFillTransparenceItem*)pOld == aItem) || !bLinearActive)
{
- rAttrs.Put(aItem);
- rAttrs.Put(aShadowItem);
+ rAttrs->Put(aItem);
+ rAttrs->Put(aShadowItem);
bModified = true;
bSwitchOffGradient = true;
}
@@ -357,11 +357,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
100, 100);
XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aTmpGradient);
- const SfxPoolItem* pOld = GetOldItem(rAttrs, XATTR_FILLFLOATTRANSPARENCE);
+ const SfxPoolItem* pOld = GetOldItem(*rAttrs, XATTR_FILLFLOATTRANSPARENCE);
if(!pOld || !(*(const XFillFloatTransparenceItem*)pOld == aItem) || !bGradActive)
{
- rAttrs.Put(aItem);
+ rAttrs->Put(aItem);
bModified = true;
bSwitchOffLinear = true;
}
@@ -383,7 +383,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
aGrad.SetEndIntens(100);
XFillFloatTransparenceItem aItem( rXFSet.GetPool()/*aString*/, aGrad);
aItem.SetEnabled(false);
- rAttrs.Put(aItem);
+ rAttrs->Put(aItem);
bModified = true;
}
@@ -392,11 +392,11 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs)
{
XFillTransparenceItem aItem(0);
SdrShadowTransparenceItem aShadowItem(0);
- rAttrs.Put(aItem);
- rAttrs.Put(aShadowItem);
+ rAttrs->Put(aItem);
+ rAttrs->Put(aShadowItem);
bModified = true;
}
- rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
+ rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
return bModified;
}
@@ -480,7 +480,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet)
int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return(LEAVE_PAGE);
}
@@ -980,14 +980,14 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
}
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
-bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
+bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
{
sal_Int32 _nPos;
bool bModified = false;
@@ -1004,10 +1004,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( eSavedStyle != eStyle )
{
XFillStyleItem aStyleItem( XFILL_NONE );
- pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
- rAttrs.Put( aStyleItem );
+ rAttrs->Put( aStyleItem );
bModified = true;
}
}
@@ -1021,10 +1021,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
{
XFillColorItem aItem( m_pLbColor->GetSelectEntry(),
m_pLbColor->GetSelectEntryColor() );
- pOld = GetOldItem( rAttrs, XATTR_FILLCOLOR );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLCOLOR );
if ( !pOld || !( *(const XFillColorItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -1034,10 +1034,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_SOLID );
- pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
- rAttrs.Put( aStyleItem );
+ rAttrs->Put( aStyleItem );
bModified = true;
}
}
@@ -1052,10 +1052,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
XGradient aGradient = pGradientList->GetGradient( _nPos )->GetGradient();
OUString aString = m_pLbGradient->GetSelectEntry();
XFillGradientItem aItem( aString, aGradient );
- pOld = GetOldItem( rAttrs, XATTR_FILLGRADIENT );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLGRADIENT );
if ( !pOld || !( *(const XFillGradientItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -1065,10 +1065,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_GRADIENT );
- pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
- rAttrs.Put( aStyleItem );
+ rAttrs->Put( aStyleItem );
bModified = true;
}
}
@@ -1083,25 +1083,25 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
XHatch aHatching = pHatchingList->GetHatch( _nPos )->GetHatch();
OUString aString = m_pLbHatching->GetSelectEntry();
XFillHatchItem aItem( aString, aHatching );
- pOld = GetOldItem( rAttrs, XATTR_FILLHATCH );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLHATCH );
if ( !pOld || !( *(const XFillHatchItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
XFillBackgroundItem aItem ( m_pCbxHatchBckgrd->IsChecked() );
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
m_pLbHatchBckgrdColor->IsValueChangedFromSaved() )
{
XFillColorItem aFillColorItem( m_pLbHatchBckgrdColor->GetSelectEntry(),
m_pLbHatchBckgrdColor->GetSelectEntryColor() );
- pOld = GetOldItem( rAttrs, XATTR_FILLCOLOR );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLCOLOR );
if ( !pOld || !( *(const XFillColorItem*)pOld == aFillColorItem ) )
{
- rAttrs.Put( aFillColorItem );
+ rAttrs->Put( aFillColorItem );
bModified = true;
}
}
@@ -1111,10 +1111,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_HATCH );
- pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
- rAttrs.Put( aStyleItem );
+ rAttrs->Put( aStyleItem );
bModified = true;
}
}
@@ -1126,8 +1126,8 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if(mbDirectGraphicSet && GRAPHIC_NONE != maDirectGraphic.GetType())
{
const XFillBitmapItem aXBmpItem(maDirectName, maDirectGraphic);
- rAttrs.Put(XFillStyleItem(XFILL_BITMAP));
- rAttrs.Put(aXBmpItem);
+ rAttrs->Put(XFillStyleItem(XFILL_BITMAP));
+ rAttrs->Put(aXBmpItem);
bModified = true;
}
else
@@ -1139,10 +1139,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos);
const OUString aString(m_pLbBitmap->GetSelectEntry());
const XFillBitmapItem aFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject());
- pOld = GetOldItem( rAttrs, XATTR_FILLBITMAP );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBITMAP );
if ( !pOld || !( *(const XFillBitmapItem*)pOld == aFillBitmapItem ) )
{
- rAttrs.Put( aFillBitmapItem );
+ rAttrs->Put( aFillBitmapItem );
bModified = true;
}
}
@@ -1152,10 +1152,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ), true ) ) )
{
XFillStyleItem aStyleItem( XFILL_BITMAP );
- pOld = GetOldItem( rAttrs, XATTR_FILLSTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLSTYLE );
if ( !pOld || !( *(const XFillStyleItem*)pOld == aStyleItem ) )
{
- rAttrs.Put( aStyleItem );
+ rAttrs->Put( aStyleItem );
bModified = true;
}
}
@@ -1188,10 +1188,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( bValueModified )
{
XGradientStepCountItem aFillBitmapItem( nValue );
- pOld = GetOldItem( rAttrs, XATTR_GRADIENTSTEPCOUNT );
+ pOld = GetOldItem( *rAttrs, XATTR_GRADIENTSTEPCOUNT );
if ( !pOld || !( *(const XGradientStepCountItem*)pOld == aFillBitmapItem ) )
{
- rAttrs.Put( aFillBitmapItem );
+ rAttrs->Put( aFillBitmapItem );
bModified = true;
}
}
@@ -1204,10 +1204,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
{
XFillBmpTileItem aFillBmpTileItem(
sal::static_int_cast< sal_Bool >( eState ) );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILE );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE );
if ( !pOld || !( *(const XFillBmpTileItem*)pOld == aFillBmpTileItem ) )
{
- rAttrs.Put( aFillBmpTileItem );
+ rAttrs->Put( aFillBmpTileItem );
bModified = true;
}
}
@@ -1220,10 +1220,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
{
XFillBmpStretchItem aFillBmpStretchItem(
sal::static_int_cast< sal_Bool >( eState ) );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_STRETCH );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH );
if ( !pOld || !( *(const XFillBmpStretchItem*)pOld == aFillBmpStretchItem ) )
{
- rAttrs.Put( aFillBmpStretchItem );
+ rAttrs->Put( aFillBmpStretchItem );
bModified = true;
}
}
@@ -1248,10 +1248,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( pItem )
{
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZELOG );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZELOG );
if ( !pOld || !( *(const XFillBmpSizeLogItem*)pOld == *pItem ) )
{
- rAttrs.Put( *pItem );
+ rAttrs->Put( *pItem );
bModified = true;
}
delete pItem;
@@ -1284,10 +1284,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( pItem )
{
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZEX );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEX );
if ( !pOld || !( *(const XFillBmpSizeXItem*)pOld == *pItem ) )
{
- rAttrs.Put( *pItem );
+ rAttrs->Put( *pItem );
bModified = true;
}
delete pItem;
@@ -1321,10 +1321,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( pItem )
{
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_SIZEY );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_SIZEY );
if ( !pOld || !( *(const XFillBmpSizeYItem*)pOld == *pItem ) )
{
- rAttrs.Put( *pItem );
+ rAttrs->Put( *pItem );
bModified = true;
}
delete pItem;
@@ -1345,22 +1345,22 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pRbtRow->IsChecked() )
{
XFillBmpTileOffsetXItem aFillBmpTileOffsetXItem( (sal_uInt16) m_pMtrFldOffset->GetValue() );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILEOFFSETX );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETX );
if ( !pOld || !( *(const XFillBmpTileOffsetXItem*)pOld == aFillBmpTileOffsetXItem ) )
{
- rAttrs.Put( aFillBmpTileOffsetXItem );
- rAttrs.Put( XFillBmpTileOffsetYItem( 0 ) );
+ rAttrs->Put( aFillBmpTileOffsetXItem );
+ rAttrs->Put( XFillBmpTileOffsetYItem( 0 ) );
bModified = true;
}
}
else if( m_pRbtColumn->IsChecked() )
{
XFillBmpTileOffsetYItem aFillBmpTileOffsetYItem( (sal_uInt16) m_pMtrFldOffset->GetValue() );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_TILEOFFSETY );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILEOFFSETY );
if ( !pOld || !( *(const XFillBmpTileOffsetYItem*)pOld == aFillBmpTileOffsetYItem ) )
{
- rAttrs.Put( aFillBmpTileOffsetYItem );
- rAttrs.Put( XFillBmpTileOffsetXItem( 0 ) );
+ rAttrs->Put( aFillBmpTileOffsetYItem );
+ rAttrs->Put( XFillBmpTileOffsetXItem( 0 ) );
bModified = true;
}
}
@@ -1384,10 +1384,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
if( bPut )
{
XFillBmpPosItem aFillBmpPosItem( _eRP );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POS );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POS );
if ( !pOld || !( *(const XFillBmpPosItem*)pOld == aFillBmpPosItem ) )
{
- rAttrs.Put( aFillBmpPosItem );
+ rAttrs->Put( aFillBmpPosItem );
bModified = true;
}
}
@@ -1401,10 +1401,10 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
m_pMtrFldXOffset->IsValueChangedFromSaved() )
{
XFillBmpPosOffsetXItem aFillBmpPosOffsetXItem( (sal_uInt16) m_pMtrFldXOffset->GetValue() );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETX );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETX );
if ( !pOld || !( *(const XFillBmpPosOffsetXItem*)pOld == aFillBmpPosOffsetXItem ) )
{
- rAttrs.Put( aFillBmpPosOffsetXItem );
+ rAttrs->Put( aFillBmpPosOffsetXItem );
bModified = true;
}
}
@@ -1418,16 +1418,16 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
m_pMtrFldYOffset->IsValueChangedFromSaved() )
{
XFillBmpPosOffsetYItem aFillBmpPosOffsetYItem( (sal_uInt16) m_pMtrFldYOffset->GetValue() );
- pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETY );
+ pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_POSOFFSETY );
if ( !pOld || !( *(const XFillBmpPosOffsetYItem*)pOld == aFillBmpPosOffsetYItem ) )
{
- rAttrs.Put( aFillBmpPosOffsetYItem );
+ rAttrs->Put( aFillBmpPosOffsetYItem );
bModified = true;
}
}
}
- rAttrs.Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
- rAttrs.Put (SfxUInt16Item(SID_TABPAGE_POS,nPos));
+ rAttrs->Put (SfxUInt16Item(SID_PAGE_TYPE,nPageType));
+ rAttrs->Put (SfxUInt16Item(SID_TABPAGE_POS,nPos));
}
return( bModified );
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index c0b95d0c7de2..3c488e0f47fb 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -218,33 +218,33 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
return KEEP_PAGE;
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
-bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
+bool SvxBitmapTabPage::FillItemSet( SfxItemSet* _rOutAttrs )
{
if( nDlgType == 0 && *pbAreaTP == false ) // area dialog
{
if(PT_BITMAP == *pPageType)
{
- _rOutAttrs.Put(XFillStyleItem(XFILL_BITMAP));
+ _rOutAttrs->Put(XFillStyleItem(XFILL_BITMAP));
sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos();
if(LISTBOX_ENTRY_NOTFOUND != nPos)
{
const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos);
const OUString aString(m_pLbBitmaps->GetSelectEntry());
- _rOutAttrs.Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()));
+ _rOutAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()));
}
else
{
const BitmapEx aBitmapEx(m_pBitmapCtl->GetBitmapEx());
- _rOutAttrs.Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx)));
+ _rOutAttrs->Put(XFillBitmapItem(OUString(), Graphic(aBitmapEx)));
}
}
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index c20bb39c9218..a81af85dca67 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -483,7 +483,7 @@ int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
return( KEEP_PAGE );
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
@@ -556,7 +556,7 @@ long SvxColorTabPage::CheckChanges_Impl()
-bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxColorTabPage::FillItemSet( SfxItemSet* rSet )
{
if( ( nDlgType != 0 ) ||
( *pPageType == PT_COLOR && *pbAreaTP == false ) )
@@ -574,8 +574,8 @@ bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
{
aColor.SetColor (aCurrentColor.GetColor());
}
- rSet.Put( XFillColorItem( aString, aColor ) );
- rSet.Put( XFillStyleItem( XFILL_SOLID ) );
+ rSet->Put( XFillColorItem( aString, aColor ) );
+ rSet->Put( XFillStyleItem( XFILL_SOLID ) );
}
return true;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 8a0e37906c92..eba96ba2dae0 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -232,7 +232,7 @@ int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
return KEEP_PAGE;
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -306,7 +306,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
-bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
{
if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == false )
{
@@ -335,8 +335,8 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
(sal_uInt16) m_pMtrColorTo->GetValue() );
}
DBG_ASSERT( pXGradient, "XGradient konnte nicht erzeugt werden" );
- rSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
- rSet.Put( XFillGradientItem( aString, *pXGradient ) );
+ rSet->Put( XFillStyleItem( XFILL_GRADIENT ) );
+ rSet->Put( XFillGradientItem( aString, *pXGradient ) );
delete pXGradient;
}
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index c24bcbfbdb6e..8524a6c4f4de 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -221,7 +221,7 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
return KEEP_PAGE;
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -278,7 +278,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
-bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
{
if( nDlgType == 0 && *pbAreaTP == false ) // area dialog
{
@@ -303,8 +303,8 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
static_cast<long>(m_pMtrAngle->GetValue() * 10) );
}
DBG_ASSERT( pXHatch, "XHatch konnte nicht erzeugt werden" );
- rSet.Put( XFillStyleItem( XFILL_HATCH ) );
- rSet.Put( XFillHatchItem( aString, *pXHatch ) );
+ rSet->Put( XFillStyleItem( XFILL_HATCH ) );
+ rSet->Put( XFillHatchItem( aString, *pXHatch ) );
delete pXHatch;
}
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index d6878cd78e23..1ac752934993 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -661,14 +661,14 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
}
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
-bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
+bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
{
const SfxPoolItem* pOld = NULL;
sal_Int32 nPos;
@@ -696,18 +696,18 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
{
XLineDashItem aDashItem( m_pLbLineStyle->GetSelectEntry(),
pDashList->GetDash( nPos - 2 )->GetDash() );
- pOld = GetOldItem( rAttrs, XATTR_LINEDASH );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEDASH );
if ( !pOld || !( *(const XLineDashItem*)pOld == aDashItem ) )
{
- rAttrs.Put( aDashItem );
+ rAttrs->Put( aDashItem );
bModified = true;
}
}
}
- pOld = GetOldItem( rAttrs, XATTR_LINESTYLE );
+ pOld = GetOldItem( *rAttrs, XATTR_LINESTYLE );
if ( !pOld || !( *(const XLineStyleItem*)pOld == *pStyleItem ) )
{
- rAttrs.Put( *pStyleItem );
+ rAttrs->Put( *pStyleItem );
bModified = true;
}
delete pStyleItem;
@@ -718,10 +718,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pMtrLineWidth->IsValueChangedFromSaved() )
{
XLineWidthItem aItem( GetCoreValue( *m_pMtrLineWidth, ePoolUnit ) );
- pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEWIDTH );
if ( !pOld || !( *(const XLineWidthItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -729,10 +729,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pMtrStartWidth->IsValueChangedFromSaved() )
{
XLineStartWidthItem aItem( GetCoreValue( *m_pMtrStartWidth, ePoolUnit ) );
- pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
+ pOld = GetOldItem( *rAttrs, XATTR_LINESTARTWIDTH );
if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -740,10 +740,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pMtrEndWidth->IsValueChangedFromSaved() )
{
XLineEndWidthItem aItem( GetCoreValue( *m_pMtrEndWidth, ePoolUnit ) );
- pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEENDWIDTH );
if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -752,10 +752,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pLbColor->IsValueChangedFromSaved() )
{
XLineColorItem aItem( m_pLbColor->GetSelectEntry(), m_pLbColor->GetSelectEntryColor() );
- pOld = GetOldItem( rAttrs, XATTR_LINECOLOR );
+ pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR );
if ( !pOld || !( *(const XLineColorItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -771,10 +771,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
pItem = new XLineStartItem();
else if( pLineEndList->Count() > (long) ( nPos - 1 ) )
pItem = new XLineStartItem( m_pLbStartStyle->GetSelectEntry(), pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() );
- pOld = GetOldItem( rAttrs, XATTR_LINESTART );
+ pOld = GetOldItem( *rAttrs, XATTR_LINESTART );
if( pItem && ( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
{
- rAttrs.Put( *pItem );
+ rAttrs->Put( *pItem );
bModified = true;
}
delete pItem;
@@ -788,11 +788,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
pItem = new XLineEndItem();
else if( pLineEndList->Count() > (long) ( nPos - 1 ) )
pItem = new XLineEndItem( m_pLbEndStyle->GetSelectEntry(), pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() );
- pOld = GetOldItem( rAttrs, XATTR_LINEEND );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEEND );
if( pItem &&
( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
{
- rAttrs.Put( *pItem );
+ rAttrs->Put( *pItem );
bModified = true;
}
delete pItem;
@@ -804,10 +804,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pTsbCenterStart->IsValueChangedFromSaved() )
{
XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
- pOld = GetOldItem( rAttrs, XATTR_LINESTARTCENTER );
+ pOld = GetOldItem( *rAttrs, XATTR_LINESTARTCENTER );
if ( !pOld || !( *(const XLineStartCenterItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -815,10 +815,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pTsbCenterEnd->IsValueChangedFromSaved() )
{
XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
- pOld = GetOldItem( rAttrs, XATTR_LINEENDCENTER );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEENDCENTER );
if ( !pOld || !( *(const XLineEndCenterItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -828,10 +828,10 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pMtrTransparent->IsValueChangedFromSaved() )
{
XLineTransparenceItem aItem( nVal );
- pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE );
+ pOld = GetOldItem( *rAttrs, XATTR_LINETRANSPARENCE );
if ( !pOld || !( *(const XLineTransparenceItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -868,11 +868,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(pNew)
{
- pOld = GetOldItem( rAttrs, XATTR_LINEJOINT );
+ pOld = GetOldItem( *rAttrs, XATTR_LINEJOINT );
if(!pOld || !(*(const XLineJointItem*)pOld == *pNew))
{
- rAttrs.Put( *pNew );
+ rAttrs->Put( *pNew );
bModified = true;
}
@@ -907,11 +907,11 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(pNew)
{
- pOld = GetOldItem( rAttrs, XATTR_LINECAP );
+ pOld = GetOldItem( *rAttrs, XATTR_LINECAP );
if(!pOld || !(*(const XLineCapItem*)pOld == *pNew))
{
- rAttrs.Put( *pNew );
+ rAttrs->Put( *pNew );
bModified = true;
}
@@ -922,40 +922,40 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(nSymbolType!=SVX_SYMBOLTYPE_UNKNOWN || bNewSize)
{
// Was set by selection or the size is different
- SvxSizeItem aSItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),aSymbolSize);
- const SfxPoolItem* pSOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE) );
+ SvxSizeItem aSItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),aSymbolSize);
+ const SfxPoolItem* pSOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE) );
bNewSize = pSOld ? *(const SvxSizeItem *)pSOld != aSItem : bNewSize ;
if(bNewSize)
{
- rAttrs.Put(aSItem);
+ rAttrs->Put(aSItem);
bModified=true;
}
- SfxInt32Item aTItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType);
- const SfxPoolItem* pTOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) );
+ SfxInt32Item aTItem(rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType);
+ const SfxPoolItem* pTOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE) );
bool bNewType = pTOld == NULL || *(const SfxInt32Item*)pTOld != aTItem;
if(bNewType && nSymbolType==SVX_SYMBOLTYPE_UNKNOWN)
bNewType=false; // a small fix, type wasn't set -> don't create a type item after all!
if(bNewType)
{
- rAttrs.Put(aTItem);
+ rAttrs->Put(aTItem);
bModified=true;
}
if(nSymbolType!=SVX_SYMBOLTYPE_NONE)
{
- SvxBrushItem aBItem(aSymbolGraphic,GPOS_MM,rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH));
- const SfxPoolItem* pBOld = GetOldItem( rAttrs, rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH) );
+ SvxBrushItem aBItem(aSymbolGraphic,GPOS_MM,rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH));
+ const SfxPoolItem* pBOld = GetOldItem( *rAttrs, rAttrs->GetPool()->GetWhich(SID_ATTR_BRUSH) );
bool bNewBrush =
pBOld == NULL || *(const SvxBrushItem*)pBOld != aBItem;
if(bNewBrush)
{
- rAttrs.Put(aBItem);
+ rAttrs->Put(aBItem);
bModified=true;
}
}
}
- rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
+ rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
return( bModified );
}
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4d6de14752f4..2365b0cb2808 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -194,7 +194,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
CheckChanges_Impl();
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
@@ -257,7 +257,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
-bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
+bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs )
{
if( nDlgType == 0 ) // line dialog
{
@@ -266,8 +266,8 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
FillDash_Impl();
OUString aString( m_pLbLineStyles->GetSelectEntry() );
- rAttrs.Put( XLineStyleItem( XLINE_DASH ) );
- rAttrs.Put( XLineDashItem( aString, aDash ) );
+ rAttrs->Put( XLineStyleItem( XLINE_DASH ) );
+ rAttrs->Put( XLineDashItem( aString, aDash ) );
}
}
return true;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 41f3917b1757..243f43ed73d5 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -172,7 +172,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
CheckChanges_Impl();
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
@@ -205,7 +205,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
-bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
+bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet )
{
if( nDlgType == 0 ) // line dialog
{
@@ -216,8 +216,8 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
long nPos = m_pLbLineEnds->GetSelectEntryPos();
XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos );
- rSet.Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) );
- rSet.Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) );
+ rSet->Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) );
+ rSet->Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) );
}
}
return true;
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 15c58c1c29d4..68119d537025 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -237,14 +237,14 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return( LEAVE_PAGE );
}
-bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
+bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
{
const SfxPoolItem* pOld = NULL;
bool bModified = false;
@@ -255,10 +255,10 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pTsbShowShadow->IsValueChangedFromSaved() )
{
SdrShadowItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
- pOld = GetOldItem( rAttrs, SDRATTR_SHADOW );
+ pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW );
if ( !pOld || !( *(const SdrShadowItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -301,19 +301,19 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
Get( SDRATTR_SHADOWYDIST ) ).GetValue();
}
SdrShadowXDistItem aXItem( nX );
- pOld = GetOldItem( rAttrs, SDRATTR_SHADOWXDIST );
+ pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWXDIST );
if ( nX != nOldX &&
( !pOld || !( *(const SdrShadowXDistItem*)pOld == aXItem ) ) )
{
- rAttrs.Put( aXItem );
+ rAttrs->Put( aXItem );
bModified = true;
}
SdrShadowYDistItem aYItem( nY );
- pOld = GetOldItem( rAttrs, SDRATTR_SHADOWYDIST );
+ pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWYDIST );
if ( nY != nOldY &&
( !pOld || !( *(const SdrShadowYDistItem*)pOld == aYItem ) ) )
{
- rAttrs.Put( aYItem );
+ rAttrs->Put( aYItem );
bModified = true;
}
}
@@ -324,10 +324,10 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
m_pLbShadowColor->IsValueChangedFromSaved() )
{
SdrShadowColorItem aItem(m_pLbShadowColor->GetSelectEntryColor());
- pOld = GetOldItem( rAttrs, SDRATTR_SHADOWCOLOR );
+ pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWCOLOR );
if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
@@ -337,16 +337,16 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
if( m_pMtrTransparent->IsValueChangedFromSaved() )
{
SdrShadowTransparenceItem aItem( nVal );
- pOld = GetOldItem( rAttrs, SDRATTR_SHADOWTRANSPARENCE );
+ pOld = GetOldItem( *rAttrs, SDRATTR_SHADOWTRANSPARENCE );
if ( !pOld || !( *(const SdrShadowTransparenceItem*)pOld == aItem ) )
{
- rAttrs.Put( aItem );
+ rAttrs->Put( aItem );
bModified = true;
}
}
}
- rAttrs.Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
+ rAttrs->Put (CntUInt16Item(SID_PAGE_TYPE,nPageType));
return( bModified );
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 629085bfdb44..6f680cccc34a 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -269,7 +269,7 @@ void SvxAngleTabPage::Construct()
}
}
-bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet)
+bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet)
{
bool bModified = false;
@@ -279,9 +279,9 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet)
const double fTmpX((GetCoreValue(*m_pMtrPosX, ePoolUnit) + maAnchor.getX()) * fUIScale);
const double fTmpY((GetCoreValue(*m_pMtrPosY, ePoolUnit) + maAnchor.getY()) * fUIScale);
- rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), m_pCtlAngle->GetRotation()));
- rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX)));
- rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY)));
+ rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), m_pCtlAngle->GetRotation()));
+ rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), basegfx::fround(fTmpX)));
+ rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), basegfx::fround(fTmpY)));
bModified = true;
}
@@ -355,7 +355,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
{
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
}
return LEAVE_PAGE;
@@ -469,7 +469,7 @@ void SvxSlantTabPage::Construct()
-bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
+bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
{
bool bModified = false;
OUString aStr = m_pMtrRadius->GetText();
@@ -480,7 +480,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
nTmp = Fraction( nTmp ) * aUIScale;
- rAttrs.Put( SdrEckenradiusItem( nTmp ) );
+ rAttrs->Put( SdrEckenradiusItem( nTmp ) );
bModified = true;
}
@@ -489,7 +489,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
if( m_pMtrAngle->IsValueChangedFromSaved() )
{
sal_Int32 nValue = static_cast<sal_Int32>(m_pMtrAngle->GetValue());
- rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) );
+ rAttrs->Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) );
bModified = true;
}
@@ -501,9 +501,9 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
pView->GetSdrPageView()->LogicToPagePos(aObjectRect);
Point aPt = aObjectRect.Center();
- rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_X, aPt.X()));
- rAttrs.Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_Y, aPt.Y()));
- rAttrs.Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) );
+ rAttrs->Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_X, aPt.X()));
+ rAttrs->Put(SfxInt32Item(SID_ATTR_TRANSFORM_SHEAR_Y, aPt.Y()));
+ rAttrs->Put( SfxBoolItem( SID_ATTR_TRANSFORM_SHEAR_VERTICAL, false ) );
}
return( bModified );
@@ -596,7 +596,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
{
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
}
return LEAVE_PAGE;
@@ -773,7 +773,7 @@ void SvxPositionSizeTabPage::Construct()
-bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
bool bModified(false);
@@ -804,8 +804,8 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
// #101581# GetTopLeftPosition(...) needs coordinates after UI scaling, in real PagePositions
GetTopLeftPosition(fX, fY, maRange);
- rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), basegfx::fround(fX)));
- rOutAttrs.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), basegfx::fround(fY)));
+ rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), basegfx::fround(fX)));
+ rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), basegfx::fround(fY)));
bModified = true;
}
@@ -814,11 +814,11 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
{
if( m_pTsbPosProtect->GetState() == TRISTATE_INDET )
{
- rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS );
+ rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS );
}
else
{
- rOutAttrs.Put(
+ rOutAttrs->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ),
m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
}
@@ -846,18 +846,18 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
lHeight = static_cast<long>(m_pMtrHeight->Denormalize( lHeight ));
// put Width & Height to itemset
- rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) lWidth ) );
- rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) lHeight ) );
- rOutAttrs.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), sal::static_int_cast< sal_uInt16 >( meRP ) ) );
+ rOutAttrs->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), (sal_uInt32) lWidth ) );
+ rOutAttrs->Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_HEIGHT ), (sal_uInt32) lHeight ) );
+ rOutAttrs->Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), sal::static_int_cast< sal_uInt16 >( meRP ) ) );
bModified = true;
}
if ( m_pTsbSizeProtect->IsValueChangedFromSaved() )
{
if ( m_pTsbSizeProtect->GetState() == TRISTATE_INDET )
- rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE );
+ rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE );
else
- rOutAttrs.Put(
+ rOutAttrs->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ),
m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
bModified = true;
@@ -868,9 +868,9 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
if ( !m_pTsbAutoGrowWidth->IsTriStateEnabled() )
{
if( m_pTsbAutoGrowWidth->GetState() == TRISTATE_INDET )
- rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH );
+ rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOWIDTH );
else
- rOutAttrs.Put(
+ rOutAttrs->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ),
m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
}
@@ -882,9 +882,9 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
if ( !m_pTsbAutoGrowHeight->IsTriStateEnabled() )
{
if( m_pTsbAutoGrowHeight->GetState() == TRISTATE_INDET )
- rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT );
+ rOutAttrs->InvalidateItem( SID_ATTR_TRANSFORM_AUTOHEIGHT );
else
- rOutAttrs.Put(
+ rOutAttrs->Put(
SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ),
m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) );
}
@@ -1048,7 +1048,7 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
basegfx::fround(fX + maRange.getWidth()), basegfx::fround(fY + maRange.getHeight()));
_pSet->Put(SfxRectangleItem(SID_ATTR_TRANSFORM_INTERN, aOutRectangle));
- FillItemSet(*_pSet);
+ FillItemSet(_pSet);
}
return LEAVE_PAGE;