_SdrItemBrowserControl: reuse BreakChangeEntry in EndChangeEntry

Change-Id: I96667dc89a25455819898b68c2366c4ecef17e6d

_SdrItemBrowserControl: reuse BreakChangeEntry in EndChangeEntry
Change-Id: I96667dc89a25455819898b68c2366c4ecef17e6d
e8d81c02 · Matteo Casalin · 8a8623d8 · e8d81c02
Kaydet (Commit) e8d81c02 authored Kas 04, 2015 tarafından Matteo Casalin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 12 deletions

svdibrow.cxx svx/source/svdraw/svdibrow.cxx +6 -12

No files found.
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -532,18 +532,12 @@ bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)

 bool _SdrItemBrowserControl::EndChangeEntry()
 {
-    bool bRet = false;
-    if (pEditControl!=nullptr) {
-        aEntryChangedHdl.Call(*this);
-        pEditControl.disposeAndClear();
-        delete pAktChangeEntry;
-        pAktChangeEntry=NULL;
-        vcl::Window* pParent=GetParent();
-        pParent->SetText(aWNamMerk);
-        SetMode(MYBROWSEMODE);
-        bRet = true;
-    }
-    return bRet;
+    if (!pEditControl)
+        return false;
+
+    aEntryChangedHdl.Call(*this);
+    BreakChangeEntry();
+    return true;
 }

 void _SdrItemBrowserControl::BreakChangeEntry()