[Libreoffice-commits] core.git: svx/source

[Armin Le Grand]

 svx/source/svdraw/svdmrkv.cxx  |    8 ++++++++
 svx/source/svdraw/svdorect.cxx |    1 +
 2 files changed, 9 insertions(+)

New commits:
commit 54a1feb9b9bd654774b9aa60cda7ef9a1cd11064
Author: Armin Le Grand <alg at apache.org>
Date:   Thu May 2 16:29:07 2013 +0000

    Resolves: #i122142# use simple text hilight frames
    
    use simple text hilight frame when captions are in TextEdit mode
    
    (cherry picked from commit bdcd01c39324f5c74e0f696f2afc3449243e6c4b)
    
    Conflicts:
    	svx/source/svdraw/svdmrkv.cxx
    	svx/source/svdraw/svdorect.cxx
    
    Change-Id: Id570a220873d1bbd0f9caed4db44f90ca2f67d9e

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index dbd259f..ff27728 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -47,6 +47,7 @@
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrhittesthelper.hxx>
+#include <svx/svdocapt.hxx>
 
 #include <editeng/editdata.hxx>
 
@@ -621,6 +622,13 @@ void SdrMarkView::SetMarkHandles()
         // ( necessary for handles to be displayed in
         // correct position )
         Point aGridOff = GetGridOffset();
+
+        // #i122142# for captions in TextEdit, force to FrameHdls to get the special text selection
+        if(!bFrmHdl && pMarkedObj && bSingleTextObjMark && dynamic_cast< SdrCaptionObj* >(pMarkedObj))
+        {
+            bFrmHdl = true;
+        }
+
         if (bFrmHdl)
         {
             Rectangle aRect(GetMarkedObjRect());
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index da2d9fe..d17a0ed 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -316,6 +316,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const
     {
         case 0:
         {
+            OSL_ENSURE(!IsTextEditActive(), "Do not use a ImpTextframeHdl for hilighting text in active text edit, this will collide with EditEngine paints (!)");
             // hack for calc grid sync to ensure the hatched area
             // for a textbox is displayed at correct position
             pH = new ImpTextframeHdl(aRect + GetGridOffset() );