diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-15 13:29:53 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-17 00:10:01 +0100 |
| commit | f7424ed710e54bb2437a28380b03ed7c26290edc (patch) | |
| tree | ca44565d82433bf9c33fbeeeddce2bd5893c262c /sw | |
| parent | e3167924fd28c8b854f23139dbf49f53e6282ef7 (diff) | |
SfxTabDialog: avoid changing const input parameter
* SfxTabDialog constructor has a const pointer parameter
pointing to the input set and also the corresponding member
is a const pointer which indicated that set is not changed by
the dialog, but this is not true, const is casted away and
the input set is changed.
* So use a copy of the input set instead, pointed by
a non-const member, so we can spare some const cast and
misunderstandings.
* GetRefreshedSet not behaves as a getter method, but changes
the input set instead, so redeclare it accordingly.
Change-Id: Ic63f9ae68c50e65d4498b20f597547c1c075b94e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/inc/tmpdlg.hxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 4ac9c0f8fb19..0fef7a5499cb 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -363,12 +363,11 @@ short SwTemplateDlg::Ok() return nRet; } -const SfxItemSet* SwTemplateDlg::GetRefreshedSet() +void SwTemplateDlg::RefreshInputSet() { SfxItemSet* pInSet = GetInputSetImpl(); pInSet->ClearItem(); pInSet->SetParent( &GetStyleSheet().GetItemSet() ); - return pInSet; } void SwTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 75cab4201d6a..c92bde4fd143 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -78,7 +78,7 @@ public: SwWrtShell* pActShell = 0, bool bNew = false ); - const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; + virtual void RefreshInputSet() SAL_OVERRIDE; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; virtual short Ok() SAL_OVERRIDE; |