diff options
| author | Steve Yin <steve_y@apache.org> | 2014-08-08 03:10:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-09 14:13:09 +0100 |
| commit | 227f3aab1791ffde82fe930ea1c9f7ed4ed2d82d (patch) | |
| tree | 843a36e554301c6f32579c888a353a1fa83cb85a | |
| parent | d005acae3aa315921f2c331612131626c470bd22 (diff) | |
Resolves: #i125391# textbox object's location changes...
after importing the sample file
Fixed by Oliver-Rainer Wittmann
(cherry picked from commit 700479573567e82f9bd9ae065f18f9ec9d943300)
Conflicts:
sw/source/filter/ww8/ww8graf.cxx
Change-Id: I963689a80dfe4ac1439afb29132015e900886317
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 1445ce55bad7..c145c221b6f3 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2138,20 +2138,15 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, if (pFSPA) { - /* - #i15718# #i19008# - Strangely in this case the FSPA value seems to be considered before - the newer escher nXRelTo record. - */ - // #i52565# - correct condition checking: - // first check, if <nXRelTo> and <nYRelTo> have default values. This - // is a hint that these values aren't set by the escher import - see - // method <SwMSDffManager::ProcessObj(..)>. Then, check if for each - // values, if it differs from the one in the FSPA. - - if ( *(pRecord->pXRelTo) == 2 && *(pRecord->pYRelTo) == 2 && !bCurSectionVertical) + // #i52565# - try to handle special case for objects in tables regarding its X Rel + + // if X and Y Rel values are on default take it as a hint, that they have not been set + // by <SwMSDffManager::ProcessObj(..)> + const bool bXYRelHaveDefaultValues = *(pRecord->pXRelTo) == 2 && *(pRecord->pYRelTo) == 2; + if ( bXYRelHaveDefaultValues + && nInTable > 0 + && !bCurSectionVertical ) { - // if <nYRelTo> differs from <FSPA.nby> overwrite <nYRelTo> if ( pFSPA->nby != *(pRecord->pYRelTo) ) { *(pRecord->pYRelTo) = pFSPA->nby; |