You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/05/02 18:29:07 UTC
svn commit: r1478430 - in /openoffice/trunk/main/svx/source/svdraw:
svdmrkv.cxx svdorect.cxx
Author: alg
Date: Thu May 2 16:29:07 2013
New Revision: 1478430
URL: http://svn.apache.org/r1478430
Log:
i122142 do use simple text hilight frame when captions are in TextEdit mode
Modified:
openoffice/trunk/main/svx/source/svdraw/svdmrkv.cxx
openoffice/trunk/main/svx/source/svdraw/svdorect.cxx
Modified: openoffice/trunk/main/svx/source/svdraw/svdmrkv.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdmrkv.cxx?rev=1478430&r1=1478429&r2=1478430&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdmrkv.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdmrkv.cxx Thu May 2 16:29:07 2013
@@ -54,6 +54,7 @@
#include <svx/sdrpaintwindow.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrhittesthelper.hxx>
+#include <svx/svdocapt.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////
// predefines
@@ -715,6 +716,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)
{
Modified: openoffice/trunk/main/svx/source/svdraw/svdorect.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdorect.cxx?rev=1478430&r1=1478429&r2=1478430&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdorect.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdorect.cxx Thu May 2 16:29:07 2013
@@ -330,6 +330,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nH
{
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);