diff options
| author | Attila Szűcs <szucs.attila3@nisz.hu> | 2021-09-22 13:19:23 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-10-13 16:57:35 +0200 |
| commit | 537cb82be8fa021fd9382cca874645c75daaef20 (patch) | |
| tree | 3e3f7921626f91deaad2625199ce78dea433cdef /oox | |
| parent | 73f26b73aaf562bf934249460480b4a60937a438 (diff) | |
tdf#144642 XLSX import: round down row height to 0.75 pt
like table layout of MSO does, e.g. 20 pt to 19.5 pt.
Changing table row height is only for interoperability.
To avoid of regressions, apply this workaround only for
documents created in MSO.
Note: likely this is an old adjustment for low-resolution
monitors, where 0.75 is the factor between 96 ppi of Windows
resolution and (originally) 72 ppi of monitor resolutions.
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: Ie1e2c781d21174a877b18cd3250eb445222bd1c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122428
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/xmlfilterbase.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 371439b022a2..7f4ff6bd0f0c 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -200,6 +200,7 @@ XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) mnRelId( 1 ), mnMaxDocId( 0 ), mbMSO2007(false), + mbMSO(false), mbMissingExtDrawing(false) { } @@ -218,9 +219,10 @@ XmlFilterBase::~XmlFilterBase() void XmlFilterBase::checkDocumentProperties(const Reference<XDocumentProperties>& xDocProps) { - mbMSO2007 = false; + mbMSO2007 = mbMSO = false; if (!xDocProps->getGenerator().startsWithIgnoreAsciiCase("Microsoft")) return; + mbMSO = true; uno::Reference<beans::XPropertyAccess> xUserDefProps(xDocProps->getUserDefinedProperties(), uno::UNO_QUERY); if (!xUserDefProps.is()) @@ -1020,6 +1022,11 @@ bool XmlFilterBase::isMSO2007Document() const return mbMSO2007; } +bool XmlFilterBase::isMSODocument() const +{ + return mbMSO; +} + void XmlFilterBase::setMissingExtDrawing() { mbMissingExtDrawing = true; |