diff options
| author | Armin Le Grand <alg@apache.org> | 2013-01-09 14:49:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-07 20:41:54 +0100 |
| commit | 501e0246bc72783f2dc830ea6b29f4a9e7c3045f (patch) | |
| tree | 283b53959976bad6dc3233b814956994765d47a1 /svx | |
| parent | 13ef16423e78d3ea825172594f08c47d2f9bfd09 (diff) | |
Resolves: #i121603# corrected D&D on existing shapes (CTRL+SHIFT pressed)
(cherry picked from commit 5f81e1134607ae67d7c598f695bd0997cd9c9284)
Conflicts:
sd/source/ui/view/sdview3.cxx
sd/source/ui/view/sdview4.cxx
svx/source/svdraw/svdoole2.cxx
Change-Id: I91634de52a23ebe897f2d38a6cca763aed19dfc0
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 1 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 15aaa0173cb9..e930d31017b9 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -855,6 +855,7 @@ SdrObjCustomShape::SdrObjCustomShape() : fObjectRotation( 0.0 ), mpLastShadowGeometry(0L) { + bClosedObj = true; // custom shapes may be filled bTextFrame = sal_True; } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index af194c0f2f58..d00e0b8fa548 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -770,8 +770,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStri SetResizeProtect(sal_True); // For math objects, set closed state to transparent - if( ImplIsMathObj( xObjRef.GetObject() ) ) - SetClosedObj( false ); + SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() )); } // ----------------------------------------------------------------------------- @@ -1508,8 +1507,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta SetResizeProtect(sal_True); // For math objects, set closed state to transparent - if( ImplIsMathObj( rNewObjRef ) ) - SetClosedObj( false ); + SetClosedObj(!ImplIsMathObj( rNewObjRef )); Connect(); } @@ -2015,8 +2013,7 @@ void SdrOle2Obj::GetObjRef_Impl() } // For math objects, set closed state to transparent - if( ImplIsMathObj( xObjRef.GetObject() ) ) - SetClosedObj( false ); + SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() )); } if ( xObjRef.is() ) |