Age | Commit message (Collapse) | Author | Files | Lines |
|
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled
AddParaTableSpacing doc setting, which broke the layout of some
documents, e.g. n#778836. Fix this by doing what the WW8 importer does:
enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing
tag is present.
(cherry picked from commit 68338abfd657ad5511a8a77b431ace8ad465c35e)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
|
|
Change-Id: I9e8dee39f63a08517eb654e33747bd8c95d84b59
|
|
Word clips pictures that are bigger than a page instead of scaling them
down. This patch introduces a new compatibility option to allow clipping
a picture in Writer instead of scaling it down.
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I4defbee05be81e23ec28a2ed272eaf4e4cc6faf5
|
|
(cherry picked from commit 5d4bd2f97128adecc5b11699e98c934be3c3a462)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I7523be9f07d378e1c4d88468077653d3fa4161d3
|
|
In Word, the layer that contains a background image is behind the layer
that contains the paragraph background. In Writer, the paragraph
background is painted before the hell layer. Add a compat flag to change
the order, so the DOCX importer can trigger that.
To reproduce, create an XShape, send it to the background, set some
color for a paragraph background, and notice that the background color
is missing where the shape is behind the text.
(cherry picked from commit 741132e8a60891684d40726a3d34ef784268a21e)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docnew.cxx
sw/source/filter/xml/xmlimp.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I94aa58fcfe47e4a2fd27d411d7e04ccce92824fa
|
|
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
|
|
(cherry picked from commit 926fe8298be1a2d4a22277a5e9ecf4e2582b0b21)
Conflicts:
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I32869aa3d7b6b25c7eb9756d79ea7126130afc4b
|
|
The DOCX filter imports floating tables as frames containing a table.
Word ignores the margins of paragraphs next to such a table, Writer does
not. Add a compatibility flag the import filter can set that triggers
this weird behaviour.
(cherry picked from commit 50a1df360c907d8419ce49f098b6bc87a37a9956)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: Iaaa1d2a2e2f9d0eaea17832b2e418f9a845efffd
|
|
Change-Id: I910a508722a309d7916377a7e2df2093070809ad
|
|
Change-Id: Ia330e70e393309dbbad025fc2ede8f4ab41a674c
|
|
|
|
|
|
|
|
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\)) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
|
|
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
|
|
|
|
Part XLV
Modules
writerfilter, writerperfect
|
|
|
|
|
|
|
|
|
|
|
|
Added a compatibility option to reproduce Word's behavior when importing
Doc, docx and RTF files. The default behavior isn't changed.
|
|
|
|
Disable the unit tests in sw, as that would duplicate the unit test in
writerfilter now.
Do not remove the old filter yet, so this commit can be reverted later
if needed.
|
|
|
|
|
|
|
|
* gnumake4's writerfilter gbuildization got pushed in a seperate branch
* it might or might not be merged to master later
|
|
|
|
|
|
|
|
|
|
* mostly switching to gnumake4/writerfilter10 gbuild implementation (thanks mst, hb)
|
|
|
|
Conflicts:
filter/source/config/cache/filtercache.cxx
filter/source/odfflatxml/makefile.mk
oox/Library_oox.mk
oox/Makefile
oox/Module_oox.mk
oox/Package_generated.mk
oox/Package_inc.mk
oox/prj/build.lst
oox/prj/d.lst
oox/prj/makefile.mk
oox/source/dump/makefile.mk
unoxml/Library_unordf.mk
unoxml/Library_unoxml.mk
writerfilter/CppunitTest_writerfilter_doctok.mk
writerfilter/Library_writerfilter.mk
writerfilter/Module_writerfilter.mk
writerfilter/Package_inc.mk
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
writerfilter/prj/build.lst
writerfilter/prj/makefile.mk
writerfilter/qa/complex/ooxml/makefile.mk
writerfilter/qa/cppunittests/doctok/makefile.mk
writerfilter/qa/cppunittests/doctok/testdoctok.cxx
writerfilter/qa/cppunittests/xxml/testXXML.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/GraphicHelpers.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/ThemeTable.cxx
writerfilter/source/doctok/WW8DocumentImpl.cxx
writerfilter/source/doctok/resourcesimpl.xsl
writerfilter/source/filter/WriterFilter.cxx
writerfilter/source/generated.mk
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFactory.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/RefAndPointer.hxx
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/unocomponent/component.cxx
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
|
|
|
|
|
|
|
|
so that later it can access its modelfactory
|
|
|
|
|
|
Conflicts:
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgwriter.cxx
lotuswordpro/source/filter/lwpchartstreamtools.cxx
lotuswordpro/source/filter/lwpfrib.cxx
lotuswordpro/source/filter/lwpgrfobj.cxx
lotuswordpro/source/filter/lwpidxmgr.cxx
lotuswordpro/source/filter/lwpobjid.cxx
lotuswordpro/source/filter/lwpparaproperty.cxx
lotuswordpro/util/makefile.mk
oox/prj/d.lst
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/makefile.mk
oox/source/drawingml/shape.cxx
oox/source/ppt/slidepersist.cxx
oox/source/token/namespaces.hxx.tail
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/makefile.mk
oox/source/xls/workbookhelper.cxx
writerfilter/source/ooxml/makefile.mk
writerfilter/source/resourcemodel/makefile.mk
|
|
|
|
|
|
|
|
|
|
This avoids exporting the same functions from multiple DLLs.
Also don't mark template classes for DLL export/import, I think that
is not what we want. Or am I on crack?
|
|
decorate component_getImplementationEnvironment &
component_getFactor with SAL_DLLPUBLIC_EXPORT, otherwise wrong functions get called
|
|
|