diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:12:44 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:12:44 +0200 |
| commit | ef05272548413db0482faf229e6f2653985001c1 (patch) | |
| tree | a84fe19ed99abdbf5fee8761c533a6e36f36ce1e | |
| parent | 733f062f2411ea6aaa4e6aeb57d9ba563a3f5e0f (diff) | |
| parent | f50712190593f0fd7f25b56b3bd527fce2b4d886 (diff) | |
CWS-TOOLING: integrate CWS impress194
Notes
split repo tag: impress_ooo/OOO330_m2
| -rwxr-xr-x[-rw-r--r--] | sd/source/filter/html/pubdlg.cxx | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/futext.cxx | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 55e141f8d4cb..8079238bc1dc 100644..100755 --- 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> diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 2fd808dcda3e..2f3111665692 100644..100755 --- 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(); |