diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-20 11:14:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-20 12:34:32 +0100 |
| commit | b0bf124360730e79366e1be73383d4639e608a4c (patch) | |
| tree | 15abc06fa2f777c390d3b8c6bddcdde0164d9143 /svx | |
| parent | b74870f27557265e347f2e191a222f514d1b8c50 (diff) | |
SdrObject: add meRelativeWidth/HeightRelation
Similar to Writer TextBoxes, this member is supposed to store the
"relation" (text::RelOrientation constants) of the relative
width/height, so far the layout always assumed "relative to page".
Change-Id: I5100745314e45ad322bff2b761e3722459aba014
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 9999a4671c72..4a0d63c894ef 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -20,6 +20,7 @@ #include "sal/config.h" #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/text/RelOrientation.hpp> #include "svdconv.hxx" @@ -437,6 +438,8 @@ SdrObject::SdrObject() ,pGrabBagItem(NULL) ,mnNavigationPosition(SAL_MAX_UINT32) ,mnLayerID(0) + ,meRelativeWidthRelation(text::RelOrientation::PAGE_FRAME) + ,meRelativeHeightRelation(text::RelOrientation::PAGE_FRAME) ,mpSvxShape( NULL ) ,maWeakUnoShape() ,mbDoNotInsertIntoPageAutomatically(false) @@ -1615,6 +1618,8 @@ void SdrObject::Resize(const Point& rRef, const Fraction& xFact, const Fraction& if (bUnsetRelative) { mnRelativeWidth.reset( ); + meRelativeWidthRelation = text::RelOrientation::PAGE_FRAME; + meRelativeHeightRelation = text::RelOrientation::PAGE_FRAME; mnRelativeHeight.reset( ); } Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); |