From 103998e7c97acfb6cec90715eca62ee519d8d3fb Mon Sep 17 00:00:00 2001
From: Christian Lippka <christian.lippka@sun.com>
Date: Thu, 8 Jul 2010 15:42:47 +0200
Subject: #112855# call SdrEndTextEdit only if we are still in text edit

---
 sd/source/ui/func/futext.cxx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 sd/source/ui/func/futext.cxx

(limited to 'sd/source')

diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
old mode 100644
new mode 100755
index 2fd808dcda3e..2f3111665692
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -400,10 +400,17 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
                             // do the EndTextEdit first, it will delete the handles and force a
                             // recreation. This will make aVEvt.pHdl to point to a deleted handle,
                             // thus it is necessary to reset it and to get it again.
-                            ::Outliner* pOutl = mpView->GetTextEditOutliner();
 
-                            if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() ||
-                                (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
+                            // #i112855#
+                            // cl: I'm not sure why we checked here also for mxTextObj->GetOutlinerParaObjet
+                            // this caused SdrEndTextEdit() to be called also when not in text editing and
+                            // this does not make sense and caused troubles. (see issue 112855)
+
+//                          ::Outliner* pOutl = mpView->GetTextEditOutliner();
+//
+//                          if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() ||
+//                              (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
+                            if( mpView->IsTextEdit() )
                             {
                                 mpView->SdrEndTextEdit();
 
-- 
cgit 


From f50712190593f0fd7f25b56b3bd527fce2b4d886 Mon Sep 17 00:00:00 2001
From: sj <sj@openoffice.org>
Date: Wed, 14 Jul 2010 15:37:03 +0200
Subject: fixed build problem (missing header file)

---
 sd/source/filter/html/pubdlg.cxx | 1 +
 1 file changed, 1 insertion(+)
 mode change 100644 => 100755 sd/source/filter/html/pubdlg.cxx

(limited to 'sd/source')

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
old mode 100644
new mode 100755
index 55e141f8d4cb..8079238bc1dc
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -51,6 +51,7 @@
 #include <svl/eitem.hxx>
 #include <svtools/colrdlg.hxx>
 #include <editeng/colritem.hxx>
+#include <tools/urlobj.hxx>
 #include <tools/list.hxx>
 #include <sdiocmpt.hxx>
 #include <sfx2/docfile.hxx>
-- 
cgit