chart2/source/model/filter/XMLFilter.cxx | 2 +- chart2/source/model/main/ChartModel.cxx | 2 +- chart2/source/view/main/ChartView.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit f4b4db10da454af98ec6071e20ef0a7e068e11fb Author: Noel Grandin <n...@peralex.com> Date: Tue May 19 10:04:54 2015 +0200 fix old GCC build after my commit 10749bbf8247f0b17201b33f95a090dfc4fc3211 "remove the last of the OUString #defines in header files" Change-Id: I7666cfb28d8a28d541c9d7a51f014ebe53c50551 diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index a12c1f6..feb94a2 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -809,7 +809,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > } OUString XMLReportFilterHelper::getMediaType(bool ) { - return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII; + return OUString(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII); } } // namespace chart diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 6ea5367..e38dfce 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -324,7 +324,7 @@ OUString SAL_CALL ChartModel::getImplementationName() OUString ChartModel::getImplementationName_Static() { - return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME; + return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 97b3181..b95b5ab 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1396,7 +1396,7 @@ OUString SAL_CALL ChartView::getImplementationName() OUString ChartView::getImplementationName_Static() { - return CHART_VIEW_SERVICE_IMPLEMENTATION_NAME; + return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits