diff options
Diffstat (limited to 'chart2/source/model')
45 files changed, 497 insertions, 497 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 41cff8a6053f..885bee06e6dc 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -138,10 +138,10 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( uno::Reference<beans::XPropertySet> xProp(xStorage,uno::UNO_QUERY); OUString aMediaType; if ( ! xProp.is() || - ! ( xProp->getPropertyValue( C2U("MediaType")) >>= aMediaType ) || + ! ( xProp->getPropertyValue( "MediaType") >>= aMediaType ) || ( aMediaType.isEmpty() )) { - xProp->setPropertyValue( C2U("MediaType"), uno::makeAny( _sMediaType )); + xProp->setPropertyValue( "MediaType", uno::makeAny( _sMediaType )); } } catch (const uno::Exception& ex) @@ -315,7 +315,7 @@ sal_Int32 XMLFilter::impl_Import( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" ))) + if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) { OSL_FAIL( "Import: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -343,7 +343,7 @@ sal_Int32 XMLFilter::impl_Import( aArgs[0] <<= xStorage; xGraphicObjectResolver.set( xServiceFactory->createInstanceWithArguments( - C2U("com.sun.star.comp.Svx.GraphicImportHelper"), aArgs ), uno::UNO_QUERY ); + "com.sun.star.comp.Svx.GraphicImportHelper", aArgs ), uno::UNO_QUERY ); } // create XPropertySet with extra informatio for the filter @@ -383,12 +383,12 @@ sal_Int32 XMLFilter::impl_Import( uno::Sequence< beans::PropertyValue > aModProps = xModel->getArgs(); for( sal_Int32 nInd = 0; nInd < aModProps.getLength(); nInd++ ) { - if( aModProps[nInd].Name.equals( C2U( "HierarchicalDocumentName" ) ) ) + if( aModProps[nInd].Name.equals( "HierarchicalDocumentName" ) ) { // Actually this argument only has meaning for embedded documents aModProps[nInd].Value >>= aHierarchName; } - else if( aModProps[nInd].Name.equals( C2U( "DocumentBaseURL" ) ) ) + else if( aModProps[nInd].Name.equals( "DocumentBaseURL" ) ) { aModProps[nInd].Value >>= aBaseUri; } @@ -396,32 +396,32 @@ sal_Int32 XMLFilter::impl_Import( } if( !aBaseUri.isEmpty() ) - xImportInfo->setPropertyValue( C2U("BaseURI"), uno::makeAny( aBaseUri ) ); + xImportInfo->setPropertyValue( "BaseURI", uno::makeAny( aBaseUri ) ); if( !aHierarchName.isEmpty() ) - xImportInfo->setPropertyValue( C2U("StreamRelPath"), uno::makeAny( aHierarchName ) ); + xImportInfo->setPropertyValue( "StreamRelPath", uno::makeAny( aHierarchName ) ); // import meta information if( bOasis ) nWarning |= impl_ImportStream( - C2U( sXML_metaStreamName ), - C2U( sXML_import_chart_oasis_meta_service ), + sXML_metaStreamName, + sXML_import_chart_oasis_meta_service, xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); // import styles nWarning |= impl_ImportStream( - C2U( sXML_styleStreamName ), + sXML_styleStreamName, bOasis - ? C2U( sXML_import_chart_oasis_styles_service ) - : C2U( sXML_import_chart_styles_service ), + ? OUString(sXML_import_chart_oasis_styles_service) + : OUString(sXML_import_chart_styles_service), xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); // import content sal_Int32 nContentWarning = impl_ImportStream( - C2U( sXML_contentStreamName ), + sXML_contentStreamName, bOasis - ? C2U( sXML_import_chart_oasis_content_service ) - : C2U( sXML_import_chart_content_service ), + ? OUString(sXML_import_chart_oasis_content_service) + : OUString(sXML_import_chart_content_service), xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); nWarning |= nContentWarning; @@ -429,8 +429,8 @@ sal_Int32 XMLFilter::impl_Import( if( nContentWarning != 0 ) { nWarning = impl_ImportStream( - C2U( sXML_oldContentStreamName ), - C2U( sXML_import_chart_old_content_service ), + sXML_oldContentStreamName, + sXML_import_chart_old_content_service, xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo ); } } @@ -462,7 +462,7 @@ sal_Int32 XMLFilter::impl_ImportStream( return 0; if( xImportInfo.is() ) - xImportInfo->setPropertyValue( C2U("StreamName"), uno::makeAny( rStreamName ) ); + xImportInfo->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) ); if( xStorage.is() && xStorage->isStreamElement( rStreamName ) ) @@ -571,7 +571,7 @@ sal_Int32 XMLFilter::impl_Export( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( C2U( "com.sun.star.chart2.ChartDocument" ))) + if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) { OSL_FAIL( "Export: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -641,7 +641,7 @@ sal_Int32 XMLFilter::impl_Export( sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); if( ! bOasis ) - xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); + xInfoSet->setPropertyValue( "ExportTableNumberList", uno::makeAny( true )); sal_Int32 nArgs = 2; if( xGraphicObjectResolver.is()) @@ -659,24 +659,24 @@ sal_Int32 XMLFilter::impl_Export( // export meta information if( bOasis ) nWarning |= impl_ExportStream( - C2U( sXML_metaStreamName ), - C2U( sXML_export_chart_oasis_meta_service ), + sXML_metaStreamName, + sXML_export_chart_oasis_meta_service, xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); // export styles nWarning |= impl_ExportStream( - C2U( sXML_styleStreamName ), + sXML_styleStreamName, bOasis - ? C2U( sXML_export_chart_oasis_styles_service ) - : C2U( sXML_export_chart_styles_service ), + ? OUString(sXML_export_chart_oasis_styles_service) + : OUString(sXML_export_chart_styles_service), xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); // export content sal_Int32 nContentWarning = impl_ExportStream( - C2U( sXML_contentStreamName ), + sXML_contentStreamName, bOasis - ? C2U( sXML_export_chart_oasis_content_service ) - : C2U( sXML_export_chart_content_service ), + ? OUString(sXML_export_chart_oasis_content_service) + : OUString(sXML_export_chart_content_service), xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); nWarning |= nContentWarning; @@ -729,9 +729,9 @@ sal_Int32 XMLFilter::impl_ExportStream( uno::Reference< beans::XPropertySet > xStreamProp( xOutputStream, uno::UNO_QUERY ); if(xStreamProp.is()) try { - xStreamProp->setPropertyValue( C2U("MediaType"), uno::makeAny( C2U("text/xml") ) ); - xStreamProp->setPropertyValue( C2U("Compressed"), uno::makeAny( sal_True ) );//@todo? - xStreamProp->setPropertyValue( C2U("UseCommonStoragePasswordEncryption"), uno::makeAny( sal_True ) ); + xStreamProp->setPropertyValue( "MediaType", uno::makeAny( OUString("text/xml") ) ); + xStreamProp->setPropertyValue( "Compressed", uno::makeAny( sal_True ) );//@todo? + xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( sal_True ) ); } catch (const uno::Exception& rEx) { @@ -747,7 +747,7 @@ sal_Int32 XMLFilter::impl_ExportStream( rFilterProperties.getConstArray()[0] >>= xInfoSet; OSL_ENSURE( xInfoSet.is(), "missing infoset for export" ); if( xInfoSet.is() ) - xInfoSet->setPropertyValue( C2U("StreamName"), uno::makeAny( rStreamName ) ); + xInfoSet->setPropertyValue( "StreamName", uno::makeAny( rStreamName ) ); } Reference< XExporter > xExporter( xServiceFactory->createInstanceWithArguments( @@ -777,8 +777,8 @@ sal_Int32 XMLFilter::impl_ExportStream( Sequence< OUString > XMLFilter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.document.ImportFilter" ); - aServices[ 1 ] = C2U( "com.sun.star.document.ExportFilter" ); + aServices[ 0 ] = "com.sun.star.document.ImportFilter"; + aServices[ 1 ] = "com.sun.star.document.ExportFilter"; // todo: services are incomplete. Missing: // XInitialization, XNamed @@ -799,7 +799,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes } // ----------------------------------------------------------------------------- -APPHELPER_XSERVICEINFO_IMPL( XMLFilter, C2U( "com.sun.star.comp.chart2.XMLFilter" ) ); +APPHELPER_XSERVICEINFO_IMPL( XMLFilter, OUString("com.sun.star.comp.chart2.XMLFilter") ); // ----------------------------------------------------------------------------- void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 5e0d07e6e4aa..b949ece25b14 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -85,100 +85,100 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_AXIS_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CrossoverPosition" ), + Property( "CrossoverPosition", PROP_AXIS_CROSSOVER_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CrossoverValue" ), + Property( "CrossoverValue", PROP_AXIS_CROSSOVER_VALUE, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "DisplayLabels" ), + Property( "DisplayLabels", PROP_AXIS_DISPLAY_LABELS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "NumberFormat" ), + Property( "NumberFormat", PROP_AXIS_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LabelPosition" ), + Property( "LabelPosition", PROP_AXIS_LABEL_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisLabelPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_AXIS_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextBreak" ), + Property( "TextBreak", PROP_AXIS_TEXT_BREAK, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextOverlap" ), + Property( "TextOverlap", PROP_AXIS_TEXT_OVERLAP, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StackCharacters" ), + Property( "StackCharacters", PROP_AXIS_TEXT_STACKED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ArrangeOrder" ), + Property( "ArrangeOrder", PROP_AXIS_TEXT_ARRANGE_ORDER, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisArrangeOrderType * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_AXIS_REFERENCE_DIAGRAM_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "MajorTickmarks" ), + Property( "MajorTickmarks", PROP_AXIS_MAJOR_TICKMARKS, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "MinorTickmarks" ), + Property( "MinorTickmarks", PROP_AXIS_MINOR_TICKMARKS, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "MarkPosition" ), + Property( "MarkPosition", PROP_AXIS_MARK_POSITION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartAxisMarkPosition * >(0)), beans::PropertyAttribute::MAYBEDEFAULT )); @@ -606,8 +606,8 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() Sequence< OUString > Axis::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Axis" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Axis"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index cb937f2be7cc..048f38d4e579 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "SwapXAndYAxis" ), + Property( "SwapXAndYAxis", PROP_COORDINATESYSTEM_SWAPXANDYAXIS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -289,7 +289,7 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); if( aIt == m_aChartTypes.end()) throw container::NoSuchElementException( - C2U( "The given chart type is no element of the container" ), + "The given chart type is no element of the container", static_cast< uno::XWeak * >( this )); m_aChartTypes.erase( aIt ); diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index ff8be7fe568d..73d249bac593 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -91,7 +91,7 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static( // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem, - C2U( "com.sun.star.comp.chart.CartesianCoordinateSystem" )) + OUString("com.sun.star.comp.chart.CartesianCoordinateSystem")) // ================================= diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0564adde45e1..743e248a2b3c 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -104,7 +104,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) , m_xInternalDataProvider( 0 ) , m_xPageBackground( new PageBackground( m_xContext ) ) , m_xXMLNamespaceMap( createNameContainer( ::getCppuType( (const OUString*) 0 ), - C2U( "com.sun.star.xml.NamespaceMap" ), C2U( "com.sun.star.comp.chart.XMLNameSpaceMap" ) ), uno::UNO_QUERY) + "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) { OSL_TRACE( "ChartModel: CTOR called" ); @@ -120,7 +120,7 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) { ModifyListenerHelper::addListener( m_xPageBackground, this ); m_xChartTypeManager.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); } osl_atomic_decrement(&m_refCount); } @@ -273,7 +273,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV if ( xProperties.is() ) { uno::Reference< drawing::XShapes > xShapes; - xProperties->getPropertyValue( C2U( "AdditionalShapes" ) ) >>= xShapes; + xProperties->getPropertyValue( "AdditionalShapes" ) >>= xShapes; if ( xShapes.is() ) { sal_Int32 nCount = xShapes->getCount(); @@ -314,8 +314,8 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static() { uno::Sequence< rtl::OUString > aSNS( 3 ); aSNS[0] = CHART_MODEL_SERVICE_NAME; - aSNS[1] = C2U( "com.sun.star.document.OfficeDocument" ); - aSNS[2] = C2U( "com.sun.star.chart.ChartDocument" ); + aSNS[1] = "com.sun.star.document.OfficeDocument"; + aSNS[2] = "com.sun.star.chart.ChartDocument"; //// @todo : add additional services if you support any further return aSNS; } @@ -760,8 +760,8 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() //create data uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), -1, - uno::makeAny( C2U("all") ), beans::PropertyState_DIRECT_VALUE ); + OUString( "CellRangeRepresentation" ), -1, + uno::makeAny( OUString("all") ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); @@ -821,7 +821,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data try { sal_Bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( Reference< frame::XModel >(this) ); - xProp->setPropertyValue(C2U("IncludeHiddenCells"), uno::makeAny(bIncludeHiddenCells)); + xProp->setPropertyValue("IncludeHiddenCells", uno::makeAny(bIncludeHiddenCells)); } catch (const beans::UnknownPropertyException&) { @@ -934,7 +934,7 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT Reference< chart2::XChartTypeTemplate > xTemplate; Reference< lang::XMultiServiceFactory > xFact( m_xChartTypeManager, uno::UNO_QUERY ); if( xFact.is() ) - xTemplate.set( xFact->createInstance( C2U( "com.sun.star.chart2.template.Column" ) ), uno::UNO_QUERY ); + xTemplate.set( xFact->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY ); return xTemplate; } @@ -1079,7 +1079,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio if( xTransferable.is() ) { datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) 0 ) ); uno::Any aData( xTransferable->getTransferData( aDataFlavor ) ); @@ -1149,7 +1149,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors uno::Sequence< datatransfer::DataFlavor > aRet(1); aRet[0] = datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, - C2U( "GDIMetaFile" ), + "GDIMetaFile", ::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) ); return aRet; @@ -1183,13 +1183,13 @@ tServiceNameMap & lcl_getStaticServiceNameMap() { static tServiceNameMap aServiceNameMap( tMakeServiceNameMap - ( C2U( "com.sun.star.drawing.DashTable" ), SERVICE_DASH_TABLE ) - ( C2U( "com.sun.star.drawing.GradientTable" ), SERVICE_GARDIENT_TABLE ) - ( C2U( "com.sun.star.drawing.HatchTable" ), SERVICE_HATCH_TABLE ) - ( C2U( "com.sun.star.drawing.BitmapTable" ), SERVICE_BITMAP_TABLE ) - ( C2U( "com.sun.star.drawing.TransparencyGradientTable" ), SERVICE_TRANSP_GRADIENT_TABLE ) - ( C2U( "com.sun.star.drawing.MarkerTable" ), SERVICE_MARKER_TABLE ) - ( C2U( "com.sun.star.xml.NamespaceMap" ), SERVICE_NAMESPACE_MAP ) + ( "com.sun.star.drawing.DashTable", SERVICE_DASH_TABLE ) + ( "com.sun.star.drawing.GradientTable", SERVICE_GARDIENT_TABLE ) + ( "com.sun.star.drawing.HatchTable", SERVICE_HATCH_TABLE ) + ( "com.sun.star.drawing.BitmapTable", SERVICE_BITMAP_TABLE ) + ( "com.sun.star.drawing.TransparencyGradientTable", SERVICE_TRANSP_GRADIENT_TABLE ) + ( "com.sun.star.drawing.MarkerTable", SERVICE_MARKER_TABLE ) + ( "com.sun.star.xml.NamespaceMap", SERVICE_NAMESPACE_MAP ) ); return aServiceNameMap; } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 0e638ece1c15..e0bf13019595 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -100,7 +100,7 @@ void lcl_addStorageToMediaDescriptor( { rOutMD.realloc( rOutMD.getLength() + 1 ); rOutMD[rOutMD.getLength() - 1] = beans::PropertyValue( - C2U("Storage"), -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE ); + "Storage", -1, uno::makeAny( xStorage ), beans::PropertyState_DIRECT_VALUE ); } Reference< embed::XStorage > lcl_createStorage( @@ -157,7 +157,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( { Reference< container::XNameAccess > xFilterFact( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.document.FilterFactory" ), m_xContext ), + "com.sun.star.document.FilterFactory", m_xContext ), uno::UNO_QUERY_THROW ); uno::Any aFilterProps( xFilterFact->getByName( aFilterName )); Sequence< beans::PropertyValue > aProps; @@ -190,7 +190,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( OSL_TRACE( "No FilterName passed in MediaDescriptor" ); xFilter.set( m_xContext->getServiceManager()->createInstanceWithContext( - C2U("com.sun.star.comp.chart2.XMLFilter"), m_xContext ), + "com.sun.star.comp.chart2.XMLFilter", m_xContext ), uno::UNO_QUERY_THROW ); } @@ -247,10 +247,10 @@ void SAL_CALL ChartModel::store() ::rtl::OUString aLocation = m_aResource; if( aLocation.isEmpty() ) - throw io::IOException( C2U( "no location specified" ), static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this)); //@todo check whether aLocation is something like private:factory... if( m_bReadOnly ) - throw io::IOException( C2U( "document is read only" ), static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( "document is read only", static_cast< ::cppu::OWeakObject* >(this)); aGuard.clear(); @@ -411,7 +411,7 @@ void SAL_CALL ChartModel::initNew() if( bSupportsCategories ) { aParam.realloc( 1 ); - aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ), + aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); } @@ -427,17 +427,17 @@ void SAL_CALL ChartModel::initNew() // create and attach legend Reference< chart2::XLegend > xLegend( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Legend" ), m_xContext ), uno::UNO_QUERY_THROW ); + "com.sun.star.chart2.Legend", m_xContext ), uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLegendProperties( xLegend, uno::UNO_QUERY ); if( xLegendProperties.is() ) { - xLegendProperties->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE )); - xLegendProperties->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE )); - xLegendProperties->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 - xLegendProperties->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xLegendProperties->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE )); + xLegendProperties->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE )); + xLegendProperties->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 + xLegendProperties->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 if( bIsRTL ) - xLegendProperties->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( chart2::LegendPosition_LINE_START )); + xLegendProperties->setPropertyValue( "AnchorPosition", uno::makeAny( chart2::LegendPosition_LINE_START )); } if(xDiagram.is()) xDiagram->setLegend( xLegend ); @@ -446,8 +446,8 @@ void SAL_CALL ChartModel::initNew() Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( C2U("RightAngledAxes"), uno::makeAny( sal_True )); - xDiagramProperties->setPropertyValue( C2U("D3DScenePerspective"), uno::makeAny( drawing::ProjectionMode_PARALLEL )); + xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( sal_True )); + xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL )); ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic ); } @@ -457,18 +457,18 @@ void SAL_CALL ChartModel::initNew() Reference< beans::XPropertySet > xWall( xDiagram->getWall() ); if( xWall.is() ) { - xWall->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ); - xWall->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE ) ); - xWall->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xWall->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xWall->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ); + xWall->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ) ); + xWall->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xWall->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 } Reference< beans::XPropertySet > xFloor( xDiagram->getFloor() ); if( xFloor.is() ) { - xFloor->setPropertyValue( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); - xFloor->setPropertyValue( C2U( "FillStyle" ), uno::makeAny( drawing::FillStyle_SOLID ) ); - xFloor->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xFloor->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 + xFloor->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) ); + xFloor->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ); + xFloor->setPropertyValue( "LineColor", uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xFloor->setPropertyValue( "FillColor", uno::makeAny( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 } } @@ -514,9 +514,9 @@ void SAL_CALL ChartModel::load( aMDHelper.ISSET_InputStream ) { if( aMDHelper.ISSET_FilterName && - (aMDHelper.FilterName.equals( C2U("StarChart 5.0")) || - aMDHelper.FilterName.equals( C2U("StarChart 4.0")) || - aMDHelper.FilterName.equals( C2U("StarChart 3.0")) )) + (aMDHelper.FilterName.equals( "StarChart 5.0") || + aMDHelper.FilterName.equals( "StarChart 4.0") || + aMDHelper.FilterName.equals( "StarChart 3.0") )) { attachResource( aMDHelper.URL, rMediaDescriptor ); impl_load( rMediaDescriptor, 0 ); // cannot create a storage from binary streams, but I do not need the storage here anyhow @@ -612,7 +612,7 @@ void ChartModel::impl_loadGraphics( try { const Reference< embed::XStorage >& xGraphicsStorage( - xStorage->openStorageElement( C2U( "Pictures" ), + xStorage->openStorageElement( "Pictures", embed::ElementModes::READ ) ); if( xGraphicsStorage.is() ) diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 14711771169c..2537dba9f869 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -289,9 +289,9 @@ void DataPoint::fireModifyEvent() Sequence< OUString > DataPoint::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.DataPoint" ); - aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.DataPoint"; + aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -301,7 +301,7 @@ using impl::DataPoint_Base; IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataPoint, C2U( "com.sun.star.comp.chart.DataPoint" )); +APPHELPER_XSERVICEINFO_IMPL( DataPoint, OUString("com.sun.star.comp.chart.DataPoint") ); } // namespace chart diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 3eba35af4b72..fb11ece86a93 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -51,7 +51,7 @@ void DataPointProperties::AddPropertiesToVector( // Common // ------ rOutProperties.push_back( - Property( C2U( "Color" ), + Property( "Color", PROP_DATAPOINT_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -59,7 +59,7 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Transparency" ), + Property( "Transparency", PROP_DATAPOINT_TRANSPARENCY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -68,14 +68,14 @@ void DataPointProperties::AddPropertiesToVector( // Fill Properties // --------------- rOutProperties.push_back( - Property( C2U( "FillStyle" ), + Property( "FillStyle", PROP_DATAPOINT_FILL_STYLE, ::getCppuType( reinterpret_cast< const drawing::FillStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TransparencyGradientName" ), + Property( "TransparencyGradientName", PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -83,7 +83,7 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "GradientName" ), + Property( "GradientName", PROP_DATAPOINT_GRADIENT_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -92,14 +92,14 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( - beans::Property( C2U( "GradientStepCount" ), + beans::Property( "GradientStepCount", PROP_DATAPOINT_GRADIENT_STEPCOUNT, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "HatchName" ), + Property( "HatchName", PROP_DATAPOINT_HATCH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -107,14 +107,14 @@ void DataPointProperties::AddPropertiesToVector( | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "FillBitmapName" ), + Property( "FillBitmapName", PROP_DATAPOINT_FILL_BITMAP_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "FillBackground" ), + Property( "FillBackground", PROP_DATAPOINT_FILL_BACKGROUND, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -123,32 +123,32 @@ void DataPointProperties::AddPropertiesToVector( // border for filled objects rOutProperties.push_back( - Property( C2U( "BorderColor" ), + Property( "BorderColor", PROP_DATAPOINT_BORDER_COLOR, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID // "maybe auto" | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderStyle" ), + Property( "BorderStyle", PROP_DATAPOINT_BORDER_STYLE, ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderWidth" ), + Property( "BorderWidth", PROP_DATAPOINT_BORDER_WIDTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "BorderDashName" ), + Property( "BorderDashName", PROP_DATAPOINT_BORDER_DASH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "BorderTransparency" ), + Property( "BorderTransparency", PROP_DATAPOINT_BORDER_TRANSPARENCY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -157,25 +157,25 @@ void DataPointProperties::AddPropertiesToVector( // Line Properties // --------------- rOutProperties.push_back( - Property( C2U( "LineStyle" ), + Property( "LineStyle", LineProperties::PROP_LINE_STYLE, ::getCppuType( reinterpret_cast< const drawing::LineStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineWidth" ), + Property( "LineWidth", LineProperties::PROP_LINE_WIDTH, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LineDash" ), + Property( "LineDash", LineProperties::PROP_LINE_DASH, ::getCppuType( reinterpret_cast< const drawing::LineDash * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LineDashName" ), + Property( "LineDashName", LineProperties::PROP_LINE_DASH_NAME, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND @@ -184,28 +184,28 @@ void DataPointProperties::AddPropertiesToVector( // FillProperties // bitmap properties rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetX" ), + Property( "FillBitmapOffsetX", FillProperties::PROP_FILL_BITMAP_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapOffsetY" ), + Property( "FillBitmapOffsetY", FillProperties::PROP_FILL_BITMAP_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetX" ), + Property( "FillBitmapPositionOffsetX", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETX, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapPositionOffsetY" ), + Property( "FillBitmapPositionOffsetY", FillProperties::PROP_FILL_BITMAP_POSITION_OFFSETY, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -213,35 +213,35 @@ void DataPointProperties::AddPropertiesToVector( rOutProperties.push_back( - Property( C2U( "FillBitmapRectanglePoint" ), + Property( "FillBitmapRectanglePoint", FillProperties::PROP_FILL_BITMAP_RECTANGLEPOINT, ::getCppuType( reinterpret_cast< const drawing::RectanglePoint * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapLogicalSize" ), + Property( "FillBitmapLogicalSize", FillProperties::PROP_FILL_BITMAP_LOGICALSIZE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeX" ), + Property( "FillBitmapSizeX", FillProperties::PROP_FILL_BITMAP_SIZEX, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapSizeY" ), + Property( "FillBitmapSizeY", FillProperties::PROP_FILL_BITMAP_SIZEY, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "FillBitmapMode" ), + Property( "FillBitmapMode", FillProperties::PROP_FILL_BITMAP_MODE, ::getCppuType( reinterpret_cast< const drawing::BitmapMode * >(0)), beans::PropertyAttribute::BOUND @@ -249,40 +249,40 @@ void DataPointProperties::AddPropertiesToVector( // others rOutProperties.push_back( - Property( C2U( "Symbol" ), + Property( "Symbol", PROP_DATAPOINT_SYMBOL_PROP, ::getCppuType( reinterpret_cast< const chart2::Symbol * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Offset" ), + Property( "Offset", PROP_DATAPOINT_OFFSET, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Geometry3D" ), + Property( "Geometry3D", PROP_DATAPOINT_GEOMETRY3D, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Label" ), + Property( "Label", PROP_DATAPOINT_LABEL, ::getCppuType( reinterpret_cast< const chart2::DataPointLabel * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LabelSeparator" ), + Property( "LabelSeparator", PROP_DATAPOINT_LABEL_SEPARATOR, ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "NumberFormat" ), + Property( "NumberFormat", PROP_DATAPOINT_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -290,28 +290,28 @@ void DataPointProperties::AddPropertiesToVector( //additional 'PercentageNumberFormat' rOutProperties.push_back( - Property( C2U( "PercentageNumberFormat" ), + Property( "PercentageNumberFormat", PROP_DATAPOINT_PERCENTAGE_NUMBER_FORMAT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "LabelPlacement" ), + Property( "LabelPlacement", PROP_DATAPOINT_LABEL_PLACEMENT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_DATAPOINT_REFERENCE_DIAGRAM_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_DATAPOINT_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND @@ -319,27 +319,27 @@ void DataPointProperties::AddPropertiesToVector( // statistics rOutProperties.push_back( - Property( C2U( "ErrorBarX" ), + Property( "ErrorBarX", PROP_DATAPOINT_ERROR_BAR_X, // XPropertySet supporting service ErrorBar ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ErrorBarY" ), + Property( "ErrorBarY", PROP_DATAPOINT_ERROR_BAR_Y, // XPropertySet supporting service ErrorBar ::getCppuType( reinterpret_cast< const uno::Reference< beans::XPropertySet > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ShowErrorBox" ), + Property( "ShowErrorBox", PROP_DATAPOINT_SHOW_ERROR_BOX, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "PercentDiagonal" ), + Property( "PercentDiagonal", PROP_DATAPOINT_PERCENT_DIAGONAL, ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)), beans::PropertyAttribute::BOUND @@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap( sal_False // ShowLegendSymbol )); - PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, C2U(" ") ); + PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " ); //@todo maybe choose a different one here -> should be dynamically that of the attached axis PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >()); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 26c64c350515..c292e1822a5f 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -268,9 +268,9 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() Sequence< OUString > DataSeries::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.DataSeries" ); - aServices[ 1 ] = C2U( "com.sun.star.chart2.DataPointProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.DataSeries"; + aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -366,7 +366,7 @@ Reference< beans::XPropertySet > } ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries( - DataSeriesHelper::getAllDataSequencesByRole( aSequences , C2U("values"), true ) ); + DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values", true ) ); if( !aValuesSeries.empty() ) { Reference< chart2::data::XDataSequence > xSeq( aValuesSeries.front()->getValues() ); @@ -513,7 +513,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) ); if( aIt == m_aRegressionCurves.end()) throw container::NoSuchElementException( - C2U( "The given regression curve is no element of this series" ), + "The given regression curve is no element of this series", static_cast< uno::XWeak * >( this )); m_aRegressionCurves.erase( aIt ); } @@ -616,7 +616,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( DataSeries, - C2U( "com.sun.star.comp.chart.DataSeries" )); + OUString("com.sun.star.comp.chart.DataSeries") ); } // namespace chart diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx index 941d1bdf29f8..74ca6183f34c 100644 --- a/chart2/source/model/main/DataSeriesProperties.cxx +++ b/chart2/source/model/main/DataSeriesProperties.cxx @@ -40,28 +40,28 @@ void DataSeriesProperties::AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "AttributedDataPoints" ), + Property( "AttributedDataPoints", PROP_DATASERIES_ATTRIBUTED_DATA_POINTS, ::getCppuType( reinterpret_cast< const uno::Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "StackingDirection" ), + Property( "StackingDirection", PROP_DATASERIES_STACKING_DIRECTION, ::getCppuType( reinterpret_cast< const chart2::StackingDirection * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "VaryColorsByPoint" ), + Property( "VaryColorsByPoint", PROP_DATASERIES_VARY_COLORS_BY_POINT, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "AttachedAxisIndex" ), + Property( "AttachedAxisIndex", PROP_DATASERIES_ATTACHED_AXIS_INDEX, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 1cca41cb71a2..75c97e173f93 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -80,88 +80,88 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_DIAGRAM_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativeSize" ), + Property( "RelativeSize", PROP_DIAGRAM_REL_SIZE, ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "PosSizeExcludeAxes" ), + Property( "PosSizeExcludeAxes", PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SortByXValues" ), + Property( "SortByXValues", PROP_DIAGRAM_SORT_BY_X_VALUES, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("ConnectBars"), + Property( "ConnectBars", PROP_DIAGRAM_CONNECT_BARS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("GroupBarsPerAxis"), + Property( "GroupBarsPerAxis", PROP_DIAGRAM_GROUP_BARS_PER_AXIS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("IncludeHiddenCells"), + Property( "IncludeHiddenCells", PROP_DIAGRAM_INCLUDE_HIDDEN_CELLS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StartingAngle" ), + Property( "StartingAngle", PROP_DIAGRAM_STARTING_ANGLE, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("RightAngledAxes"), + Property( "RightAngledAxes", PROP_DIAGRAM_RIGHT_ANGLED_AXES, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U("Perspective"), + Property( "Perspective", PROP_DIAGRAM_PERSPECTIVE, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U("RotationHorizontal"), + Property( "RotationHorizontal", PROP_DIAGRAM_ROTATION_HORIZONTAL, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U("RotationVertical"), + Property( "RotationVertical", PROP_DIAGRAM_ROTATION_VERTICAL, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "MissingValueTreatment" ), + Property( "MissingValueTreatment", PROP_DIAGRAM_MISSING_VALUE_TREATMENT, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -425,11 +425,11 @@ void SAL_CALL Diagram::setDiagramData( throw (uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.ChartTypeManager" ), m_xContext ), uno::UNO_QUERY ); + "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( this, xChartTypeManager ); uno::Reference< chart2::XChartTypeTemplate > xTemplate( aTemplateAndService.first ); if( !xTemplate.is() ) - xTemplate.set( xChartTypeManager->createInstance( C2U("com.sun.star.chart2.template.Column") ), uno::UNO_QUERY ); + xTemplate.set( xChartTypeManager->createInstance( "com.sun.star.chart2.template.Column" ), uno::UNO_QUERY ); if(!xTemplate.is()) return; xTemplate->changeDiagramData( this, xDataSource, aArguments ); @@ -514,7 +514,7 @@ void SAL_CALL Diagram::removeCoordinateSystem( aIt( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )); if( aIt == m_aCoordSystems.end()) throw container::NoSuchElementException( - C2U( "The given coordinate-system is no element of the container" ), + "The given coordinate-system is no element of the container", static_cast< uno::XWeak * >( this )); m_aCoordSystems.erase( aIt ); } @@ -619,9 +619,9 @@ Sequence< OUString > Diagram::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Diagram" ); - aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Diagram"; + aServices[ 1 ] = "com.sun.star.layout.LayoutElement"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -716,7 +716,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( Diagram, - C2U( "com.sun.star.comp.chart2.Diagram" )); + OUString("com.sun.star.comp.chart2.Diagram") ); } // namespace chart diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index bdb71320e096..e21beed575df 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -207,8 +207,8 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.FormattedString" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.FormattedString"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -248,7 +248,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( FormattedString, - C2U( "com.sun.star.comp.chart.FormattedString" )); + OUString("com.sun.star.comp.chart.FormattedString") ); } // namespace chart diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index ec947bdd219f..77e009be2f2c 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -54,7 +54,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_GRID_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -247,8 +247,8 @@ void GridProperties::fireModifyEvent() Sequence< OUString > GridProperties::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.GridProperties" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.GridProperties"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 5e1656f48316..353d1e9eeb0c 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -65,41 +65,41 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "AnchorPosition" ), + Property( "AnchorPosition", PROP_LEGEND_ANCHOR_POSITION, ::getCppuType( reinterpret_cast< const chart2::LegendPosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Expansion" ), + Property( "Expansion", PROP_LEGEND_EXPANSION, ::getCppuType( reinterpret_cast< const ::com::sun::star::chart::ChartLegendExpansion * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Show" ), + Property( "Show", PROP_LEGEND_SHOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_LEGEND_REF_PAGE_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_LEGEND_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "RelativeSize" ), + Property( "RelativeSize", PROP_LEGEND_REL_SIZE, ::getCppuType( reinterpret_cast< const chart2::RelativeSize * >(0)), beans::PropertyAttribute::BOUND @@ -271,12 +271,12 @@ Sequence< OUString > Legend::getSupportedServiceNames_Static() const sal_Int32 nNumServices( 6 ); sal_Int32 nI = 0; Sequence< OUString > aServices( nNumServices ); - aServices[ nI++ ] = C2U( "com.sun.star.chart2.Legend" ); - aServices[ nI++ ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.FillProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.drawing.LineProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.style.CharacterProperties" ); - aServices[ nI++ ] = C2U( "com.sun.star.layout.LayoutElement" ); + aServices[ nI++ ] = "com.sun.star.chart2.Legend"; + aServices[ nI++ ] = "com.sun.star.beans.PropertySet"; + aServices[ nI++ ] = "com.sun.star.drawing.FillProperties"; + aServices[ nI++ ] = "com.sun.star.drawing.LineProperties"; + aServices[ nI++ ] = "com.sun.star.style.CharacterProperties"; + aServices[ nI++ ] = "com.sun.star.layout.LayoutElement"; OSL_ASSERT( nNumServices == nI ); return aServices; } diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index dce468a589df..83a4c8e02ea8 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -224,8 +224,8 @@ void PageBackground::fireModifyEvent() uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.PageBackground" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.PageBackground"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 6f34cc44a9dc..d82b09369e7c 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -91,7 +91,7 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem, - C2U( "com.sun.star.comp.chart.PolarCoordinateSystem" )) + OUString("com.sun.star.comp.chart.PolarCoordinateSystem") ) // ================================= diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 0fbf2e648c1d..f0d440f6f36f 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -236,8 +236,8 @@ void StockBar::fireModifyEvent() uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.StockBar" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.StockBar"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index fc3769d9c3ef..8295a390926f 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -70,76 +70,76 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "ParaAdjust" ), + Property( "ParaAdjust", PROP_TITLE_PARA_ADJUST, ::getCppuType( reinterpret_cast< ::com::sun::star::style::ParagraphAdjust * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaLastLineAdjust" ), + Property( "ParaLastLineAdjust", PROP_TITLE_PARA_LAST_LINE_ADJUST, ::getCppuType( reinterpret_cast< sal_Int16 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaLeftMargin" ), + Property( "ParaLeftMargin", PROP_TITLE_PARA_LEFT_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaRightMargin" ), + Property( "ParaRightMargin", PROP_TITLE_PARA_RIGHT_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaTopMargin" ), + Property( "ParaTopMargin", PROP_TITLE_PARA_TOP_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaBottomMargin" ), + Property( "ParaBottomMargin", PROP_TITLE_PARA_BOTTOM_MARGIN, ::getCppuType( reinterpret_cast< sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ParaIsHyphenation" ), + Property( "ParaIsHyphenation", PROP_TITLE_PARA_IS_HYPHENATION, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "TextRotation" ), + Property( "TextRotation", PROP_TITLE_TEXT_ROTATION, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "StackCharacters" ), + Property( "StackCharacters", PROP_TITLE_TEXT_STACKED, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "RelativePosition" ), + Property( "RelativePosition", PROP_TITLE_REL_POS, ::getCppuType( reinterpret_cast< const chart2::RelativePosition * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ReferencePageSize" ), + Property( "ReferencePageSize", PROP_TITLE_REF_PAGE_SIZE, ::getCppuType( reinterpret_cast< const awt::Size * >(0)), beans::PropertyAttribute::BOUND @@ -377,10 +377,10 @@ void Title::fireModifyEvent() uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 4 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Title" ); - aServices[ 1 ] = C2U( "com.sun.star.style.ParagraphProperties" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); - aServices[ 3 ] = C2U( "com.sun.star.layout.LayoutElement" ); + aServices[ 0 ] = "com.sun.star.chart2.Title"; + aServices[ 1 ] = "com.sun.star.style.ParagraphProperties"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; + aServices[ 3 ] = "com.sun.star.layout.LayoutElement"; return aServices; } diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 2f56aa568909..4947f259e180 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -227,8 +227,8 @@ void Wall::fireModifyEvent() uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.Wall" ); - aServices[ 1 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.Wall"; + aServices[ 1 ] = "com.sun.star.beans.PropertySet"; return aServices; } diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index a00dc9dac108..2a06ac188695 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -56,13 +56,13 @@ uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( AreaChartType, - C2U( "com.sun.star.comp.chart.AreaChartType" )); + OUString("com.sun.star.comp.chart.AreaChartType") ); } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 7b63bee3908f..695d662da3db 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -53,7 +53,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_AREA_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -194,7 +194,7 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) @@ -211,9 +211,9 @@ void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiag Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY ); if( xState.is() && xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -253,7 +253,7 @@ uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 5450bc9bee90..cec160893c6c 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -57,13 +57,13 @@ uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( BarChartType, - C2U( "com.sun.star.comp.chart.BarChartType" )); + OUString("com.sun.star.comp.chart.BarChartType") ); } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 49c51d56be05..7f936b4f1b5b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -54,13 +54,13 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_BAR_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Geometry3D" ), + Property( "Geometry3D", PROP_BAR_TEMPLATE_GEOMETRY3D, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -264,7 +264,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); if( getDimension() == 3 ) { try @@ -272,7 +272,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( //apply Geometry3D uno::Any aAGeometry3D; this->getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "Geometry3D" ), aAGeometry3D ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D ); } catch( const uno::Exception & ex ) { @@ -296,12 +296,12 @@ void SAL_CALL BarChartTypeTemplate::resetStyles( if( xState.is()) { if( getDimension() == 3 ) - xState->setPropertyToDefault( C2U("Geometry3D")); + xState->setPropertyToDefault( "Geometry3D"); Reference< beans::XPropertySet > xProp( xState, uno::UNO_QUERY ); if( xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -325,7 +325,7 @@ Sequence< OUString > BarChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index aff8baa2d17d..d18219356b6a 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -169,17 +169,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatory { uno::Sequence< ::rtl::OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); - aMandRolesSeq[0] = C2U( "label" ); - aMandRolesSeq[1] = C2U( "values-x" ); - aMandRolesSeq[2] = C2U( "values-y" ); - aMandRolesSeq[3] = C2U( "values-size" ); + aMandRolesSeq[0] = "label"; + aMandRolesSeq[1] = "values-x"; + aMandRolesSeq[2] = "values-y"; + aMandRolesSeq[3] = "values-size"; return aMandRolesSeq; } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-size" ); + return OUString("values-size"); } // ____ OPropertySet ____ @@ -210,14 +210,14 @@ uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( BubbleChartType, - C2U( "com.sun.star.comp.chart.BubbleChartType" )); + OUString("com.sun.star.comp.chart.BubbleChartType") ); } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index b48c3696578f..79fef5d67752 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -164,7 +164,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( throw (uno::RuntimeException) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); try { @@ -279,7 +279,7 @@ Sequence< OUString > BubbleChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 9e7db81b72c2..be2f1f0aee3f 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -86,7 +86,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( xCategories.set( aData[nDataIdx] ); if( xCategories.is()) { - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); if( bUseCategoriesAsX ) { bSetXValues = false; @@ -99,20 +99,20 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( { xValuesX.set( aData[nDataIdx] ); if( xValuesX.is()) - SetRole( xValuesX->getValues(), C2U("values-x")); + SetRole( xValuesX->getValues(), "values-x"); } else if( bNextIsYValues ) { aYValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-y")); + SetRole( aData[nDataIdx]->getValues(), "values-y"); bNextIsYValues = false; } else if( !bNextIsYValues ) { aSizeValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-size")); + SetRole( aData[nDataIdx]->getValues(), "values-size"); bNextIsYValues = (nDataSeqCount-(nDataIdx+1)) >= 2;//two or more left } } @@ -179,11 +179,11 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( Sequence< Reference< data::XLabeledDataSequence > > aNewSequences; Reference< data::XLabeledDataSequence > xValuesSize( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-size"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-size", false )); Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); Reference< data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false )); if( ! xValuesX.is() || ! xValuesY.is() || @@ -191,7 +191,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { vector< Reference< data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - xSeriesSource->getDataSequences(), C2U("values"), true )); + xSeriesSource->getDataSequences(), "values", true )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -206,7 +206,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesSize.set( aValueSeqVec[nIndex++] ); if( xValuesSize.is()) - SetRole( xValuesSize->getValues(), C2U("values-size")); + SetRole( xValuesSize->getValues(), "values-size"); } if( ! xValuesY.is() && @@ -214,7 +214,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesY.set( aValueSeqVec[nIndex++] ); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( ! xValuesX.is() && @@ -222,7 +222,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( { xValuesX.set( aValueSeqVec[nIndex++] ); if( xValuesX.is()) - SetRole( xValuesY->getValues(), C2U("values-x")); + SetRole( xValuesY->getValues(), "values-x"); } } if( xValuesSize.is()) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 7593bee4a06e..d1ccc532ef0e 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -52,33 +52,33 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Japanese" ), + Property( "Japanese", PROP_CANDLESTICKCHARTTYPE_JAPANESE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "WhiteDay" ), + Property( "WhiteDay", PROP_CANDLESTICKCHARTTYPE_WHITE_DAY, ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "BlackDay" ), + Property( "BlackDay", PROP_CANDLESTICKCHARTTYPE_BLACK_DAY, ::getCppuType( reinterpret_cast< Reference< beans::XPropertySet > *>(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEVOID )); rOutProperties.push_back( - Property( C2U( "ShowFirst" ), + Property( "ShowFirst", PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "ShowHighLow" ), + Property( "ShowHighLow", PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -232,17 +232,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMand ::std::vector< OUString > aMandRoles; - aMandRoles.push_back( C2U( "label" )); + aMandRoles.push_back( "label"); if( bShowFirst ) - aMandRoles.push_back( C2U( "values-first" )); + aMandRoles.push_back( "values-first"); if( bShowHiLow ) { - aMandRoles.push_back( C2U( "values-min" )); - aMandRoles.push_back( C2U( "values-max" )); + aMandRoles.push_back( "values-min"); + aMandRoles.push_back( "values-max"); } - aMandRoles.push_back( C2U( "values-last" )); + aMandRoles.push_back( "values-last"); return ContainerHelper::ContainerToSequence( aMandRoles ); } @@ -258,12 +258,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() ::std::vector< OUString > aOptRoles; if( ! bShowFirst ) - aOptRoles.push_back( C2U( "values-first" )); + aOptRoles.push_back( "values-first"); if( ! bShowHiLow ) { - aOptRoles.push_back( C2U( "values-min" )); - aOptRoles.push_back( C2U( "values-max" )); + aOptRoles.push_back( "values-min"); + aOptRoles.push_back( "values-max"); } return ContainerHelper::ContainerToSequence( aOptRoles ); @@ -272,7 +272,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-last" ); + return OUString("values-last"); } // ____ OPropertySet ____ @@ -332,14 +332,14 @@ uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( CandleStickChartType, - C2U( "com.sun.star.comp.chart.CandleStickChartType" )); + OUString("com.sun.star.comp.chart.CandleStickChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index b87107a975f1..d78d16ed0e89 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -112,8 +112,8 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() throw (uno::RuntimeException) { Sequence< OUString > aDefaultSeq(2); - aDefaultSeq[0] = C2U( "label" ); - aDefaultSeq[1] = C2U( "values-y" ); + aDefaultSeq[0] = "label"; + aDefaultSeq[1] = "values-y"; return aDefaultSeq; } @@ -126,7 +126,7 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() throw (uno::RuntimeException) { - return C2U( "values-y" ); + return OUString("values-y"); } void ChartType::impl_addDataSeriesWithoutNotification( @@ -161,7 +161,7 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries if( aIt == m_aDataSeries.end()) throw container::NoSuchElementException( - C2U( "The given series is no element of this charttype" ), + "The given series is no element of this charttype", static_cast< uno::XWeak * >( this )); ModifyListenerHelper::removeListener( xDataSeries, m_xModifyEventForwarder ); diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 61f55cffd54c..25aba04d05c1 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -135,72 +135,72 @@ const tTemplateMapType & lcl_DefaultChartTypeMap() { static const tTemplateMapType aMap = tTemplateMapType( ::comphelper::MakeMap< tTemplateMapType::key_type, tTemplateMapType::mapped_type > - ( C2U( "com.sun.star.chart2.template.Symbol" ), TEMPLATE_SYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedSymbol" ), TEMPLATE_STACKEDSYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedSymbol" ), TEMPLATE_PERCENTSTACKEDSYMBOL ) - ( 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 ) - ( C2U( "com.sun.star.chart2.template.LineSymbol" ), TEMPLATE_LINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedLineSymbol" ), TEMPLATE_STACKEDLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedLineSymbol" ), TEMPLATE_PERCENTSTACKEDLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.ThreeDLine" ), TEMPLATE_THREEDLINE ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDLine" ), TEMPLATE_STACKEDTHREEDLINE ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDLine" ), TEMPLATE_PERCENTSTACKEDTHREEDLINE ) - ( C2U( "com.sun.star.chart2.template.ThreeDLineDeep" ), TEMPLATE_THREEDLINEDEEP ) - ( C2U( "com.sun.star.chart2.template.Column" ), TEMPLATE_COLUMN ) - ( C2U( "com.sun.star.chart2.template.StackedColumn" ), TEMPLATE_STACKEDCOLUMN ) - ( C2U( "com.sun.star.chart2.template.PercentStackedColumn" ), TEMPLATE_PERCENTSTACKEDCOLUMN ) - ( C2U( "com.sun.star.chart2.template.Bar" ), TEMPLATE_BAR ) - ( C2U( "com.sun.star.chart2.template.StackedBar" ), TEMPLATE_STACKEDBAR ) - ( C2U( "com.sun.star.chart2.template.PercentStackedBar" ), TEMPLATE_PERCENTSTACKEDBAR ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnDeep" ), TEMPLATE_THREEDCOLUMNDEEP ) - ( C2U( "com.sun.star.chart2.template.ThreeDColumnFlat" ), TEMPLATE_THREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDColumnFlat" ), TEMPLATE_STACKEDTHREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarDeep" ), TEMPLATE_THREEDBARDEEP ) - ( C2U( "com.sun.star.chart2.template.ThreeDBarFlat" ), TEMPLATE_THREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDBarFlat" ), TEMPLATE_STACKEDTHREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" ), TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT ) - ( C2U( "com.sun.star.chart2.template.ColumnWithLine" ), TEMPLATE_COLUMNWITHLINE ) - ( C2U( "com.sun.star.chart2.template.StackedColumnWithLine" ), TEMPLATE_STACKEDCOLUMNWITHLINE ) - ( C2U( "com.sun.star.chart2.template.Area" ), TEMPLATE_AREA ) - ( C2U( "com.sun.star.chart2.template.StackedArea" ), TEMPLATE_STACKEDAREA ) - ( C2U( "com.sun.star.chart2.template.PercentStackedArea" ), TEMPLATE_PERCENTSTACKEDAREA ) - ( C2U( "com.sun.star.chart2.template.ThreeDArea" ), TEMPLATE_THREEDAREA ) - ( C2U( "com.sun.star.chart2.template.StackedThreeDArea" ), TEMPLATE_STACKEDTHREEDAREA ) - ( C2U( "com.sun.star.chart2.template.PercentStackedThreeDArea" ), TEMPLATE_PERCENTSTACKEDTHREEDAREA ) - ( C2U( "com.sun.star.chart2.template.Pie" ), TEMPLATE_PIE ) - ( C2U( "com.sun.star.chart2.template.PieAllExploded" ), TEMPLATE_PIEALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.Donut" ), TEMPLATE_DONUT ) - ( C2U( "com.sun.star.chart2.template.DonutAllExploded" ), TEMPLATE_DONUTALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ThreeDPie" ), TEMPLATE_THREEDPIE ) - ( C2U( "com.sun.star.chart2.template.ThreeDPieAllExploded" ), TEMPLATE_THREEDPIEALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonut" ), TEMPLATE_THREEDDONUT ) - ( C2U( "com.sun.star.chart2.template.ThreeDDonutAllExploded" ), TEMPLATE_THREEDDONUTALLEXPLODED ) - ( C2U( "com.sun.star.chart2.template.ScatterLineSymbol" ), TEMPLATE_SCATTERLINESYMBOL ) - ( C2U( "com.sun.star.chart2.template.ScatterLine" ), TEMPLATE_SCATTERLINE ) - ( C2U( "com.sun.star.chart2.template.ScatterSymbol" ), TEMPLATE_SCATTERSYMBOL ) - ( C2U( "com.sun.star.chart2.template.ThreeDScatter" ), TEMPLATE_THREEDSCATTER ) - ( C2U( "com.sun.star.chart2.template.Net" ), TEMPLATE_NET ) - ( C2U( "com.sun.star.chart2.template.NetSymbol" ), TEMPLATE_NETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.NetLine" ), TEMPLATE_NETLINE ) - ( C2U( "com.sun.star.chart2.template.StackedNet" ), TEMPLATE_STACKEDNET ) - ( C2U( "com.sun.star.chart2.template.StackedNetSymbol" ), TEMPLATE_STACKEDNETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.StackedNetLine" ), TEMPLATE_STACKEDNETLINE ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNet" ), TEMPLATE_PERCENTSTACKEDNET ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetSymbol" ), TEMPLATE_PERCENTSTACKEDNETSYMBOL ) - ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ), TEMPLATE_PERCENTSTACKEDNETLINE ) - ( C2U( "com.sun.star.chart2.template.FilledNet" ), TEMPLATE_FILLEDNET ) - ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ), TEMPLATE_STACKEDFILLEDNET ) - ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ), TEMPLATE_PERCENTSTACKEDFILLEDNET ) - ( C2U( "com.sun.star.chart2.template.StockLowHighClose" ), TEMPLATE_STOCKLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockOpenLowHighClose" ), TEMPLATE_STOCKOPENLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockVolumeLowHighClose" ), TEMPLATE_STOCKVOLUMELOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ), TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE ) - ( C2U( "com.sun.star.chart2.template.Bubble" ), TEMPLATE_BUBBLE ) -// ( C2U( "com.sun.star.chart2.template.Surface" ), TEMPLATE_SURFACE ) -// ( C2U( "com.sun.star.chart2.template.Addin" ), TEMPLATE_ADDIN ) + ( "com.sun.star.chart2.template.Symbol", TEMPLATE_SYMBOL ) + ( "com.sun.star.chart2.template.StackedSymbol", TEMPLATE_STACKEDSYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedSymbol", TEMPLATE_PERCENTSTACKEDSYMBOL ) + ( "com.sun.star.chart2.template.Line", TEMPLATE_LINE ) + ( "com.sun.star.chart2.template.StackedLine", TEMPLATE_STACKEDLINE ) + ( "com.sun.star.chart2.template.PercentStackedLine", TEMPLATE_PERCENTSTACKEDLINE ) + ( "com.sun.star.chart2.template.LineSymbol", TEMPLATE_LINESYMBOL ) + ( "com.sun.star.chart2.template.StackedLineSymbol", TEMPLATE_STACKEDLINESYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedLineSymbol", TEMPLATE_PERCENTSTACKEDLINESYMBOL ) + ( "com.sun.star.chart2.template.ThreeDLine", TEMPLATE_THREEDLINE ) + ( "com.sun.star.chart2.template.StackedThreeDLine", TEMPLATE_STACKEDTHREEDLINE ) + ( "com.sun.star.chart2.template.PercentStackedThreeDLine", TEMPLATE_PERCENTSTACKEDTHREEDLINE ) + ( "com.sun.star.chart2.template.ThreeDLineDeep", TEMPLATE_THREEDLINEDEEP ) + ( "com.sun.star.chart2.template.Column", TEMPLATE_COLUMN ) + ( "com.sun.star.chart2.template.StackedColumn", TEMPLATE_STACKEDCOLUMN ) + ( "com.sun.star.chart2.template.PercentStackedColumn", TEMPLATE_PERCENTSTACKEDCOLUMN ) + ( "com.sun.star.chart2.template.Bar", TEMPLATE_BAR ) + ( "com.sun.star.chart2.template.StackedBar", TEMPLATE_STACKEDBAR ) + ( "com.sun.star.chart2.template.PercentStackedBar", TEMPLATE_PERCENTSTACKEDBAR ) + ( "com.sun.star.chart2.template.ThreeDColumnDeep", TEMPLATE_THREEDCOLUMNDEEP ) + ( "com.sun.star.chart2.template.ThreeDColumnFlat", TEMPLATE_THREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.StackedThreeDColumnFlat", TEMPLATE_STACKEDTHREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat", TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT ) + ( "com.sun.star.chart2.template.ThreeDBarDeep", TEMPLATE_THREEDBARDEEP ) + ( "com.sun.star.chart2.template.ThreeDBarFlat", TEMPLATE_THREEDBARFLAT ) + ( "com.sun.star.chart2.template.StackedThreeDBarFlat", TEMPLATE_STACKEDTHREEDBARFLAT ) + ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat", TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT ) + ( "com.sun.star.chart2.template.ColumnWithLine", TEMPLATE_COLUMNWITHLINE ) + ( "com.sun.star.chart2.template.StackedColumnWithLine", TEMPLATE_STACKEDCOLUMNWITHLINE ) + ( "com.sun.star.chart2.template.Area", TEMPLATE_AREA ) + ( "com.sun.star.chart2.template.StackedArea", TEMPLATE_STACKEDAREA ) + ( "com.sun.star.chart2.template.PercentStackedArea", TEMPLATE_PERCENTSTACKEDAREA ) + ( "com.sun.star.chart2.template.ThreeDArea", TEMPLATE_THREEDAREA ) + ( "com.sun.star.chart2.template.StackedThreeDArea", TEMPLATE_STACKEDTHREEDAREA ) + ( "com.sun.star.chart2.template.PercentStackedThreeDArea", TEMPLATE_PERCENTSTACKEDTHREEDAREA ) + ( "com.sun.star.chart2.template.Pie", TEMPLATE_PIE ) + ( "com.sun.star.chart2.template.PieAllExploded", TEMPLATE_PIEALLEXPLODED ) + ( "com.sun.star.chart2.template.Donut", TEMPLATE_DONUT ) + ( "com.sun.star.chart2.template.DonutAllExploded", TEMPLATE_DONUTALLEXPLODED ) + ( "com.sun.star.chart2.template.ThreeDPie", TEMPLATE_THREEDPIE ) + ( "com.sun.star.chart2.template.ThreeDPieAllExploded", TEMPLATE_THREEDPIEALLEXPLODED ) + ( "com.sun.star.chart2.template.ThreeDDonut", TEMPLATE_THREEDDONUT ) + ( "com.sun.star.chart2.template.ThreeDDonutAllExploded", TEMPLATE_THREEDDONUTALLEXPLODED ) + ( "com.sun.star.chart2.template.ScatterLineSymbol", TEMPLATE_SCATTERLINESYMBOL ) + ( "com.sun.star.chart2.template.ScatterLine", TEMPLATE_SCATTERLINE ) + ( "com.sun.star.chart2.template.ScatterSymbol", TEMPLATE_SCATTERSYMBOL ) + ( "com.sun.star.chart2.template.ThreeDScatter", TEMPLATE_THREEDSCATTER ) + ( "com.sun.star.chart2.template.Net", TEMPLATE_NET ) + ( "com.sun.star.chart2.template.NetSymbol", TEMPLATE_NETSYMBOL ) + ( "com.sun.star.chart2.template.NetLine", TEMPLATE_NETLINE ) + ( "com.sun.star.chart2.template.StackedNet", TEMPLATE_STACKEDNET ) + ( "com.sun.star.chart2.template.StackedNetSymbol", TEMPLATE_STACKEDNETSYMBOL ) + ( "com.sun.star.chart2.template.StackedNetLine", TEMPLATE_STACKEDNETLINE ) + ( "com.sun.star.chart2.template.PercentStackedNet", TEMPLATE_PERCENTSTACKEDNET ) + ( "com.sun.star.chart2.template.PercentStackedNetSymbol", TEMPLATE_PERCENTSTACKEDNETSYMBOL ) + ( "com.sun.star.chart2.template.PercentStackedNetLine", TEMPLATE_PERCENTSTACKEDNETLINE ) + ( "com.sun.star.chart2.template.FilledNet", TEMPLATE_FILLEDNET ) + ( "com.sun.star.chart2.template.StackedFilledNet", TEMPLATE_STACKEDFILLEDNET ) + ( "com.sun.star.chart2.template.PercentStackedFilledNet", TEMPLATE_PERCENTSTACKEDFILLEDNET ) + ( "com.sun.star.chart2.template.StockLowHighClose", TEMPLATE_STOCKLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockOpenLowHighClose", TEMPLATE_STOCKOPENLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockVolumeLowHighClose", TEMPLATE_STOCKVOLUMELOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose", TEMPLATE_STOCKVOLUMEOPENLOWHIGHCLOSE ) + ( "com.sun.star.chart2.template.Bubble", TEMPLATE_BUBBLE ) +// ( "com.sun.star.chart2.template.Surface", TEMPLATE_SURFACE ) +// ( "com.sun.star.chart2.template.Addin", TEMPLATE_ADDIN ) ); return aMap; @@ -573,7 +573,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() if( xEnumAcc.is()) { uno::Reference< container::XEnumeration > xEnum( - xEnumAcc->createContentEnumeration( C2U( "com.sun.star.chart2.ChartTypeTemplate" ) )); + xEnumAcc->createContentEnumeration( "com.sun.star.chart2.ChartTypeTemplate" )); if( xEnum.is()) { uno::Reference< uno::XInterface > xFactIntf; @@ -597,8 +597,8 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeManager" ); - aServices[ 1 ] = C2U( "com.sun.star.lang.MultiServiceFactory" ); + aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager"; + aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory"; return aServices; } @@ -606,7 +606,7 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager, - C2U( "com.sun.star.comp.chart.ChartTypeManager" )); + OUString("com.sun.star.comp.chart.ChartTypeManager") ); } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 195dbb2f9f61..3f7899f34e15 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -67,7 +67,7 @@ void lcl_applyDefaultStyle( Reference< chart2::XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xSeriesProp.is() && xColorScheme.is() ) xSeriesProp->setPropertyValue( - C2U("Color"), + "Color", uno::makeAny( xColorScheme->getColorByIndex( nIndex ))); } } @@ -75,7 +75,7 @@ void lcl_applyDefaultStyle( void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xProp, const uno::Sequence < sal_Int32 >& rAvailablePlacements ) { sal_Int32 nLabelPlacement=0; - if( xProp.is() && (xProp->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nLabelPlacement) ) + if( xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement) ) { bool bValid = false; for( sal_Int32 nN = 0; nN < rAvailablePlacements.getLength(); nN++ ) @@ -92,7 +92,7 @@ void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xP //otherwise use the first supported one if( rAvailablePlacements.getLength() ) aNewValue <<=rAvailablePlacements[0]; - xProp->setPropertyValue( C2U("LabelPlacement"), aNewValue ); + xProp->setPropertyValue( "LabelPlacement", aNewValue ); } } } @@ -101,10 +101,10 @@ void lcl_resetLabelPlacementIfDefault( const Reference< beans::XPropertySet >& x { sal_Int32 nLabelPlacement=0; - if( xProp.is() && (xProp->getPropertyValue( C2U( "LabelPlacement" ) ) >>= nLabelPlacement) ) + if( xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement) ) { if( nDefaultPlacement == nLabelPlacement ) - xProp->setPropertyValue( C2U("LabelPlacement"), uno::Any() ); + xProp->setPropertyValue( "LabelPlacement", uno::Any() ); } } @@ -117,9 +117,9 @@ void lcl_ensureCorrectMissingValueTreatment( const Reference< chart2::XDiagram > ::chart::ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) ); if( aAvailableMissingValueTreatment.getLength() ) - xDiaProp->setPropertyValue( C2U( "MissingValueTreatment" ), uno::makeAny( aAvailableMissingValueTreatment[0] ) ); + xDiaProp->setPropertyValue( "MissingValueTreatment", uno::makeAny( aAvailableMissingValueTreatment[0] ) ); else - xDiaProp->setPropertyValue( C2U( "MissingValueTreatment" ), uno::Any() ); + xDiaProp->setPropertyValue( "MissingValueTreatment", uno::Any() ); } } @@ -152,7 +152,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource // create diagram xDia.set( GetComponentContext()->getServiceManager()->createInstanceWithContext( - C2U( "com.sun.star.chart2.Diagram" ), + "com.sun.star.chart2.Diagram", GetComponentContext() ), uno::UNO_QUERY_THROW ); @@ -221,7 +221,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > if( aData.Categories.is()) { aParam.realloc( 1 ); - aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ), + aParam[0] = beans::PropertyValue( "HasCategories", -1, uno::makeAny( true ), beans::PropertyState_DIRECT_VALUE ); } aData = xInterpreter->interpretDataSource( xSource, aParam, aFlatSeriesSeq ); @@ -404,7 +404,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( : (eStackMode == StackMode_Z_STACKED ) ? chart2::StackingDirection_Z_STACKING : chart2::StackingDirection_NO_STACKING ); - xSeriesProp->setPropertyValue( C2U("StackingDirection"), aPropValue ); + xSeriesProp->setPropertyValue( "StackingDirection", aPropValue ); //ensure valid label placement { @@ -413,7 +413,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( lcl_ensureCorrectLabelPlacement( xSeriesProp, aAvailablePlacements ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) lcl_ensureCorrectLabelPlacement( xSeries->getDataPointByIndex(aAttributedDataPointIndexList[nN]), aAvailablePlacements ); } @@ -458,9 +458,9 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram if( xAxisProp.is()) { // set number format to source format - uno::Any aValue( xAxisProp->getPropertyValue(C2U("NumberFormat"))); + uno::Any aValue( xAxisProp->getPropertyValue("NumberFormat")); if( aValue.hasValue()) - xAxisProp->setPropertyValue(C2U("NumberFormat"), uno::Any()); + xAxisProp->setPropertyValue("NumberFormat", uno::Any()); } } } @@ -510,7 +510,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram lcl_resetLabelPlacementIfDefault( xSeriesProp, nDefaultPlacement ); uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xSeriesProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xSeriesProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) lcl_resetLabelPlacementIfDefault( xSeries->getDataPointByIndex(aAttributedDataPointIndexList[nN]), nDefaultPlacement ); } @@ -762,9 +762,9 @@ void ChartTypeTemplate::adaptAxes( if( xAxisProp.is()) { // set number format to source format - uno::Any aValue( xAxisProp->getPropertyValue(C2U("NumberFormat"))); + uno::Any aValue( xAxisProp->getPropertyValue("NumberFormat")); if( aValue.hasValue()) - xAxisProp->setPropertyValue(C2U("NumberFormat"), uno::Any()); + xAxisProp->setPropertyValue("NumberFormat", uno::Any()); } } } @@ -915,9 +915,9 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( Sequence< OUString > ChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 3 ); - aServices[ 0 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); - aServices[ 1 ] = C2U( "com.sun.star.layout.LayoutElement" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 0 ] = "com.sun.star.chart2.ChartTypeTemplate"; + aServices[ 1 ] = "com.sun.star.layout.LayoutElement"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } @@ -930,7 +930,7 @@ Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() con // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ChartTypeTemplate, - C2U( "com.sun.star.comp.chart.ChartTypeTemplate" )); + OUString("com.sun.star.comp.chart.ChartTypeTemplate") ); } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index c4bb660d9f5c..90bf825e42de 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -43,14 +43,14 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "OverlapSequence" ), + Property( "OverlapSequence", PROP_BARCHARTTYPE_OVERLAP_SEQUENCE, ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "GapwidthSequence" ), + Property( "GapwidthSequence", PROP_BARCHARTTYPE_GAPWIDTH_SEQUENCE, ::getCppuType( reinterpret_cast< const Sequence< sal_Int32 > * >(0)), beans::PropertyAttribute::BOUND @@ -182,13 +182,13 @@ uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Stati { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ColumnChartType, - C2U( "com.sun.star.comp.chart.ColumnChartType" )); + OUString("com.sun.star.comp.chart.ColumnChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 1df923c33e3f..28f956512355 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -59,7 +59,7 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "NumberOfLines" ), + Property( "NumberOfLines", PROP_COL_LINE_NUMBER_OF_LINES, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -258,7 +258,7 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( if( nChartTypeIndex==0 ) // columns { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } else if( nChartTypeIndex==1 ) // lines { @@ -425,7 +425,7 @@ uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServic { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 374add7f1626..613570f164b9 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -97,14 +97,14 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( { xCategories.set( aData[i] ); if( xCategories.is()) - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); bCategoriesUsed = true; } else { aSequencesVec.push_back( aData[i] ); if( aData[i].is()) - SetRole( aData[i]->getValues(), C2U("values-y")); + SetRole( aData[i]->getValues(), "values-y"); } } catch( const uno::Exception & ex ) @@ -160,14 +160,14 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( // values-y Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); // re-use values-... as values-y if( ! xValuesY.is()) { xValuesY.set( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values"), true )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values", true )); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( xValuesY.is()) { @@ -328,7 +328,7 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( C2U("Role")) >>= aResult; + xProp->getPropertyValue( "Role") >>= aResult; } catch( const uno::Exception & ex ) { @@ -344,7 +344,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( C2U("Role"), uno::makeAny( rRole )); + xProp->setPropertyValue( "Role", uno::makeAny( rRole )); } catch( const uno::Exception & ex ) { @@ -371,7 +371,7 @@ bool DataInterpreter::HasCategories( bool bHasCategories = false; if( rArguments.getLength() > 0 ) - GetProperty( rArguments, C2U(("HasCategories"))) >>= bHasCategories; + GetProperty( rArguments, "HasCategories" ) >>= bHasCategories; for( sal_Int32 nLSeqIdx=0; ! bHasCategories && nLSeqIdx<rData.getLength(); ++nLSeqIdx ) bHasCategories = ( rData[nLSeqIdx].is() && GetRole( rData[nLSeqIdx]->getValues() ) == "categories"); @@ -383,7 +383,7 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & { bool bUseCategoriesAsX = true; if( rArguments.getLength() > 0 ) - GetProperty( rArguments, C2U(("UseCategoriesAsX"))) >>= bUseCategoriesAsX; + GetProperty( rArguments, "UseCategoriesAsX" ) >>= bUseCategoriesAsX; return bUseCategoriesAsX; } @@ -392,12 +392,12 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 1 ); - aServices[0] = C2U( "com.sun.star.chart2.DataInterpreter" ); + aServices[0] = "com.sun.star.chart2.DataInterpreter"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, C2U("com.sun.star.comp.chart2.DataInterpreter")); +APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, OUString("com.sun.star.comp.chart2.DataInterpreter") ); } // namespace chart @@ -419,12 +419,12 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) { if( aSequences[k].is()) { - OUString aSourceRepr(C2U("<none>")); + OUString aSourceRepr("<none>"); if( aSequences[k]->getValues().is()) aSourceRepr = aSequences[k]->getValues()->getSourceRangeRepresentation(); xProp.set( aSequences[k]->getValues(), uno::UNO_QUERY ); if( xProp.is() && - ( xProp->getPropertyValue( C2U( "Role" )) >>= aId )) + ( xProp->getPropertyValue( "Role") >>= aId )) { OSL_TRACE( " <data sequence %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); } @@ -433,12 +433,12 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) OSL_TRACE( " <data sequence %d> unknown Role, Source: %s", k, U2C( aSourceRepr ) ); } - aSourceRepr = C2U("<none>"); + aSourceRepr = "<none>"; if( aSequences[k]->getLabel().is()) aSourceRepr = OUString( aSequences[k]->getLabel()->getSourceRangeRepresentation()); xProp.set( aSequences[k]->getLabel(), uno::UNO_QUERY ); if( xProp.is() && - ( xProp->getPropertyValue( C2U( "Role" )) >>= aId )) + ( xProp->getPropertyValue( "Role") >>= aId )) { OSL_TRACE( " <data sequence label %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); } diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 3ffd11967926..4c267fe40679 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -72,14 +72,14 @@ uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_St { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( FilledNetChartType, - C2U( "com.sun.star.comp.chart.FilledNetChartType" )); + OUString("com.sun.star.comp.chart.FilledNetChartType") ); } // namespace chart diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index 5aaaec1adb99..d35dde6fe776 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -48,20 +48,20 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_LINECHARTTYPE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_LINECHARTTYPE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_LINECHARTTYPE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -193,14 +193,14 @@ uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static( { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LineChartType, - C2U( "com.sun.star.comp.chart.LineChartType" )); + OUString("com.sun.star.comp.chart.LineChartType") ); } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 78229978c392..5f264bee3100 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -59,19 +59,19 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -229,7 +229,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -241,7 +241,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -278,9 +278,9 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xChartTypeProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue(C2U("CurveStyle" )) ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(C2U("CurveResolution" )) ); - setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(C2U("SplineOrder" )) ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue("CurveStyle") ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue("CurveResolution") ); + setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue("SplineOrder") ); } catch( const uno::Exception & ex ) { @@ -306,11 +306,11 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -340,11 +340,11 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -384,7 +384,7 @@ Sequence< OUString > LineChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 84ae4653054d..ca3ddc545056 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -62,7 +62,7 @@ Reference< XCoordinateSystem > SAL_CALL { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( - C2U( "NetChart must be two-dimensional" ), + "NetChart must be two-dimensional", static_cast< ::cppu::OWeakObject* >( this ), 0 ); Reference< XCoordinateSystem > xResult( @@ -178,14 +178,14 @@ uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( NetChartType, - C2U( "com.sun.star.comp.chart.NetChartType" )); + OUString("com.sun.star.comp.chart.NetChartType") ); } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 0a1ae7836ae5..f7205f1581e1 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -126,7 +126,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -138,7 +138,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -209,7 +209,7 @@ Sequence< OUString > NetChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 450a622b52ab..41e44fafd89a 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -49,7 +49,7 @@ static void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "UseRings" ), + Property( "UseRings", PROP_PIECHARTTYPE_USE_RINGS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -217,14 +217,14 @@ uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( PieChartType, - C2U( "com.sun.star.comp.chart.PieChartType" )); + OUString("com.sun.star.comp.chart.PieChartType") ); } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 49cc2e1c944a..36c727a558d4 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -65,25 +65,25 @@ static void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "OffsetMode" ), + Property( "OffsetMode", PROP_PIE_TEMPLATE_OFFSET_MODE, ::getCppuType( reinterpret_cast< const chart2::PieChartOffsetMode * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "DefaultOffset" ), + Property( "DefaultOffset", PROP_PIE_TEMPLATE_DEFAULT_OFFSET, ::getCppuType( reinterpret_cast< const double * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Dimension" ), + Property( "Dimension", PROP_PIE_TEMPLATE_DIMENSION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "UseRings" ), + Property( "UseRings", PROP_PIE_TEMPLATE_USE_RINGS, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -288,7 +288,7 @@ void PieChartTypeTemplate::createChartTypes( if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } Reference< chart2::XChartTypeContainer > xCTCnt( rCoordSys[0], uno::UNO_QUERY_THROW ); xCTCnt->setChartTypes( Sequence< Reference< chart2::XChartType > >( &xCT, 1 )); @@ -339,11 +339,11 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale Reference< chart2::XDataSeries > xSeries( aSeriesVec[nOuterSeriesIndex] ); Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( C2U( "Offset" )) >>= fOffset; + xProp->getPropertyValue( "Offset") >>= fOffset; //get AttributedDataPoints uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - if( xProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList ) + if( xProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList ) { for(sal_Int32 nN=aAttributedDataPointIndexList.getLength();nN--;) { @@ -351,7 +351,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( if(xPointProp.is()) { double fPointOffset=0.0; - if( (xProp->getPropertyValue( C2U( "Offset" )) >>= fPointOffset ) ) + if( (xProp->getPropertyValue( "Offset") >>= fPointOffset ) ) { if( ! ::rtl::math::approxEqual( fPointOffset, fOffset ) ) { @@ -387,7 +387,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xCTProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); sal_Bool bUseRings = false; - if( xCTProp->getPropertyValue( C2U( "UseRings" )) >>= bUseRings ) + if( xCTProp->getPropertyValue( "UseRings") >>= bUseRings ) { bResult = ( bTemplateUsesRings == bUseRings ); } @@ -410,7 +410,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } } @@ -439,7 +439,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "UseRings" ), getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); + "UseRings", getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS )); } } @@ -480,7 +480,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( double fOffsetToSet = fDefaultOffset; uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; - xProp->getPropertyValue( C2U( "AttributedDataPoints" ) ) >>= aAttributedDataPointIndexList; + xProp->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList; // determine whether to set the new offset bool bSetOffset = ( ePieOffsetMode == chart2::PieChartOffsetMode_ALL_EXPLODED ); @@ -531,10 +531,10 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } // line style - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); // vary colors by point - xProp->setPropertyValue( C2U("VaryColorsByPoint"), uno::makeAny( true )); + xProp->setPropertyValue( "VaryColorsByPoint", uno::makeAny( true )); } catch( const uno::Exception & ex ) { @@ -595,12 +595,12 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY ); if( xState.is()) { - xState->setPropertyToDefault( C2U("VaryColorsByPoint")); + xState->setPropertyToDefault( "VaryColorsByPoint"); Reference< beans::XPropertySet > xProp( xState, uno::UNO_QUERY ); if( xProp.is() && - xProp->getPropertyValue( C2U("BorderStyle")) == aLineStyleAny ) + xProp->getPropertyValue( "BorderStyle") == aLineStyleAny ) { - xState->setPropertyToDefault( C2U("BorderStyle")); + xState->setPropertyToDefault( "BorderStyle"); } } } @@ -625,7 +625,7 @@ uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_ { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 2cab24ef67d9..20e89cb15ff7 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -52,20 +52,20 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_SCATTERCHARTTYPE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_SCATTERCHARTTYPE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -218,9 +218,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandator throw (uno::RuntimeException) { uno::Sequence< ::rtl::OUString > aMandRolesSeq(3); - aMandRolesSeq[0] = C2U( "label" ); - aMandRolesSeq[1] = C2U( "values-x" ); - aMandRolesSeq[2] = C2U( "values-y" ); + aMandRolesSeq[0] = "label"; + aMandRolesSeq[1] = "values-x"; + aMandRolesSeq[2] = "values-y"; return aMandRolesSeq; } @@ -259,14 +259,14 @@ uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Stat { uno::Sequence< ::rtl::OUString > aServices( 3 ); aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartType" ); - aServices[ 2 ] = C2U( "com.sun.star.beans.PropertySet" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartType"; + aServices[ 2 ] = "com.sun.star.beans.PropertySet"; return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( ScatterChartType, - C2U( "com.sun.star.comp.chart.ScatterChartType" )); + OUString("com.sun.star.comp.chart.ScatterChartType") ); } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 2b895fd0b985..57a48ebda661 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -61,19 +61,19 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "CurveStyle" ), + Property( "CurveStyle", PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, ::getCppuType( reinterpret_cast< const chart2::CurveStyle * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "CurveResolution" ), + Property( "CurveResolution", PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "SplineOrder" ), + Property( "SplineOrder", PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), beans::PropertyAttribute::BOUND @@ -221,7 +221,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( DataSeriesHelper::switchLinesOnOrOff( xProp, m_bHasLines ); DataSeriesHelper::makeLinesThickOrThin( xProp, m_nDim==2 ); if( m_nDim==3 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } catch( const uno::Exception & ex ) { @@ -263,7 +263,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( drawing::LineStyle eLineStyle; Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW ); - bool bCurrentHasSymbol = (xProp->getPropertyValue( C2U( "Symbol" )) >>= aSymbProp) && + bool bCurrentHasSymbol = (xProp->getPropertyValue( "Symbol") >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -275,7 +275,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( break; } - bool bCurrentHasLine = (xProp->getPropertyValue( C2U( "LineStyle" )) >>= eLineStyle) && + bool bCurrentHasLine = (xProp->getPropertyValue( "LineStyle") >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) @@ -312,9 +312,9 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( uno::Reference< beans::XPropertySet > xChartTypeProp( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue(C2U("CurveStyle" )) ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(C2U("CurveResolution" )) ); - setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(C2U("SplineOrder" )) ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, xChartTypeProp->getPropertyValue("CurveStyle") ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue("CurveResolution") ); + setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue("SplineOrder") ); } catch( const uno::Exception & ex ) { @@ -340,11 +340,11 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -374,11 +374,11 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF if( xCTProp.is()) { xCTProp->setPropertyValue( - C2U( "CurveStyle" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); + "CurveStyle", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE )); xCTProp->setPropertyValue( - C2U( "CurveResolution" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); + "CurveResolution", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION )); xCTProp->setPropertyValue( - C2U( "SplineOrder" ), getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); + "SplineOrder", getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER )); } } catch( const uno::Exception & ex ) @@ -404,7 +404,7 @@ Sequence< OUString > ScatterChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index fb50ae3faf58..b203abd4e8c4 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -68,25 +68,25 @@ void lcl_AddPropertiesToVector( ::std::vector< Property > & rOutProperties ) { rOutProperties.push_back( - Property( C2U( "Volume" ), + Property( "Volume", PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Open" ), + Property( "Open", PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "LowHigh" ), + Property( "LowHigh", PROP_STOCKCHARTTYPE_TEMPLATE_LOW_HIGH, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT )); rOutProperties.push_back( - Property( C2U( "Japanese" ), + Property( "Japanese", PROP_STOCKCHARTTYPE_TEMPLATE_JAPANESE, ::getBooleanCppuType(), beans::PropertyAttribute::BOUND @@ -246,12 +246,12 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U("AttachedAxisIndex"), uno::makeAny( nNewAxisIndex ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) ); if( bHasVolume && nChartTypeIndex==0 ) { //switch lines off for volume bars - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, C2U( "BorderStyle" ), uno::makeAny( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } else { @@ -259,9 +259,9 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( if( xProp.is() ) { drawing::LineStyle eStyle = drawing::LineStyle_NONE; - xProp->getPropertyValue( C2U("LineStyle") ) >>= eStyle; + xProp->getPropertyValue( "LineStyle" ) >>= eStyle; if( eStyle == drawing::LineStyle_NONE ) - xProp->setPropertyValue( C2U("LineStyle"), uno::makeAny( drawing::LineStyle_SOLID )); + xProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID )); } } @@ -286,7 +286,7 @@ void SAL_CALL StockChartTypeTemplate::resetStyles( { Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY ); if( xProp.is() ) - xProp->setPropertyValue( C2U("AttachedAxisIndex"), uno::makeAny( sal_Int32(0) ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( sal_Int32(0) ) ); } } @@ -374,9 +374,9 @@ void StockChartTypeTemplate::createChartTypes( Reference< beans::XPropertySet > xCTProp( xCT, uno::UNO_QUERY ); if( xCTProp.is()) { - xCTProp->setPropertyValue( C2U("Japanese"), uno::makeAny( bJapaneseStyle )); - xCTProp->setPropertyValue( C2U("ShowFirst"), uno::makeAny( bShowFirst )); - xCTProp->setPropertyValue( C2U("ShowHighLow"), uno::makeAny( bShowHighLow )); + xCTProp->setPropertyValue( "Japanese", uno::makeAny( bJapaneseStyle )); + xCTProp->setPropertyValue( "ShowFirst", uno::makeAny( bShowFirst )); + xCTProp->setPropertyValue( "ShowHighLow", uno::makeAny( bShowHighLow )); } if( aSeriesSeq.getLength() > nSeriesIndex && @@ -475,12 +475,12 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( if( xCTProp.is()) { sal_Bool bJapaneseProp = sal_False; - xCTProp->getPropertyValue( C2U("Japanese")) >>= bJapaneseProp; + xCTProp->getPropertyValue( "Japanese") >>= bJapaneseProp; bResult = bResult && ( bHasJapaneseStyle == bJapaneseProp ); // in old chart japanese == showFirst sal_Bool bShowFirstProp = sal_False; - xCTProp->getPropertyValue( C2U("ShowFirst")) >>= bShowFirstProp; + xCTProp->getPropertyValue( "ShowFirst") >>= bShowFirstProp; bResult = bResult && ( bHasOpenValue == bShowFirstProp ); } } @@ -530,7 +530,7 @@ Sequence< OUString > StockChartTypeTemplate::getSupportedServiceNames_Static() { Sequence< OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "com.sun.star.chart2.ChartTypeTemplate" ); + aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate"; return aServices; } diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 75379c89e04b..0cafbd98a14a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -143,7 +143,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nBarGroupIndex][nLabeledSeqIdx].realloc( 1 ); aSequences[nBarGroupIndex][nLabeledSeqIdx][0].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-y")); + SetRole( aData[nSourceIndex]->getValues(), "values-y"); ++nSourceIndex; } @@ -153,7 +153,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nCandleStickGroupIndex][nLabeledSeqIdx].realloc( 4 ); aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-first")); + SetRole( aData[nSourceIndex]->getValues(), "values-first"); ++nSourceIndex, ++nSeqIdx; } else @@ -161,17 +161,17 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-min")); + SetRole( aData[nSourceIndex]->getValues(), "values-min"); ++nSourceIndex, ++nSeqIdx; aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-max")); + SetRole( aData[nSourceIndex]->getValues(), "values-max"); ++nSourceIndex, ++nSeqIdx; aSequences[nCandleStickGroupIndex][nLabeledSeqIdx][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-last")); + SetRole( aData[nSourceIndex]->getValues(), "values-last"); ++nSourceIndex, ++nSeqIdx; } @@ -182,7 +182,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( aSequences[nBarGroupIndex][nVolumeSeries - 1].realloc( 1 ); OSL_ASSERT( nDataCount > nSourceIndex ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-y")); + SetRole( aData[nSourceIndex]->getValues(), "values-y"); aSequences[nBarGroupIndex][nVolumeSeries - 1][0].set( aData[nSourceIndex] ); ++nSourceIndex; --nRemaining; @@ -201,7 +201,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( sal_Int32 nSeqIdx( 0 ); aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-min")); + SetRole( aData[nSourceIndex]->getValues(), "values-min"); ++nSourceIndex, ++nSeqIdx; // 2. high @@ -209,7 +209,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( { aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-max")); + SetRole( aData[nSourceIndex]->getValues(), "values-max"); ++nSourceIndex, ++nSeqIdx; } @@ -219,7 +219,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( { aSequences[nCandleStickGroupIndex][nSeriesIndex][nSeqIdx].set( aData[nSourceIndex] ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), C2U("values-last")); + SetRole( aData[nSourceIndex]->getValues(), "values-last"); ++nSourceIndex, ++nSeqIdx; } diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index e79c23444572..48d742421d83 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -80,7 +80,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( xCategories.set( aData[nDataIdx] ); if( xCategories.is()) { - SetRole( xCategories->getValues(), C2U("categories")); + SetRole( xCategories->getValues(), "categories"); if( bUseCategoriesAsX ) bSetXValues = false; } @@ -90,13 +90,13 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( { xValuesX.set( aData[nDataIdx] ); if( xValuesX.is()) - SetRole( xValuesX->getValues(), C2U("values-x")); + SetRole( xValuesX->getValues(), "values-x"); } else { aSequencesVec.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), C2U("values-y")); + SetRole( aData[nDataIdx]->getValues(), "values-y"); } } catch( const uno::Exception & ex ) @@ -163,16 +163,16 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( // values-y Reference< data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-y"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-y", false )); Reference< data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, C2U("values-x"), false )); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x", false )); // re-use values-... as values-x/values-y if( ! xValuesX.is() || ! xValuesY.is()) { vector< Reference< data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - xSeriesSource->getDataSequences(), C2U("values"), true )); + xSeriesSource->getDataSequences(), "values", true )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -184,7 +184,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( { xValuesY.set( aValueSeqVec[nIndex++] ); if( xValuesY.is()) - SetRole( xValuesY->getValues(), C2U("values-y")); + SetRole( xValuesY->getValues(), "values-y"); } if( ! xValuesX.is() && @@ -192,7 +192,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( { xValuesX.set( aValueSeqVec[nIndex++] ); if( xValuesX.is()) - SetRole( xValuesY->getValues(), C2U("values-x")); + SetRole( xValuesY->getValues(), "values-x"); } } if( xValuesY.is()) |