summaryrefslogtreecommitdiff
path: root/chart2/source/model
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/model')
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx41
-rw-r--r--chart2/source/model/main/Axis.cxx4
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx14
-rw-r--r--chart2/source/model/main/GridProperties.cxx4
-rw-r--r--chart2/source/model/main/Legend.cxx4
-rw-r--r--chart2/source/model/main/PageBackground.cxx4
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx14
-rw-r--r--chart2/source/model/main/Title.cxx4
8 files changed, 25 insertions, 64 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index cc74c3e2873e..7302b71e6885 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -60,24 +60,7 @@ namespace
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
-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";
-
-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
-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";
-
-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,
@@ -384,23 +367,23 @@ sal_Int32 XMLFilter::impl_Import(
if( bOasis )
nWarning |= impl_ImportStream(
sXML_metaStreamName,
- sXML_import_chart_oasis_meta_service,
+ "com.sun.star.comp.Chart.XMLOasisMetaImporter",
xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo );
// import styles
nWarning |= impl_ImportStream(
sXML_styleStreamName,
bOasis
- ? OUString(sXML_import_chart_oasis_styles_service)
- : OUString(sXML_import_chart_styles_service),
+ ? OUString("com.sun.star.comp.Chart.XMLOasisStylesImporter")
+ : OUString("com.sun.star.comp.Chart.XMLStylesImporter"),
xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo );
// import content
sal_Int32 nContentWarning = impl_ImportStream(
sXML_contentStreamName,
bOasis
- ? OUString(sXML_import_chart_oasis_content_service)
- : OUString(sXML_import_chart_content_service),
+ ? OUString("com.sun.star.comp.Chart.XMLOasisContentImporter")
+ : OUString("com.sun.star.comp.Chart.XMLContentImporter"),
xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo );
nWarning |= nContentWarning;
@@ -408,8 +391,8 @@ sal_Int32 XMLFilter::impl_Import(
if( nContentWarning != 0 )
{
nWarning = impl_ImportStream(
- sXML_oldContentStreamName,
- sXML_import_chart_old_content_service,
+ "Content.xml", // old content stream name
+ "com.sun.star.office.sax.importer.Chart",
xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo );
}
}
@@ -639,23 +622,23 @@ sal_Int32 XMLFilter::impl_Export(
if( bOasis )
nWarning |= impl_ExportStream(
sXML_metaStreamName,
- sXML_export_chart_oasis_meta_service,
+ "com.sun.star.comp.Chart.XMLOasisMetaExporter",
xStorage, xSaxWriter, xServiceFactory, aFilterProperties );
// export styles
nWarning |= impl_ExportStream(
sXML_styleStreamName,
bOasis
- ? OUString(sXML_export_chart_oasis_styles_service)
- : OUString(sXML_export_chart_styles_service),
+ ? OUString("com.sun.star.comp.Chart.XMLOasisStylesExporter")
+ : OUString("com.sun.star.comp.Chart.XMLStylesExporter"), // soffice 6/7
xStorage, xSaxWriter, xServiceFactory, aFilterProperties );
// export content
sal_Int32 nContentWarning = impl_ExportStream(
sXML_contentStreamName,
bOasis
- ? OUString(sXML_export_chart_oasis_content_service)
- : OUString(sXML_export_chart_content_service),
+ ? OUString("com.sun.star.comp.Chart.XMLOasisContentExporter")
+ : OUString("com.sun.star.comp.Chart.XMLContentExporter"),
xStorage, xSaxWriter, xServiceFactory, aFilterProperties );
nWarning |= nContentWarning;
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index eec6bbecad70..f29567c9b9fb 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -58,8 +58,6 @@ using ::osl::MutexGuard;
namespace
{
-static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Axis";
-
enum
{
PROP_AXIS_SHOW,
@@ -657,7 +655,7 @@ OUString SAL_CALL Axis::getImplementationName()
OUString Axis::getImplementationName_Static()
{
- return OUString(lcl_aServiceName);
+ return OUString("com.sun.star.comp.chart2.Axis");
}
sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index ec99d529703a..31961279ac8a 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -31,12 +31,6 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const char lcl_aServiceNameCartesian2d[] = "com.sun.star.chart2.CartesianCoordinateSystem2d";
-static const char lcl_aServiceNameCartesian3d[] = "com.sun.star.chart2.CartesianCoordinateSystem3d";
-
-static const char lcl_aImplementationNameCartesian2d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem2d";
-static const char lcl_aImplementationNameCartesian3d[] = "com.sun.star.comp.chart2.CartesianCoordinateSystem3d";
-
static const char CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Cartesian";
}
@@ -124,7 +118,7 @@ Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Stati
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
- aServices[ 1 ] = lcl_aServiceNameCartesian2d;
+ aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem2d";
return aServices;
}
@@ -137,7 +131,7 @@ OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName()
OUString CartesianCoordinateSystem2d::getImplementationName_Static()
{
- return OUString(lcl_aImplementationNameCartesian2d);
+ return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d");
}
sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName )
@@ -167,7 +161,7 @@ Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Stati
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
- aServices[ 1 ] = lcl_aServiceNameCartesian3d;
+ aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem3d";
return aServices;
}
@@ -180,7 +174,7 @@ OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName()
OUString CartesianCoordinateSystem3d::getImplementationName_Static()
{
- return OUString(lcl_aImplementationNameCartesian3d);
+ return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d");
}
sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index e145a704afbb..cd506a4ba97f 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -37,8 +37,6 @@ using ::com::sun::star::beans::Property;
namespace
{
-static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.GridProperties";
-
enum
{
PROP_GRID_SHOW
@@ -250,7 +248,7 @@ OUString SAL_CALL GridProperties::getImplementationName()
OUString GridProperties::getImplementationName_Static()
{
- return OUString(lcl_aServiceName);
+ return OUString("com.sun.star.comp.chart2.GridProperties");
}
sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 2d3d691e94c8..29ebc46a081a 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -47,8 +47,6 @@ using ::com::sun::star::beans::Property;
namespace
{
-static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Legend";
-
enum
{
PROP_LEGEND_ANCHOR_POSITION,
@@ -306,7 +304,7 @@ OUString SAL_CALL Legend::getImplementationName()
OUString Legend::getImplementationName_Static()
{
- return OUString(lcl_aServiceName);
+ return OUString("com.sun.star.comp.chart2.Legend");
}
sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index c73f58c3fc43..c8654e31d2f0 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -39,8 +39,6 @@ using ::com::sun::star::beans::Property;
namespace
{
-static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.PageBackground";
-
struct StaticPageBackgroundDefaults_Initializer
{
::chart::tPropertyValueMap* operator()()
@@ -230,7 +228,7 @@ OUString SAL_CALL PageBackground::getImplementationName()
OUString PageBackground::getImplementationName_Static()
{
- return OUString(lcl_aServiceName);
+ return OUString("com.sun.star.comp.chart2.PageBackground");
}
sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 44433a0a606f..aa982cd687f7 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -31,12 +31,6 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-static const char lcl_aServiceNamePolar2d[] = "com.sun.star.chart2.PolarCoordinateSystem2d";
-static const char lcl_aServiceNamePolar3d[] = "com.sun.star.chart2.PolarCoordinateSystem3d";
-
-static const char lcl_aImplementationNamePolar2d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem2d";
-static const char lcl_aImplementationNamePolar3d[] = "com.sun.star.comp.chart2.PolarCoordinateSystem3d";
-
static const char CHART2_COOSYSTEM_POLAR_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Polar";
}
@@ -124,7 +118,7 @@ Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
- aServices[ 1 ] = lcl_aServiceNamePolar2d;
+ aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem2d";
return aServices;
}
@@ -137,7 +131,7 @@ OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName()
OUString PolarCoordinateSystem2d::getImplementationName_Static()
{
- return OUString(lcl_aImplementationNamePolar2d) ;
+ return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ;
}
sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName )
@@ -167,7 +161,7 @@ Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
- aServices[ 1 ] = lcl_aServiceNamePolar3d;
+ aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem3d";
return aServices;
}
@@ -180,7 +174,7 @@ OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName()
OUString PolarCoordinateSystem3d::getImplementationName_Static()
{
- return OUString(lcl_aImplementationNamePolar3d);
+ return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d");
}
sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName )
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 06a03e148c93..e704c1ffda81 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -47,8 +47,6 @@ using ::osl::MutexGuard;
namespace
{
-static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.Title";
-
enum
{
PROP_TITLE_PARA_ADJUST,
@@ -393,7 +391,7 @@ OUString SAL_CALL Title::getImplementationName()
OUString Title::getImplementationName_Static()
{
- return OUString(lcl_aServiceName);
+ return OUString("com.sun.star.comp.chart2.Title");
}
sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName )
generated by cgit (git 2.34.1) at 2024-07-12 15:06:57 +0000