diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 10:19:32 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-07 10:47:35 +0100 |
commit | 5946eedfb78e250a40f14ae1e5b709e827b2504c (patch) | |
tree | 53e224bc8277264156034d22854b2967c17673ca /include | |
parent | 9d2baccabec7f0e04469a715da613886999b6e0e (diff) |
test: clang-format recently added xsheet tests
Jens says he was unhappy with the 80 cols limit, so clang-format was
explicitly avoided for these new files, but now that the both the config
and TEMPLATE.SOURCECODE.HEADER says 100, it's fine to reformat these to
enforce consistency from now on.
Change-Id: Ia6f0a65920ad2c9d7b0834a0712356568c39624e
Diffstat (limited to 'include')
-rw-r--r-- | include/test/cppunitasserthelper.hxx | 20 | ||||
-rw-r--r-- | include/test/sheet/xsheetcellrange.hxx | 7 | ||||
-rw-r--r-- | include/test/sheet/xsheetcellrangecontainer.hxx | 8 | ||||
-rw-r--r-- | include/test/sheet/xsheetcellranges.hxx | 7 | ||||
-rw-r--r-- | include/test/sheet/xsheetcondition.hxx | 7 | ||||
-rw-r--r-- | include/test/sheet/xsheetconditionalentries.hxx | 10 | ||||
-rw-r--r-- | include/test/sheet/xsheetconditionalentry.hxx | 7 |
7 files changed, 29 insertions, 37 deletions
diff --git a/include/test/cppunitasserthelper.hxx b/include/test/cppunitasserthelper.hxx index 0b26a228ba31..362413baef15 100644 --- a/include/test/cppunitasserthelper.hxx +++ b/include/test/cppunitasserthelper.hxx @@ -27,15 +27,11 @@ CPPUNIT_NS_BEGIN * This specialization from @c struct @c assertion_traits<> helps to compare * @see com::sun::star::table::CellAddress. */ -template<> -struct assertion_traits<table::CellAddress> +template <> struct assertion_traits<table::CellAddress> { - static bool equal(const table::CellAddress& x, const table::CellAddress& y) - { - return x == y; - } + static bool equal(const table::CellAddress& x, const table::CellAddress& y) { return x == y; } - static std::string toString( const table::CellAddress& x ) + static std::string toString(const table::CellAddress& x) { OStringStream ost; ost << "Sheet: " << x.Sheet << " Column: " << x.Column << " Row: " << x.Row; @@ -48,19 +44,19 @@ struct assertion_traits<table::CellAddress> * This specialization from @c struct @c assertion_traits<> helps to compare * @see com::sun::star::table::CellRangeAddress. */ -template<> -struct assertion_traits<table::CellRangeAddress> +template <> struct assertion_traits<table::CellRangeAddress> { static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y) { return x == y; } - static std::string toString( const table::CellRangeAddress& x ) + static std::string toString(const table::CellRangeAddress& x) { OStringStream ost; - ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow - << " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow; + ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn + << " StartRow: " << x.StartRow << " EndColumn: " << x.EndColumn + << " EndRow: " << x.EndRow; return ost.str(); } }; diff --git a/include/test/sheet/xsheetcellrange.hxx b/include/test/sheet/xsheetcellrange.hxx index 80fd064b7832..5f44d21dd0dd 100644 --- a/include/test/sheet/xsheetcellrange.hxx +++ b/include/test/sheet/xsheetcellrange.hxx @@ -10,25 +10,24 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX #define INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetCellRange { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetSpreadsheet(); protected: ~XSheetCellRange() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGE_HXX diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx index f0b0c7355420..f87d80a78a47 100644 --- a/include/test/sheet/xsheetcellrangecontainer.hxx +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -18,21 +18,21 @@ #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testAddRemoveRangeAddress(); void testAddRemoveRangeAddresses(); protected: ~XSheetCellRangeContainer() {} - css::uno::Sequence< com::sun::star::table::CellRangeAddress > createCellRangeAddresses(); + css::uno::Sequence<com::sun::star::table::CellRangeAddress> createCellRangeAddresses(); }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX diff --git a/include/test/sheet/xsheetcellranges.hxx b/include/test/sheet/xsheetcellranges.hxx index 18275195df01..2024ec5f25e9 100644 --- a/include/test/sheet/xsheetcellranges.hxx +++ b/include/test/sheet/xsheetcellranges.hxx @@ -10,18 +10,18 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX #define INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetCellRanges { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetCells(); void testGetRangeAddresses(); @@ -30,7 +30,6 @@ public: protected: ~XSheetCellRanges() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGES_HXX diff --git a/include/test/sheet/xsheetcondition.hxx b/include/test/sheet/xsheetcondition.hxx index 39fef9870c63..c25eae86858c 100644 --- a/include/test/sheet/xsheetcondition.hxx +++ b/include/test/sheet/xsheetcondition.hxx @@ -10,18 +10,18 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX #define INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetCondition { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetSetFormula1(); void testGetSetFormula2(); @@ -31,7 +31,6 @@ public: protected: ~XSheetCondition() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCONDITION_HXX diff --git a/include/test/sheet/xsheetconditionalentries.hxx b/include/test/sheet/xsheetconditionalentries.hxx index 35389cc4ca42..25a51325ea87 100644 --- a/include/test/sheet/xsheetconditionalentries.hxx +++ b/include/test/sheet/xsheetconditionalentries.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX #define INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX - #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XInterface.hpp> @@ -19,13 +18,15 @@ #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetConditionalEntries { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; - virtual css::uno::Sequence< com::sun::star::beans::PropertyValue > createCondition(const sal_Int32 nr) =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; + virtual css::uno::Sequence<com::sun::star::beans::PropertyValue> + createCondition(const sal_Int32 nr) = 0; void testAddNew(); void testClear(); @@ -34,7 +35,6 @@ public: protected: ~XSheetConditionalEntries() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRIES_HXX diff --git a/include/test/sheet/xsheetconditionalentry.hxx b/include/test/sheet/xsheetconditionalentry.hxx index 449e3534c333..775c55b5858b 100644 --- a/include/test/sheet/xsheetconditionalentry.hxx +++ b/include/test/sheet/xsheetconditionalentry.hxx @@ -10,25 +10,24 @@ #ifndef INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX #define INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX - #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> #include <test/testdllapi.hxx> -namespace apitest { +namespace apitest +{ class OOO_DLLPUBLIC_TEST XSheetConditionalEntry { public: - virtual css::uno::Reference< css::uno::XInterface > init() =0; + virtual css::uno::Reference<css::uno::XInterface> init() = 0; void testGetSetStyleName(); protected: ~XSheetConditionalEntry() {} }; - } #endif // INCLUDED_TEST_SHEET_XSHEETCONDITIONALENTRY_HXX |