diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-01-16 23:26:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-16 23:42:22 +0000 |
commit | 8fd85527981e3a6a915192aaea6f1595ea9f037c (patch) | |
tree | 99bb1359ec33d00d45fd63dcb27b6b2ee0ac4dfb /sfx2/inc | |
parent | 47d95d7591ec6218ad3c3ce75b232ee15d00c174 (diff) |
Resolves: fdo#58998 insert section applied twice
regression since 0157f0b1ba364f7f9af2aacd1be9fbb5ddec2b4d
my belief was that OK_Impl was only called in one
place, in sw/source/ui/fmtui/tmpdlg.cxx, so I
merged the use there into OK_Impl, but of course
there was another use in sfx2/source/dialog/tabdlg.cxx
Given that OK_Impl only called PrepareLeaveCurrentPage originally...
a) replace OK_Impl in sfx2/source/dialog/tabdlg.cxx
with PrepareLeaveCurrentPage, a no-op from the original state.
b) add an Apply method that does what I want, i.e.
call ok without closing the dialog, so we can retain
the fix of fdo#38606 to have "apply" immediately
apply the effect of pressing "ok" without closing
and reopening the dialog
Change-Id: I57e2e41c07ab9bf89ada98d1b9c3336db3493f19
Diffstat (limited to 'sfx2/inc')
-rw-r--r-- | sfx2/inc/sfx2/tabdlg.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index 69c7d892c722..d9593c053c39 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -219,13 +219,9 @@ public: void SetApplyHandler(const Link& _rHdl); SAL_DLLPRIVATE void Start_Impl(); - bool OK_Impl() - { - bool bRet = PrepareLeaveCurrentPage(); - if (bRet) - Ok(); - return bRet; - } + + //calls Ok without closing dialog + bool Apply(); }; namespace sfx { class ItemConnectionBase; } |