diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2024-04-10 16:50:51 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-04-18 09:16:12 +0200 |
| commit | 828c1999e08c5bfad0a1d0e6e5ab07ee8bbc427e (patch) | |
| tree | 65dfe08b2f389fd5b6d8a639fda2815815931b2e /compilerplugins | |
| parent | 8e86df886f84fe69f13cfc367a5dd843e6ea917c (diff) | |
move writerfilter inside sw
writerfilter wants to convert incoming RTF and OOXML files into
writer's document model. But it currently has to do so by
manipulating the limited subset that we expose through the UNO
API.
This is both slower and less accurate than having access
to the full document model.
So move it inside, and then we can strip out various hacks, and
optimise imports.
Change-Id: Ie1114d28130ef5f9a786531bc552cb8ee7768015
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165953
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'compilerplugins')
| -rw-r--r-- | compilerplugins/clang/bufferadd.cxx | 6 | ||||
| -rw-r--r-- | compilerplugins/clang/buriedassign.cxx | 4 | ||||
| -rwxr-xr-x | compilerplugins/clang/unusedenumconstants.py | 4 | ||||
| -rwxr-xr-x | compilerplugins/clang/virtualdead.py | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/compilerplugins/clang/bufferadd.cxx b/compilerplugins/clang/bufferadd.cxx index 06f3a2b02733..8f58e46aba14 100644 --- a/compilerplugins/clang/bufferadd.cxx +++ b/compilerplugins/clang/bufferadd.cxx @@ -49,9 +49,11 @@ public: // some false + if (loplugin::isSamePathname(fn, SRCDIR "/unoidl/source/sourcetreeprovider.cxx")) return false; - if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/StyleSheetTable.cxx")) + if (loplugin::isSamePathname(fn, + SRCDIR "/sw/source/writerfilter/dmapper/StyleSheetTable.cxx")) return false; - if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/GraphicImport.cxx")) + if (loplugin::isSamePathname(fn, + SRCDIR "/sw/source/writerfilter/dmapper/GraphicImport.cxx")) return false; if (loplugin::isSamePathname(fn, SRCDIR "/sdext/source/pdfimport/pdfparse/pdfparse.cxx")) return false; diff --git a/compilerplugins/clang/buriedassign.cxx b/compilerplugins/clang/buriedassign.cxx index acc8bfe7dd67..8c2b13c3a708 100644 --- a/compilerplugins/clang/buriedassign.cxx +++ b/compilerplugins/clang/buriedassign.cxx @@ -129,9 +129,9 @@ public: return; if (fn == SRCDIR "/dbaccess/source/core/dataaccess/intercept.cxx") return; - if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper.cxx") + if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper.cxx") return; - if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper_Impl.cxx") + if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper_Impl.cxx") return; if (fn == SRCDIR "/lotuswordpro/source/filter/lwptablelayout.cxx") return; diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index c0079ab86f59..ebceffca0234 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -79,7 +79,7 @@ def is_ignore(srcLoc): "include/registry/version.h", "include/svtools/rtftoken.h", "sc/source/filter/inc/xltracer.hxx", - "writerfilter/source/dmapper/FieldTypes.hxx", + "sw/source/writerfilter/dmapper/FieldTypes.hxx", "vcl/source/fontsubset/cff.cxx", "vcl/source/filter/wmf/winmtf.hxx", "vcl/source/filter/sgvmain.hxx", @@ -188,7 +188,7 @@ def is_ignore(srcLoc): "include/i18nlangtag/applelangid.hxx", # AppleLanguageId "connectivity/source/drivers/firebird/Util.hxx", # firebird::BlobSubtype "include/xmloff/xmltoken.hxx", - "writerfilter/source/rtftok/rtfcontrolwords.hxx", + "sw/source/writerfilter/rtftok/rtfcontrolwords.hxx", ]): return True if d[1] == "UNKNOWN" or d[1] == "LAST" or d[1].endswith("NONE") or d[1].endswith("None") or d[1].endswith("EQUAL_SIZE"): diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py index efb5e2e777f3..e653c7e23832 100755 --- a/compilerplugins/clang/virtualdead.py +++ b/compilerplugins/clang/virtualdead.py @@ -100,7 +100,7 @@ for name, bitfield in iter(tmp2dict.items()): # ignore external stuff if srcloc.startswith("workdir/"): continue # referenced by generated code in workdir/ - if srcloc.startswith("writerfilter/source/ooxml/OOXMLFactory.hxx"): continue + if srcloc.startswith("sw/source/writerfilter/ooxml/OOXMLFactory.hxx"): continue if "0" in bitfield: tmp2list.append((srcloc, name, bitfield)) |