commit bdcd01c39324f5c74e0f696f2afc3449243e6c4b
author Armin Le Grand <alg@apache.org> Thu May 02 16:29:07 2013 +0000
committer Armin Le Grand <alg@apache.org> Thu May 02 16:29:07 2013 +0000
tree 82734ca3c2415eedafded6d610901ea736b1698c
parent fd23db16149eb517de9b2b403ff28ed0d31c83d6

i122142 do use simple text hilight frame when captions are in TextEdit mode

svx/source/svdraw/svdmrkv.cxx

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b8c1d8c..5132140 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -54,6 +54,7 @@
#include <svx/sdrpaintwindow.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrhittesthelper.hxx>
#include <svx/svdocapt.hxx>

////////////////////////////////////////////////////////////////////////////////////////////////////
// predefines
@@ -716,6 +717,12 @@ void SdrMarkView::SetMarkHandles()
            }
        }

        // #122142# 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());

svx/source/svdraw/svdorect.cxx

diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 8d21289..7e1c213 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -330,6 +330,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 (!)");
            pH = new ImpTextframeHdl(aRect);
            pH->SetObj((SdrObject*)this);
            pH->SetDrehWink(aGeo.nDrehWink);