diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 16:02:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 16:02:24 +0000 |
| commit | 9ae71aa0edbe688853054dd5726605aa3e161fe1 (patch) | |
| tree | 01ba4bbead70919328ee262d788e43d19312c5db /chart2 | |
| parent | 08f3f401aec0016cb398e1fe703342a499fa34af (diff) | |
INTEGRATION: CWS ooo20040704 (1.12.40); FILE MERGED
2004/07/02 15:28:29 cmc 1.12.40.2: #i30891# revert header and namespace change
2004/06/29 15:57:46 cmc 1.12.40.1: #i30801# allow using system stl if possible
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/model/template/ChartTypeManager.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 6a6dfea37421..897f7ed545be 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeManager.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: bm $ $Date: 2004-01-26 09:12:48 $ + * last change: $Author: rt $ $Date: 2004-09-08 17:02:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -289,7 +289,7 @@ typedef ::std::map< OUString, TemplateId > tTemplateMapType; const tTemplateMapType & lcl_DefaultChartTypeMap() { static const tTemplateMapType aMap = tTemplateMapType( - ::comphelper::MakeMap< tTemplateMapType::key_type, tTemplateMapType::data_type > + ::comphelper::MakeMap< tTemplateMapType::key_type, tTemplateMapType::mapped_type > ( C2U( "com.sun.star.chart2.template.Line" ), TEMPLATE_LINE ) ( C2U( "com.sun.star.chart2.template.StackedLine" ), TEMPLATE_STACKEDLINE ) ( C2U( "com.sun.star.chart2.template.PercentStackedLine" ), TEMPLATE_PERCENTSTACKEDLINE ) @@ -404,7 +404,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // As XMultiServiceFactory does not specify, what to do in case // createInstance is called with an unknown service-name, this - // function will just return an empty XInterface. + // function will just return an empty XInterface ASSERT_EXCEPTION( ex ); xResult.set( 0 ); } |