diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:29:07 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-19 19:25:20 +0100 |
commit | c927d6daa9a6403c53cc41b1ab4dde820f08f387 (patch) | |
tree | bf87e9a9e8769ac831c75d84fbc5aa851f21f132 /xmloff/inc | |
parent | 7b49f8c7ebf40048181b56e9bfb11135bd473cab (diff) |
tdf#123936 Formatting files in module xmloff with clang-format
Change-Id: I4d9016a0e646da5d9f0044762f6ecce86ce1242b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105732
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/MultiPropertySetHelper.hxx | 62 | ||||
-rw-r--r-- | xmloff/inc/PropertySetMerger.hxx | 7 | ||||
-rw-r--r-- | xmloff/inc/XMLTextColumnsExport.hxx | 13 | ||||
-rw-r--r-- | xmloff/inc/animimp.hxx | 9 | ||||
-rw-r--r-- | xmloff/inc/forms/form_handler_factory.hxx | 13 | ||||
-rw-r--r-- | xmloff/inc/xmltabi.hxx | 13 |
6 files changed, 59 insertions, 58 deletions
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx index ee996422e2e3..65e378bd7a2d 100644 --- a/xmloff/inc/MultiPropertySetHelper.hxx +++ b/xmloff/inc/MultiPropertySetHelper.hxx @@ -23,13 +23,21 @@ #include <com/sun/star/uno/Sequence.hxx> #include <memory> - -namespace com::sun::star { - namespace beans { class XMultiPropertySet; } - namespace beans { class XPropertySet; } - namespace beans { class XPropertySetInfo; } +namespace com::sun::star +{ +namespace beans +{ +class XMultiPropertySet; +} +namespace beans +{ +class XPropertySet; +} +namespace beans +{ +class XPropertySetInfo; +} } - /** * The MultiPropertySetHelper performs the following functions: @@ -62,14 +70,14 @@ class MultiPropertySetHelper /// the sequence of property names that the current (multi) /// property set implementation supports - css::uno::Sequence< OUString > aPropertySequence; + css::uno::Sequence<OUString> aPropertySequence; /// an array of indices that maps from pPropertyNames indices to /// aPropertySequence indices std::unique_ptr<sal_Int16[]> pSequenceIndex; /// the last set of values retrieved by getValues - css::uno::Sequence< css::uno::Any > aValues; + css::uno::Sequence<css::uno::Any> aValues; /// result of aValues.getConstArray() const css::uno::Any* pValues; @@ -78,18 +86,15 @@ class MultiPropertySetHelper css::uno::Any aEmptyAny; public: - - MultiPropertySetHelper( const char** pNames ); + MultiPropertySetHelper(const char** pNames); ~MultiPropertySetHelper(); - /** * Call hasPropertiesByName for the provided XPropertySetInfo and build * list of allowed properties. */ - void hasProperties( const css::uno::Reference<css::beans::XPropertySetInfo> & ); - + void hasProperties(const css::uno::Reference<css::beans::XPropertySetInfo>&); /** * Return whether hasProperties was called @@ -103,7 +108,7 @@ public: * May only be called after hasProperties() was called for the * appropriate XPropertySetInfo. */ - void getValues( const css::uno::Reference<css::beans::XMultiPropertySet> & ); + void getValues(const css::uno::Reference<css::beans::XMultiPropertySet>&); /** * Get values from the XPropertySet. This can be much slower than @@ -113,22 +118,21 @@ public: * May only be called after hasProperties() was called for the * appropriate XPropertySetInfo. */ - void getValues( const css::uno::Reference<css::beans::XPropertySet> & ); - + void getValues(const css::uno::Reference<css::beans::XPropertySet>&); /** * Get a value from the values array. * * May only be called after getValues() was called. */ - inline const css::uno::Any& getValue( sal_Int16 nIndex ); + inline const css::uno::Any& getValue(sal_Int16 nIndex); /** * Find out if this property is supported. * * May only be called after hasProperties() was called. */ - inline bool hasProperty( sal_Int16 nIndex ); + inline bool hasProperty(sal_Int16 nIndex); /** * Get a value from the XPropertySet on demand. @@ -140,9 +144,9 @@ public: * bTryMult is set, the XMultiPropertySet is used to get the values. * */ - const css::uno::Any& getValue( sal_Int16 nIndex, - const css::uno::Reference<css::beans::XPropertySet> &, - bool bTryMulti = false ); + const css::uno::Any& getValue(sal_Int16 nIndex, + const css::uno::Reference<css::beans::XPropertySet>&, + bool bTryMulti = false); /** * Get a value from the XMultiPropertySet on demand. @@ -154,32 +158,30 @@ public: * XMultiPropertySet is used to get the values. * */ - const css::uno::Any& getValue( sal_Int16 nIndex, - const css::uno::Reference<css::beans::XMultiPropertySet> & ); + const css::uno::Any& getValue(sal_Int16 nIndex, + const css::uno::Reference<css::beans::XMultiPropertySet>&); void resetValues() { pValues = nullptr; } }; - // inline implementations of the often-called methods getValue and hasProperty: -const css::uno::Any& MultiPropertySetHelper::getValue( - sal_Int16 nValueNo ) +const css::uno::Any& MultiPropertySetHelper::getValue(sal_Int16 nValueNo) { assert(pValues && "called getValue() without calling getValues()"); assert(pSequenceIndex && "called getValue() without calling hasProperties()"); assert(nValueNo < nLength); - sal_Int16 nIndex = pSequenceIndex[ nValueNo ]; - return ( nIndex != -1 ) ? pValues[ nIndex ] : aEmptyAny; + sal_Int16 nIndex = pSequenceIndex[nValueNo]; + return (nIndex != -1) ? pValues[nIndex] : aEmptyAny; } -bool MultiPropertySetHelper::hasProperty( sal_Int16 nValueNo ) +bool MultiPropertySetHelper::hasProperty(sal_Int16 nValueNo) { assert(pSequenceIndex && "called hasProperty() without calling hasProperties()"); assert(nValueNo < nLength); - return pSequenceIndex[ nValueNo ] != -1; + return pSequenceIndex[nValueNo] != -1; } #endif diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx index 22ec387fa0b9..26b076b4972b 100644 --- a/xmloff/inc/PropertySetMerger.hxx +++ b/xmloff/inc/PropertySetMerger.hxx @@ -22,10 +22,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> -extern css::uno::Reference< css::beans::XPropertySet > - PropertySetMerger_CreateInstance( - const css::uno::Reference< css::beans::XPropertySet >& rPropSet1, - const css::uno::Reference< css::beans::XPropertySet >& rPropSet2 ) throw(); +extern css::uno::Reference<css::beans::XPropertySet> PropertySetMerger_CreateInstance( + const css::uno::Reference<css::beans::XPropertySet>& rPropSet1, + const css::uno::Reference<css::beans::XPropertySet>& rPropSet2) throw(); #endif diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx index a21f96125ff9..d407aee40f21 100644 --- a/xmloff/inc/XMLTextColumnsExport.hxx +++ b/xmloff/inc/XMLTextColumnsExport.hxx @@ -21,23 +21,24 @@ #include <sal/types.h> -namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno +{ +class Any; +} class SvXMLExport; class XMLTextColumnsExport { - SvXMLExport& rExport; + SvXMLExport& rExport; SvXMLExport& GetExport() { return rExport; } public: + XMLTextColumnsExport(SvXMLExport& rExport); - XMLTextColumnsExport( SvXMLExport& rExport ); - - void exportXML( const css::uno::Any& rAny ); + void exportXML(const css::uno::Any& rAny); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index f187ac411e62..f526af6fb07b 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -30,13 +30,14 @@ class XMLAnimationsContext final : public SvXMLImportContext { public: - css::uno::Reference< css::beans::XPropertySet > mxLastShape; + css::uno::Reference<css::beans::XPropertySet> mxLastShape; OUString maLastShapeId; - XMLAnimationsContext( SvXMLImport& rImport); + XMLAnimationsContext(SvXMLImport& rImport); - virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; + virtual css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( + sal_Int32 nElement, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& AttrList) override; }; #endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX diff --git a/xmloff/inc/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx index 0ee97e631edc..5f33b23dda03 100644 --- a/xmloff/inc/forms/form_handler_factory.hxx +++ b/xmloff/inc/forms/form_handler_factory.hxx @@ -24,13 +24,12 @@ namespace xmloff { - - //= FormHandlerFactory - class FormHandlerFactory - { - public: - static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId ); - }; +//= FormHandlerFactory +class FormHandlerFactory +{ +public: + static PPropertyHandler getFormPropertyHandler(const PropertyId i_propertyId); +}; } // namespace xmloff diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index bc51546cdd4a..809c257de9ef 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -35,18 +35,17 @@ private: std::unique_ptr<SvxXMLTabStopArray_Impl> mpTabStops; public: + SvxXMLTabStopImportContext(SvXMLImport& rImport, sal_Int32 nElement, + const XMLPropertyState& rProp, + ::std::vector<XMLPropertyState>& rProps); - SvxXMLTabStopImportContext( SvXMLImport& rImport, sal_Int32 nElement, - const XMLPropertyState& rProp, - ::std::vector< XMLPropertyState > &rProps ); - - virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( - sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; + virtual css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( + sal_Int32 nElement, + const css::uno::Reference<css::xml::sax::XFastAttributeList>& AttrList) override; virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; - #endif // INCLUDED_XMLOFF_INC_XMLTABI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |