sc/qa/unit/subsequent_filters-test.cxx | 2 +-
sc/source/filter/inc/condformatbuffer.hxx | 4 ----
sc/source/filter/oox/condformatbuffer.cxx | 13 -------------
sc/source/filter/xml/xmlstyle.cxx | 1 -
sc/source/filter/xml/xmlstyli.cxx | 1 -
sc/source/ui/vba/vbaformatcondition.cxx | 3 ++-
sc/source/ui/vba/vbaformatconditions.cxx | 3 ++-
7 files changed, 5 insertions(+), 22 deletions(-)
New commits:
commit 61ce99c9fdb75631f5f34b9b1cda98e7e08af08d
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Fri Dec 19 10:19:28 2014 +0100
"ConditionalFormat" -> SC_UNONAME_CONDFMT
Change-Id: Ic6c461e0e91b37c94381e6303d91f4a8438ee600
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx
b/sc/source/ui/vba/vbaformatcondition.cxx
index 8833c75..1098d5e8 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -18,6 +18,7 @@
*/
#include "vbaformatcondition.hxx"
#include "vbaformatconditions.hxx"
+#include "unonames.hxx"
#include <ooo/vba/excel/XlFormatConditionType.hpp>
using namespace ::ooo::vba;
@@ -147,7 +148,7 @@ ScVbaFormatCondition::notifyRange() throw (
script::BasicErrorException )
{
try
{
- mxParentRangePropertySet->setPropertyValue("ConditionalFormat",
uno::makeAny( mxSheetConditionalEntries) );
+ mxParentRangePropertySet->setPropertyValue(SC_UNONAME_CONDFMT,
uno::makeAny( mxSheetConditionalEntries));
}
catch (uno::Exception& )
{
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx
b/sc/source/ui/vba/vbaformatconditions.cxx
index b8b74e0..be2c9a9 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <cppuhelper/exc_hlp.hxx>
#include <vector>
+#include "unonames.hxx"
#include "vbaformatconditions.hxx"
#include "vbaformatcondition.hxx"
#include "vbaworkbook.hxx"
@@ -227,7 +228,7 @@ ScVbaFormatConditions::notifyRange() throw (
script::BasicErrorException )
{
try
{
- mxParentRangePropertySet->setPropertyValue("ConditionalFormat",
uno::makeAny( mxSheetConditionalEntries ));
+ mxParentRangePropertySet->setPropertyValue(SC_UNONAME_CONDFMT,
uno::makeAny( mxSheetConditionalEntries ));
}
catch (uno::Exception& )
{
commit 026f59d323e713b96faca2bfa6e3b88ce3cdffab
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Wed Dec 17 20:45:53 2014 +0100
Remove unused includes
Change-Id: Ic76f42da7f88357339240ba987d73297905cfe13
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index e36ba56..cdc2553 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -20,15 +20,11 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_CONDFORMATBUFFER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_CONDFORMATBUFFER_HXX
-#include <com/sun/star/sheet/ConditionOperator2.hpp>
#include "formulaparser.hxx"
#include "worksheethelper.hxx"
#include <boost/scoped_ptr.hpp>
#include <tools/color.hxx>
-namespace com { namespace sun { namespace star {
- namespace sheet { class XSheetConditionalEntries; }
-} } }
class ScColorScaleFormat;
class ScDataBarFormat;
struct ScDataBarFormatData;
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 4c1894a..b8f92b5 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -19,20 +19,9 @@
#include "condformatbuffer.hxx"
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/sheet/ConditionOperator2.hpp>
-#include <com/sun/star/sheet/XSheetCellRanges.hpp>
-#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheets.hpp>
-#include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <svl/intitem.hxx>
@@ -57,8 +46,6 @@
namespace oox {
namespace xls {
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::style;
using namespace ::com::sun::star::table;
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index 50fe787..cf6ed80 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -42,7 +42,6 @@
#include <com/sun/star/table/CellJustifyMethod.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <com/sun/star/sheet/XSheetCondition.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index 7fb3721..9c65adb5 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -27,7 +27,6 @@
#include <xmloff/xmltoken.hxx>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <comphelper/extract.hxx>
#include <xmloff/xmlprcon.hxx>
commit beddfe27e38c73c22c2f9b7f6e3293a7f8bbef85
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Wed Dec 17 12:38:19 2014 +0100
fix typo
Change-Id: If0bbec305259e2b2c1b91813eef3faa3c2857900
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 45b12f1..d556335 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2248,7 +2248,7 @@ void ScFiltersTest::testNewCondFormatODS()
{
ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc(
"new_cond_format_test.", ODS );
- CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx",
xDocSh.Is());
+ CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods",
xDocSh.Is());
ScDocument& rDoc = xDocSh->GetDocument();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
