summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-12-11 15:24:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-12-12 08:26:43 +0100
commit12bbe8f1304aba005599d55cdffa09976ed7bf6c (patch)
tree13f4b7e627123319068280e2321184131a66af66 /chart2
parenta62c2a5fa5d5be465b0edab6adeb1fd16ace462f (diff)
Remove unnecessary macro
Change-Id: I8af2e887a6ad2b345b5b214eb02095c71cdafbc2
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx32
1 files changed, 15 insertions, 17 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 54ccfaf460f5..0cd5a3cfc842 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -60,29 +60,27 @@ using ::osl::MutexGuard;
namespace
{
-#define LOCAL_CONST_STR(i, x) sal_Char const i[sizeof(x)] = x
-
-LOCAL_CONST_STR( sXML_metaStreamName, "meta.xml");
-LOCAL_CONST_STR( sXML_styleStreamName, "styles.xml" );
-LOCAL_CONST_STR( sXML_contentStreamName, "content.xml" );
-LOCAL_CONST_STR( sXML_oldContentStreamName, "Content.xml" );
+char const sXML_metaStreamName[] = "meta.xml";
+char const sXML_styleStreamName[] = "styles.xml";
+char const sXML_contentStreamName[] = "content.xml";
+char const sXML_oldContentStreamName[] = "Content.xml";
// soffice 6/7
-LOCAL_CONST_STR( sXML_export_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesExporter" );
-LOCAL_CONST_STR( sXML_export_chart_content_service, "com.sun.star.comp.Chart.XMLContentExporter" );
+char const sXML_export_chart_styles_service[] = "com.sun.star.comp.Chart.XMLStylesExporter";
+char const sXML_export_chart_content_service[] = "com.sun.star.comp.Chart.XMLContentExporter";
-LOCAL_CONST_STR( sXML_import_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesImporter" );
-LOCAL_CONST_STR( sXML_import_chart_content_service, "com.sun.star.comp.Chart.XMLContentImporter" );
-LOCAL_CONST_STR( sXML_import_chart_old_content_service, "com.sun.star.office.sax.importer.Chart" );
+char const sXML_import_chart_styles_service[] = "com.sun.star.comp.Chart.XMLStylesImporter";
+char const sXML_import_chart_content_service[] = "com.sun.star.comp.Chart.XMLContentImporter";
+char const sXML_import_chart_old_content_service[] = "com.sun.star.office.sax.importer.Chart";
// Oasis
-LOCAL_CONST_STR( sXML_export_chart_oasis_styles_service, "com.sun.star.comp.Chart.XMLOasisStylesExporter" );
-LOCAL_CONST_STR( sXML_export_chart_oasis_content_service, "com.sun.star.comp.Chart.XMLOasisContentExporter" );
-LOCAL_CONST_STR( sXML_export_chart_oasis_meta_service, "com.sun.star.comp.Chart.XMLOasisMetaExporter" );
+char const sXML_export_chart_oasis_styles_service[] = "com.sun.star.comp.Chart.XMLOasisStylesExporter";
+char const sXML_export_chart_oasis_content_service[] = "com.sun.star.comp.Chart.XMLOasisContentExporter";
+char const sXML_export_chart_oasis_meta_service[] = "com.sun.star.comp.Chart.XMLOasisMetaExporter";
-LOCAL_CONST_STR( sXML_import_chart_oasis_styles_service, "com.sun.star.comp.Chart.XMLOasisStylesImporter" );
-LOCAL_CONST_STR( sXML_import_chart_oasis_content_service, "com.sun.star.comp.Chart.XMLOasisContentImporter" );
-LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service, "com.sun.star.comp.Chart.XMLOasisMetaImporter" );
+char const sXML_import_chart_oasis_styles_service[] = "com.sun.star.comp.Chart.XMLOasisStylesImporter";
+char const sXML_import_chart_oasis_content_service[] = "com.sun.star.comp.Chart.XMLOasisContentImporter";
+char const sXML_import_chart_oasis_meta_service[] = "com.sun.star.comp.Chart.XMLOasisMetaImporter";
uno::Reference< embed::XStorage > lcl_getWriteStorage(
const Sequence< beans::PropertyValue >& rMediaDescriptor,