diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 09:20:23 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 11:24:24 +0100 |
commit | fd6150915253e382a7e9f674fe23a72a9a801761 (patch) | |
tree | aa76c8e0cd09eaa2cafbf7897fe48eb42a0886ec /solenv | |
parent | 9ffa900cb4d0381587162e3deb9d910965b69d58 (diff) |
RTF filter: drop now redundant astyle.options
I (tried to) keep the RTF filter style consistent locally with astyle in
the past, but now that's redundant when we have an enforcing
clang-format mechanism in place. So drop the astyle config and switch to
clang-format in the RTF filter case.
To minimize backport pain, do this shortly before the libreoffice-6-0
branch-off.
Change-Id: I708dbeb0b5ad2afacc90029ee5abba9495f4601f
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/clang-format/blacklist | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 96abb04a37b7..216fb6a6de22 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -4810,7 +4810,6 @@ filter/source/msfilter/msocximex.cxx filter/source/msfilter/msoleexp.cxx filter/source/msfilter/mstoolbar.cxx filter/source/msfilter/msvbahelper.cxx -filter/source/msfilter/rtfutil.cxx filter/source/msfilter/services.cxx filter/source/msfilter/svdfppt.cxx filter/source/msfilter/svxmsbas2.cxx @@ -6488,7 +6487,6 @@ include/filter/msfilter/msocximex.hxx include/filter/msfilter/msoleexp.hxx include/filter/msfilter/mstoolbar.hxx include/filter/msfilter/msvbahelper.hxx -include/filter/msfilter/rtfutil.hxx include/filter/msfilter/svdfppt.hxx include/filter/msfilter/svxmsbas.hxx include/filter/msfilter/util.hxx @@ -13674,8 +13672,6 @@ starmath/source/parse.cxx starmath/source/rect.cxx starmath/source/register.cxx starmath/source/register.hxx -starmath/source/rtfexport.cxx -starmath/source/rtfexport.hxx starmath/source/smdetect.cxx starmath/source/smdetect.hxx starmath/source/smdll.cxx @@ -15254,10 +15250,6 @@ sw/qa/extras/ooxmlexport/ooxmlexport9.cxx sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx sw/qa/extras/ooxmlexport/ooxmlw14export.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx -sw/qa/extras/rtfexport/rtfexport.cxx -sw/qa/extras/rtfexport/rtfexport2.cxx -sw/qa/extras/rtfexport/rtfexport3.cxx -sw/qa/extras/rtfimport/rtfimport.cxx sw/qa/extras/tiledrendering/tiledrendering.cxx sw/qa/extras/txtexport/txtexport.cxx sw/qa/extras/uiwriter/uiwriter.cxx @@ -15937,7 +15929,6 @@ sw/source/filter/inc/rtf.hxx sw/source/filter/inc/wrt_fn.hxx sw/source/filter/inc/wrtswtbl.hxx sw/source/filter/inc/wwstyles.hxx -sw/source/filter/rtf/swparrtf.cxx sw/source/filter/writer/writer.cxx sw/source/filter/writer/wrt_fn.cxx sw/source/filter/writer/wrtswtbl.cxx @@ -15966,16 +15957,6 @@ sw/source/filter/ww8/escher.hxx sw/source/filter/ww8/fields.cxx sw/source/filter/ww8/fields.hxx sw/source/filter/ww8/needed_cast.hxx -sw/source/filter/ww8/rtfattributeoutput.cxx -sw/source/filter/ww8/rtfattributeoutput.hxx -sw/source/filter/ww8/rtfexport.cxx -sw/source/filter/ww8/rtfexport.hxx -sw/source/filter/ww8/rtfexportfilter.cxx -sw/source/filter/ww8/rtfexportfilter.hxx -sw/source/filter/ww8/rtfsdrexport.cxx -sw/source/filter/ww8/rtfsdrexport.hxx -sw/source/filter/ww8/rtfstringbuffer.cxx -sw/source/filter/ww8/rtfstringbuffer.hxx sw/source/filter/ww8/sortedarray.hxx sw/source/filter/ww8/sprmids.hxx sw/source/filter/ww8/styles.cxx @@ -18787,9 +18768,7 @@ writerfilter/inc/ooxml/OOXMLDocument.hxx writerfilter/inc/ooxml/QNameToString.hxx writerfilter/inc/pch/precompiled_writerfilter.cxx writerfilter/inc/pch/precompiled_writerfilter.hxx -writerfilter/inc/rtftok/RTFDocument.hxx writerfilter/qa/cppunittests/misc/misc.cxx -writerfilter/qa/cppunittests/rtftok/testrtftok.cxx writerfilter/source/dmapper/BorderHandler.cxx writerfilter/source/dmapper/BorderHandler.hxx writerfilter/source/dmapper/CellColorHandler.cxx @@ -18893,35 +18872,6 @@ writerfilter/source/ooxml/OOXMLPropertySet.hxx writerfilter/source/ooxml/OOXMLStreamImpl.cxx writerfilter/source/ooxml/OOXMLStreamImpl.hxx writerfilter/source/ooxml/qnametostrcore.cxx -writerfilter/source/rtftok/rtfcharsets.cxx -writerfilter/source/rtftok/rtfcharsets.hxx -writerfilter/source/rtftok/rtfcontrolwords.cxx -writerfilter/source/rtftok/rtfcontrolwords.hxx -writerfilter/source/rtftok/rtfdispatchdestination.cxx -writerfilter/source/rtftok/rtfdispatchflag.cxx -writerfilter/source/rtftok/rtfdispatchsymbol.cxx -writerfilter/source/rtftok/rtfdispatchvalue.cxx -writerfilter/source/rtftok/rtfdocumentfactory.cxx -writerfilter/source/rtftok/rtfdocumentimpl.cxx -writerfilter/source/rtftok/rtfdocumentimpl.hxx -writerfilter/source/rtftok/rtffly.hxx -writerfilter/source/rtftok/rtflistener.hxx -writerfilter/source/rtftok/rtflookahead.cxx -writerfilter/source/rtftok/rtflookahead.hxx -writerfilter/source/rtftok/rtfreferenceproperties.cxx -writerfilter/source/rtftok/rtfreferenceproperties.hxx -writerfilter/source/rtftok/rtfreferencetable.cxx -writerfilter/source/rtftok/rtfreferencetable.hxx -writerfilter/source/rtftok/rtfsdrimport.cxx -writerfilter/source/rtftok/rtfsdrimport.hxx -writerfilter/source/rtftok/rtfskipdestination.cxx -writerfilter/source/rtftok/rtfskipdestination.hxx -writerfilter/source/rtftok/rtfsprm.cxx -writerfilter/source/rtftok/rtfsprm.hxx -writerfilter/source/rtftok/rtftokenizer.cxx -writerfilter/source/rtftok/rtftokenizer.hxx -writerfilter/source/rtftok/rtfvalue.cxx -writerfilter/source/rtftok/rtfvalue.hxx writerperfect/inc/DirectoryStream.hxx writerperfect/inc/DocumentHandler.hxx writerperfect/inc/DocumentHandlerFor.hxx |