diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 08:58:21 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 09:42:47 -0500 |
| commit | ed65cd71edeb86664b9e6aa298493bbc83cbbeb5 (patch) | |
| tree | d595e86fe532676a52faab3d5e4f76c62d47120c | |
| parent | 516c63442b2ae58f611c7d8932cd0bf1f0aead81 (diff) | |
targeted string re-work
Change-Id: I56fe169cb78e8b3d57a5949f90b8d364e95a3917
| -rw-r--r-- | xmloff/source/chart/PropertyMaps.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 58 | ||||
| -rwxr-xr-x | xmloff/source/chart/SchXMLExport.cxx | 215 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLPlotAreaContext.cxx | 94 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLSeries2Context.cxx | 85 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLSeriesHelper.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 90 | ||||
| -rw-r--r-- | xmloff/source/core/RDFaExportHelper.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/core/unoatrcn.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/core/xmluconv.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 24 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 80 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 185 | ||||
| -rw-r--r-- | xmloff/source/draw/xexptran.cxx | 48 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 211 |
15 files changed, 558 insertions, 568 deletions
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 96c148f77241..1ca2694822f3 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -226,24 +226,24 @@ void XMLChartExportPropertyMapper::ContextFilter( // if Auto... is set the corresponding properties mustn't be exported case XML_SCH_CONTEXT_MIN: bCheckAuto = sal_True; - aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMin" )); + aAutoPropName = ::rtl::OUString( "AutoMin" ); break; case XML_SCH_CONTEXT_MAX: bCheckAuto = sal_True; - aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoMax" )); + aAutoPropName = ::rtl::OUString( "AutoMax" ); break; case XML_SCH_CONTEXT_STEP_MAIN: bCheckAuto = sal_True; - aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepMain" )); + aAutoPropName = ::rtl::OUString( "AutoStepMain" ); break; case XML_SCH_CONTEXT_STEP_HELP_COUNT: bCheckAuto = sal_True; - aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoStepHelp" )); + aAutoPropName = ::rtl::OUString( "AutoStepHelp" ); break; case XML_SCH_CONTEXT_ORIGIN: bCheckAuto = sal_True; - aAutoPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoOrigin" )); + aAutoPropName = ::rtl::OUString( "AutoOrigin" ); break; // the following property is deprecated diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index ff70d98b783d..801d4122508f 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -84,7 +84,7 @@ void lcl_setRoleAtLabeledSequence( { uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole )); + xProp->setPropertyValue(OUString( "Role" ), uno::makeAny( rRole )); } } @@ -363,9 +363,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { try { - xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "BaseDiagram" ))) >>= aOldChartTypeName; + xDocProp->getPropertyValue( ::rtl::OUString( "BaseDiagram" )) >>= aOldChartTypeName; maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName ); - xDocProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_False) ); + xDocProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); } catch(const uno::Exception&) { @@ -621,15 +621,15 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( uno::Sequence< beans::PropertyValue > aArgs( 3 ); aArgs[0] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CellRangeRepresentation" )), + ::rtl::OUString( "CellRangeRepresentation" ), -1, uno::makeAny( rRectangularRange ), beans::PropertyState_DIRECT_VALUE ); aArgs[1] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), + ::rtl::OUString( "DataRowSource" ), -1, uno::makeAny( eDataRowSource ), beans::PropertyState_DIRECT_VALUE ); aArgs[2] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FirstCellAsLabel" )), + ::rtl::OUString( "FirstCellAsLabel" ), -1, uno::makeAny( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE ); @@ -637,7 +637,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SequenceMapping" )), + ::rtl::OUString( "SequenceMapping" ), -1, uno::makeAny( !sColTrans.isEmpty() ? lcl_getNumberSequenceFromString( sColTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) : lcl_getNumberSequenceFromString( sRowTrans, bHasCateories && !xNewDoc->hasInternalDataProvider() ) ), @@ -653,7 +653,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( comphelper::MediaDescriptor aMediaDescriptor( xModel->getArgs() ); comphelper::MediaDescriptor::const_iterator aIt( - aMediaDescriptor.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HierarchicalDocumentName" )))); + aMediaDescriptor.find( rtl::OUString( "HierarchicalDocumentName" ))); if( aIt != aMediaDescriptor.end() ) { aChartOleObjectName = (*aIt).second.get< ::rtl::OUString >(); @@ -663,7 +663,7 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( { aArgs.realloc( aArgs.getLength() + 1 ); aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartOleObjectName" )), + ::rtl::OUString( "ChartOleObjectName" ), -1, uno::makeAny( aChartOleObjectName ), beans::PropertyState_DIRECT_VALUE ); } @@ -675,11 +675,11 @@ void lcl_ApplyDataFromRectangularRangeToDiagram( aArgs.realloc( aArgs.getLength() + 2 ); aArgs[ aArgs.getLength() - 2 ] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasCategories" )), + ::rtl::OUString( "HasCategories" ), -1, uno::makeAny( bHasCateories ), beans::PropertyState_DIRECT_VALUE ); aArgs[ aArgs.getLength() - 1 ] = beans::PropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCategoriesAsX")), + ::rtl::OUString("UseCategoriesAsX"), -1, uno::makeAny( sal_False ),//categories in ODF files are not to be used as x values (independent from what is offered in our ui) beans::PropertyState_DIRECT_VALUE ); @@ -703,7 +703,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maMainTitle; - xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny ); + xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -720,7 +720,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maSubTitle; - xTitleProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )), aAny ); + xTitleProp->setPropertyValue( rtl::OUString( "String" ), aAny ); } catch(const beans::UnknownPropertyException&) { @@ -739,13 +739,13 @@ void SchXMLChartContext::EndElement() if( xDiaProp.is()) { if( maSeriesDefaultsAndStyles.maStackedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stacked")),maSeriesDefaultsAndStyles.maStackedDefault); + xDiaProp->setPropertyValue(::rtl::OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); if( maSeriesDefaultsAndStyles.maPercentDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Percent")),maSeriesDefaultsAndStyles.maPercentDefault); + xDiaProp->setPropertyValue(::rtl::OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); if( maSeriesDefaultsAndStyles.maDeepDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deep")),maSeriesDefaultsAndStyles.maDeepDefault); + xDiaProp->setPropertyValue(::rtl::OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); if( maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault.hasValue()) - xDiaProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StackedBarsConnected")),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); + xDiaProp->setPropertyValue(::rtl::OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); } //the OOo 2.0 implementation and older has a bug with donuts @@ -782,7 +782,7 @@ void SchXMLChartContext::EndElement() xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ ); } if( bHasOwnData ) - msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" )); + msChartAddress = ::rtl::OUString( "all" ); bool bSwitchRangesFromOuterToInternalIfNecessary = false; if( !bHasOwnData && mbAllRangeAddressesAvailable ) @@ -816,7 +816,7 @@ void SchXMLChartContext::EndElement() try { if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly - xDiaProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IncludeHiddenCells")),uno::makeAny(false)); + xDiaProp->setPropertyValue(::rtl::OUString("IncludeHiddenCells"),uno::makeAny(false)); // note: mbRowHasLabels means the first row contains labels, that means we have "column-descriptions", // (analogously mbColHasLabels means we have "row-descriptions") @@ -829,7 +829,7 @@ void SchXMLChartContext::EndElement() if(!bHasOwnData) { bHasOwnData = true; - msChartAddress = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "all" )); + msChartAddress = ::rtl::OUString( "all" ); if( !xNewDoc->hasInternalDataProvider() ) { xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ ); @@ -914,7 +914,7 @@ void SchXMLChartContext::EndElement() } if( xProp.is()) - xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RefreshAddInAllowed" )) , uno::makeAny( sal_True) ); + xProp->setPropertyValue( rtl::OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); } void SchXMLChartContext::MergeSeriesForStockChart() @@ -942,7 +942,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() { xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); - xCTProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bHasJapaneseCandlestick; + xCTProp->getPropertyValue( ::rtl::OUString( "Japanese" )) >>= bHasJapaneseCandlestick; break; } } @@ -964,27 +964,27 @@ void SchXMLChartContext::MergeSeriesForStockChart() if( bHasJapaneseCandlestick ) { // open values - lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" ))); + lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-first" )); aNewSeries[i] = aSeriesSeq[ nSeriesIndex ]; // low values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" ))); + aNewSeries[i], OUString( "values-min" )); } else { // low values - lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" ))); + lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-min" )); aNewSeries[i] = aSeriesSeq[ nSeriesIndex ]; } // high values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" ))); + aNewSeries[i], OUString( "values-max" )); // close values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" ))); + aNewSeries[i], OUString( "values-last" )); } xDSContainer->setDataSeries( aNewSeries ); } @@ -1027,7 +1027,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )), aTrueBool ); + xProp->setPropertyValue( rtl::OUString( "HasMainTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1040,7 +1040,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSubTitle" )), aTrueBool ); + xProp->setPropertyValue( rtl::OUString( "HasSubTitle" ), aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index cabb0f199a9e..c661ac293a94 100755 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -303,7 +303,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext() { Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); if( xFactProp.is()) - xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; } catch( const uno::Exception& ) { @@ -328,7 +328,7 @@ public: return ( xProp.is() && (xProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" )) ) >>= aRole ) && + OUString( "Role" ) ) >>= aRole ) && m_aRole.equals( aRole )); } @@ -388,9 +388,9 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen { (void)ex; // avoid warning for pro build OSL_FAIL( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) + + OUString( "Exception caught. Type: " ) + OUString::createFromAscii( typeid( ex ).name()) + - OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) + + OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -405,7 +405,7 @@ Reference< chart2::data::XDataSource > lcl_createDataSource( if( xContext.is() ) xSink.set( xContext->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.DataSource" )), + OUString( "com.sun.star.chart2.data.DataSource" ), xContext ), uno::UNO_QUERY_THROW ); if( xSink.is()) xSink->setData( aData ); @@ -471,12 +471,12 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c //the first x-values is always the next sequence //todo ... other x-values get lost for old format Reference< chart2::data::XLabeledDataSequence > xXValues( - lcl_getDataSequenceByRole( aSeriesSeqVector, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) ); + lcl_getDataSequenceByRole( aSeriesSeqVector, OUString( "values-x" ) ) ); if( xXValues.is() ) aLabeledSeqVector.push_back( xXValues ); //add all other sequences now without x-values - lcl_MatchesRole aHasXValues( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ); + lcl_MatchesRole aHasXValues( OUString( "values-x" ) ); for( sal_Int32 nN=0; nN<aSeriesSeqVector.getLength(); nN++ ) { if( !aHasXValues( aSeriesSeqVector[nN] ) ) @@ -499,16 +499,16 @@ bool lcl_isSeriesAttachedToFirstAxis( sal_Int32 nAxisIndex = 0; Reference< beans::XPropertySet > xProp( xDataSeries, uno::UNO_QUERY_THROW ); if( xProp.is() ) - xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("AttachedAxisIndex") ) ) >>= nAxisIndex; + xProp->getPropertyValue( OUString( "AttachedAxisIndex" ) ) >>= nAxisIndex; bResult = (0==nAxisIndex); } catch( const uno::Exception & ex ) { (void)ex; // avoid warning for pro build OSL_FAIL( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) + + OUString( "Exception caught. Type: " ) + OUString::createFromAscii( typeid( ex ).name()) + - OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) + + OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -670,8 +670,8 @@ uno::Sequence< rtl::OUString > lcl_DataSequenceToStringSequence( if( xProp.is() ) { OUString aRole; - xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Role") ) ) >>= aRole; - if( aRole.match( OUString( RTL_CONSTASCII_USTRINGPARAM( "values-x") ) ) ) + xProp->getPropertyValue( OUString( "Role" ) ) >>= aRole; + if( aRole.match( OUString( "values-x" ) ) ) { //lcl_clearIfNoValuesButTextIsContained - replace by indices if the values are not appropriate bool bHasValue=false; @@ -723,7 +723,7 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque uno::Sequence< sal_Int32 > aHiddenValues; try { - xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "HiddenValues" ) ) ) >>= aHiddenValues; + xProp->getPropertyValue( OUString( "HiddenValues" ) ) >>= aHiddenValues; if( !aHiddenValues.getLength() ) return true; } @@ -951,8 +951,8 @@ lcl_TableData lcl_getDataForLocalTable( catch( const uno::Exception & rEx ) { (void)rEx; // avoid warning for pro build - OSL_TRACE( OUStringToOString( OUString( RTL_CONSTASCII_USTRINGPARAM( - "something went wrong during table data collection: " )) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); + OSL_TRACE( OUStringToOString( OUString( + "something went wrong during table data collection: " ) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } return aResult; @@ -978,7 +978,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea if( !xErrorBarDataSource.is()) return aResult; - const OUString aRolePrefix( RTL_CONSTASCII_USTRINGPARAM( "error-bars-" )); + const OUString aRolePrefix( "error-bars-" ); Sequence< Reference< chart2::data::XLabeledDataSequence > > aSequences( xErrorBarDataSource->getDataSequences()); @@ -992,7 +992,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; if( ( xSeqProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole ) && + OUString( "Role" )) >>= aRole ) && aRole.match( aRolePrefix )) { aResult.push_back( xSequence ); @@ -1113,7 +1113,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( Reference<lang::XServiceInfo> xServiceInfo( mrExport.getServiceFactory(), uno::UNO_QUERY ); DBG_ASSERT( xServiceInfo.is(), "XMultiServiceFactory without xServiceInfo (!)" ); OUString rdbURL = xServiceInfo->getImplementationName(); - OUString implLegacyServiceManagerName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.LegacyServiceManager" ) ); + OUString implLegacyServiceManagerName( "com.sun.star.comp.office.LegacyServiceManager" ); if( rdbURL.equals( implLegacyServiceManagerName )) { @@ -1124,7 +1124,7 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()); } - msTableName = OUString(RTL_CONSTASCII_USTRINGPARAM( "local-table" )); + msTableName = OUString( "local-table" ); // create factory mxPropertyHandlerFactory = new XMLChartPropHdlFactory; @@ -1140,16 +1140,16 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl( // register chart auto-style family mrAutoStylePool.AddFamily( XML_STYLE_FAMILY_SCH_CHART_ID, - OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_NAME )), + OUString( XML_STYLE_FAMILY_SCH_CHART_NAME ), mxExpPropMapper.get(), - OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SCH_CHART_PREFIX ))); + OUString( XML_STYLE_FAMILY_SCH_CHART_PREFIX )); // register shape family mrAutoStylePool.AddFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID, - OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_NAME )), + OUString( XML_STYLE_FAMILY_SD_GRAPHICS_NAME ), mxExpPropMapper.get(), - OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX ))); + OUString( XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX )); // register paragraph family also for shapes mrAutoStylePool.AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, @@ -1245,17 +1245,17 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& try { Any aAny( xDocPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "HasMainTitle" )))); + OUString( "HasMainTitle" ))); aAny >>= bHasMainTitle; aAny = xDocPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "HasSubTitle" ))); + OUString( "HasSubTitle" )); aAny >>= bHasSubTitle; aAny = xDocPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "HasLegend" ))); + OUString( "HasLegend" )); aAny >>= bHasLegend; if ( bIncludeTable ) { - OUString sNullDate( RTL_CONSTASCII_USTRINGPARAM( "NullDate" )); + OUString sNullDate( "NullDate" ); aAny = xDocPropSet->getPropertyValue(sNullDate); if ( !aAny.hasValue() ) { @@ -1306,14 +1306,14 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); if( nCurrentODFVersion >= SvtSaveOptions::ODFVER_012 ) { - OUString aDataProviderURL( RTL_CONSTASCII_USTRINGPARAM( ".." ) ); + OUString aDataProviderURL( ".." ); if( xNewDoc->hasInternalDataProvider() ) - aDataProviderURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ); + aDataProviderURL = OUString( "." ); else //special handling for data base data provider necessary { Reference< chart2::data::XDatabaseDataProvider > xDBDataProvider( xNewDoc->getDataProvider(), uno::UNO_QUERY ); if( xDBDataProvider.is() ) - aDataProviderURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ); + aDataProviderURL = OUString( "." ); } mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aDataProviderURL ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); @@ -1401,7 +1401,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& if( xPropSet.is()) { Any aAny( xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )))); + OUString( "String" ))); OUString aText; aAny >>= aText; exportText( aText ); @@ -1445,7 +1445,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& if( xPropSet.is()) { Any aAny( xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )))); + OUString( "String" ))); OUString aText; aAny >>= aText; exportText( aText ); @@ -1479,7 +1479,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // export legend anchor position try { - Any aAny( xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Alignment" )))); + Any aAny( xProp->getPropertyValue( OUString( "Alignment" ))); if( SchXMLEnumConverter::getLegendPositionConverter().exportXML( msString, aAny, mrExport.GetMM100UnitConverter() ) ) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LEGEND_POSITION, msString ); } @@ -1500,7 +1500,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { chart::ChartLegendExpansion nLegendExpansion = chart::ChartLegendExpansion_HIGH; OUString aExpansionString; - Any aAny( xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Expansion" )))); + Any aAny( xProp->getPropertyValue( OUString( "Expansion" ))); bool bHasExpansion = (aAny >>= nLegendExpansion); if( bHasExpansion && SchXMLEnumConverter::getLegendExpansionConverter().exportXML( aExpansionString, aAny, mrExport.GetMM100UnitConverter() ) ) { @@ -1576,7 +1576,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // get a sequence of non-chart shapes (inserted via clipboard) try { - Any aShapesAny = xDocPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AdditionalShapes" ))); + Any aShapesAny = xDocPropSet->getPropertyValue( OUString( "AdditionalShapes" )); aShapesAny >>= mxAdditionalShapes; } catch( const uno::Exception & rEx ) @@ -1584,8 +1584,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& (void)rEx; // avoid warning for pro build OSL_TRACE( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "AdditionalShapes not found: " )) + + OUString( "AdditionalShapes not found: " ) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -1668,7 +1667,7 @@ void SchXMLExportHelper_Impl::exportTable() { bool bProtected = false; Reference< beans::XPropertySet > xProps( mrExport.GetModel(), uno::UNO_QUERY_THROW ); - if ( ( xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>= bProtected ) && + if ( ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bProtected ) && bProtected ) { mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE ); @@ -1994,10 +1993,10 @@ void SchXMLExportHelper_Impl::exportPlotArea( try { aAny = xDocProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstColumn" ))); + OUString( "DataSourceLabelsInFirstColumn" )); aAny >>= bFirstCol; aAny = xDocProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" ))); + OUString( "DataSourceLabelsInFirstRow" )); aAny >>= bFirstRow; if( bFirstCol || bFirstRow ) @@ -2025,7 +2024,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( { try { - OUString sExportTableNumListPropName( RTL_CONSTASCII_USTRINGPARAM("ExportTableNumberList")); + OUString sExportTableNumListPropName( "ExportTableNumberList"); Reference< beans::XPropertySetInfo > xInfo( xExportInfo->getPropertySetInfo()); bool bExportTableNumberList = false; if( xInfo.is() && xInfo->hasPropertyByName( sExportTableNumListPropName ) && @@ -2063,7 +2062,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( // 3d attributes try { - aAny = xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Dim3D" ))); + aAny = xPropSet->getPropertyValue( OUString( "Dim3D" )); aAny >>= bIs3DChart; if( bIs3DChart ) @@ -2297,7 +2296,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty return; chart::TimeIncrement aIncrement; - if( (xAxisProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "TimeIncrement" ))) >>= aIncrement) ) + if( (xAxisProps->getPropertyValue( OUString( "TimeIncrement" )) >>= aIncrement) ) { sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; if( aIncrement.TimeResolution >>= nTimeResolution ) @@ -2331,7 +2330,7 @@ void SchXMLExportHelper_Impl::exportAxisTitle( const Reference< beans::XProperty { OUString aText; Any aAny( xTitleProps->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "String" )))); + OUString( "String" ))); aAny >>= aText; Reference< drawing::XShape > xShape( xTitleProps, uno::UNO_QUERY ); @@ -2421,7 +2420,7 @@ void SchXMLExportHelper_Impl::exportAxis( bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid, bool bExportContent ) { - static const OUString sNumFormat( OUString(RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ))); + static const OUString sNumFormat( OUString( "NumberFormat" )); std::vector< XMLPropertyState > aPropertyStates; SvXMLElementExport* pAxis = NULL; @@ -2518,40 +2517,40 @@ void SchXMLExportHelper_Impl::exportAxes( MultiPropertySetHandler aDiagramProperties (xDiagram); aDiagramProperties.Add ( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis")), bHasXAxis); + OUString("HasXAxis"), bHasXAxis); aDiagramProperties.Add ( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis")), bHasYAxis); + OUString("HasYAxis"), bHasYAxis); aDiagramProperties.Add ( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis")), bHasZAxis); + OUString("HasZAxis"), bHasZAxis); aDiagramProperties.Add ( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis")), bHasSecondaryXAxis); + OUString("HasSecondaryXAxis"), bHasSecondaryXAxis); aDiagramProperties.Add ( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis")), bHasSecondaryYAxis); + OUString("HasSecondaryYAxis"), bHasSecondaryYAxis); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisTitle")), bHasXAxisTitle); + OUString ("HasXAxisTitle"), bHasXAxisTitle); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisTitle")), bHasYAxisTitle); + OUString ("HasYAxisTitle"), bHasYAxisTitle); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisTitle")), bHasZAxisTitle); + OUString ("HasZAxisTitle"), bHasZAxisTitle); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryXAxisTitle")), bHasSecondaryXAxisTitle); + OUString ("HasSecondaryXAxisTitle"), bHasSecondaryXAxisTitle); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryYAxisTitle")), bHasSecondaryYAxisTitle); + OUString ("HasSecondaryYAxisTitle"), bHasSecondaryYAxisTitle); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisGrid")), bHasXAxisMajorGrid); + OUString ("HasXAxisGrid"), bHasXAxisMajorGrid); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisGrid")), bHasYAxisMajorGrid); + OUString ("HasYAxisGrid"), bHasYAxisMajorGrid); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisGrid")), bHasZAxisMajorGrid); + OUString ("HasZAxisGrid"), bHasZAxisMajorGrid); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisHelpGrid")), bHasXAxisMinorGrid); + OUString ("HasXAxisHelpGrid"), bHasXAxisMinorGrid); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisHelpGrid")), bHasYAxisMinorGrid); + OUString ("HasYAxisHelpGrid"), bHasYAxisMinorGrid); aDiagramProperties.Add ( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisHelpGrid")), bHasZAxisMinorGrid); + OUString ("HasZAxisHelpGrid"), bHasZAxisMinorGrid); if ( ! aDiagramProperties.GetProperties ()) { @@ -2705,8 +2704,8 @@ void SchXMLExportHelper_Impl::exportSeries( std::vector< XMLPropertyState > aPropertyStates; - const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); - const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat")); + const OUString sNumFormat("NumberFormat"); + const OUString sPercentageNumFormat( "PercentageNumberFormat"); Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq( xBCooSysCnt->getCoordinateSystems()); @@ -2731,7 +2730,7 @@ void SchXMLExportHelper_Impl::exportSeries( sal_Bool bJapaneseCandleSticks = sal_False; Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY ); if( xCTProp.is()) - xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Japanese" ))) >>= bJapaneseCandleSticks; + xCTProp->getPropertyValue( OUString( "Japanese" )) >>= bJapaneseCandleSticks; exportCandleStickSeries( xDSCnt->getDataSeries(), xNewDiagram, bJapaneseCandleSticks, bExportContent ); continue; @@ -2769,7 +2768,7 @@ void SchXMLExportHelper_Impl::exportSeries( { Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" ))) >>= aRole; + xSeqProp->getPropertyValue(OUString( "Role" )) >>= aRole; // "main" sequence if( aRole.equals( aLabelRole )) { @@ -2797,8 +2796,7 @@ void SchXMLExportHelper_Impl::exportSeries( (void)rEx; // avoid warning for pro build OSL_TRACE( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "Series not found or no XPropertySet: " )) + + OUString( "Series not found or no XPropertySet: " ) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); continue; @@ -2809,15 +2807,15 @@ void SchXMLExportHelper_Impl::exportSeries( try { Any aAny( xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Axis" )))); + OUString( "Axis" ))); aAny >>= nAttachedAxis; aAny = xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM ( "MeanValue" ))); + OUString( "MeanValue" )); aAny >>= bHasMeanValueLine; aAny = xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "RegressionCurves" ))); + OUString( "RegressionCurves" )); aAny >>= eRegressionType; } catch( const beans::UnknownPropertyException & rEx ) @@ -2825,8 +2823,7 @@ void SchXMLExportHelper_Impl::exportSeries( (void)rEx; // avoid warning for pro build OSL_TRACE( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "Required property not found in DataRowProperties: " )) + + OUString( "Required property not found in DataRowProperties: " ) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -2903,7 +2900,7 @@ void SchXMLExportHelper_Impl::exportSeries( Reference< chart2::data::XDataSequence > xYValuesForBubbleChart; if( bIsBubbleChart ) { - Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )) ) ); + Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-y" ) ) ); if( xSequence.is() ) { xYValuesForBubbleChart = xSequence->getValues(); @@ -2913,7 +2910,7 @@ void SchXMLExportHelper_Impl::exportSeries( } if( bIsScatterChart || bIsBubbleChart ) { - Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )) ) ); + Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-x" ) ) ); if( xSequence.is() ) { Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() ); @@ -2953,7 +2950,7 @@ void SchXMLExportHelper_Impl::exportSeries( try { Any aPropAny( xPropSet->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMeanValueProperties" )))); + OUString( "DataMeanValueProperties" ))); aPropAny >>= xStatProp; } catch( const uno::Exception & rEx ) @@ -3023,7 +3020,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( try { Any aPropAny( xSeriesProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRegressionProperties" )))); + OUString( "DataRegressionProperties" ))); aPropAny >>= xStatProp; } catch( const uno::Exception & rEx ) @@ -3046,9 +3043,9 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( aPropertyStates = mxExpPropMapper->Filter( xStatProp ); if( xEquationProperties.is()) { - xEquationProperties->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowEquation" ))) + xEquationProperties->getPropertyValue( OUString( "ShowEquation" )) >>= bShowEquation; - xEquationProperties->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowCorrelationCoefficient" ))) + xEquationProperties->getPropertyValue( OUString( "ShowCorrelationCoefficient" )) >>= bShowRSquared; bExportEquation = ( bShowEquation || bShowRSquared ); const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( SvtSaveOptions().GetODFDefaultVersion() ); @@ -3059,7 +3056,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( // number format sal_Int32 nNumberFormat = 0; if( ( xEquationProperties->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberFormat" ))) >>= nNumberFormat ) && + OUString( "NumberFormat" )) >>= nNumberFormat ) && nNumberFormat != -1 ) { mrExport.addDataStyle( nNumberFormat ); @@ -3089,7 +3086,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( // export position chart2::RelativePosition aRelativePosition; if( xEquationProperties->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM("RelativePosition"))) >>= aRelativePosition ) + OUString( "RelativePosition")) >>= aRelativePosition ) { double fX = aRelativePosition.Primary * rPageSize.Width; double fY = aRelativePosition.Secondary * rPageSize.Height; @@ -3222,7 +3219,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( xSource->getDataSequences()); sal_Int32 nSeriesLength = - lcl_getSequenceLengthByRole( aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" ))); + lcl_getSequenceLengthByRole( aSeqCnt, OUString( "values-last" )); if( bExportContent ) { @@ -3233,7 +3230,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( if( bJapaneseCandleSticks ) { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-first" )), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, OUString( "values-first" ), xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3250,7 +3247,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // low { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-min" )), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, OUString( "values-min" ), xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3267,7 +3264,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // high { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-max" )), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, OUString( "values-max" ), xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3284,7 +3281,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // close { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString(RTL_CONSTASCII_USTRINGPARAM( "values-last" )), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, OUString( "values-last" ), xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3332,18 +3329,18 @@ void SchXMLExportHelper_Impl::exportDataPoints( std::vector< XMLPropertyState > aPropertyStates; - const OUString sNumFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); - const OUString sPercentageNumFormat(RTL_CONSTASCII_USTRINGPARAM( "PercentageNumberFormat")); + const OUString sNumFormat("NumberFormat"); + const OUString sPercentageNumFormat( "PercentageNumberFormat"); bool bVaryColorsByPoint = false; Sequence< sal_Int32 > aDataPointSeq; if( xSeriesProperties.is()) { Any aAny = xSeriesProperties->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "AttributedDataPoints" ))); + OUString( "AttributedDataPoints" )); aAny >>= aDataPointSeq; xSeriesProperties->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "VaryColorsByPoint" ))) >>= bVaryColorsByPoint; + OUString( "VaryColorsByPoint" )) >>= bVaryColorsByPoint; } @@ -3716,7 +3713,7 @@ void SchXMLExport::_ExportContent() if( xServ.is()) { if( xServ->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTableAddressSupplier" )))) + OUString( "com.sun.star.chart.ChartTableAddressSupplier" ))) { Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY ); if( xProp.is()) @@ -3726,13 +3723,13 @@ void SchXMLExport::_ExportContent() { OUString sChartAddress; aAny = xProp->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM( "ChartRangeAddress" ))); + OUString( "ChartRangeAddress" )); aAny >>= sChartAddress; maExportHelper.m_pImpl->SetChartRangeAddress( sChartAddress ); OUString sTableNumberList; aAny = xProp->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM( "TableNumberList" ))); + OUString( "TableNumberList" )); aAny >>= sTableNumberList; maExportHelper.m_pImpl->SetTableNumberList( sTableNumberList ); @@ -3813,9 +3810,9 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< { (void)ex; // avoid warning for pro build OSL_FAIL( OUStringToOString( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) + + OUString( "Exception caught. Type: " ) + OUString::createFromAscii( typeid( ex ).name()) + - OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) + + OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -3826,14 +3823,14 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference< Sequence< OUString > SAL_CALL SchXMLExport_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLExporter" ) ); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Compact" ) ); + return OUString( "SchXMLExport.Compact" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3846,14 +3843,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Referenc // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisExporter" ) ); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Oasis.Compact" ) ); + return OUString( "SchXMLExport.Oasis.Compact" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3869,14 +3866,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re Sequence< OUString > SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLStylesExporter" )); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLStylesExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Styles" )); + return OUString( "SchXMLExport.Styles" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception ) @@ -3888,14 +3885,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const R // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Styles_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisStylesExporter" )); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisStylesExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Oasis.Styles" )); + return OUString( "SchXMLExport.Oasis.Styles" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3907,14 +3904,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(c Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLContentExporter" )); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLContentExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Content" )); + return OUString( "SchXMLExport.Content" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3926,14 +3923,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Content_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisContentExporter" )); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisContentExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Oasis.Content" )); + return OUString( "SchXMLExport.Oasis.Content" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3946,14 +3943,14 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance( // Oasis format Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw() { - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.XMLOasisMetaExporter" )); + const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisMetaExporter" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport.Oasis.Meta" )); + return OUString( "SchXMLExport.Oasis.Meta" ); } Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) @@ -3987,7 +3984,7 @@ OUString SAL_CALL SchXMLExport::getImplementationName() throw( uno::RuntimeExcep case EXPORT_SETTINGS: // there is no settings component in chart default: - return OUString(RTL_CONSTASCII_USTRINGPARAM( "SchXMLExport" )); + return OUString( "SchXMLExport" ); } } diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 50eabc70d19e..588d819d7b91 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -112,7 +112,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe if( xProp.is() ) { drawing::CameraGeometry aCamGeo; - xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "D3DCameraGeometry" ))) >>= aCamGeo; + xProp->getPropertyValue( ::rtl::OUString( "D3DCameraGeometry" )) >>= aCamGeo; maVRP.setX( aCamGeo.vrp.PositionX ); maVRP.setY( aCamGeo.vrp.PositionY ); maVRP.setZ( aCamGeo.vrp.PositionZ ); @@ -205,36 +205,36 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( try { xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxis" )), aFalseBool ); + rtl::OUString( "HasXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisGrid" )), aFalseBool ); + rtl::OUString( "HasXAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasXAxisDescription" )), aFalseBool ); + rtl::OUString( "HasXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxis" )), aFalseBool ); + rtl::OUString( "HasSecondaryXAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryXAxisDescription" )), aFalseBool ); + rtl::OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxis" )), aFalseBool ); + rtl::OUString( "HasYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisGrid" )), aFalseBool ); + rtl::OUString( "HasYAxisGrid" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasYAxisDescription" )), aFalseBool ); + rtl::OUString( "HasYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxis" )), aFalseBool ); + rtl::OUString( "HasSecondaryYAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasSecondaryYAxisDescription" )), aFalseBool ); + rtl::OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxis" )), aFalseBool ); + rtl::OUString( "HasZAxis" ), aFalseBool ); xProp->setPropertyValue( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "HasZAxisDescription" )), aFalseBool ); + rtl::OUString( "HasZAxisDescription" ), aFalseBool ); uno::Any aAny; chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; aAny <<= eSource; - xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), aAny ); + xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), aAny ); } catch( const beans::UnknownPropertyException & ) { @@ -312,12 +312,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Any aAny; aAny <<= (sal_Bool)(mrColHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstColumn" )), + ::rtl::OUString( "DataSourceLabelsInFirstColumn" ), aAny ); aAny <<= (sal_Bool)(mrRowHasLabels); xDocProp->setPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" )), + ::rtl::OUString( "DataSourceLabelsInFirstRow" ), aAny ); } catch( const beans::UnknownPropertyException & ) @@ -347,13 +347,13 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xProp ); // get the data row source that was set without having data - xProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" ))) + xProp->getPropertyValue( ::rtl::OUString( "DataRowSource" )) >>= mrDataRowSource; //lines on/off //this old property is not supported fully anymore with the new chart, so we need to get the information a little bit different from similar properties mrSeriesDefaultsAndStyles.maLinesOnProperty = SchXMLTools::getPropertyFromContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lines")), pPropStyleContext, pStylesCtxt ); + ::rtl::OUString("Lines"), pPropStyleContext, pStylesCtxt ); //handle automatic position and size m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt ); @@ -362,12 +362,12 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_0( GetImport().GetModel() ) ) { bool bIs3d = false; - if( xProp.is() && ( xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3d ) && + if( xProp.is() && ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) { - ::rtl::OUString aPropName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StartingAngle")) ); + ::rtl::OUString aPropName( ::rtl::OUString("StartingAngle") ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); if( !aAStartingAngle.hasValue() ) xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ; @@ -383,35 +383,35 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if(xProp.is()) try { - mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolType"))); - mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCaption"))); + mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(::rtl::OUString("SymbolType")); + mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(::rtl::OUString("DataCaption")); - mrSeriesDefaultsAndStyles.maErrorIndicatorDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorIndicator"))); - mrSeriesDefaultsAndStyles.maErrorCategoryDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorCategory"))); - mrSeriesDefaultsAndStyles.maConstantErrorLowDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantErrorLow"))); - mrSeriesDefaultsAndStyles.maConstantErrorHighDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantErrorHigh"))); - mrSeriesDefaultsAndStyles.maPercentageErrorDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PercentageError"))); - mrSeriesDefaultsAndStyles.maErrorMarginDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorMargin"))); + mrSeriesDefaultsAndStyles.maErrorIndicatorDefault = xProp->getPropertyValue(::rtl::OUString("ErrorIndicator")); + mrSeriesDefaultsAndStyles.maErrorCategoryDefault = xProp->getPropertyValue(::rtl::OUString("ErrorCategory")); + mrSeriesDefaultsAndStyles.maConstantErrorLowDefault = xProp->getPropertyValue(::rtl::OUString("ConstantErrorLow")); + mrSeriesDefaultsAndStyles.maConstantErrorHighDefault = xProp->getPropertyValue(::rtl::OUString("ConstantErrorHigh")); + mrSeriesDefaultsAndStyles.maPercentageErrorDefault = xProp->getPropertyValue(::rtl::OUString("PercentageError")); + mrSeriesDefaultsAndStyles.maErrorMarginDefault = xProp->getPropertyValue(::rtl::OUString("ErrorMargin")); - mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MeanValue"))); - mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegressionCurves"))); + mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(::rtl::OUString("MeanValue")); + mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(::rtl::OUString("RegressionCurves")); bool bStacked = false; - mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Stacked"))); + mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(::rtl::OUString("Stacked")); mrSeriesDefaultsAndStyles.maStackedDefault >>= bStacked; - mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Percent"))); + mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(::rtl::OUString("Percent")); mrSeriesDefaultsAndStyles.maPercentDefault >>= mbPercentStacked; - mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StackedBarsConnected"))); + mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(::rtl::OUString("StackedBarsConnected")); // deep - uno::Any aDeepProperty( xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deep")))); + uno::Any aDeepProperty( xProp->getPropertyValue(::rtl::OUString("Deep"))); // #124488# old versions store a 3d area and 3D line deep chart with Deep==false => workaround for this if( ! (bStacked || mbPercentStacked )) { if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( GetImport().GetModel() ) ) { bool bIs3d = false; - if( ( xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dim3D"))) >>= bIs3d ) && + if( ( xProp->getPropertyValue(::rtl::OUString("Dim3D")) >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" ) @@ -423,8 +423,8 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri } mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberOfLines"))) >>= mnNumOfLinesProp; - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Volume"))) >>= mbStockHasVolume; + xProp->getPropertyValue(::rtl::OUString("NumberOfLines")) >>= mnNumOfLinesProp; + xProp->getPropertyValue(::rtl::OUString("Volume")) >>= mbStockHasVolume; } catch( const uno::Exception & rEx ) { @@ -454,7 +454,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri // data yet. mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ ); if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS ) - xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), uno::makeAny(mrDataRowSource) ); + xProp->setPropertyValue( rtl::OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); } } @@ -582,7 +582,7 @@ void SchXMLPlotAreaContext::EndElement() if( xDiaProp.is()) { sal_Bool bIsThreeDim = sal_False; - uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Dim3D" ))); + uno::Any aAny = xDiaProp->getPropertyValue( ::rtl::OUString( "Dim3D" )); aAny >>= bIsThreeDim; // set 3d scene attributes @@ -597,7 +597,7 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberOfLines" )), + xDiaProp->setPropertyValue( ::rtl::OUString( "NumberOfLines" ), uno::makeAny( mnNumOfLinesProp )); } catch( const uno::Exception & rEx ) @@ -618,7 +618,7 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Volume" )), + xDiaProp->setPropertyValue( ::rtl::OUString( "Volume" ), uno::makeAny( true )); } catch( const uno::Exception & rEx ) @@ -797,9 +797,9 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS { //handle automatic position and size SchXMLTools::getPropertyFromContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticSize")), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; + ::rtl::OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; SchXMLTools::getPropertyFromContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticPosition")), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; + ::rtl::OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; } } @@ -1130,7 +1130,7 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri uno::Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); if( xFact.is()) xEqProp.set( xFact->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.RegressionEquation" ))), uno::UNO_QUERY ); + ::rtl::OUString( "com.sun.star.chart2.RegressionEquation" )), uno::UNO_QUERY ); if( xEqProp.is()) { if( !sAutoStyleName.isEmpty() ) @@ -1148,15 +1148,15 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xEqProp ); } } - xEqProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowEquation")), uno::makeAny( bShowEquation )); - xEqProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("ShowCorrelationCoefficient")), uno::makeAny( bShowRSquare )); + xEqProp->setPropertyValue( OUString( "ShowEquation"), uno::makeAny( bShowEquation )); + xEqProp->setPropertyValue( OUString( "ShowCorrelationCoefficient"), uno::makeAny( bShowRSquare )); if( bHasXPos && bHasYPos ) { chart2::RelativePosition aRelPos; aRelPos.Primary = static_cast< double >( aPosition.X ) / static_cast< double >( maChartSize.Width ); aRelPos.Secondary = static_cast< double >( aPosition.Y ) / static_cast< double >( maChartSize.Height ); - xEqProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "RelativePosition" )), + xEqProp->setPropertyValue( OUString( "RelativePosition" ), uno::makeAny( aRelPos )); } OSL_ASSERT( mrRegressionStyle.meType == DataRowPointStyle::REGRESSION ); diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index d9f9c09a96ee..8e50d4a3622d 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -135,12 +135,12 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS double fScale = 1; uno::Reference< beans::XPropertySet > xLegendProp( xChartDoc->getLegend(), uno::UNO_QUERY ); chart::ChartLegendPosition aLegendPosition = chart::ChartLegendPosition_NONE; - if( xLegendProp.is() && (xLegendProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Alignment" ))) >>= aLegendPosition) + if( xLegendProp.is() && (xLegendProp->getPropertyValue( OUString( "Alignment" )) >>= aLegendPosition) && chart::ChartLegendPosition_NONE != aLegendPosition ) { double fFontHeight = 6.0; - if( xLegendProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CharHeight" ))) >>= fFontHeight ) + if( xLegendProp->getPropertyValue( OUString( "CharHeight" )) >>= fFontHeight ) fScale = 0.75*fFontHeight/6.0; } else @@ -158,7 +158,7 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS aSymbolSize.Width = aSymbolSize.Height; } } - xSeriesOrPointProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolSize")),uno::makeAny( aSymbolSize )); + xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( aSymbolSize )); } void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp, const SvXMLImport& rImport ) @@ -167,14 +167,14 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe return; sal_Int32 nSymbolType = chart::ChartSymbolType::NONE; - if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolType"))) >>= nSymbolType) ) + if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(::rtl::OUString("SymbolType")) >>= nSymbolType) ) { if(chart::ChartSymbolType::NONE!=nSymbolType) { if( chart::ChartSymbolType::BITMAPURL==nSymbolType ) { //set special size for graphics to indicate to use the bitmap size itself - xSeriesOrPointProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolSize")),uno::makeAny( awt::Size(-1,-1) )); + xSeriesOrPointProp->setPropertyValue(::rtl::OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); } else { @@ -187,7 +187,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe void lcl_resetSymbolSizeForPointsIfNecessary( const uno::Reference< beans::XPropertySet >& xPointProp, const SvXMLImport& rImport , const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolSize")), pPropStyleContext, pStylesCtxt ) ); + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); if( !aASymbolSize.hasValue() ) lcl_setSymbolSizeIfNeeded( xPointProp, rImport ); } @@ -200,8 +200,8 @@ void lcl_insertErrorBarLSequencesToMap( Reference< chart2::data::XDataSource > xErrorBarSource; const OUString aPropName( bYError - ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ErrorBarY" )) - : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ErrorBarX" ))); + ? ::rtl::OUString( "ErrorBarY" ) + : ::rtl::OUString( "ErrorBarX" )); if( ( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBarSource ) && xErrorBarSource.is() ) { @@ -237,7 +237,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createAndAddSequenceToSeries Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc ); Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( rRole)); + xSeqProp->setPropertyValue(OUString( "Role" ), uno::makeAny( rRole)); xLabeledSeq->setValues( xSeq ); // add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards @@ -290,7 +290,7 @@ SchXMLSeries2Context::SchXMLSeries2Context( { if( 0 == aGlobalChartTypeName.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.DonutChartType" ) ) ) { - maSeriesChartTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.PieChartType" )); + maSeriesChartTypeName = ::rtl::OUString("com.sun.star.chart2.PieChartType" ); maGlobalChartTypeName = maSeriesChartTypeName; } } @@ -385,7 +385,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib && m_bStockHasVolume && mnSeriesIndex == 0 ) { - maSeriesChartTypeName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" )); + maSeriesChartTypeName = OUString( "com.sun.star.chart2.ColumnChartType" ); bIsCandleStick = false; } else @@ -406,7 +406,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib // set default color for range-line to black (before applying styles) Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Color")), + xSeriesProp->setPropertyValue( ::rtl::OUString("Color"), uno::makeAny( sal_Int32( 0x000000 ))); // black } else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" ) @@ -414,7 +414,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib //@todo: this property should be saved Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VaryColorsByPoint")), + xSeriesProp->setPropertyValue( ::rtl::OUString("VaryColorsByPoint"), uno::makeAny( true )); } @@ -426,10 +426,10 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY ); if( xSeqProp.is()) { - OUString aMainRole(RTL_CONSTASCII_USTRINGPARAM("values-y")); + OUString aMainRole("values-y"); if ( maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType" ) - aMainRole = OUString(RTL_CONSTASCII_USTRINGPARAM( "values-size" )); - xSeqProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "Role" )), uno::makeAny( aMainRole )); + aMainRole = OUString( "values-size" ); + xSeqProp->setPropertyValue(OUString( "Role" ), uno::makeAny( aMainRole )); } xLabeledSeq->setValues( xSeq ); @@ -463,9 +463,9 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib { (void)ex; // avoid warning for pro build OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) + + ::rtl::OUString( "Exception caught. Type: " ) + ::rtl::OUString::createFromAscii( typeid( ex ).name()) + - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) + + ::rtl::OUString( ", Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -482,7 +482,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle ); - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolSize")) + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( ::rtl::OUString("SymbolSize") , pPropStyleContext, pStylesCtxt ) ); mbSymbolSizeIsMissingInFile = !aASymbolSize.hasValue(); } @@ -517,7 +517,7 @@ void SchXMLSeries2Context::EndElement() //different handling for different chart types necessary if( bIsScatterChart || ( nDomainCount==1 && !bIsBubbleChart ) ) { - DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; + DomainInfo aDomainInfo( OUString( "values-x" ), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; bool bCreateXValues = true; if( !maDomainAddresses.empty() ) { @@ -550,7 +550,7 @@ void SchXMLSeries2Context::EndElement() { if( nDomainCount>1 ) { - DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; + DomainInfo aDomainInfo( OUString( "values-x" ), maDomainAddresses[1], m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; if( m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() ) { //for bubble chart the second domain contains the x values which should become an index smaller than y values for own data table @@ -563,12 +563,12 @@ void SchXMLSeries2Context::EndElement() } else if( !m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress.isEmpty() ) { - DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-x" )), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ; + DomainInfo aDomainInfo( OUString( "values-x" ), m_rGlobalSeriesImportInfo.aFirstSecondDomainAddress, m_rGlobalSeriesImportInfo.nFirstSecondDomainIndex ) ; aDomainInfos.push_back( aDomainInfo ); } if( nDomainCount>0) { - DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM( "values-y" )), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; + DomainInfo aDomainInfo( OUString( "values-y" ), maDomainAddresses.front(), m_rGlobalSeriesImportInfo.nCurrentDataIndex ) ; if( m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() ) { m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress = maDomainAddresses.front(); @@ -579,7 +579,7 @@ void SchXMLSeries2Context::EndElement() } else if( !m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress.isEmpty() ) { - DomainInfo aDomainInfo( OUString(RTL_CONSTASCII_USTRINGPARAM("values-y")), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; + DomainInfo aDomainInfo( OUString("values-y"), m_rGlobalSeriesImportInfo.aFirstFirstDomainAddress, m_rGlobalSeriesImportInfo.nFirstFirstDomainIndex ) ; aDomainInfos.push_back( aDomainInfo ); } } @@ -741,27 +741,27 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries continue; if( rSeriesDefaultsAndStyles.maSymbolTypeDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SymbolType")),rSeriesDefaultsAndStyles.maSymbolTypeDefault); + xSeries->setPropertyValue(::rtl::OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); if( rSeriesDefaultsAndStyles.maDataCaptionDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCaption")),rSeriesDefaultsAndStyles.maDataCaptionDefault); + xSeries->setPropertyValue(::rtl::OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); if( rSeriesDefaultsAndStyles.maErrorIndicatorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorIndicator")),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); + xSeries->setPropertyValue(::rtl::OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); if( rSeriesDefaultsAndStyles.maErrorCategoryDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorCategory")),rSeriesDefaultsAndStyles.maErrorCategoryDefault); + xSeries->setPropertyValue(::rtl::OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); if( rSeriesDefaultsAndStyles.maConstantErrorLowDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantErrorLow")),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); + xSeries->setPropertyValue(::rtl::OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); if( rSeriesDefaultsAndStyles.maConstantErrorHighDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConstantErrorHigh")),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); + xSeries->setPropertyValue(::rtl::OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); if( rSeriesDefaultsAndStyles.maPercentageErrorDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PercentageError")),rSeriesDefaultsAndStyles.maPercentageErrorDefault); + xSeries->setPropertyValue(::rtl::OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); if( rSeriesDefaultsAndStyles.maErrorMarginDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ErrorMargin")),rSeriesDefaultsAndStyles.maErrorMarginDefault); + xSeries->setPropertyValue(::rtl::OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); if( rSeriesDefaultsAndStyles.maMeanValueDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MeanValue")),rSeriesDefaultsAndStyles.maMeanValueDefault); + xSeries->setPropertyValue(::rtl::OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); if( rSeriesDefaultsAndStyles.maRegressionCurvesDefault.hasValue() ) - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegressionCurves")),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); + xSeries->setPropertyValue(::rtl::OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); } catch( uno::Exception & ) { @@ -795,7 +795,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( iStyle->mnAttachedAxis != 1 ) { - xSeriesProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Axis" )) + xSeriesProp->setPropertyValue( rtl::OUString( "Axis" ) , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); } @@ -820,7 +820,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe // this property) bool bHasErrorBarRangesFromData = false; { - const ::rtl::OUString aErrorBarStylePropName( RTL_CONSTASCII_USTRINGPARAM("ErrorBarStyle")); + const ::rtl::OUString aErrorBarStylePropName( "ErrorBarStyle"); uno::Any aErrorBarStyle( SchXMLTools::getPropertyFromContext( aErrorBarStylePropName, pPropStyleContext, pStylesCtxt )); if( aErrorBarStyle.hasValue()) @@ -904,18 +904,15 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles { case DataRowPointStyle::MEAN_VALUE: xSeriesProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "DataMeanValueProperties" ))) >>= xStatPropSet; + OUString( "DataMeanValueProperties" )) >>= xStatPropSet; break; case DataRowPointStyle::REGRESSION: xSeriesProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "DataRegressionProperties" ))) >>= xStatPropSet; + OUString( "DataRegressionProperties" )) >>= xStatPropSet; break; case DataRowPointStyle::ERROR_INDICATOR: xSeriesProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "DataErrorProperties" ))) >>= xStatPropSet; + OUString( "DataErrorProperties" )) >>= xStatPropSet; break; default: break; @@ -1011,7 +1008,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { //need to set this explicitly here for old files as the new api does not support this property fully anymore if( bSwitchOffLinesForScatter ) - xPointProp->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lines")),uno::makeAny(sal_False)); + xPointProp->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); } catch( const uno::Exception & ) { @@ -1062,7 +1059,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle if( !xSeries.is() ) continue; - xSeries->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Lines")),uno::makeAny(sal_False)); + xSeries->setPropertyValue(::rtl::OUString("Lines"),uno::makeAny(sal_False)); } catch( uno::Exception & ) { diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index 2722a1163bc8..c4edfca6f461 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -82,9 +82,9 @@ using ::rtl::OUString; (void)ex; // avoid warning for pro build OSL_FAIL( OUStringToOString( OUString( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught. Type: " )) + + OUString( "Exception caught. Type: " ) + OUString::createFromAscii( typeid( ex ).name()) + - OUString( RTL_CONSTASCII_USTRINGPARAM( ", Message: " )) + + OUString( ", Message: " ) + ex.Message), RTL_TEXTENCODING_ASCII_US ).getStr()); } @@ -203,7 +203,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPISeriesProp if( xFactory.is() ) { xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY ); + OUString( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY ); Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); if(xInit.is()) { @@ -240,7 +240,7 @@ uno::Reference< beans::XPropertySet > SchXMLSeriesHelper::createOldAPIDataPointP if( xFactory.is() ) { xRet = uno::Reference< beans::XPropertySet >( xFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.chart2.DataSeriesWrapper" )) ), uno::UNO_QUERY ); + OUString( "com.sun.star.comp.chart2.DataSeriesWrapper" ) ), uno::UNO_QUERY ); Reference< lang::XInitialization > xInit( xRet, uno::UNO_QUERY ); if(xInit.is()) { diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index de5bad54585c..86e2516f8c60 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -79,7 +79,7 @@ Reference< uno::XComponentContext > lcl_getComponentContext() { Reference< beans::XPropertySet > xFactProp( comphelper::getProcessServiceFactory(), uno::UNO_QUERY ); if( xFactProp.is()) - xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xFactProp->getPropertyValue(OUString( "DefaultContext" )) >>= xContext; } catch( uno::Exception& ) {} @@ -117,7 +117,7 @@ sal_Int32 lcl_getBuildIDFromGenerator( const ::rtl::OUString& rGenerator ) { //returns -1 if nothing found sal_Int32 nBuildId = -1; - const OUString sBuildCompare( RTL_CONSTASCII_USTRINGPARAM( "$Build-" ) ); + const OUString sBuildCompare( "$Build-" ); sal_Int32 nEnd = -1; sal_Int32 nBegin = rGenerator.indexOf( sBuildCompare, nEnd ); if( nBegin != -1 ) @@ -191,35 +191,35 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() //shape property -- chart model object property static tMakeStringStringMap g_aChartTypeNameMap = tMakeStringStringMap - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.LineDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.LineChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.LineDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.LineChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.AreaChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.AreaDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.AreaChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BarDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ColumnChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.BarDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.ColumnChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.PieDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.PieChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.PieDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.PieChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.DonutDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.DonutChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.DonutDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.DonutChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.XYDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.ScatterChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.XYDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.ScatterChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.NetDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.NetChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.NetDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.NetChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.FilledNetDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.FilledNetChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.FilledNetDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.FilledNetChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.StockDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.CandleStickChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.StockDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.CandleStickChartType" ) ) - ( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" )) - , ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" )) ) + ( ::rtl::OUString( "com.sun.star.chart.BubbleDiagram" ) + , ::rtl::OUString( "com.sun.star.chart2.BubbleChartType" ) ) ; return g_aChartTypeNameMap; @@ -322,13 +322,13 @@ XMLTokenEnum getTokenByChartType( if( bUseOldNames ) { - aPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.")); - aPostfix = OUString( RTL_CONSTASCII_USTRINGPARAM("Diagram")); + aPrefix = OUString( "com.sun.star.chart."); + aPostfix = OUString( "Diagram"); } else { - aPrefix = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.")); - aPostfix = OUString( RTL_CONSTASCII_USTRINGPARAM("ChartType")); + aPrefix = OUString( "com.sun.star.chart2."); + aPostfix = OUString( "ChartType"); } if( rChartTypeService.match( aPrefix )) @@ -380,7 +380,7 @@ Reference< chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence() if( xContext.is() ) xResult.set( xContext->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.data.LabeledDataSequence" )), + OUString( "com.sun.star.chart2.data.LabeledDataSequence" ), xContext ), uno::UNO_QUERY_THROW ); return xResult; } @@ -491,7 +491,7 @@ void CreateCategories( { (void)ex; // avoid warning for pro build OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IllegalArgumentException caught, Message: " )) + + ::rtl::OUString( "IllegalArgumentException caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } aData.Categories.set( xLabeledSeq ); @@ -657,7 +657,7 @@ void setXMLRangePropertyAtDataSequence( return; try { - const OUString aXMLRangePropName( RTL_CONSTASCII_USTRINGPARAM( "CachedXMLRange" )); + const OUString aXMLRangePropName( "CachedXMLRange" ); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName )) @@ -667,7 +667,7 @@ void setXMLRangePropertyAtDataSequence( { (void)ex; // avoid warning for pro build OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught, Message: " )) + + ::rtl::OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -682,7 +682,7 @@ bool getXMLRangePropertyFromDataSequence( { try { - const OUString aXMLRangePropName( RTL_CONSTASCII_USTRINGPARAM( "CachedXMLRange" )); + const OUString aXMLRangePropName( "CachedXMLRange" ); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); bResult = @@ -697,7 +697,7 @@ bool getXMLRangePropertyFromDataSequence( { (void)ex; // avoid warning for pro build OSL_FAIL( ::rtl::OUStringToOString( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Exception caught, Message: " )) + + ::rtl::OUString( "Exception caught, Message: " ) + ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr()); } } @@ -779,17 +779,17 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame: if( !bResult ) { ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); - if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/3") ) ) != -1 ) + if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/3" ) ) != -1 ) { - if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/300m") ) ) != -1 ) + if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/300m" ) ) != -1 ) { sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( nBuilId>0 && nBuilId<9491 ) //9491 is build id of dev300m76 bResult= true; } - else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/310m") ) ) != -1 ) + else if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/310m" ) ) != -1 ) bResult= true; - else if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/320m") ) ) != -1 ) + else if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/320m" ) ) != -1 ) bResult= true; } } @@ -802,7 +802,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame: if( !bResult ) { ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); - if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/680m") ) ) != -1 ) + if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/680m" ) ) != -1 ) bResult= true; } return bResult; @@ -834,11 +834,11 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: if( xChild.is() ) { aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) ); - if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 ) + if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project" ) ) != -1 ) { //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream - if( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project/31") ) ) != -1 ) + if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/31" ) ) != -1 ) bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer else bResult= true; //in this case the OLE chart was created by an older version, as OLE objects are sometimes stream copied the version can differ from the parents version, so the parents version is not a reliable indicator @@ -854,11 +854,11 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno: { bool bResult = false; ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); - if( ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 ) + if( ( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org 1" ) ) == 0 ) + || ( aGenerator.indexOf( ::rtl::OUString( "StarOffice 6" ) ) == 0 ) + || ( aGenerator.indexOf( ::rtl::OUString( "StarOffice 7" ) ) == 0 ) + || ( aGenerator.indexOf( ::rtl::OUString( "StarSuite 6" ) ) == 0 ) + || ( aGenerator.indexOf( ::rtl::OUString( "StarSuite 7" ) ) == 0 ) ) bResult= true; return bResult; @@ -873,7 +873,7 @@ Reference< chart2::data::XDataProvider > getDataProviderFromParent( const Refere Reference< lang::XMultiServiceFactory > xFact( xChild->getParent(), uno::UNO_QUERY ); if( xFact.is() ) { - const OUString aDataProviderServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.data.DataProvider")); + const OUString aDataProviderServiceName( "com.sun.star.chart2.data.DataProvider"); const uno::Sequence< OUString > aServiceNames( xFact->getAvailableServiceNames()); const OUString * pBegin = aServiceNames.getConstArray(); const OUString * pEnd = pBegin + aServiceNames.getLength(); diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 4527dab12b27..4a9d39ba15ec 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -103,8 +103,7 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI) xContext->getServiceManager(), uno::UNO_SET_THROW); uno::Reference<uri::XUriReferenceFactory> const xUriFactory( xServiceFactory->createInstanceWithContext( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.uri.UriReferenceFactory")), xContext), + ::rtl::OUString( "com.sun.star.uri.UriReferenceFactory"), xContext), uno::UNO_QUERY_THROW); uno::Reference< uri::XUriReference > const xBaseURI( @@ -214,7 +213,7 @@ RDFaExportHelper::AddRDFa( ::boost::bind(&makeCURIE, &m_rExport, ::boost::bind(&rdf::Statement::Predicate, _1))), ::comphelper::OUStringBufferAppender(property), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "))); + ::rtl::OUString(" ")); m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY, property.makeStringAndClear()); diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 56cb96080257..b29473b6ace6 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -138,7 +138,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName) xml::AttributeData aData; aData.Namespace = mpContainer->GetAttrNamespace(nAttr); - aData.Type = OUString(RTL_CONSTASCII_USTRINGPARAM("CDATA")); + aData.Type = OUString("CDATA"); aData.Value = mpContainer->GetAttrValue(nAttr); uno::Any aAny; @@ -265,13 +265,13 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name) //XServiceInfo OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "SvUnoAttributeContainer" )); + return OUString( "SvUnoAttributeContainer" ); } uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - OUString aSN( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.AttributeContainer" )) ); + OUString aSN( OUString( "com.sun.star.xml.AttributeContainer" ) ); uno::Sequence< OUString > aNS( &aSN, 1L ); return aNS; } diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 804bdae9bfc4..b8fc35dea068 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -98,7 +98,7 @@ void SvXMLUnitConverter::Impl::createNumTypeInfo() const const_cast<Impl*>(this)->m_xNumTypeInfo = Reference < XNumberingTypeInfo > ( m_xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.DefaultNumberingProvider") ) ), UNO_QUERY ); + OUString("com.sun.star.text.DefaultNumberingProvider" ) ), UNO_QUERY ); } } @@ -309,7 +309,7 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c if (xNumberFormatsSupplier.is()) { const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); - return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_NULLDATE))) >>= m_pImpl->m_aNullDate); + return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); } return sal_False; } @@ -813,8 +813,7 @@ OUString SvXMLUnitConverter::encodeStyleName( ->m_pImpl->m_xCharClass = Reference < XCharacterClassification >( m_pImpl->m_xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.i18n.CharacterClassification_Unicode")) ), + OUString( "com.sun.star.i18n.CharacterClassification_Unicode") ), UNO_QUERY ); OSL_ENSURE( m_pImpl->m_xCharClass.is(), diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 2687a18b6301..139b149827de 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -296,13 +296,13 @@ SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext( #define SERVICE(classname,servicename,implementationname,draw,flags)\ uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\ {\ - const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( servicename ) );\ + const OUString aServiceName( servicename );\ const uno::Sequence< OUString > aSeq( &aServiceName, 1 );\ return aSeq;\ }\ OUString SAL_CALL classname##_getImplementationName() throw()\ {\ - return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationname ) );\ + return OUString( implementationname );\ }\ uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\ {\ @@ -348,8 +348,8 @@ SdXMLImport::SdXMLImport( mbIsDraw(bIsDraw), mbLoadDoc(sal_True), mbPreview(sal_False), - msPageLayouts( RTL_CONSTASCII_USTRINGPARAM( "PageLayouts" ) ), - msPreview( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) ) + msPageLayouts( "PageLayouts" ), + msPreview( "Preview" ) { // add namespaces GetNamespaceMap().Add( @@ -378,7 +378,7 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo if( !xDocServices.is() ) throw lang::IllegalArgumentException(); - mbIsDraw = !xDocServices->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ); + mbIsDraw = !xDocServices->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ); // prepare access to styles uno::Reference< style::XStyleFamiliesSupplier > xFamSup( GetModel(), uno::UNO_QUERY ); @@ -445,7 +445,7 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen xInfoSet->getPropertyValue( msPreview ) >>= mbPreview; ::rtl::OUString const sOrganizerMode( - RTL_CONSTASCII_USTRINGPARAM("OrganizerMode")); + "OrganizerMode"); if (xInfoSetInfo->hasPropertyByName(sOrganizerMode)) { sal_Bool bStyleOnly(sal_False); @@ -732,8 +732,8 @@ SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix, } else if ( (XML_NAMESPACE_OFFICE == nPrefix) && ( IsXMLToken(rLocalName, XML_DOCUMENT)) ) { uno::Reference<xml::sax::XDocumentHandler> xDocBuilder( - mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.dom.SAXDocumentBuilder"))), + mxServiceFactory->createInstance(::rtl::OUString( + "com.sun.star.xml.dom.SAXDocumentBuilder")), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); @@ -757,8 +757,8 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName, if (getImportFlags() & IMPORT_META) { uno::Reference<xml::sax::XDocumentHandler> xDocBuilder( - mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.dom.SAXDocumentBuilder"))), + mxServiceFactory->createInstance(::rtl::OUString( + "com.sun.star.xml.dom.SAXDocumentBuilder")), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); @@ -896,7 +896,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: try { - xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), uno::makeAny( aVisArea ) ); + xPropSet->setPropertyValue( OUString( "VisibleArea" ), uno::makeAny( aVisArea ) ); } catch(const com::sun::star::uno::Exception&) { @@ -913,7 +913,7 @@ void SdXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<c if( !xFac.is() ) return; - uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY ); if( !xProps.is() ) return; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 264510fcaafb..bec909b5f1ba 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -80,27 +80,27 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, mbExportLayer( sal_False ), // #88546# init to sal_False mbHandleProgressBar( sal_False ), - msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ), - msPrintable( RTL_CONSTASCII_USTRINGPARAM("Printable") ), - msVisible( RTL_CONSTASCII_USTRINGPARAM("Visible") ), - msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), - msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ), - msStartShape( RTL_CONSTASCII_USTRINGPARAM("StartShape") ), - msEndShape( RTL_CONSTASCII_USTRINGPARAM("EndShape") ), - msOnClick( RTL_CONSTASCII_USTRINGPARAM("OnClick") ), - msEventType( RTL_CONSTASCII_USTRINGPARAM("EventType") ), - msPresentation( RTL_CONSTASCII_USTRINGPARAM("Presentation") ), - msMacroName( RTL_CONSTASCII_USTRINGPARAM("MacroName") ), - msScript( RTL_CONSTASCII_USTRINGPARAM("Script") ), - msLibrary( RTL_CONSTASCII_USTRINGPARAM("Library") ), - msClickAction( RTL_CONSTASCII_USTRINGPARAM("ClickAction") ), - msBookmark( RTL_CONSTASCII_USTRINGPARAM("Bookmark") ), - msEffect( RTL_CONSTASCII_USTRINGPARAM("Effect") ), - msPlayFull( RTL_CONSTASCII_USTRINGPARAM("PlayFull") ), - msVerb( RTL_CONSTASCII_USTRINGPARAM("Verb") ), - msSoundURL( RTL_CONSTASCII_USTRINGPARAM("SoundURL") ), - msSpeed( RTL_CONSTASCII_USTRINGPARAM("Speed") ), - msStarBasic( RTL_CONSTASCII_USTRINGPARAM("StarBasic") ) + msZIndex( "ZOrder" ), + msPrintable( "Printable" ), + msVisible( "Visible" ), + msEmptyPres( "IsEmptyPresentationObject" ), + msModel( "Model" ), + msStartShape( "StartShape" ), + msEndShape( "EndShape" ), + msOnClick( "OnClick" ), + msEventType( "EventType" ), + msPresentation( "Presentation" ), + msMacroName( "MacroName" ), + msScript( "Script" ), + msLibrary( "Library" ), + msClickAction( "ClickAction" ), + msBookmark( "Bookmark" ), + msEffect( "Effect" ), + msPlayFull( "PlayFull" ), + msVerb( "Verb" ), + msSoundURL( "SoundURL" ), + msSpeed( "Speed" ), + msStarBasic( "StarBasic" ) { // construct PropertyHandlerFactory mxSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(), rExp ); @@ -119,14 +119,14 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, mrExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID, - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), + OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetPropertySetMapper(), - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX))); + OUString(XML_STYLE_FAMILY_SD_GRAPHICS_PREFIX)); mrExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_SD_PRESENTATION_ID, - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_NAME)), + OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME), GetPropertySetMapper(), - OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX))); + OUString(XML_STYLE_FAMILY_SD_PRESENTATION_PREFIX)); maCurrentInfo = maShapeInfos.end(); @@ -156,9 +156,9 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement if( xSet.is() ) { rtl::OUString aEngine; - xSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeEngine" ) ) ) >>= aEngine; + xSet->getPropertyValue( OUString( "CustomShapeEngine" ) ) >>= aEngine; if ( aEngine.isEmpty() ) - aEngine = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.EnhancedCustomShapeEngine" ) ); + aEngine = OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" ); uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -166,10 +166,10 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement { uno::Sequence< uno::Any > aArgument( 1 ); uno::Sequence< beans::PropertyValue > aPropValues( 2 ); - aPropValues[ 0 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CustomShape" )); + aPropValues[ 0 ].Name = rtl::OUString( "CustomShape" ); aPropValues[ 0 ].Value <<= xShape; sal_Bool bForceGroupWithText = sal_True; - aPropValues[ 1 ].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ForceGroupWithText" )); + aPropValues[ 1 ].Name = rtl::OUString( "ForceGroupWithText" ); aPropValues[ 1 ].Value <<= bForceGroupWithText; aArgument[ 0 ] <<= aPropValues; uno::Reference< uno::XInterface > xInterface( xFactory->createInstanceWithArguments( aEngine, aArgument ) ); @@ -279,8 +279,8 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( bObjSupportsStyle ) { - if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName( OUString(RTL_CONSTASCII_USTRINGPARAM("Style"))) ) - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Style"))) >>= xStyle; + if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName( OUString("Style")) ) + xPropSet->getPropertyValue(OUString("Style")) >>= xStyle; if(xStyle.is()) { @@ -292,7 +292,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if(xStylePropSet.is()) { OUString aFamilyName; - xStylePropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Family"))) >>= aFamilyName; + xStylePropSet->getPropertyValue(OUString("Family")) >>= aFamilyName; if( !aFamilyName.isEmpty() && aFamilyName != "graphics" ) aShapeInfo.mnFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID; } @@ -394,7 +394,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap // * defaults for style properties are not written, but we need to write the "left", // because we need to distiguish this "left" from the case where not align attribute // is present which means "void" - static const ::rtl::OUString s_sParaAdjustPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" ) ); + static const ::rtl::OUString s_sParaAdjustPropertyName( "ParaAdjust" ); if ( xPropSetInfo->hasPropertyByName( s_sParaAdjustPropertyName ) && ( beans::PropertyState_DEFAULT_VALUE == xPropState->getPropertyState( s_sParaAdjustPropertyName ) ) ) @@ -540,7 +540,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::E_DRAW) ) try { presentation::ClickAction eAction = presentation::ClickAction_NONE; - xSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("OnClick"))) >>= eAction; + xSet->getPropertyValue(OUString("OnClick")) >>= eAction; if( (eAction == presentation::ClickAction_DOCUMENT) || (eAction == presentation::ClickAction_BOOKMARK) ) @@ -676,7 +676,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); OUString aLayerName; - xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LayerName" )) ) >>= aLayerName; + xProps->getPropertyValue( OUString( "LayerName" ) ) >>= aLayerName; mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName ); } @@ -1089,7 +1089,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) { rtl::OUString sCLSID; - if(xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) >>= sCLSID) + if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID())) { @@ -1144,7 +1144,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) try { rtl::OUString sCLSID; - if(xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) >>= sCLSID) + if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) { if( sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) || sCLSID.equals(rtl::OUString( SvGlobalName( BF_SO3_SC_CLASSID ).GetHexName())) ) @@ -1250,13 +1250,13 @@ void XMLShapeExport::ExportGraphicDefaults() { try { - uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( OUString("com.sun.star.drawing.Defaults" ) ), uno::UNO_QUERY ); if( xDefaults.is() ) { - aStEx.exportDefaultStyle( xDefaults, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper ); + aStEx.exportDefaultStyle( xDefaults, OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper ); // write graphic family styles - aStEx.exportStyleFamily("graphics", OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), xPropertySetMapper, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID); + aStEx.exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, sal_False, XML_STYLE_FAMILY_SD_GRAPHICS_ID); } } catch(const lang::ServiceNotRegisteredException&) diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 0e6c2a12511b..43d9711458f0 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -107,13 +107,13 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& uno::Any aAny; if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 && xPropSet->getPropertySetInfo()->hasPropertyByName( - OUString(RTL_CONSTASCII_USTRINGPARAM("TransformationInHoriL2R"))) ) + OUString("TransformationInHoriL2R")) ) { - aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("TransformationInHoriL2R"))); + aAny = xPropSet->getPropertyValue(OUString("TransformationInHoriL2R")); } else { - aAny = xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation"))); + aAny = xPropSet->getPropertyValue(OUString("Transformation")); } drawing::HomogenMatrix3 aMatrix; aAny >>= aMatrix; @@ -252,17 +252,17 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< sal_Bool bTemp = false; // is empty pes shape? - if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject")))) + if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsEmptyPresentationObject"))) { - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject"))) >>= bIsEmpty; + xPropSet->getPropertyValue(OUString("IsEmptyPresentationObject")) >>= bIsEmpty; if( bIsEmpty ) mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TRUE); } // is user-transformed? - if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent")))) + if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsPlaceholderDependent"))) { - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent"))) >>= bTemp; + xPropSet->getPropertyValue(OUString("IsPlaceholderDependent")) >>= bTemp; if(!bTemp) mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TRUE); } @@ -423,7 +423,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) ); + XML_NAMESPACE_DOM, OUString( "click" ) ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction ); @@ -513,11 +513,10 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OOO, - OUString( RTL_CONSTASCII_USTRINGPARAM( - "starbasic" ) ) ) ); + OUString( "starbasic" ) ) ); OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) ); + XML_NAMESPACE_DOM, OUString( "click" ) ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); if( nFound & FOUND_LIBRARY ) @@ -552,7 +551,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) ); OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( RTL_CONSTASCII_USTRINGPARAM( "click" ) ) ) ); + XML_NAMESPACE_DOM, OUString( "click" ) ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro ); @@ -573,8 +572,8 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape OUString aDescription; uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) >>= aTitle; - xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Description" )) ) >>= aDescription; + xProps->getPropertyValue( OUString( "Title" ) ) >>= aTitle; + xProps->getPropertyValue( OUString( "Description" ) ) >>= aDescription; if(!aTitle.isEmpty()) { @@ -709,7 +708,7 @@ void XMLShapeExport::ImpExportTextBoxShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius"))) >>= nCornerRadius; + xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -745,7 +744,7 @@ void XMLShapeExport::ImpExportRectangleShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius"))) >>= nCornerRadius; + xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -797,7 +796,7 @@ void XMLShapeExport::ImpExportLineShape( awt::Point aBasePosition(FRound(aTRTranslate.getX()), FRound(aTRTranslate.getY())); // get the two points - uno::Any aAny(xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry")))); + uno::Any aAny(xPropSet->getPropertyValue(OUString("Geometry"))); drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue(); if(pSourcePolyPolygon) @@ -898,14 +897,14 @@ void XMLShapeExport::ImpExportEllipseShape( ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); drawing::CircleKind eKind = drawing::CircleKind_FULL; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleKind")) ) >>= eKind; + xPropSet->getPropertyValue( OUString("CircleKind") ) >>= eKind; if( eKind != drawing::CircleKind_FULL ) { OUStringBuffer sStringBuffer; sal_Int32 nStartAngle = 0; sal_Int32 nEndAngle = 0; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleStartAngle")) ) >>= nStartAngle; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleEndAngle")) ) >>= nEndAngle; + xPropSet->getPropertyValue( OUString("CircleStartAngle") ) >>= nStartAngle; + xPropSet->getPropertyValue( OUString("CircleEndAngle") ) >>= nEndAngle; const double dStartAngle = nStartAngle / 100.0; const double dEndAngle = nEndAngle / 100.0; @@ -987,7 +986,7 @@ void XMLShapeExport::ImpExportPolygonShape( if(bBezier) { // get PolygonBezier - uno::Any aAny( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry"))) ); + uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) ); drawing::PolyPolygonBezierCoords* pSourcePolyPolygon = (drawing::PolyPolygonBezierCoords*)aAny.getValue(); @@ -1030,7 +1029,7 @@ void XMLShapeExport::ImpExportPolygonShape( else { // get non-bezier polygon - uno::Any aAny( xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry"))) ); + uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) ); drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue(); if(pSourcePolyPolygon && pSourcePolyPolygon->getLength()) @@ -1129,11 +1128,11 @@ void XMLShapeExport::ImpExportGraphicObjectShape( OUString aStreamURL; OUString aStr; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL"))) >>= aStreamURL; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL"))) >>= sImageURL; + xPropSet->getPropertyValue( OUString("GraphicStreamURL")) >>= aStreamURL; + xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL; OUString aResolveURL( sImageURL ); - const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.Package:") ); + const rtl::OUString sPackageURL( "vnd.sun.star.Package:" ); // sj: trying to preserve the filename if ( aStreamURL.match( sPackageURL, 0 ) ) @@ -1147,7 +1146,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( sRequestedName = sRequestedName.copy( 0, nLastIndex ); if ( !sRequestedName.isEmpty() ) { - aResolveURL = aResolveURL.concat( OUString(RTL_CONSTASCII_USTRINGPARAM("?requestedName="))); + aResolveURL = aResolveURL.concat( OUString("?requestedName=")); aResolveURL = aResolveURL.concat( sRequestedName ); } } @@ -1159,14 +1158,14 @@ void XMLShapeExport::ImpExportGraphicObjectShape( { if( aStr[ 0 ] == '#' ) { - aStreamURL = OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" )); + aStreamURL = OUString( "vnd.sun.star.Package:" ); aStreamURL = aStreamURL.concat( aStr.copy( 1, aStr.getLength() - 1 ) ); } // update stream URL for load on demand uno::Any aAny; aAny <<= aStreamURL; - xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL")), aAny ); + xPropSet->setPropertyValue( OUString("GraphicStreamURL"), aAny ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); @@ -1258,7 +1257,7 @@ void XMLShapeExport::ImpExportConnectorShape( // export connection kind drawing::ConnectorType eType = drawing::ConnectorType_STANDARD; - uno::Any aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeKind"))); + uno::Any aAny = xProps->getPropertyValue(OUString("EdgeKind")); aAny >>= eType; if( eType != drawing::ConnectorType_STANDARD ) @@ -1271,11 +1270,11 @@ void XMLShapeExport::ImpExportConnectorShape( // export line skew sal_Int32 nDelta1 = 0, nDelta2 = 0, nDelta3 = 0; - aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine1Delta"))); + aAny = xProps->getPropertyValue(OUString("EdgeLine1Delta")); aAny >>= nDelta1; - aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine2Delta"))); + aAny = xProps->getPropertyValue(OUString("EdgeLine2Delta")); aAny >>= nDelta2; - aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine3Delta"))); + aAny = xProps->getPropertyValue(OUString("EdgeLine3Delta")); aAny >>= nDelta3; if( nDelta1 != 0 || nDelta2 != 0 || nDelta3 != 0 ) @@ -1318,17 +1317,17 @@ void XMLShapeExport::ImpExportConnectorShape( */ if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 && xProps->getPropertySetInfo()->hasPropertyByName( - OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) && + OUString("StartPositionInHoriL2R")) && xProps->getPropertySetInfo()->hasPropertyByName( - OUString(RTL_CONSTASCII_USTRINGPARAM("EndPositionInHoriL2R"))) ) + OUString("EndPositionInHoriL2R")) ) { - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) >>= aStart; - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPositionInHoriL2R"))) >>= aEnd; + xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart; + xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd; } else { - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart; - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd; + xProps->getPropertyValue(OUString("StartPosition")) >>= aStart; + xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd; } if( pRefPoint ) @@ -1380,13 +1379,13 @@ void XMLShapeExport::ImpExportConnectorShape( uno::Reference< uno::XInterface > xRefE; // export start connection - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartShape") ) ) >>= xRefS; + xProps->getPropertyValue(OUString("StartShape" ) ) >>= xRefS; if( xRefS.is() ) { const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefS ); mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, rShapeId); - aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartGluePointIndex")) ); + aAny = xProps->getPropertyValue(OUString("StartGluePointIndex") ); sal_Int32 nGluePointId = 0; if( aAny >>= nGluePointId ) { @@ -1398,13 +1397,13 @@ void XMLShapeExport::ImpExportConnectorShape( } // export end connection - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndShape")) ) >>= xRefE; + xProps->getPropertyValue(OUString("EndShape") ) >>= xRefE; if( xRefE.is() ) { const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefE ); mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, rShapeId); - aAny = xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndGluePointIndex")) ); + aAny = xProps->getPropertyValue(OUString("EndGluePointIndex") ); sal_Int32 nGluePointId = 0; if( aAny >>= nGluePointId ) { @@ -1415,7 +1414,7 @@ void XMLShapeExport::ImpExportConnectorShape( } } - if( xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ) ) >>= aAny ) + if( xProps->getPropertyValue( OUString( "PolyPolygonBezier" ) ) >>= aAny ) { // get PolygonBezier drawing::PolyPolygonBezierCoords* pSourcePolyPolygon = @@ -1492,17 +1491,17 @@ void XMLShapeExport::ImpExportMeasureShape( */ if ( ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 && xProps->getPropertySetInfo()->hasPropertyByName( - OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) && + OUString("StartPositionInHoriL2R")) && xProps->getPropertySetInfo()->hasPropertyByName( - OUString(RTL_CONSTASCII_USTRINGPARAM("EndPositionInHoriL2R"))) ) + OUString("EndPositionInHoriL2R")) ) { - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPositionInHoriL2R"))) >>= aStart; - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPositionInHoriL2R"))) >>= aEnd; + xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart; + xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd; } else { - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition"))) >>= aStart; - xProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition"))) >>= aEnd; + xProps->getPropertyValue(OUString("StartPosition")) >>= aStart; + xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd; } if( pRefPoint ) @@ -1606,7 +1605,7 @@ void XMLShapeExport::ImpExportOLE2Shape( OUString sClassId; OUString sURL; sal_Bool bInternal = false; - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("IsInternal"))) >>= bInternal; + xPropSet->getPropertyValue(OUString("IsInternal")) >>= bInternal; if( !bIsEmptyPresObj ) { @@ -1615,21 +1614,21 @@ void XMLShapeExport::ImpExportOLE2Shape( { // OOo internal links have no storage persistance, URL is stored in the XML file // the result LinkURL is empty in case the object is not a link - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "LinkURL" )) ) >>= sURL; + xPropSet->getPropertyValue( OUString( "LinkURL" ) ) >>= sURL; } - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ) ) >>= sPersistName; + xPropSet->getPropertyValue( OUString( "PersistName" ) ) >>= sPersistName; if ( sURL.isEmpty() ) { if( !sPersistName.isEmpty() ) { - sURL = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" ) ); + sURL = OUString( "vnd.sun.star.EmbeddedObject:" ); sURL += sPersistName; } } if( !bInternal ) - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) >>= sClassId; + xPropSet->getPropertyValue(OUString("CLSID")) >>= sClassId; if( !sClassId.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId ); @@ -1671,7 +1670,7 @@ void XMLShapeExport::ImpExportOLE2Shape( { // embedded XML uno::Reference< lang::XComponent > xComp; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ) >>= xComp; + xPropSet->getPropertyValue( OUString("Model" ) ) >>= xComp; DBG_ASSERT( xComp.is(), "no xModel for own OLE format" ); mrExport.ExportEmbeddedOwnObject( xComp ); } @@ -1683,14 +1682,14 @@ void XMLShapeExport::ImpExportOLE2Shape( ::rtl::OUString sURLRequest( sURL ); if ( ( mrExport.getExportFlags() & EXPORT_OASIS ) == 0 ) - sURLRequest += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?oasis=false" ) ); + sURLRequest += ::rtl::OUString( "?oasis=false" ); mrExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } } if( !bIsEmptyPresObj ) { - OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ); + OUString sURL( "vnd.sun.star.GraphicObject:" ); sURL += sPersistName; if( !bExportEmbedded ) { @@ -1728,7 +1727,7 @@ void XMLShapeExport::ImpExportPageShape( // export page number used for this page uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - const OUString aPageNumberStr(RTL_CONSTASCII_USTRINGPARAM("PageNumber")); + const OUString aPageNumberStr("PageNumber"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr)) { sal_Int32 nPageNumber = 0; @@ -1766,7 +1765,7 @@ void XMLShapeExport::ImpExportCaptionShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius"))) >>= nCornerRadius; + xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -1776,7 +1775,7 @@ void XMLShapeExport::ImpExportCaptionShape( } awt::Point aCaptionPoint; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" ) ) ) >>= aCaptionPoint; + xPropSet->getPropertyValue( OUString( "CaptionPoint" ) ) >>= aCaptionPoint; mrExport.GetMM100UnitConverter().convertMeasureToXML(msBuffer, aCaptionPoint.X); @@ -1822,14 +1821,14 @@ void XMLShapeExport::ImpExportFrameShape( // export frame url OUString aStr; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameURL" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "FrameURL" ) ) >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export name - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameName" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "FrameName" ) ) >>= aStr; if( !aStr.isEmpty() ) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, aStr ); @@ -1858,24 +1857,24 @@ void XMLShapeExport::ImpExportAppletShape( // export frame url OUString aStr; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCodeBase" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "AppletCodeBase" ) ) >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export draw:applet-name - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletName" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "AppletName" ) ) >>= aStr; if( !aStr.isEmpty() ) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); // export draw:code - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCode" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "AppletCode" ) ) >>= aStr; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); // export draw:may-script sal_Bool bIsScript = false; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletIsScript" ) ) ) >>= bIsScript; + xPropSet->getPropertyValue( OUString( "AppletIsScript" ) ) >>= bIsScript; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE ); { @@ -1884,7 +1883,7 @@ void XMLShapeExport::ImpExportAppletShape( // export parameters uno::Sequence< beans::PropertyValue > aCommands; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCommands" ) ) ) >>= aCommands; + xPropSet->getPropertyValue( OUString( "AppletCommands" ) ) >>= aCommands; const sal_Int32 nCount = aCommands.getLength(); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -1915,7 +1914,7 @@ void XMLShapeExport::ImpExportPluginShape( // export plugin url OUString aStr; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginURL" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "PluginURL" ) ) >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); @@ -1923,7 +1922,7 @@ void XMLShapeExport::ImpExportPluginShape( // export mime-type - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginMimeType" ) ) ) >>= aStr; + xPropSet->getPropertyValue( OUString( "PluginMimeType" ) ) >>= aStr; if(!aStr.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); @@ -1933,7 +1932,7 @@ void XMLShapeExport::ImpExportPluginShape( // export parameters uno::Sequence< beans::PropertyValue > aCommands; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginCommands" ) ) ) >>= aCommands; + xPropSet->getPropertyValue( OUString( "PluginCommands" ) ) >>= aCommands; const sal_Int32 nCount = aCommands.getLength(); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -1963,19 +1962,19 @@ static void lcl_CopyStream( { SAL_WARN("xmloff", "no output stream"); throw uno::Exception( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("no output stream")),0); + ::rtl::OUString("no output stream"),0); } uno::Reference< beans::XPropertySet > const xStreamProps(xStream, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), - uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + ::rtl::OUString("MediaType"), + uno::makeAny(::rtl::OUString( //FIXME how to detect real media type? //but currently xmloff has this one hardcoded anyway... - "application/vnd.sun.star.media")))); + "application/vnd.sun.star.media"))); xStreamProps->setPropertyValue( // turn off compression - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")), + ::rtl::OUString("Compressed"), uno::makeAny(sal_False)); } ::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream); @@ -2000,7 +1999,7 @@ lcl_StoreMediaAndGetURL(SvXMLExport & rExport, rExport.GetTargetStorage(), uno::UNO_QUERY_THROW); uno::Reference<io::XInputStream> xInStream; xPropSet->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrivateStream"))) + ::rtl::OUString("PrivateStream")) >>= xInStream; if (!xInStream.is()) @@ -2048,7 +2047,7 @@ void XMLShapeExport::ImpExportMediaShape( // export media url OUString aMediaURL; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ) ) >>= aMediaURL; + xPropSet->getPropertyValue( OUString( "MediaURL" ) ) >>= aMediaURL; OUString const persistentURL = lcl_StoreMediaAndGetURL(GetExport(), xPropSet, aMediaURL); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, persistentURL ); @@ -2057,49 +2056,49 @@ void XMLShapeExport::ImpExportMediaShape( mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export mime-type - mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.media" ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, OUString( "application/vnd.sun.star.media" ) ); // write plugin SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), sal_True); // export parameters - const OUString aFalseStr( RTL_CONSTASCII_USTRINGPARAM( "false" ) ), aTrueStr( RTL_CONSTASCII_USTRINGPARAM( "true" ) ); + const OUString aFalseStr( "false" ), aTrueStr( "true" ); sal_Bool bLoop = false; - const OUString aLoopStr( RTL_CONSTASCII_USTRINGPARAM( "Loop" ) ); + const OUString aLoopStr( "Loop" ); xPropSet->getPropertyValue( aLoopStr ) >>= bLoop; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); sal_Bool bMute = false; - const OUString aMuteStr( RTL_CONSTASCII_USTRINGPARAM( "Mute" ) ); + const OUString aMuteStr( "Mute" ); xPropSet->getPropertyValue( aMuteStr ) >>= bMute; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bMute ? aTrueStr : aFalseStr ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); sal_Int16 nVolumeDB = 0; - const OUString aVolumeDBStr( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" ) ); - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" ) ) ) >>= nVolumeDB; + const OUString aVolumeDBStr( "VolumeDB" ); + xPropSet->getPropertyValue( OUString( "VolumeDB" ) ) >>= nVolumeDB; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::valueOf( static_cast< sal_Int32 >( nVolumeDB ) ) ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); media::ZoomLevel eZoom; - const OUString aZoomStr( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ) ); + const OUString aZoomStr( "Zoom" ); OUString aZoomValue; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ) ) ) >>= eZoom; + xPropSet->getPropertyValue( OUString( "Zoom" ) ) >>= eZoom; switch( eZoom ) { - case( media::ZoomLevel_ZOOM_1_TO_4 ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "25%" ) ); break; - case( media::ZoomLevel_ZOOM_1_TO_2 ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "50%" ) ); break; - case( media::ZoomLevel_ORIGINAL ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "100%" ) ); break; - case( media::ZoomLevel_ZOOM_2_TO_1 ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "200%" ) ); break; - case( media::ZoomLevel_ZOOM_4_TO_1 ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "400%" ) ); break; - case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "fit" ) ); break; - case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "fixedfit" ) ); break; - case( media::ZoomLevel_FULLSCREEN ): aZoomValue = OUString( RTL_CONSTASCII_USTRINGPARAM( "fullscreen" ) ); break; + case( media::ZoomLevel_ZOOM_1_TO_4 ): aZoomValue = OUString( "25%" ); break; + case( media::ZoomLevel_ZOOM_1_TO_2 ): aZoomValue = OUString( "50%" ); break; + case( media::ZoomLevel_ORIGINAL ): aZoomValue = OUString( "100%" ); break; + case( media::ZoomLevel_ZOOM_2_TO_1 ): aZoomValue = OUString( "200%" ); break; + case( media::ZoomLevel_ZOOM_4_TO_1 ): aZoomValue = OUString( "400%" ); break; + case( media::ZoomLevel_FIT_TO_WINDOW ): aZoomValue = OUString( "fit" ); break; + case( media::ZoomLevel_FIT_TO_WINDOW_FIXED_ASPECT ): aZoomValue = OUString( "fixedfit" ); break; + case( media::ZoomLevel_FULLSCREEN ): aZoomValue = OUString( "fullscreen" ); break; default: break; diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 80a61ac33a27..050409667707 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -417,14 +417,14 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& { case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotate (" )); + aNewString += OUString( "rotate (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ2D_SCALE : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" )); + aNewString += OUString( "scale (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX()); aNewString += aEmptySpace; Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY()); @@ -433,7 +433,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& } case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" )); + aNewString += OUString( "translate (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true); aNewString += aEmptySpace; Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true); @@ -442,21 +442,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& } case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewX (" )); + aNewString += OUString( "skewX (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "skewY (" )); + aNewString += OUString( "skewY (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" )); + aNewString += OUString( "matrix (" ); // a Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0)); @@ -516,12 +516,12 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength()); const sal_Int32 nLen(aStr.getLength()); - const OUString aString_rotate(RTL_CONSTASCII_USTRINGPARAM( "rotate" )); - const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" )); - const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" )); - const OUString aString_skewX(RTL_CONSTASCII_USTRINGPARAM( "skewX" )); - const OUString aString_skewY(RTL_CONSTASCII_USTRINGPARAM( "skewY" )); - const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" )); + const OUString aString_rotate( "rotate" ); + const OUString aString_scale( "scale" ); + const OUString aString_translate( "translate" ); + const OUString aString_skewX( "skewX" ); + const OUString aString_skewY( "skewY" ); + const OUString aString_matrix( "matrix" ); sal_Int32 nPos(0); @@ -856,28 +856,28 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& { case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatex (" )); + aNewString += OUString( "rotatex (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatey (" )); + aNewString += OUString( "rotatey (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "rotatez (" )); + aNewString += OUString( "rotatez (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ); aNewString += aClosingBrace; break; } case IMP_SDXMLEXP_TRANSOBJ3D_SCALE : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "scale (" )); + aNewString += OUString( "scale (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX()); aNewString += aEmptySpace; Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY()); @@ -888,7 +888,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& } case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "translate (" )); + aNewString += OUString( "translate (" ); Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true); aNewString += aEmptySpace; Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true); @@ -899,7 +899,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& } case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX : { - aNewString += OUString(RTL_CONSTASCII_USTRINGPARAM( "matrix (" )); + aNewString += OUString( "matrix (" ); // a Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0)); @@ -990,12 +990,12 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver const OUString aStr(msString.getStr(), (sal_uInt16)msString.getLength()); const sal_Int32 nLen(aStr.getLength()); - const OUString aString_rotatex(RTL_CONSTASCII_USTRINGPARAM( "rotatex" )); - const OUString aString_rotatey(RTL_CONSTASCII_USTRINGPARAM( "rotatey" )); - const OUString aString_rotatez(RTL_CONSTASCII_USTRINGPARAM( "rotatez" )); - const OUString aString_scale(RTL_CONSTASCII_USTRINGPARAM( "scale" )); - const OUString aString_translate(RTL_CONSTASCII_USTRINGPARAM( "translate" )); - const OUString aString_matrix(RTL_CONSTASCII_USTRINGPARAM( "matrix" )); + const OUString aString_rotatex( "rotatex" ); + const OUString aString_rotatey( "rotatey" ); + const OUString aString_rotatez( "rotatez" ); + const OUString aString_scale( "scale" ); + const OUString aString_translate( "translate" ); + const OUString aString_matrix( "matrix" ); sal_Int32 nPos(0); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 5ce4c1167c46..03f23247f2f0 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -375,23 +375,23 @@ void SdXMLShapeContext::EndElement() { uno::Reference< beans::XPropertySet > xProp( mxShape, uno::UNO_QUERY ); - rtl::OUString sLink( RTL_CONSTASCII_USTRINGPARAM( "Hyperlink" ) ); + rtl::OUString sLink( "Hyperlink" ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) ) xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) ); Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW ); - const OUString sBookmark( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) ); + const OUString sBookmark( "Bookmark" ); if( xEventsSupplier.is() ) { - const OUString sEventType( RTL_CONSTASCII_USTRINGPARAM( "EventType" ) ); - const OUString sClickAction( RTL_CONSTASCII_USTRINGPARAM( "ClickAction" ) ); + const OUString sEventType( "EventType" ); + const OUString sClickAction( "ClickAction" ); Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aProperties( 3 ); aProperties[0].Name = sEventType; aProperties[0].Handle = -1; - aProperties[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Presentation") ); + aProperties[0].Value <<= OUString( "Presentation" ); aProperties[0].State = beans::PropertyState_DIRECT_VALUE; aProperties[1].Name = sClickAction; @@ -404,7 +404,7 @@ void SdXMLShapeContext::EndElement() aProperties[2].Value <<= msHyperlink; aProperties[2].State = beans::PropertyState_DIRECT_VALUE; - const OUString sAPIEventName( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ); + const OUString sAPIEventName( "OnClick" ); xEvents->replaceByName( sAPIEventName, Any( aProperties ) ); } else @@ -412,7 +412,7 @@ void SdXMLShapeContext::EndElement() // in draw use the Bookmark property Reference< beans::XPropertySet > xSet( mxShape, UNO_QUERY_THROW ); xSet->setPropertyValue( sBookmark, Any( msHyperlink ) ); - xSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "OnClick" ) ), Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); + xSet->setPropertyValue( OUString( "OnClick" ), Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); } } catch(const Exception&) @@ -454,10 +454,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW ); if( !mbVisible ) - xSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ), uno::Any( sal_False ) ); + xSet->setPropertyValue( rtl::OUString( "Visible" ), uno::Any( sal_False ) ); if( !mbPrintable ) - xSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Printable" ) ), uno::Any( sal_False ) ); + xSet->setPropertyValue( rtl::OUString( "Printable" ), uno::Any( sal_False ) ); } catch(const Exception&) { @@ -511,7 +511,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 && uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() ) { - xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"))), uno::UNO_QUERY); + xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString("com.sun.star.drawing.temporaryForXMLImportOLE2Shape")), uno::UNO_QUERY); } else { @@ -592,7 +592,7 @@ void SdXMLShapeContext::SetTransformation() aAny <<= aMatrix; xPropSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Transformation")), aAny); + OUString("Transformation"), aAny); } } } @@ -676,7 +676,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) else { // get graphics familie - xFamilies->getByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) ) ) >>= xFamily; + xFamilies->getByName( OUString( "graphics" ) ) >>= xFamily; aStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_SD_GRAPHICS_ID, aStyleName ); @@ -700,7 +700,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) // set style on object uno::Any aAny; aAny <<= xStyle; - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Style")), aAny); + xPropSet->setPropertyValue(OUString("Style"), aAny); } catch(const uno::Exception&) { @@ -754,7 +754,7 @@ void SdXMLShapeContext::SetLayer() uno::Any aAny; aAny <<= maLayerName; - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayerName")), aAny); + xPropSet->setPropertyValue(OUString("LayerName"), aAny); return; } } @@ -775,7 +775,7 @@ void SdXMLShapeContext::SetThumbnail() if( !xPropSet.is() ) return; - const OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("ThumbnailGraphicURL")); + const OUString sProperty("ThumbnailGraphicURL"); uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( sProperty ) ) @@ -993,7 +993,7 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib { try { - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius")), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -1115,7 +1115,7 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib aAny <<= aPolyPoly; xPropSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry")), aAny); + OUString("Geometry"), aAny); } // set sizes for transformation @@ -1252,13 +1252,13 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { uno::Any aAny; aAny <<= (drawing::CircleKind)meKind; - xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleKind")), aAny ); + xPropSet->setPropertyValue( OUString("CircleKind"), aAny ); aAny <<= mnStartAngle; - xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleStartAngle")), aAny ); + xPropSet->setPropertyValue( OUString("CircleStartAngle"), aAny ); aAny <<= mnEndAngle; - xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CircleEndAngle")), aAny ); + xPropSet->setPropertyValue( OUString("CircleEndAngle"), aAny ); } } @@ -1348,7 +1348,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt uno::Any aAny; aAny <<= aPoints.GetPointSequenceSequence(); xPropSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry")), aAny); + OUString("Geometry"), aAny); } } @@ -1474,13 +1474,13 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib aAny <<= aSourcePolyPolygon; xPropSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry")), aAny); + OUString("Geometry"), aAny); } else { aAny <<= aPoints.GetPointSequenceSequence(); xPropSet->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("Geometry")), aAny); + OUString("Geometry"), aAny); } } } @@ -1619,11 +1619,11 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -1655,7 +1655,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { try { - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius")), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -1926,22 +1926,22 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA { uno::Any aAny; aAny <<= maStart; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")), aAny); + xProps->setPropertyValue(OUString("StartPosition"), aAny); aAny <<= maEnd; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")), aAny ); + xProps->setPropertyValue(OUString("EndPosition"), aAny ); aAny <<= (drawing::ConnectorType)mnType; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeKind")), aAny ); + xProps->setPropertyValue(OUString("EdgeKind"), aAny ); aAny <<= mnDelta1; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine1Delta")), aAny ); + xProps->setPropertyValue(OUString("EdgeLine1Delta"), aAny ); aAny <<= mnDelta2; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine2Delta")), aAny ); + xProps->setPropertyValue(OUString("EdgeLine2Delta"), aAny ); aAny <<= mnDelta3; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EdgeLine3Delta")), aAny ); + xProps->setPropertyValue(OUString("EdgeLine3Delta"), aAny ); } SetStyle(); SetLayer(); @@ -1972,7 +1972,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA if ( bApplySVGD ) { - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygonBezier") ), maPath ); + xProps->setPropertyValue( OUString("PolyPolygonBezier" ), maPath ); } } @@ -2059,17 +2059,17 @@ void SdXMLMeasureShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { uno::Any aAny; aAny <<= maStart; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("StartPosition")), aAny); + xProps->setPropertyValue(OUString("StartPosition"), aAny); aAny <<= maEnd; - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("EndPosition")), aAny ); + xProps->setPropertyValue(OUString("EndPosition"), aAny ); } // delete pre created fields uno::Reference< text::XText > xText( mxShape, uno::UNO_QUERY ); if( xText.is() ) { - const OUString aEmpty( RTL_CONSTASCII_USTRINGPARAM( " " ) ); + const OUString aEmpty( " " ); xText->setString( aEmpty ); } @@ -2153,7 +2153,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib GetImport().GetShapeImport()->IsPresentationShapesSupported(); uno::Reference< lang::XServiceInfo > xInfo( mxShapes, uno::UNO_QUERY ); - const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutMasterPage")) ); + const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService( OUString( "com.sun.star.presentation.HandoutMasterPage") ); if( bIsOnHandoutPage ) { @@ -2188,7 +2188,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib if(xPropSet.is()) { uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - const OUString aPageNumberStr(RTL_CONSTASCII_USTRINGPARAM("PageNumber")); + const OUString aPageNumberStr("PageNumber"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(aPageNumberStr)) xPropSet->setPropertyValue(aPageNumberStr, uno::makeAny( mnPageNumber )); } @@ -2243,20 +2243,20 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt sal_Bool bIsAutoGrowWidth = sal_False; if ( xProps.is() ) { - uno::Any aAny( xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowWidth") ) ) ); + uno::Any aAny( xProps->getPropertyValue( OUString("TextAutoGrowWidth" ) ) ); aAny >>= bIsAutoGrowWidth; if ( bIsAutoGrowWidth ) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowWidth")), uno::makeAny( sal_False ) ); + xProps->setPropertyValue( OUString("TextAutoGrowWidth"), uno::makeAny( sal_False ) ); } // set pos, size, shear and rotate SetTransformation(); if( xProps.is() ) - xProps->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CaptionPoint")), uno::makeAny( maCaptionPoint ) ); + xProps->setPropertyValue(OUString("CaptionPoint"), uno::makeAny( maCaptionPoint ) ); if ( bIsAutoGrowWidth ) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TextAutoGrowWidth")), uno::makeAny( sal_True ) ); + xProps->setPropertyValue( OUString("TextAutoGrowWidth"), uno::makeAny( sal_True ) ); if(mnRadius) { @@ -2265,7 +2265,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { try { - xPropSet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("CornerRadius")), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -2370,16 +2370,16 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: sal_Int32 nUPD, nBuildId; if( GetImport().getBuildIds( nUPD, nBuildId ) && (nUPD == 645) ) try { - xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FillStyle")), Any( FillStyle_NONE ) ); - xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), Any( LineStyle_NONE ) ); + xPropset->setPropertyValue( OUString("FillStyle"), Any( FillStyle_NONE ) ); + xPropset->setPropertyValue( OUString("LineStyle"), Any( LineStyle_NONE ) ); } catch(const Exception&) { } uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() ); - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( mbIsPlaceholder ) ); + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xPropset->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( mbIsPlaceholder ) ); if( !mbIsPlaceholder ) { @@ -2389,8 +2389,8 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: aAny <<= GetImport().ResolveGraphicObjectURL( maURL, GetImport().isGraphicLoadOnDemandSupported() ); try { - xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL") ), aAny ); - xPropset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL") ), aAny ); + xPropset->setPropertyValue( OUString("GraphicURL" ), aAny ); + xPropset->setPropertyValue( OUString("GraphicStreamURL" ), aAny ); } catch (const lang::IllegalArgumentException&) { @@ -2407,8 +2407,8 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -2433,8 +2433,8 @@ void SdXMLGraphicObjectShapeContext::EndElement() if(xProps.is()) { const uno::Any aAny( uno::makeAny( sURL ) ); - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL") ), aAny ); - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicStreamURL") ), aAny ); + xProps->setPropertyValue( OUString("GraphicURL" ), aAny ); + xProps->setPropertyValue( OUString("GraphicStreamURL" ), aAny ); } } catch (const lang::IllegalArgumentException&) @@ -2527,17 +2527,17 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri if(xProps.is()) { uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); uno::Any aAny; - const OUString aCLSID( RTL_CONSTASCII_USTRINGPARAM("12DCAE26-281F-416F-a234-c3086127382e")); + const OUString aCLSID( "12DCAE26-281F-416F-a234-c3086127382e"); aAny <<= aCLSID; - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID") ), aAny ); + xProps->setPropertyValue( OUString("CLSID" ), aAny ); - aAny = xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ); + aAny = xProps->getPropertyValue( OUString("Model" ) ); uno::Reference< frame::XModel > xChartModel; if( aAny >>= xChartModel ) { @@ -2554,8 +2554,8 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -2661,11 +2661,11 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -2680,18 +2680,18 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen if ( GetImport().IsPackageURL( maHref ) ) { - const OUString sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" )); + const OUString sURL( "vnd.sun.star.EmbeddedObject:" ); if ( aPersistName.compareTo( sURL, sURL.getLength() ) == 0 ) aPersistName = aPersistName.copy( sURL.getLength() ); - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), + xProps->setPropertyValue( OUString( "PersistName" ), uno::makeAny( aPersistName ) ); } else { // this is OOo link object - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "LinkURL" ) ), + xProps->setPropertyValue( OUString( "LinkURL" ), uno::makeAny( aPersistName ) ); } } @@ -2712,13 +2712,13 @@ void SdXMLObjectShapeContext::EndElement() if( mxBase64Stream.is() ) { OUString aPersistName( GetImport().ResolveEmbeddedObjectURLFromBase64() ); - const OUString sURL(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.EmbeddedObject:" )); + const OUString sURL( "vnd.sun.star.EmbeddedObject:" ); aPersistName = aPersistName.copy( sURL.getLength() ); uno::Reference< beans::XPropertySet > xProps(mxShape, uno::UNO_QUERY); if( xProps.is() ) - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistName" ) ), uno::makeAny( aPersistName ) ); + xProps->setPropertyValue( OUString( "PersistName" ), uno::makeAny( aPersistName ) ); } SdXMLShapeContext::EndElement(); @@ -2775,10 +2775,10 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); if( xPropSet.is() ) { - xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID") ), uno::makeAny( maCLSID ) ); + xPropSet->setPropertyValue( OUString("CLSID" ), uno::makeAny( maCLSID ) ); uno::Reference< lang::XComponent > xComp; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ) >>= xComp; + xPropSet->getPropertyValue( OUString("Model" ) ) >>= xComp; DBG_ASSERT( xComp.is(), "no xModel for own OLE format" ); pEContext->SetComponent( xComp ); } @@ -2872,42 +2872,42 @@ void SdXMLAppletShapeContext::EndElement() // the visual area for applet must be set on loading awt::Rectangle aRect( 0, 0, maSize.Width, maSize.Height ); aAny <<= aRect; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), aAny ); + xProps->setPropertyValue( OUString( "VisibleArea" ), aAny ); } if( maParams.getLength() ) { aAny <<= maParams; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCommands" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletCommands" ), aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCodeBase" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletCodeBase" ), aAny ); } if( !maAppletName.isEmpty() ) { aAny <<= maAppletName; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletName" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletName" ), aAny ); } if( mbIsScript ) { aAny <<= mbIsScript; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletIsScript" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletIsScript" ), aAny ); } if( !maAppletCode.isEmpty() ) { aAny <<= maAppletCode; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletCode" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletCode" ), aAny ); } aAny <<= ::rtl::OUString( GetImport().GetDocumentBase() ); - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "AppletDocBase" ) ), aAny ); + xProps->setPropertyValue( OUString( "AppletDocBase" ), aAny ); SetThumbnail(); } @@ -3028,11 +3028,11 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -3048,8 +3048,7 @@ lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL) { if (rImport.IsPackageURL(rURL)) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "vnd.sun.star.Package:")) + rURL; + return ::rtl::OUString( "vnd.sun.star.Package:") + rURL; } else { @@ -3091,7 +3090,7 @@ void SdXMLPluginShapeContext::EndElement() if ( maSize.Width && maSize.Height ) { - const rtl::OUString sVisibleArea( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ); + const rtl::OUString sVisibleArea( "VisibleArea" ); uno::Reference< beans::XPropertySetInfo > aXPropSetInfo( xProps->getPropertySetInfo() ); if ( !aXPropSetInfo.is() || aXPropSetInfo->hasPropertyByName( sVisibleArea ) ) { @@ -3108,26 +3107,26 @@ void SdXMLPluginShapeContext::EndElement() if( maParams.getLength() ) { aAny <<= maParams; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginCommands" ) ), aAny ); + xProps->setPropertyValue( OUString( "PluginCommands" ), aAny ); } if( !maMimeType.isEmpty() ) { aAny <<= maMimeType; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginMimeType" ) ), aAny ); + xProps->setPropertyValue( OUString( "PluginMimeType" ), aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "PluginURL" ) ), aAny ); + xProps->setPropertyValue( OUString( "PluginURL" ), aAny ); } } else { // in case we have a media object xProps->setPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("MediaURL")), + OUString("MediaURL"), uno::makeAny(maHref)); for( sal_Int32 nParam = 0; nParam < maParams.getLength(); ++nParam ) @@ -3138,21 +3137,21 @@ void SdXMLPluginShapeContext::EndElement() { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Loop" ) ), + xProps->setPropertyValue( OUString( "Loop" ), uno::makeAny( static_cast< sal_Bool >( 0 == aValueStr.compareToAscii( "true" ) ) ) ); } else if( 0 == rName.compareToAscii( "Mute" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Mute" ) ), + xProps->setPropertyValue( OUString( "Mute" ), uno::makeAny( static_cast< sal_Bool >( 0 == aValueStr.compareToAscii( "true" ) ) ) ); } else if( 0 == rName.compareToAscii( "VolumeDB" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" ) ), + xProps->setPropertyValue( OUString( "VolumeDB" ), uno::makeAny( static_cast< sal_Int16 >( aValueStr.toInt32() ) ) ); } else if( 0 == rName.compareToAscii( "Zoom" ) ) @@ -3181,7 +3180,7 @@ void SdXMLPluginShapeContext::EndElement() else eZoomLevel = media::ZoomLevel_NOT_AVAILABLE; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" ) ), uno::makeAny( eZoomLevel ) ); + xProps->setPropertyValue( OUString( "Zoom" ), uno::makeAny( eZoomLevel ) ); } } } @@ -3272,13 +3271,13 @@ void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno:: if( !maFrameName.isEmpty() ) { aAny <<= maFrameName; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameName" ) ), aAny ); + xProps->setPropertyValue( OUString( "FrameName" ), aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameURL" ) ), aAny ); + xProps->setPropertyValue( OUString( "FrameURL" ), aAny ); } } @@ -3324,7 +3323,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() awt::Rectangle aRect( 0, 0, maSize.Width, maSize.Height ); uno::Any aAny; aAny <<= aRect; - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ), aAny ); + xProps->setPropertyValue( OUString( "VisibleArea" ), aAny ); } } @@ -3587,7 +3586,7 @@ void SdXMLCustomShapeContext::EndElement() { if ( !maCustomShapeGeometry.empty() ) { - const rtl::OUString sCustomShapeGeometry ( RTL_CONSTASCII_USTRINGPARAM( "CustomShapeGeometry" ) ); + const rtl::OUString sCustomShapeGeometry ( "CustomShapeGeometry" ); // converting the vector to a sequence uno::Sequence< beans::PropertyValue > aSeq( maCustomShapeGeometry.size() ); @@ -3696,11 +3695,11 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) + xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ))) - xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsPlaceholderDependent") ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) + xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); } } } @@ -3713,10 +3712,10 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc { Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetImport().GetModel(), UNO_QUERY_THROW ); Reference< XNameAccess > xFamilies( xFamiliesSupp->getStyleFamilies() ); - const OUString sFamilyName( RTL_CONSTASCII_USTRINGPARAM("table" ) ); + const OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamily( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); Reference< XStyle > xTableStyle( xTableFamily->getByName( msTemplateStyleName ), UNO_QUERY_THROW ); - xProps->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TableTemplate" ) ), Any( xTableStyle ) ); + xProps->setPropertyValue( OUString( "TableTemplate" ), Any( xTableStyle ) ); } catch(const Exception&) { @@ -3744,7 +3743,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc if( xTableImport.is() && xProps.is() ) { uno::Reference< table::XColumnRowRange > xColumnRowRange( - xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) ), uno::UNO_QUERY ); + xProps->getPropertyValue( OUString("Model" ) ), uno::UNO_QUERY ); if( xColumnRowRange.is() ) mxTableImportContext = xTableImport->CreateTableContext( GetPrefix(), GetLocalName(), xColumnRowRange ); |