diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-17 16:27:39 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-17 17:16:15 +0100 |
| commit | f7a7a5a686367aa775fef8d077bfdfec7b2fad82 (patch) | |
| tree | 7fd60639ce18e630802e3f642635704605f3b63d /sw/source | |
| parent | cd03b4ac54076b5471bfdddd8b3154ecb6b4e7cc (diff) | |
SwAnchoredDrawObject::GetObjBoundRect: ignore relative size of group shapes
Instead of not reading the relative size of group shapes at all, read it
into the document model, just ignore it during painting. Visually this
doesn't change anything, however this way we can write the information
back to the file.
Change-Id: Ic24fceaacec0f831d657a35e52493e1c0e9bf626
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/anchoreddrawobject.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index dd260ec14b65..65416d42163f 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -27,8 +27,8 @@ // --> #i32795# #include <txtfrm.hxx> // --> #i32795# -// template class <std::vector> #include <vector> +#include <svx/svdogrp.hxx> using namespace ::com::sun::star; @@ -626,8 +626,9 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const // --> #i70122# const SwRect SwAnchoredDrawObject::GetObjBoundRect() const { + bool bGroupShape = PTR_CAST(SdrObjGroup, GetDrawObj()); // Resize objects with relative width or height - if ( GetPageFrm( ) && ( GetDrawObj( )->GetRelativeWidth( ) || GetDrawObj()->GetRelativeHeight( ) ) ) + if ( !bGroupShape && GetPageFrm( ) && ( GetDrawObj( )->GetRelativeWidth( ) || GetDrawObj()->GetRelativeHeight( ) ) ) { Rectangle aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect(); Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect(); |