diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-23 07:19:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-25 19:24:23 +0200 |
commit | 98de5b40c8a3fd4e57477b6d994e3b1472207f71 (patch) | |
tree | 567fdbbaecbddbfc19f28a08da5d1f6d5207748c /chart2 | |
parent | 0552a91acde9dce28c0d92c552d21fbadfcb9184 (diff) |
Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/accessibility/AccessibleChartView.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/DialogModel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ResId.cxx | 1 | ||||
-rw-r--r-- | chart2/source/view/main/ChartItemPool.cxx | 4 |
5 files changed, 5 insertions, 6 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 0df51e1e1d88..8125ab90521e 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> // for SolarMutex diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 7ac81f8f654a..e98c58e8a9a7 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <utility> #include <algorithm> diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 943081c9d5d1..9b0fdc91b69b 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -32,7 +32,7 @@ #include "NumberFormatterWrapper.hxx" #include "RegressionCurveHelper.hxx" #include <rtl/math.hxx> -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 72a7b21ba21d..61e6755f3e90 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -19,7 +19,6 @@ #include "ResId.hxx" #include "ResourceManager.hxx" -#include <tools/string.hxx> namespace chart { diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index c2c6507ce798..ef480dddd3de 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -71,8 +71,8 @@ ChartItemPool::ChartItemPool(): ppPoolDefaults[SCHATTR_STAT_CONSTPLUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTPLUS); ppPoolDefaults[SCHATTR_STAT_CONSTMINUS - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTMINUS); ppPoolDefaults[SCHATTR_STAT_INDICATE - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE); - ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, String()); - ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, String()); + ppPoolDefaults[SCHATTR_STAT_RANGE_POS - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, OUString()); + ppPoolDefaults[SCHATTR_STAT_RANGE_NEG - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, OUString()); ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true); ppPoolDefaults[SCHATTR_STYLE_DEEP - SCHATTR_START] = new SfxBoolItem (SCHATTR_STYLE_DEEP, 0); |