writerfilter/source/dmapper/SdtHelper.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit d4a628a1ecbbf52c94e7924f17d6163cb34e1135
Author: Miklos Vajna <vmik...@suse.cz>
Date: Thu May 16 17:27:49 2013 +0200
bnc#779630 DOCX import: improve w:sdt size guessing
The problem was that when border was enabled (and the importer leaves it
unchanged, and it's on by default), there was not enough space for the
text.
Change-Id: I3ce770eb523389bcf7c5e83d4e76155e2c45de6d
(cherry picked from commit d0edc4e4c3709a3d0300e0b2b035e10493f583f9)
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx
b/writerfilter/source/dmapper/SdtHelper.cxx
index a1b215b..35f4d93 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -53,8 +53,13 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr
pStyleSheet, OUString& rDefault
sal_Int32 nWidth = pOut->GetTextWidth(aLongest);
pOut->Pop();
+
+ // Border: see PDFWriterImpl::drawFieldBorder(), border size is font
height / 4,
+ // so additional width / height needed is height / 2.
+ sal_Int32 nBorder = nHeight / 2;
+
// Width: space for the text + the square having the dropdown arrow.
- return awt::Size(nWidth + nHeight, nHeight);
+ return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
}
SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
