summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>2013-01-11 17:40:39 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-09-03 16:41:30 +0200
commit6bf4fac3759a4fb986382b032efbb22aa8c23175 (patch)
tree077dee99f15011802a55d45dc78715e52127492d
parentc1bf8f7dbaee8d5633f6bdf06e6a50ea597c821b (diff)
bnc#816593 docx import: fix incorrect nested table margins
Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68 (cherry picked from commit 194ba3a2cacbb5438dfcb8fb35167055e01ca251)
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 41d2c045daf0..d9c5abb1ac21 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -416,7 +416,9 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
{
aTableBorder.LeftLine = aLeftBorder;
aTableBorder.IsLeftLineValid = sal_True;
- rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
+ // Only top level table position depends on border width
+ if (rInfo.nNestLevel == 1)
+ rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
}
if (lcl_extractTableBorderProperty(m_aTableProperties, PROP_RIGHT_BORDER, rInfo, aBorderLine))
{