diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:08:56 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-19 19:22:02 +0100 |
commit | c4ab5393e1c2332d92ea6672d3c8ffc3a6220afa (patch) | |
tree | 322f3de17afd5fccc26f3b2f9df56714b97cfc65 /oox/inc/drawingml | |
parent | de80fdc2060abe5b171bcef72944dd7b914ccd33 (diff) |
tdf#123936 Formatting files in module oox with clang-format
Change-Id: Ie061189450e0f9004ca503bb28164885812f2acc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105694
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'oox/inc/drawingml')
-rw-r--r-- | oox/inc/drawingml/objectdefaultcontext.hxx | 10 | ||||
-rw-r--r-- | oox/inc/drawingml/shapepropertiescontext.hxx | 12 | ||||
-rw-r--r-- | oox/inc/drawingml/shapestylecontext.hxx | 12 | ||||
-rw-r--r-- | oox/inc/drawingml/spdefcontext.hxx | 10 | ||||
-rw-r--r-- | oox/inc/drawingml/table/tablecellcontext.hxx | 13 | ||||
-rw-r--r-- | oox/inc/drawingml/table/tablecontext.hxx | 11 | ||||
-rw-r--r-- | oox/inc/drawingml/table/tablerow.hxx | 13 | ||||
-rw-r--r-- | oox/inc/drawingml/table/tablerowcontext.hxx | 13 | ||||
-rw-r--r-- | oox/inc/drawingml/textliststyle.hxx | 20 | ||||
-rw-r--r-- | oox/inc/drawingml/themeelementscontext.hxx | 10 |
10 files changed, 59 insertions, 65 deletions
diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx index 703b03097673..45873c8253ff 100644 --- a/oox/inc/drawingml/objectdefaultcontext.hxx +++ b/oox/inc/drawingml/objectdefaultcontext.hxx @@ -22,20 +22,20 @@ #include <oox/core/contexthandler2.hxx> -namespace oox::drawingml { - +namespace oox::drawingml +{ class Theme; class objectDefaultContext final : public oox::core::ContextHandler2 { public: - objectDefaultContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + objectDefaultContext(::oox::core::ContextHandler2Helper const& rParent, Theme& rTheme); + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: Theme& mrTheme; }; - } #endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX diff --git a/oox/inc/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx index 6736403f6063..9d047c15c224 100644 --- a/oox/inc/drawingml/shapepropertiescontext.hxx +++ b/oox/inc/drawingml/shapepropertiescontext.hxx @@ -23,19 +23,19 @@ #include <oox/core/contexthandler2.hxx> #include <oox/drawingml/shape.hxx> -namespace oox::drawingml { - +namespace oox::drawingml +{ class ShapePropertiesContext : public ::oox::core::ContextHandler2 { public: - ShapePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape ); + ShapePropertiesContext(::oox::core::ContextHandler2Helper const& rParent, Shape& rShape); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; protected: - Shape& mrShape; + Shape& mrShape; }; - } #endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx index 8a2cf9f904fd..02faa22a7670 100644 --- a/oox/inc/drawingml/shapestylecontext.hxx +++ b/oox/inc/drawingml/shapestylecontext.hxx @@ -23,20 +23,20 @@ #include <oox/drawingml/shape.hxx> #include <oox/core/contexthandler2.hxx> -namespace oox::drawingml { - +namespace oox::drawingml +{ class ShapeStyleContext final : public ::oox::core::ContextHandler2 { public: - ShapeStyleContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape ); + ShapeStyleContext(::oox::core::ContextHandler2Helper const& rParent, Shape& rShape); virtual ~ShapeStyleContext() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: - Shape& mrShape; + Shape& mrShape; }; - } #endif // INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX diff --git a/oox/inc/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx index 6b046af5b61a..6e9206d4acc0 100644 --- a/oox/inc/drawingml/spdefcontext.hxx +++ b/oox/inc/drawingml/spdefcontext.hxx @@ -23,18 +23,18 @@ #include <oox/drawingml/shape.hxx> #include <oox/core/contexthandler2.hxx> -namespace oox::drawingml { - +namespace oox::drawingml +{ class spDefContext final : public oox::core::ContextHandler2 { public: - spDefContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rDefaultObject ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + spDefContext(::oox::core::ContextHandler2Helper const& rParent, Shape& rDefaultObject); + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: Shape& mrDefaultObject; }; - } #endif // INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx index b4c32cdb67cc..a70ad2475e6e 100644 --- a/oox/inc/drawingml/table/tablecellcontext.hxx +++ b/oox/inc/drawingml/table/tablecellcontext.hxx @@ -23,22 +23,21 @@ #include <oox/core/contexthandler2.hxx> #include <drawingml/table/tablecell.hxx> -namespace oox::drawingml::table { - +namespace oox::drawingml::table +{ class TableCellContext : public ::oox::core::ContextHandler2 { public: - TableCellContext( ::oox::core::ContextHandler2Helper const & rParent, - const ::oox::AttributeList& rAttribs, TableCell& rTableCell ); + TableCellContext(::oox::core::ContextHandler2Helper const& rParent, + const ::oox::AttributeList& rAttribs, TableCell& rTableCell); virtual ~TableCellContext() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: - TableCell& mrTableCell; }; - } #endif diff --git a/oox/inc/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx index a6866ec2c18f..3004333d2739 100644 --- a/oox/inc/drawingml/table/tablecontext.hxx +++ b/oox/inc/drawingml/table/tablecontext.hxx @@ -22,23 +22,22 @@ #include <oox/drawingml/shapecontext.hxx> -namespace oox::drawingml::table { - +namespace oox::drawingml::table +{ class TableProperties; class TableContext final : public ShapeContext { public: - TableContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr ); + TableContext(::oox::core::ContextHandler2Helper const& rParent, const ShapePtr& pShapePtr); virtual ~TableContext() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: - TableProperties& mrTableProperties; }; - } #endif diff --git a/oox/inc/drawingml/table/tablerow.hxx b/oox/inc/drawingml/table/tablerow.hxx index b344a75cea6c..7f8d212c111e 100644 --- a/oox/inc/drawingml/table/tablerow.hxx +++ b/oox/inc/drawingml/table/tablerow.hxx @@ -23,24 +23,21 @@ #include <drawingml/table/tablecell.hxx> #include <vector> -namespace oox::drawingml::table { - +namespace oox::drawingml::table +{ class TableRow { public: - TableRow(); - void setHeight( sal_Int32 nHeight ){ mnHeight = nHeight; }; + void setHeight(sal_Int32 nHeight) { mnHeight = nHeight; }; sal_Int32 getHeight() const { return mnHeight; }; - std::vector< TableCell >& getTableCells() { return mvTableCells; }; + std::vector<TableCell>& getTableCells() { return mvTableCells; }; private: - sal_Int32 mnHeight; - std::vector< TableCell > mvTableCells; + std::vector<TableCell> mvTableCells; }; - } #endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX diff --git a/oox/inc/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx index 4d5c7348b7bd..1b18e45d16da 100644 --- a/oox/inc/drawingml/table/tablerowcontext.hxx +++ b/oox/inc/drawingml/table/tablerowcontext.hxx @@ -22,24 +22,23 @@ #include <oox/core/contexthandler2.hxx> -namespace oox::drawingml::table { - +namespace oox::drawingml::table +{ class TableRow; class TableRowContext final : public ::oox::core::ContextHandler2 { public: - TableRowContext( ::oox::core::ContextHandler2Helper const & rParent, - const ::oox::AttributeList& rAttribs, TableRow& rTableRow ); + TableRowContext(::oox::core::ContextHandler2Helper const& rParent, + const ::oox::AttributeList& rAttribs, TableRow& rTableRow); virtual ~TableRowContext() override; - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual ::oox::core::ContextHandlerRef + onCreateContext(::sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; private: - TableRow& mrTableRow; }; - } #endif diff --git a/oox/inc/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx index 95f101e0a6c4..52cb29330877 100644 --- a/oox/inc/drawingml/textliststyle.hxx +++ b/oox/inc/drawingml/textliststyle.hxx @@ -23,38 +23,38 @@ #include <drawingml/textparagraphproperties.hxx> #include <oox/helper/refvector.hxx> -namespace oox::drawingml { - -typedef RefVector< TextParagraphProperties > TextParagraphPropertiesVector; +namespace oox::drawingml +{ +typedef RefVector<TextParagraphProperties> TextParagraphPropertiesVector; class TextListStyle { public: - TextListStyle(); ~TextListStyle(); TextListStyle(const TextListStyle& rStyle); TextListStyle& operator=(const TextListStyle& rStyle); - void apply( const TextListStyle& rTextListStyle ); + void apply(const TextListStyle& rTextListStyle); const TextParagraphPropertiesVector& getListStyle() const { return maListStyle; }; - TextParagraphPropertiesVector& getListStyle() { return maListStyle; }; + TextParagraphPropertiesVector& getListStyle() { return maListStyle; }; - const TextParagraphPropertiesVector& getAggregationListStyle() const { return maAggregationListStyle; }; - TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; + const TextParagraphPropertiesVector& getAggregationListStyle() const + { + return maAggregationListStyle; + }; + TextParagraphPropertiesVector& getAggregationListStyle() { return maAggregationListStyle; }; #ifdef DBG_UTIL void dump() const; #endif private: - TextParagraphPropertiesVector maListStyle; TextParagraphPropertiesVector maAggregationListStyle; }; - } #endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX diff --git a/oox/inc/drawingml/themeelementscontext.hxx b/oox/inc/drawingml/themeelementscontext.hxx index 1f292fca7cff..4c113762e10c 100644 --- a/oox/inc/drawingml/themeelementscontext.hxx +++ b/oox/inc/drawingml/themeelementscontext.hxx @@ -22,16 +22,16 @@ #include <oox/core/contexthandler2.hxx> -namespace oox::drawingml { - +namespace oox::drawingml +{ class Theme; class ThemeElementsContext final : public oox::core::ContextHandler2 { public: - ThemeElementsContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs ) override; + ThemeElementsContext(::oox::core::ContextHandler2Helper const& rParent, Theme& rTheme); + virtual ::oox::core::ContextHandlerRef + onCreateContext(sal_Int32 nElement, const ::oox::AttributeList& rAttribs) override; private: Theme& mrTheme; |