[Libreoffice-commits] core.git: solenv/clang-format xmloff/inc xmloff/source

Muhammet Kara (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 7 11:06:47 UTC 2020 

 solenv/clang-format/blacklist                    |   12 ------------
 xmloff/inc/SchXMLImport.hxx                      |   15 ++++++++-------
 xmloff/inc/anim.hxx                              |    6 ++++--
 xmloff/inc/animations.hxx                        |    3 +--
 xmloff/inc/enummaps.hxx                          |    2 +-
 xmloff/inc/prstylecond.hxx                       |    2 +-
 xmloff/source/draw/layerexp.hxx                  |    2 +-
 xmloff/source/table/table.hxx                    |    2 +-
 xmloff/source/text/XMLLineNumberingExport.hxx    |    1 -
 xmloff/source/transform/PropType.hxx             |    2 +-
 xmloff/source/transform/PropertyActionsOASIS.hxx |    2 +-
 xmloff/source/transform/PropertyActionsOOo.hxx   |    2 +-
 xmloff/source/transform/TransformerAction.hxx    |    1 -
 13 files changed, 20 insertions(+), 32 deletions(-)

New commits:
commit f9b31a49027a8fa5e8fa094a3b62866832426466
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sat Mar 7 12:43:48 2020 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sat Mar 7 12:06:07 2020 +0100

    clang-format xmloff with under 5-percent lines of change
    
    Files which could become clang-format conformant with
    under 5-percent lines of change relative to the total
    count of lines in the file are found by using bin/find-clang-format.py,
    and fixed with /opt/lo/bin/clang-format -i <path-of-the-file>
    
    There will be follow-up patches to fix all 'under-5-percent' files.
    
    Change-Id: Ia2b85f00fc182798176d0af686b37f0df59ecb3c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90151
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9caa70d31144..204cd1a4031b 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17870,7 +17870,6 @@ xmloff/inc/RDFaExportHelper.hxx
 xmloff/inc/RDFaImportHelper.hxx
 xmloff/inc/SchXMLAutoStylePoolP.hxx
 xmloff/inc/SchXMLExport.hxx
-xmloff/inc/SchXMLImport.hxx
 xmloff/inc/StyleMap.hxx
 xmloff/inc/TransGradientStyle.hxx
 xmloff/inc/WordWrapPropertyHdl.hxx
@@ -17908,18 +17907,14 @@ xmloff/inc/XMLTextColumnsContext.hxx
 xmloff/inc/XMLTextColumnsExport.hxx
 xmloff/inc/XMLTextColumnsPropertyHandler.hxx
 xmloff/inc/XMLTextHeaderFooterContext.hxx
-xmloff/inc/anim.hxx
 xmloff/inc/animationimport.hxx
-xmloff/inc/animations.hxx
 xmloff/inc/animimp.hxx
-xmloff/inc/enummaps.hxx
 xmloff/inc/facreg.hxx
 xmloff/inc/fasttokenhandler.hxx
 xmloff/inc/forms/form_handler_factory.hxx
 xmloff/inc/forms/property_handler.hxx
 xmloff/inc/forms/property_ids.hxx
 xmloff/inc/propimp0.hxx
-xmloff/inc/prstylecond.hxx
 xmloff/inc/txtflde.hxx
 xmloff/inc/txtfldi.hxx
 xmloff/inc/txtlists.hxx
@@ -18039,7 +18034,6 @@ xmloff/source/draw/descriptionimp.hxx
 xmloff/source/draw/eventimp.cxx
 xmloff/source/draw/eventimp.hxx
 xmloff/source/draw/layerexp.cxx
-xmloff/source/draw/layerexp.hxx
 xmloff/source/draw/layerimp.cxx
 xmloff/source/draw/layerimp.hxx
 xmloff/source/draw/numithdl.cxx
@@ -18258,7 +18252,6 @@ xmloff/source/style/xmltabe.cxx
 xmloff/source/style/xmltabi.cxx
 xmloff/source/table/XMLTableExport.cxx
 xmloff/source/table/XMLTableImport.cxx
-xmloff/source/table/table.hxx
 xmloff/source/text/XMLAnchorTypePropHdl.hxx
 xmloff/source/text/XMLAutoMarkFileContext.cxx
 xmloff/source/text/XMLAutoMarkFileContext.hxx
@@ -18323,7 +18316,6 @@ xmloff/source/text/XMLIndexTitleTemplateContext.hxx
 xmloff/source/text/XMLIndexUserSourceContext.cxx
 xmloff/source/text/XMLIndexUserSourceContext.hxx
 xmloff/source/text/XMLLineNumberingExport.cxx
-xmloff/source/text/XMLLineNumberingExport.hxx
 xmloff/source/text/XMLLineNumberingImportContext.cxx
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx
 xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx
@@ -18455,11 +18447,8 @@ xmloff/source/transform/ProcAddAttrTContext.cxx
 xmloff/source/transform/ProcAddAttrTContext.hxx
 xmloff/source/transform/ProcAttrTContext.cxx
 xmloff/source/transform/ProcAttrTContext.hxx
-xmloff/source/transform/PropType.hxx
 xmloff/source/transform/PropertyActionsOASIS.cxx
-xmloff/source/transform/PropertyActionsOASIS.hxx
 xmloff/source/transform/PropertyActionsOOo.cxx
-xmloff/source/transform/PropertyActionsOOo.hxx
 xmloff/source/transform/RenameElemTContext.cxx
 xmloff/source/transform/RenameElemTContext.hxx
 xmloff/source/transform/StyleOASISTContext.cxx
@@ -18467,7 +18456,6 @@ xmloff/source/transform/StyleOASISTContext.hxx
 xmloff/source/transform/StyleOOoTContext.cxx
 xmloff/source/transform/StyleOOoTContext.hxx
 xmloff/source/transform/Transformer.hxx
-xmloff/source/transform/TransformerAction.hxx
 xmloff/source/transform/TransformerActionInit.hxx
 xmloff/source/transform/TransformerActions.cxx
 xmloff/source/transform/TransformerActions.hxx
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 690038c80bf8..33b0f50d5764 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -152,20 +152,21 @@ class SchXMLImport final : public SvXMLImport
 private:
     rtl::Reference<SchXMLImportHelper> maImportHelper;
 
-    virtual SvXMLImportContext *CreateFastContext( sal_Int32 nElement,
-        const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& xAttrList ) override;
+    virtual SvXMLImportContext* CreateFastContext(
+        sal_Int32 nElement,
+        const ::css::uno::Reference<::css::xml::sax::XFastAttributeList>& xAttrList) override;
 
 public:
-    SchXMLImport(
-        const css::uno::Reference< css::uno::XComponentContext >& xContext,
-        OUString const & implementationName, SvXMLImportFlags nImportFlags );
+    SchXMLImport(const css::uno::Reference<css::uno::XComponentContext>& xContext,
+                 OUString const& implementationName, SvXMLImportFlags nImportFlags);
 
-    virtual ~SchXMLImport() throw () override;
+    virtual ~SchXMLImport() throw() override;
 
     SvXMLImportContext* CreateStylesContext();
 
     // XImporter
-    virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
+    virtual void SAL_CALL
+    setTargetDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override;
 };
 
 #endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index b4c2e6d58b6e..f3fb92d38431 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -88,8 +88,10 @@ extern const SvXMLEnumMapEntry<XMLEffectDirection> aXML_AnimationDirection_EnumM
 
 extern const SvXMLEnumMapEntry<css::presentation::AnimationSpeed> aXML_AnimationSpeed_EnumMap[];
 
-void SdXMLImplSetEffect( css::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
-css::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
+void SdXMLImplSetEffect(css::presentation::AnimationEffect eEffect, XMLEffect& eKind,
+                        XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn);
+css::presentation::AnimationEffect
+ImplSdXMLgetEffect(XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn);
 
 #endif // INCLUDED_XMLOFF_INC_ANIM_HXX
 
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 0144a590a806..a84907845236 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -22,7 +22,7 @@
 
 #include <xmloff/xmltoken.hxx>
 
-template<typename EnumT> struct SvXMLEnumMapEntry;
+template <typename EnumT> struct SvXMLEnumMapEntry;
 
 namespace xmloff
 {
@@ -50,7 +50,6 @@ struct ImplAttributeNameConversion
 };
 
 extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConversionList();
-
 }
 
 #endif // INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
diff --git a/xmloff/inc/enummaps.hxx b/xmloff/inc/enummaps.hxx
index 525620b72239..97bd9ea8764f 100644
--- a/xmloff/inc/enummaps.hxx
+++ b/xmloff/inc/enummaps.hxx
@@ -15,7 +15,7 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
 
-template<typename EnumT> struct SvXMLEnumMapEntry;
+template <typename EnumT> struct SvXMLEnumMapEntry;
 
 extern SvXMLEnumMapEntry<css::drawing::FillStyle> const aXML_FillStyle_EnumMap[];
 extern SvXMLEnumMapEntry<css::drawing::RectanglePoint> const aXML_RefPoint_EnumMap[];
diff --git a/xmloff/inc/prstylecond.hxx b/xmloff/inc/prstylecond.hxx
index 57df2f80ae17..e658a83b9125 100644
--- a/xmloff/inc/prstylecond.hxx
+++ b/xmloff/inc/prstylecond.hxx
@@ -19,6 +19,6 @@
 
 #include <rtl/ustring.hxx>
 
-OUString GetParaStyleCondExternal( OUString const &);
+OUString GetParaStyleCondExternal(OUString const&);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/layerexp.hxx b/xmloff/source/draw/layerexp.hxx
index 2c2ea0efe721..90c905879091 100644
--- a/xmloff/source/draw/layerexp.hxx
+++ b/xmloff/source/draw/layerexp.hxx
@@ -25,7 +25,7 @@ class SvXMLExport;
 class SdXMLayerExporter
 {
 public:
-    static void exportLayer( SvXMLExport& rExport );
+    static void exportLayer(SvXMLExport& rExport);
 };
 
 #endif // INCLUDED_XMLOFF_SOURCE_DRAW_LAYEREXP_HXX
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index 79a4779e56ba..cdf5dba92311 100644
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/table.hxx
@@ -31,7 +31,7 @@ struct TableStyleElement
 };
 
 extern const TableStyleElement* getTableStyleMap();
-extern const TableStyleElement*  getWriterSpecificTableStyleMap();
+extern const TableStyleElement* getWriterSpecificTableStyleMap();
 extern const XMLPropertyMapEntry* getColumnPropertiesMap();
 extern const XMLPropertyMapEntry* getRowPropertiesMap();
 extern const XMLPropertyMapEntry* getCellPropertiesMap();
diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index 9b96219c71b2..f120f757641c 100644
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGEXPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGEXPORT_HXX
 
-
 class SvXMLExport;
 
 /** export <text:linenumbering-configuration> and its child elements */
diff --git a/xmloff/source/transform/PropType.hxx b/xmloff/source/transform/PropType.hxx
index 2b15d36743bc..5c7b7f721d28 100644
--- a/xmloff/source/transform/PropType.hxx
+++ b/xmloff/source/transform/PropType.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPTYPE_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPTYPE_HXX
 
-enum  XMLPropType
+enum XMLPropType
 {
     XML_PROP_TYPE_GRAPHIC,
     XML_PROP_TYPE_DRAWING_PAGE,
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 1f0cd92f891c..3dbfa10de66f 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -25,7 +25,7 @@
 
 enum XMLPropOASISTransformerAction
 {
-    XML_OPTACTION_LINE_MODE=XML_ATACTION_USER_DEFINED,
+    XML_OPTACTION_LINE_MODE = XML_ATACTION_USER_DEFINED,
     XML_OPTACTION_UNDERLINE_TYPE,
     XML_OPTACTION_UNDERLINE_STYLE,
     XML_OPTACTION_UNDERLINE_WIDTH,
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index 5d693a00bcee..5353724f95d1 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -25,7 +25,7 @@
 
 enum XMLPropOOOTransformerAction
 {
-    XML_PTACTION_LINE_MODE=XML_ATACTION_USER_DEFINED,
+    XML_PTACTION_LINE_MODE = XML_ATACTION_USER_DEFINED,
     XML_PTACTION_UNDERLINE,
     XML_PTACTION_LINETHROUGH,
     XML_PTACTION_KEEP_WITH_NEXT,
diff --git a/xmloff/source/transform/TransformerAction.hxx b/xmloff/source/transform/TransformerAction.hxx
index d3571ba0ccb3..32707a3d1a85 100644
--- a/xmloff/source/transform/TransformerAction.hxx
+++ b/xmloff/source/transform/TransformerAction.hxx
@@ -23,7 +23,6 @@
 #define XML_TACTION_EOT 0x0000
 #define XML_TACTION_END 0xffff
 
-
 #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list