diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-03-27 04:12:53 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-03-30 04:34:22 +0200 |
| commit | 35ea7ffe7549eb8a5f2539bc37ac5041a8d80c72 (patch) | |
| tree | 898f86e51ca111c227923b0680fe087c4bb1bde3 | |
| parent | 4a9ba96520bdd6f8d40a9e92ef11b481f0d408dc (diff) | |
fix return type
Change-Id: I581a8a0c7348a9752611b378e883ef20172d16e0
| -rw-r--r-- | sc/qa/extras/new_cond_format.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/condformatuno.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx index e648edcfe0ae..0bd96d4cb2c2 100644 --- a/sc/qa/extras/new_cond_format.cxx +++ b/sc/qa/extras/new_cond_format.cxx @@ -163,7 +163,7 @@ void ScConditionalFormatTest::testCondFormatXIndex() CPPUNIT_ASSERT(xCondFormat.is()); uno::Type aType = xCondFormat->getElementType(); - CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.sheet.XConditionEntry"), aType.getTypeName()); + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.beans.XPropertySet"), aType.getTypeName()); CPPUNIT_ASSERT(xCondFormat->hasElements()); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xCondFormat->getCount()); diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index a21fc7efe9a7..fcf32b51d0e1 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -336,7 +336,7 @@ void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex) uno::Type ScCondFormatObj::getElementType() throw(uno::RuntimeException, std::exception) { - return cppu::UnoType<sheet::XConditionEntry>::get(); + return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool ScCondFormatObj::hasElements() |