[Libreoffice-commits] core.git: 3 commits - include/test solenv/clang-format test/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Nov 7 09:48:17 UTC 2017
include/test/cppunitasserthelper.hxx | 22 +++-----
include/test/sheet/xsheetcellrange.hxx | 7 +-
include/test/sheet/xsheetcellrangecontainer.hxx | 8 +--
include/test/sheet/xsheetcellranges.hxx | 7 +-
include/test/sheet/xsheetcondition.hxx | 7 +-
include/test/sheet/xsheetconditionalentries.hxx | 10 +--
include/test/sheet/xsheetconditionalentry.hxx | 7 +-
solenv/clang-format/blacklist | 12 ++--
test/source/sheet/xsheetcellrange.cxx | 8 +--
test/source/sheet/xsheetcellrangecontainer.cxx | 61 +++++++++++-------------
test/source/sheet/xsheetcellranges.cxx | 18 +++----
test/source/sheet/xsheetcondition.cxx | 14 ++---
test/source/sheet/xsheetconditionalentries.cxx | 26 +++++-----
test/source/sheet/xsheetconditionalentry.cxx | 9 +--
14 files changed, 104 insertions(+), 112 deletions(-)
New commits:
commit 3a32caa141f9c16a4f3d3895381384da13acd149
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 7 10:23:36 2017 +0100
test: avoid 'using namespace' declarations in a header
Change-Id: I8dc06129360124fcaa52bc13bb9d134918b84c17
diff --git a/include/test/cppunitasserthelper.hxx b/include/test/cppunitasserthelper.hxx
index 362413baef15..4f4f920dd9fc 100644
--- a/include/test/cppunitasserthelper.hxx
+++ b/include/test/cppunitasserthelper.hxx
@@ -17,9 +17,6 @@
#include <cppunit/TestAssert.h>
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-
CPPUNIT_NS_BEGIN
/** @brief Trait used by CPPUNIT_ASSERT* macros to compare com::sun::star::table::CellAddress.
@@ -27,11 +24,14 @@ 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<css::table::CellAddress>
{
- static bool equal(const table::CellAddress& x, const table::CellAddress& y) { return x == y; }
+ static bool equal(const css::table::CellAddress& x, const css::table::CellAddress& y)
+ {
+ return x == y;
+ }
- static std::string toString(const table::CellAddress& x)
+ static std::string toString(const css::table::CellAddress& x)
{
OStringStream ost;
ost << "Sheet: " << x.Sheet << " Column: " << x.Column << " Row: " << x.Row;
@@ -44,14 +44,14 @@ template <> 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<css::table::CellRangeAddress>
{
- static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y)
+ static bool equal(const css::table::CellRangeAddress& x, const css::table::CellRangeAddress& y)
{
return x == y;
}
- static std::string toString(const table::CellRangeAddress& x)
+ static std::string toString(const css::table::CellRangeAddress& x)
{
OStringStream ost;
ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn
commit 5946eedfb78e250a40f14ae1e5b709e827b2504c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 7 10:19:32 2017 +0100
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
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
diff --git a/test/source/sheet/xsheetcellrange.cxx b/test/source/sheet/xsheetcellrange.cxx
index c3adc74e32ce..46f0e64b0e8e 100644
--- a/test/source/sheet/xsheetcellrange.cxx
+++ b/test/source/sheet/xsheetcellrange.cxx
@@ -19,16 +19,16 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetCellRange::testGetSpreadsheet()
{
- uno::Reference< sheet::XSheetCellRange > xSheetCellRange(init(), UNO_QUERY_THROW);
- uno::Reference< sheet::XSpreadsheet > xSheet = xSheetCellRange->getSpreadsheet();
+ uno::Reference<sheet::XSheetCellRange> xSheetCellRange(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSpreadsheet> xSheet = xSheetCellRange->getSpreadsheet();
CPPUNIT_ASSERT_MESSAGE("Unable to get spreadsheet", xSheet.is());
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/xsheetcellrangecontainer.cxx b/test/source/sheet/xsheetcellrangecontainer.cxx
index b68e09a7ffe2..05e630ab3f6e 100644
--- a/test/source/sheet/xsheetcellrangecontainer.cxx
+++ b/test/source/sheet/xsheetcellrangecontainer.cxx
@@ -20,60 +20,60 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetCellRangeContainer::testAddRemoveRangeAddress()
{
- uno::Reference< sheet::XSheetCellRangeContainer > xSCRC(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCellRangeContainer> xSCRC(init(), UNO_QUERY_THROW);
xSCRC->removeRangeAddresses(xSCRC->getRangeAddresses()); // prepare a clean slate
- uno::Sequence< table::CellRangeAddress > aAddr = createCellRangeAddresses();
+ uno::Sequence<table::CellRangeAddress> aAddr = createCellRangeAddresses();
sal_Int32 cnt = xSCRC->getCount();
xSCRC->addRangeAddress(aAddr[0], false);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)",
- cnt + 1, xSCRC->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)", cnt + 1,
+ xSCRC->getCount());
- uno::Sequence< table::CellRangeAddress > aAfterAddAddr = xSCRC->getRangeAddresses();
+ uno::Sequence<table::CellRangeAddress> aAfterAddAddr = xSCRC->getRangeAddresses();
cnt = xSCRC->getCount();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (entry)",
- aAddr[0], aAfterAddAddr[cnt - 1]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (entry)", aAddr[0],
+ aAfterAddAddr[cnt - 1]);
xSCRC->removeRangeAddress(aAddr[0]);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddress (count)",
- cnt - 1, xSCRC->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddress (count)", cnt - 1,
+ xSCRC->getCount());
- uno::Sequence< table::CellRangeAddress > aAfterRemoveAddr = xSCRC->getRangeAddresses();
- for ( auto const & addr : aAfterRemoveAddr )
+ uno::Sequence<table::CellRangeAddress> aAfterRemoveAddr = xSCRC->getRangeAddresses();
+ for (auto const& addr : aAfterRemoveAddr)
{
- CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddress (entry)",
- aAddr[0] != addr);
+ CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddress (entry)", aAddr[0] != addr);
}
}
void XSheetCellRangeContainer::testAddRemoveRangeAddresses()
{
- uno::Reference< sheet::XSheetCellRangeContainer > xSCRC(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCellRangeContainer> xSCRC(init(), UNO_QUERY_THROW);
xSCRC->removeRangeAddresses(xSCRC->getRangeAddresses()); // prepare a clean slate
- uno::Sequence< table::CellRangeAddress > aAddr = createCellRangeAddresses();
+ uno::Sequence<table::CellRangeAddress> aAddr = createCellRangeAddresses();
sal_Int32 cnt = xSCRC->getCount();
xSCRC->addRangeAddresses(aAddr, false);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)",
- cnt + 2, xSCRC->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddress (count)", cnt + 2,
+ xSCRC->getCount());
- uno::Sequence< table::CellRangeAddress > aAfterAddAddr = xSCRC->getRangeAddresses();
+ uno::Sequence<table::CellRangeAddress> aAfterAddAddr = xSCRC->getRangeAddresses();
cnt = xSCRC->getCount();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: first)",
- aAddr[0], aAfterAddAddr[cnt - 2]);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: second)",
- aAddr[1], aAfterAddAddr[cnt - 1]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: first)", aAddr[0],
+ aAfterAddAddr[cnt - 2]);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add CellRangeAddresses (entry: second)", aAddr[1],
+ aAfterAddAddr[cnt - 1]);
xSCRC->removeRangeAddresses(aAddr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddresses (count)",
- cnt - 2, xSCRC->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove CellRangeAddresses (count)", cnt - 2,
+ xSCRC->getCount());
- uno::Sequence< table::CellRangeAddress > aAfterRemoveAddr = xSCRC->getRangeAddresses();
- for ( auto const & addr : aAfterRemoveAddr )
+ uno::Sequence<table::CellRangeAddress> aAfterRemoveAddr = xSCRC->getRangeAddresses();
+ for (auto const& addr : aAfterRemoveAddr)
{
CPPUNIT_ASSERT_MESSAGE("Unable to remove CellRangeAddresses (entry: first)",
aAddr[0] != addr);
@@ -82,10 +82,10 @@ void XSheetCellRangeContainer::testAddRemoveRangeAddresses()
}
}
-uno::Sequence< table::CellRangeAddress > XSheetCellRangeContainer::createCellRangeAddresses()
+uno::Sequence<table::CellRangeAddress> XSheetCellRangeContainer::createCellRangeAddresses()
{
- uno::Sequence< table::CellRangeAddress > aAddr(2);
- for ( unsigned int i = 0; i < 2; i++ )
+ uno::Sequence<table::CellRangeAddress> aAddr(2);
+ for (unsigned int i = 0; i < 2; i++)
{
aAddr[i].Sheet = i;
aAddr[i].StartColumn = i;
@@ -96,7 +96,6 @@ uno::Sequence< table::CellRangeAddress > XSheetCellRangeContainer::createCellRan
return aAddr;
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/xsheetcellranges.cxx b/test/source/sheet/xsheetcellranges.cxx
index 0b590ad249a8..046541d02c23 100644
--- a/test/source/sheet/xsheetcellranges.cxx
+++ b/test/source/sheet/xsheetcellranges.cxx
@@ -22,31 +22,31 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetCellRanges::testGetCells()
{
- uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
- uno::Reference< container::XEnumerationAccess > xEA = xSheetCellRanges->getCells();
+ uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
+ uno::Reference<container::XEnumerationAccess> xEA = xSheetCellRanges->getCells();
CPPUNIT_ASSERT_MESSAGE("Unable to get cells", xEA->hasElements());
}
void XSheetCellRanges::testGetRangeAddresses()
{
- uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
- uno::Sequence< table::CellRangeAddress > aCellRangeAddress = xSheetCellRanges->getRangeAddresses();
- CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses",
- aCellRangeAddress.getLength() > 2);
+ uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
+ uno::Sequence<table::CellRangeAddress> aCellRangeAddress
+ = xSheetCellRanges->getRangeAddresses();
+ CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses", aCellRangeAddress.getLength() > 2);
}
void XSheetCellRanges::testGetRangeAddressesAsString()
{
- uno::Reference< sheet::XSheetCellRanges > xSheetCellRanges(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCellRanges> xSheetCellRanges(init(), UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("Unable to get RangeAddresses (string)",
xSheetCellRanges->getRangeAddressesAsString().indexOf("C1:D4") > 0);
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/xsheetcondition.cxx b/test/source/sheet/xsheetcondition.cxx
index ba7c22ecc436..402902700a79 100644
--- a/test/source/sheet/xsheetcondition.cxx
+++ b/test/source/sheet/xsheetcondition.cxx
@@ -20,11 +20,12 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetCondition::testGetSetFormula1()
{
- uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
OUString aFormula1;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Formula1",
aFormula1 = xSheetCondition->getFormula1());
@@ -35,7 +36,7 @@ void XSheetCondition::testGetSetFormula1()
void XSheetCondition::testGetSetFormula2()
{
- uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
OUString aFormula2;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Formula2",
aFormula2 = xSheetCondition->getFormula2());
@@ -46,19 +47,19 @@ void XSheetCondition::testGetSetFormula2()
void XSheetCondition::testGetSetOperator()
{
- uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
sheet::ConditionOperator aOperator = sheet::ConditionOperator_NONE;
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get Operator",
aOperator = xSheetCondition->getOperator());
- xSheetCondition->setOperator( sheet::ConditionOperator_BETWEEN );
+ xSheetCondition->setOperator(sheet::ConditionOperator_BETWEEN);
sheet::ConditionOperator aOperatorNew = xSheetCondition->getOperator();
CPPUNIT_ASSERT_MESSAGE("Unable to set Operator", aOperator != aOperatorNew);
}
void XSheetCondition::testGetSetSourcePosition()
{
- uno::Reference< sheet::XSheetCondition > xSheetCondition(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetCondition> xSheetCondition(init(), UNO_QUERY_THROW);
table::CellAddress aSourcePosition(0, 0, 0);
CPPUNIT_ASSERT_NO_THROW_MESSAGE("Unable to get SourcePosition",
aSourcePosition = xSheetCondition->getSourcePosition());
@@ -68,7 +69,6 @@ void XSheetCondition::testGetSetSourcePosition()
CPPUNIT_ASSERT_MESSAGE("Unable to set SourcePosition",
aSourcePosition.Row != aSourcePositionNew.Row);
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/xsheetconditionalentries.cxx b/test/source/sheet/xsheetconditionalentries.cxx
index e22f3b8195e9..b464303310cc 100644
--- a/test/source/sheet/xsheetconditionalentries.cxx
+++ b/test/source/sheet/xsheetconditionalentries.cxx
@@ -21,39 +21,41 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetConditionalEntries::testAddNew()
{
- uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
+ UNO_QUERY_THROW);
const sal_Int32 aCount = xSheetConditionalEntries->getCount();
xSheetConditionalEntries->addNew(createCondition(4));
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add new condition",
- aCount + 1, xSheetConditionalEntries->getCount());
-
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to add new condition", aCount + 1,
+ xSheetConditionalEntries->getCount());
}
void XSheetConditionalEntries::testClear()
{
- uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
+ UNO_QUERY_THROW);
xSheetConditionalEntries->clear();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to clear conditions",
- sal_Int32(0), xSheetConditionalEntries->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to clear conditions", sal_Int32(0),
+ xSheetConditionalEntries->getCount());
}
void XSheetConditionalEntries::testRemoveByIndex()
{
- uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetConditionalEntries> xSheetConditionalEntries(init(),
+ UNO_QUERY_THROW);
const sal_Int32 aCount = xSheetConditionalEntries->getCount();
xSheetConditionalEntries->removeByIndex(0);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove condition",
- aCount - 1, xSheetConditionalEntries->getCount());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to remove condition", aCount - 1,
+ xSheetConditionalEntries->getCount());
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/sheet/xsheetconditionalentry.cxx b/test/source/sheet/xsheetconditionalentry.cxx
index e6d3afcde020..e72c95a12129 100644
--- a/test/source/sheet/xsheetconditionalentry.cxx
+++ b/test/source/sheet/xsheetconditionalentry.cxx
@@ -18,20 +18,19 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace apitest {
+namespace apitest
+{
void XSheetConditionalEntry::testGetSetStyleName()
{
- uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry(init(), UNO_QUERY_THROW);
+ uno::Reference<sheet::XSheetConditionalEntry> xSheetConditionalEntry(init(), UNO_QUERY_THROW);
OUString aStyleName = xSheetConditionalEntry->getStyleName();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get StyleName",
- OUString("Result2"), aStyleName);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get StyleName", OUString("Result2"), aStyleName);
xSheetConditionalEntry->setStyleName("Heading");
CPPUNIT_ASSERT_MESSAGE("Unable to set StyleName",
aStyleName != xSheetConditionalEntry->getStyleName());
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
commit 9d2baccabec7f0e04469a715da613886999b6e0e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Nov 7 10:13:53 2017 +0100
Adapt clang-format blacklist to recent renames
Change-Id: I5e2e431900af9ea7de7dd9395af038ba2f8f7e0c
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 1b4b04676b0b..0dbcf0ef3b04 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -2075,8 +2075,6 @@ connectivity/source/drivers/ado/AViews.cxx
connectivity/source/drivers/ado/Aolevariant.cxx
connectivity/source/drivers/ado/Aservices.cxx
connectivity/source/drivers/ado/Awrapado.cxx
-connectivity/source/drivers/ado/ado_post_sys_include.h
-connectivity/source/drivers/ado/ado_pre_sys_include.h
connectivity/source/drivers/ado/adoimp.cxx
connectivity/source/drivers/calc/CCatalog.cxx
connectivity/source/drivers/calc/CConnection.cxx
@@ -2480,6 +2478,8 @@ connectivity/source/inc/ado/WrapIndex.hxx
connectivity/source/inc/ado/WrapKey.hxx
connectivity/source/inc/ado/WrapTable.hxx
connectivity/source/inc/ado/WrapTypeDefs.hxx
+connectivity/source/inc/ado/ado_post_sys_include.h
+connectivity/source/inc/ado/ado_pre_sys_include.h
connectivity/source/inc/ado/adoimp.hxx
connectivity/source/inc/calc/CCatalog.hxx
connectivity/source/inc/calc/CConnection.hxx
@@ -10706,7 +10706,6 @@ sc/source/filter/inc/rtfimp.hxx
sc/source/filter/inc/rtfparse.hxx
sc/source/filter/inc/scenariobuffer.hxx
sc/source/filter/inc/scenariocontext.hxx
-sc/source/filter/inc/scflt.hxx
sc/source/filter/inc/scfobj.hxx
sc/source/filter/inc/scmem.h
sc/source/filter/inc/sharedformulagroups.hxx
@@ -10869,6 +10868,7 @@ sc/source/filter/rtf/rtfparse.cxx
sc/source/filter/starcalc/collect.cxx
sc/source/filter/starcalc/collect.hxx
sc/source/filter/starcalc/scflt.cxx
+sc/source/filter/starcalc/scflt.hxx
sc/source/filter/starcalc/scfobj.cxx
sc/source/filter/xcl97/XclExpChangeTrack.cxx
sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -13876,7 +13876,6 @@ svl/source/fsstor/oinputstreamcontainer.hxx
svl/source/fsstor/ostreamcontainer.cxx
svl/source/fsstor/ostreamcontainer.hxx
svl/source/inc/fsfactory.hxx
-svl/source/inc/passwordcontainer.hxx
svl/source/inc/poolio.hxx
svl/source/inc/stringio.hxx
svl/source/items/IndexedStyleSheets.cxx
@@ -13948,6 +13947,7 @@ svl/source/numbers/zformat.cxx
svl/source/numbers/zforscan.cxx
svl/source/numbers/zforscan.hxx
svl/source/passwordcontainer/passwordcontainer.cxx
+svl/source/passwordcontainer/passwordcontainer.hxx
svl/source/passwordcontainer/syscreds.cxx
svl/source/passwordcontainer/syscreds.hxx
svl/source/svdde/ddecli.cxx
@@ -15466,6 +15466,7 @@ sw/source/core/docnode/swthreadjoiner.cxx
sw/source/core/docnode/swthreadmanager.cxx
sw/source/core/docnode/threadlistener.cxx
sw/source/core/docnode/threadmanager.cxx
+sw/source/core/docnode/threadmanager.hxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dflyobj.cxx
sw/source/core/draw/dobjfac.cxx
@@ -15638,7 +15639,6 @@ sw/source/core/inc/tabfrm.hxx
sw/source/core/inc/tblrwcl.hxx
sw/source/core/inc/textapi.hxx
sw/source/core/inc/threadlistener.hxx
-sw/source/core/inc/threadmanager.hxx
sw/source/core/inc/tocntntanchoredobjectposition.hxx
sw/source/core/inc/tolayoutanchoredobjectposition.hxx
sw/source/core/inc/txmsrt.hxx
@@ -19811,6 +19811,7 @@ xmlsecurity/inc/xmlsec/xmlsec_init.hxx
xmlsecurity/inc/xmlsec/xmlstreamio.hxx
xmlsecurity/inc/xmlsecuritydllapi.h
xmlsecurity/inc/xmlsignaturehelper.hxx
+xmlsecurity/inc/xmlsignaturehelper2.hxx
xmlsecurity/inc/xsecctl.hxx
xmlsecurity/inc/xsecfwdllapi.h
xmlsecurity/inc/xsecgpgdllapi.h
@@ -19865,7 +19866,6 @@ xmlsecurity/source/helper/ooxmlsecparser.hxx
xmlsecurity/source/helper/pdfsignaturehelper.cxx
xmlsecurity/source/helper/xmlsignaturehelper.cxx
xmlsecurity/source/helper/xmlsignaturehelper2.cxx
-xmlsecurity/source/helper/xmlsignaturehelper2.hxx
xmlsecurity/source/helper/xsecctl.cxx
xmlsecurity/source/helper/xsecparser.cxx
xmlsecurity/source/helper/xsecparser.hxx
More information about the Libreoffice-commits
mailing list