diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-05-17 09:47:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-19 09:42:41 +0200 |
| commit | 10749bbf8247f0b17201b33f95a090dfc4fc3211 (patch) | |
| tree | c34474977546aaccb6d5cd30ac4b45b1d422c11d /chart2 | |
| parent | df64e7c709fc6d771546554b4026583c55609105 (diff) | |
remove the last of the OUString #defines in header files
Change-Id: Id9e8ce7987e055e83b52c7024413570f262e6e8d
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/inc/servicenames.hxx | 14 | ||||
| -rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index 212632e7caa0..c34870ca1e70 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -22,28 +22,28 @@ namespace chart { -#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartModel" ) +#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartModel" #define CHART_MODEL_SERVICE_NAME "com.sun.star.chart2.ChartDocument" //@todo create your own service containing the service com.sun.star.document.OfficeDocument -#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartController" ) +#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartController" #define CHART_CONTROLLER_SERVICE_NAME "com.sun.star.chart2.ChartController" //@todo create your own service containing the service com.sun.star.frame.Controller -#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartView" ) +#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartView" #define CHART_VIEW_SERVICE_NAME "com.sun.star.chart2.ChartView" -#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartFrameLoader" ) +#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartFrameLoader" #define CHART_FRAMELOADER_SERVICE_NAME "com.sun.star.frame.SynchronousFrameLoader" -#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.WizardDialog" ) +#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.WizardDialog" #define CHART_WIZARD_DIALOG_SERVICE_NAME "com.sun.star.chart2.WizardDialog" -#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartTypeDialog" ) +#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartTypeDialog" #define CHART_TYPE_DIALOG_SERVICE_NAME "com.sun.star.chart2.ChartTypeDialog" // wrapper for old UNO API (com.sun.star.chart) -#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME OUString( "com.sun.star.comp.chart2.ChartDocumentWrapper" ) +#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartDocumentWrapper" #define CHART_CHARTAPIWRAPPER_SERVICE_NAME "com.sun.star.chart2.ChartDocumentWrapper" // accessibility diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 07125082ff95..a12c1f6b5246 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -775,7 +775,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes } OUString XMLFilter::getMediaType(bool _bOasis) { - return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; + return _bOasis ? OUString(MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII) : OUString(MIMETYPE_VND_SUN_XML_CHART_ASCII); } OUString SAL_CALL XMLFilter::getImplementationName() @@ -809,7 +809,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue > } OUString XMLReportFilterHelper::getMediaType(bool ) { - return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART; + return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII; } } // namespace chart |