Author: alg
Date: Thu Dec 13 09:47:57 2012
New Revision: 1421172
URL: http://svn.apache.org/viewvc?rev=1421172&view=rev
Log:
#121463# Enhanced handle visualization and some fixes in that region
Modified:
openoffice/trunk/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
openoffice/trunk/main/default_images/svx/res/cropmarkers.png
openoffice/trunk/main/default_images/svx/res/cropmarkers2.png
openoffice/trunk/main/default_images/svx/res/cropmarkersACC.png
openoffice/trunk/main/default_images/svx/res/markers.png
openoffice/trunk/main/default_images/svx/res/markers2.png
openoffice/trunk/main/default_images/svx/res/markersACC.png
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
openoffice/trunk/main/sc/source/core/tool/viewopti.cxx
openoffice/trunk/main/sd/source/ui/app/optsitem.cxx
openoffice/trunk/main/svx/inc/svx/svdhdl.hxx
openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx
openoffice/trunk/main/svx/source/svdraw/svdstr.src
openoffice/trunk/main/sw/source/ui/config/viewopt.cxx
openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
Modified:
openoffice/trunk/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
(original)
+++
openoffice/trunk/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
Thu Dec 13 09:47:57 2012
@@ -180,6 +180,9 @@ DrawViewWrapper::DrawViewWrapper( SdrMod
pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100,
EE_CHAR_FONTHEIGHT ) ); // 12pt
}
+ // #121463# Use big handles by default
+ SetMarkHdlSizePixel(9);
+
ReInit();
}
Modified: openoffice/trunk/main/default_images/svx/res/cropmarkers.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/cropmarkers.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/default_images/svx/res/cropmarkers2.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/cropmarkers2.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/default_images/svx/res/cropmarkersACC.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/cropmarkersACC.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/default_images/svx/res/markers.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/markers.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/default_images/svx/res/markers2.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/markers2.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/default_images/svx/res/markersACC.png
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/svx/res/markersACC.png?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
Binary files - no diff available.
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
Thu Dec 13 09:47:57 2012
@@ -333,7 +333,7 @@
<!-- UIHints: Tools - Options
-Spreadsheets - Layout - [Section] Lines -->
<info>
<author>NN</author>
- <desc>Specifies whether control
points are displayed as simple squares without 3D effect.</desc>
+ <desc>Specifies whether control
points are displayed simple or enhanced.</desc>
<label>Simple control
points</label>
</info>
<value>false</value>
@@ -347,7 +347,7 @@
<desc>Specifies whether control
points are displayed as larger than the default size.</desc>
<label>Large control
points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
Thu Dec 13 09:47:57 2012
@@ -366,7 +366,7 @@
<!-- UIHints: Optionbar -->
<info>
<author>AF</author>
- <desc>Indicates whether to show simple (true) or 3D-handles
(false).</desc>
+ <desc>Indicates whether to show simple (true) or enhanced handles
(false).</desc>
<label>Simple Handles</label>
</info>
<value>true</value>
@@ -380,7 +380,7 @@
<desc>Indicates whether to show big
(true) or small (false) handles.</desc>
<label>Big Handles</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="ModifyWithAttributes"
oor:type="xs:boolean">
<!-- OldPath: Draw/Other -->
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
Thu Dec 13 09:47:57 2012
@@ -409,10 +409,10 @@
<!-- OldLocation: soffice.cfg -->
<!-- UIHints: Optionbar -->
<info>
- <desc>Indicates whether to show simple (true) or 3D-handles
(false).</desc>
+ <desc>Indicates whether to show simple (true) or enhanced handles
(false).</desc>
<label>Simple Handles</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<!-- OldPath: Impress/Other -->
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
Thu Dec 13 09:47:57 2012
@@ -1298,10 +1298,10 @@
<!-- UIHints: Tools - Options - Text
document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control
points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control
points are displayed simple or enhanced.</desc>
<label>Simple control
points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint"
oor:type="xs:boolean">
<!-- OldPath: Writer/Layout/Lines -->
@@ -1309,10 +1309,10 @@
<!-- UIHints: Tools - Options - Text
document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control
points.</desc>
+ <desc>Specifies whether control
points are displayed as larger than the default size.</desc>
<label>Large control
points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
Modified:
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
(original)
+++
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
Thu Dec 13 09:47:57 2012
@@ -212,10 +212,10 @@
<!-- UIHints: Tools - Option -
HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays the control
points as simple squares without a 3D effect.</desc>
+ <desc>Specifies whether control
points are displayed simple or enhanced.</desc>
<label>Simple control
points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
<prop oor:name="LargeControlPoint"
oor:type="xs:boolean">
<!-- OldPath: HTML_Editor/Layout/Lines
-->
@@ -223,10 +223,10 @@
<!-- UIHints: Tools - Option -
HTML-Document - Layout - [Section] Lines -->
<info>
<author>OS</author>
- <desc>Displays larger control
points.</desc>
+ <desc>Specifies whether control
points are displayed as larger than the default size.</desc>
<label>Large control
points</label>
</info>
- <value>false</value>
+ <value>true</value>
</prop>
</group>
<group oor:name="Window">
Modified: openoffice/trunk/main/sc/source/core/tool/viewopti.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/viewopti.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/viewopti.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/viewopti.cxx Thu Dec 13 09:47:57
2012
@@ -146,9 +146,9 @@ void ScViewOptions::SetDefaults()
{
aOptArr[ VOPT_FORMULAS ] =
aOptArr[ VOPT_SYNTAX ] =
- aOptArr[ VOPT_HELPLINES ] =
- aOptArr[ VOPT_BIGHANDLES ] = sal_False;
- aOptArr[ VOPT_NOTES ] =
+ aOptArr[ VOPT_HELPLINES ] = sal_False;
+
+ aOptArr[ VOPT_NOTES ] =
aOptArr[ VOPT_NULLVALS ] =
aOptArr[ VOPT_VSCROLL ] =
aOptArr[ VOPT_HSCROLL ] =
@@ -158,7 +158,8 @@ void ScViewOptions::SetDefaults()
aOptArr[ VOPT_GRID ] =
aOptArr[ VOPT_ANCHOR ] =
aOptArr[ VOPT_PAGEBREAKS ] =
- aOptArr[ VOPT_SOLIDHANDLES] =
+ aOptArr[ VOPT_SOLIDHANDLES] = // default is enhanced handles
+ aOptArr[ VOPT_BIGHANDLES ] = // default is big handles
aOptArr[ VOPT_CLIPMARKS ] = sal_True;
aModeArr[VOBJ_TYPE_OLE ] =
Modified: openoffice/trunk/main/sd/source/ui/app/optsitem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/app/optsitem.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/app/optsitem.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/app/optsitem.cxx Thu Dec 13 09:47:57 2012
@@ -494,12 +494,12 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16
bMasterPageCache( sal_True ),
bDragWithCopy( sal_False ),
bPickThrough( sal_True ),
- bBigHandles( sal_False ),
+ bBigHandles( sal_True ), // new default: Use big handles
bDoubleClickTextEdit( sal_True ),
bClickChangeRotation( sal_False ),
bStartWithActualPage( sal_False ),
bSolidDragging( sal_True ),
- bSolidMarkHdl( sal_True ),
+ bSolidMarkHdl( sal_True ), // default: Use nice handles
bSummationOfParagraphs( sal_False ),
// #90356#
bShowUndoDeleteWarning( sal_True ),
Modified: openoffice/trunk/main/svx/inc/svx/svdhdl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/svdhdl.hxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/svdhdl.hxx (original)
+++ openoffice/trunk/main/svx/inc/svx/svdhdl.hxx Thu Dec 13 09:47:57 2012
@@ -138,7 +138,9 @@ enum BitmapMarkerKind
AnchorPressedTR,
// for SJ and the CustomShapeHandles:
- Customshape1
+ Customshape_7x7,
+ Customshape_9x9,
+ Customshape_11x11
};
////////////////////////////////////////////////////////////////////////////////////////////////////
Modified: openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdhdl.cxx Thu Dec 13 09:47:57 2012
@@ -96,18 +96,10 @@ public:
#define INDIVIDUAL_COUNT (4)
SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
-: maMarkersBitmap(),
+: maMarkersBitmap(ResId(nResId, *ImpGetResMgr())), // just use ressource
with alpha channel
// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
{
- // #101928# change color used for transparent parts to 0x00ff00ff
(ImageList standard)
- const Color aColTransparent(0x00ff00ff);
- const Bitmap aBitmap(ResId(nResId, *ImpGetResMgr()));
- const Bitmap aMask(aBitmap.CreateMask(aColTransparent));
-
- // create a real BitmapEx with an AlphaMask
- maMarkersBitmap = BitmapEx(aBitmap, aMask);
- // maMarkersBitmap = BitmapEx(aBitmap, aColTransparent);
}
SdrHdlBitmapSet::~SdrHdlBitmapSet()
@@ -171,15 +163,15 @@ const BitmapEx& SdrHdlBitmapSet::GetBitm
}
case 2:
{
- return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(72, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(72, 79), Size(13, 13)));
}
case 3:
{
- return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(85, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(85, 79), Size(13, 13)));
}
case 4:
{
- return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(98, 78), Size(13, 13)));
+ return impGetOrCreateTargetBitmap(nIndex,
Rectangle(Point(98, 79), Size(13, 13)));
}
default: // case 5:
{
@@ -189,17 +181,19 @@ const BitmapEx& SdrHdlBitmapSet::GetBitm
}
case Circ_7x7:
+ case Customshape_7x7:
{
return impGetOrCreateTargetBitmap((4 * INDEX_COUNT) +
nInd, Rectangle(Point(27, nYPos), Size(7, 7)));
}
case Circ_9x9:
- case Customshape1:
+ case Customshape_9x9:
{
return impGetOrCreateTargetBitmap((5 * INDEX_COUNT) +
nInd, Rectangle(Point(34, nYPos), Size(9, 9)));
}
case Circ_11x11:
+ case Customshape_11x11:
{
return impGetOrCreateTargetBitmap((6 * INDEX_COUNT) +
nInd, Rectangle(Point(43, nYPos), Size(11, 11)));
}
@@ -252,14 +246,14 @@ const BitmapEx& SdrHdlBitmapSet::GetBitm
case Anchor: // #101688# AnchorTR for SW
case AnchorTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 2, Rectangle(Point(24, 68), Size(24, 23)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 2, Rectangle(Point(24, 68), Size(24, 24)));
}
// #98388# add AnchorPressed to be able to aninate anchor
control
case AnchorPressed:
case AnchorPressedTR:
{
- return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 3, Rectangle(Point(48, 68), Size(24, 23)));
+ return impGetOrCreateTargetBitmap((KIND_COUNT *
INDEX_COUNT) + 3, Rectangle(Point(48, 68), Size(24, 24)));
}
}
@@ -551,7 +545,7 @@ void SdrHdl::CreateB2dIAObject()
// for SJ and the CustomShapeHandles:
case HDL_CUSTOMSHAPE1:
{
- eKindOfMarker = Customshape1;
+ eKindOfMarker = (b1PixMore) ? Customshape_7x7 :
Customshape_9x9;
eColIndex = Yellow;
break;
}
@@ -626,6 +620,10 @@ BitmapMarkerKind SdrHdl::GetNextBigger(B
case Circ_9x9: eRetval = Circ_11x11;
break;
//case Circ_11x11: eRetval = ; break;
+ case Customshape_7x7: eRetval = Customshape_9x9;
break;
+ case Customshape_9x9: eRetval = Customshape_11x11;
break;
+ //case Customshape_11x11: eRetval = ; break;
+
case Elli_7x9: eRetval = Elli_9x11;
break;
//case Elli_9x11: eRetval = ; break;
@@ -685,7 +683,27 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMa
if(pHdlList->GetHdlSize() > 3)
{
- bForceBiggerSize = sal_True;
+ switch(eKindOfMarker)
+ {
+ case Anchor:
+ case AnchorPressed:
+ case AnchorTR:
+ case AnchorPressedTR:
+ {
+ // #121463# For anchor, do not simply make bigger because of
HdlSize,
+ // do it dependent of IsSelected() which Writer can set in
drag mode
+ if(IsSelected())
+ {
+ bForceBiggerSize = sal_True;
+ }
+ break;
+ }
+ default:
+ {
+ bForceBiggerSize = sal_True;
+ break;
+ }
+ }
}
// #101928# ...for high contrast, too.
@@ -2084,7 +2102,7 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
bRotateShear = sal_False;
bMoveOutside = sal_False;
bDistortShear = sal_False;
- bFineHandles = sal_False;
+ bFineHandles = sal_True; // new default: Handles are fine handles
}
SdrHdlList::~SdrHdlList()
Modified: openoffice/trunk/main/svx/source/svdraw/svdstr.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdstr.src?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdstr.src (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdstr.src Thu Dec 13 09:47:57 2012
@@ -2763,12 +2763,12 @@ Bitmap SIP_SA_PAGESHADOW35X35
Bitmap SIP_SA_MARKERS
{
- File = "markers.bmp";
+ File = "markers.png";
};
Bitmap SIP_SA_FINE_MARKERS
{
- File = "markers2.bmp";
+ File = "markers2.png";
};
// #100499#
@@ -2780,7 +2780,7 @@ Bitmap BMP_SVXOLEOBJ
// #101928#
Bitmap SIP_SA_ACCESSIBILITY_MARKERS
{
- File = "markersACC.bmp";
+ File = "markersACC.png";
};
String STR_ObjNameSingulMEDIA
Modified: openoffice/trunk/main/sw/source/ui/config/viewopt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/config/viewopt.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/config/viewopt.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/config/viewopt.cxx Thu Dec 13 09:47:57
2012
@@ -223,14 +223,27 @@ SwViewOption::SwViewOption() :
{
// Initialisierung ist jetzt etwas einfacher
// alle Bits auf 0
- nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
- VIEWOPT_1_REF |
- VIEWOPT_1_GRAPHIC |
- VIEWOPT_1_TABLE | VIEWOPT_1_DRAW |
VIEWOPT_1_CONTROL |
- VIEWOPT_1_PAGEBACK |
- VIEWOPT_1_SOLIDMARKHDL |
VIEWOPT_1_POSTITS;
- nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
- nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM
|VIEWOPT_2_ANY_RULER;
+ nCoreOptions =
+ VIEWOPT_1_HARDBLANK |
+ VIEWOPT_1_SOFTHYPH |
+ VIEWOPT_1_REF |
+ VIEWOPT_1_GRAPHIC |
+ VIEWOPT_1_TABLE |
+ VIEWOPT_1_DRAW |
+ VIEWOPT_1_CONTROL |
+ VIEWOPT_1_PAGEBACK |
+ VIEWOPT_1_SOLIDMARKHDL | // default is enhanced handles
+ VIEWOPT_1_POSTITS;
+
+ nCore2Options =
+ VIEWOPT_CORE2_BLACKFONT |
+ VIEWOPT_CORE2_HIDDENPARA |
+ VIEWOPT_CORE2_BIGMARKHDL; // default is big handles
+
+ nUIOptions =
+ VIEWOPT_2_MODIFIED |
+ VIEWOPT_2_GRFKEEPZOOM |
+ VIEWOPT_2_ANY_RULER;
if(MEASURE_METRIC !=
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
aSnapSize.Width() = aSnapSize.Height() = 720; // 1/2"
Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx?rev=1421172&r1=1421171&r2=1421172&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx Thu Dec 13 09:47:57 2012
@@ -206,6 +206,7 @@ public:
void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
const Point& GetPos() { return pHdl->GetPos(); }
const Point& GetHdlPos() { return aHdlPos; }
+ SdrHdl* GetHdl() const { return pHdl; }
void ChgHdl( SdrHdl* pNew )
{
pHdl = pNew;
@@ -2881,6 +2882,8 @@ void SwEditWin::MouseButtonDown(const Mo
( pHdl->GetKind() == HDL_ANCHOR ||
pHdl->GetKind() == HDL_ANCHOR_TR ) )
{
+ // #121463# Set selected during drag
+ pHdl->SetSelected(true);
pAnchorMarker = new SwAnchorMarker( pHdl );
UpdatePointer( aDocPos, rMEvt.GetModifier() );
return;
@@ -4069,6 +4072,12 @@ void SwEditWin::MouseButtonUp(const Mous
if( pAnchorMarker )
{
+ if(pAnchorMarker->GetHdl())
+ {
+ // #121463# delete selected after drag
+ pAnchorMarker->GetHdl()->SetSelected(false);
+ }
+
Point aPnt( pAnchorMarker->GetLastPos() );
//OLMpSdrView->RefreshAllIAOManagers();
DELETEZ( pAnchorMarker );
