diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-08-27 14:06:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-28 14:46:16 +0200 |
| commit | 47a971230b629b7e124044de0789ade7987db848 (patch) | |
| tree | c194fc75582043ef33f75c1bf08ccef300eceb06 /writerfilter/source/filter | |
| parent | 681fbb8eb275db4fd2bf7357819e8a991b734109 (diff) | |
n#775899 docx import of w:usePrinterMetrics compat option
This was set unconditionally, but it turns out it's not the default for
docx, it's triggered by a compat flag there as well.
(cherry picked from commit 93cdd851ee5917fa95e78d84734c73055b0edc4e)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I84dccfe7ffd49fbc6878b19ff4276f8a36b827a3
Diffstat (limited to 'writerfilter/source/filter')
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 2b20cf80d71b..55febf6758fd 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <comphelper/mediadescriptor.hxx> #include <oox/core/filterdetect.hxx> #include <dmapper/DomainMapper.hxx> @@ -185,7 +184,6 @@ void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xSettings->setPropertyValue( rtl::OUString::createFromAscii( "UnbreakableNumberings" ), uno::makeAny( sal_True ) ); xSettings->setPropertyValue(rtl::OUString::createFromAscii("FloattableNomargins"), uno::makeAny( sal_True )); - xSettings->setPropertyValue(rtl::OUString::createFromAscii("PrinterIndependentLayout"), uno::makeAny(document::PrinterIndependentLayout::DISABLED)); } void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) |