diff options
-rw-r--r-- | filter/source/t602/t602filter.cxx | 20 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 44 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 110 |
3 files changed, 87 insertions, 87 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index 9a567ae246ad..0106a9a5f75c 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -168,7 +168,7 @@ T602ImportFilter::~T602ImportFilter() /* if ( aFilterName == "T602Document" || aTypeName == "writer_T602_Document" ) // preselection by type (extension) or filter name: no reason to check type - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_T602_Document" ) ); */ + return rtl::OUString( "writer_T602_Document" ); */ ::com::sun::star::uno::Sequence< sal_Int8 > aData; size_t numBytes = 4; @@ -180,7 +180,7 @@ T602ImportFilter::~T602ImportFilter() (aData[1] != 'C') || (aData[2] != 'T') || (aData[3] != ' ')) return ::rtl::OUString(); - return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_T602_Document" ) ); + return rtl::OUString( "writer_T602_Document" ); } // XFilter @@ -271,7 +271,7 @@ sal_Bool SAL_CALL T602ImportFilter::importImpl( const Sequence< ::com::sun::star } // An XML import service: what we push sax messages to.. - OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLImporter" ) ); + OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLImporter" ); mxHandler = Reference< XDocumentHandler >( mxMSF->createInstance( sXMLImportService ), UNO_QUERY ); @@ -883,7 +883,7 @@ Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames( ) OUString T602ImportFilter_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } #define SERVICE_NAME1 "com.sun.star.document.ImportFilter" @@ -899,8 +899,8 @@ Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) { Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); - pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); + pArray[0] = OUString ( SERVICE_NAME1 ); + pArray[1] = OUString ( SERVICE_NAME2 ); return aRet; } #undef SERVICE_NAME2 @@ -1015,12 +1015,12 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() ous[2] = getResStr(T602FILTER_STR_ENCODING_CP895); ous[3] = getResStr(T602FILTER_STR_ENCODING_KOI8CS2); any <<= ous; - xPSetCodeLB->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( "StringItemList" )), any); + xPSetCodeLB->setPropertyValue(OUString( "StringItemList" ), any); Sequence < sal_Int16 > shr(1); shr[0] = ini.forcecode ? ((sal_Int16) ini.xcode) + 1 : 0; any <<= shr; - xPSetCodeLB->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" )), any); + xPSetCodeLB->setPropertyValue(OUString( "SelectedItems" ), any); Reference < XInterface > AzbCheckBoxModel = _Inst("com.sun.star.awt.UnoControlCheckBoxModel"); Reference < XPropertySet > xPSetAzbukaCB( AzbCheckBoxModel, UNO_QUERY ); @@ -1211,7 +1211,7 @@ Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames( OUString T602ImportFilterDialog_getImplementationName () throw (RuntimeException) { - return OUString ( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) ); + return OUString ( IMPLEMENTATION_NAME ); } #define SERVICE_NAME "com.sun.star.ui.dialogs.FilterOptionsDialog" @@ -1226,7 +1226,7 @@ Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); - pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); + pArray[0] = OUString ( SERVICE_NAME ); return aRet; } #undef SERVICE_NAME diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index b42e1f373b0a..9e70b8859a76 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -191,17 +191,17 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) css::uno::Reference<XPropertySet> xProps(m_rServiceFactory, UNO_QUERY_THROW); xContext.set(xProps->getPropertyValue(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), + "DefaultContext" )), UNO_QUERY_THROW); css::uno::Reference<XMacroExpander> xMacroExpander( xContext->getValueByName( ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.util.theMacroExpander" ))), + "/singletons/com.sun.star.util.theMacroExpander" )), UNO_QUERY_THROW); sExpandedUrl = xMacroExpander->expandMacros(sUrl); sal_Int32 nPos = sExpandedUrl.indexOf(::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ))); + "vnd.sun.star.expand:" )); if (nPos != -1) sExpandedUrl = sExpandedUrl.copy(nPos + 20); } @@ -249,10 +249,10 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) subs( m_rServiceFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" ))), + "com.sun.star.util.PathSubstitution" )), UNO_QUERY); OUString aWorkingDir(subs->getSubstituteVariableValue(OUString( - RTL_CONSTASCII_USTRINGPARAM("$(progurl)")))); + "$(progurl")))); INetURLObject aObj(aWorkingDir); aObj.setFinalSlash(); bool bWasAbsolute; @@ -303,7 +303,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) xSaxParser( m_rServiceFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" ))), + "com.sun.star.xml.sax.Parser" )), UNO_QUERY); OSL_ASSERT(xSaxParser.is()); if (!xSaxParser.is()) @@ -313,17 +313,17 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) Sequence<Any> args(3); NamedValue nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "StylesheetURL" )); + nv.Name = OUString( "StylesheetURL" ); nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "SourceURL" )); + nv.Name = OUString( "SourceURL" ); nv.Value <<= aURL; args[1] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "SourceBaseURL" )); + nv.Name = OUString( "SourceBaseURL" ); nv.Value <<= OUString(INetURLObject(aURL).getBase()); args[2] <<= nv; - OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.documentconversion.LibXSLTTransformer")); + OUString serviceName("com.sun.star.comp.documentconversion.LibXSLTTransformer"); if (!msUserData[1].isEmpty()) serviceName = msUserData[1]; @@ -349,7 +349,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) pipeout( m_rServiceFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" ))), + "com.sun.star.io.Pipe" )), UNO_QUERY); css::uno::Reference<XInputStream> pipein(pipeout, UNO_QUERY); @@ -375,7 +375,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) if (xInterActionHandler.is()) { Sequence<Any> excArgs(0); ::com::sun::star::ucb::InteractiveAugmentedIOException exc( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Timeout!")), + rtl::OUString("Timeout!"), static_cast< OWeakObject * >( this ), InteractionClassification_ERROR, ::com::sun::star::ucb::IOErrorCode_GENERAL, @@ -461,33 +461,33 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) setDelegate(css::uno::Reference<XExtendedDocumentHandler> ( m_rServiceFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ))), + "com.sun.star.xml.sax.Writer" )), UNO_QUERY)); } // create transformer Sequence<Any> args(4); NamedValue nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "StylesheetURL" )); + nv.Name = OUString( "StylesheetURL" ); nv.Value <<= expandUrl(udStyleSheet); args[0] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetURL" )); + nv.Name = OUString( "TargetURL" ); nv.Value <<= sURL; args[1] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "DoctypeSystem" )); + nv.Name = OUString( "DoctypeSystem" ); nv.Value <<= aDoctypeSystem; args[2] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "DoctypePublic" )); + nv.Name = OUString( "DoctypePublic" ); nv.Value <<= aDoctypePublic; args[3] <<= nv; - nv.Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "TargetBaseURL" )); + nv.Name = OUString( "TargetBaseURL" ); INetURLObject ineturl(sURL); ineturl.removeSegment(); m_aExportBaseUrl = ineturl.GetMainURL(INetURLObject::NO_DECODE); nv.Value <<= m_aExportBaseUrl; args[3] <<= nv; - OUString serviceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.documentconversion.LibXSLTTransformer")); + OUString serviceName("com.sun.star.comp.documentconversion.LibXSLTTransformer"); if (!msUserData[1].isEmpty()) serviceName = msUserData[1]; @@ -505,7 +505,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) pipeout( m_rServiceFactory->createInstance( OUString( - RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pipe" ))), + "com.sun.star.io.Pipe" )), UNO_QUERY); css::uno::Reference<XInputStream> pipein(pipeout, UNO_QUERY); @@ -600,7 +600,7 @@ extern "C" Sequence<OUString> serviceNames(1); serviceNames.getArray()[0] = OUString( - RTL_CONSTASCII_USTRINGPARAM( FILTER_SERVICE_NAME )); + FILTER_SERVICE_NAME ); css::uno::Reference<XSingleServiceFactory> xFactory( @@ -622,7 +622,7 @@ extern "C" Sequence<OUString> serviceNames(1); serviceNames.getArray()[0] = OUString( - RTL_CONSTASCII_USTRINGPARAM( TRANSFORMER_SERVICE_NAME )); + TRANSFORMER_SERVICE_NAME ); css::uno::Reference<XSingleServiceFactory> xFactory( createSingleFactory( diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 92f9e759c209..9d68be9bbde2 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -121,10 +121,10 @@ DBG(extern void dump_pset(Reference< XPropertySet > rXPropSet)); namespace oox { namespace drawingml { #define GETA(propName) \ - GetProperty( rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ) ) + GetProperty( rXPropSet, String( #propName ) ) #define GETAD(propName) \ - ( GetPropertyAndState( rXPropSet, rXPropState, String( RTL_CONSTASCII_USTRINGPARAM( #propName ) ), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) + ( GetPropertyAndState( rXPropSet, rXPropState, String( #propName ), eState ) && eState == beans::PropertyState_DIRECT_VALUE ) #define GET(variable, propName) \ if ( GETA(propName) ) \ @@ -137,7 +137,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& ) {} @@ -161,7 +161,7 @@ public: return ( xProp.is() && (xProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Role" )) ) >>= aRole ) && + OUString( "Role" ) ) >>= aRole ) && m_aRole.equals( aRole )); } @@ -214,9 +214,9 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen { (void)ex; // avoid warning for pro build OSL_FAIL( rtl::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()); } @@ -231,7 +231,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 ); @@ -297,12 +297,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] ) ) @@ -325,16 +325,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( rtl::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()); } @@ -507,7 +507,7 @@ OUString ChartExport::parseFormula( const OUString& rRange ) { try { - xParser.set( xSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.FormulaParser")) ), UNO_QUERY ); + xParser.set( xSF->createInstance( OUString("com.sun.star.sheet.FormulaParser") ), UNO_QUERY ); } catch( Exception& ) { @@ -519,12 +519,12 @@ OUString ChartExport::parseFormula( const OUString& rRange ) Reference< XPropertySet > xParserProps( xParser, uno::UNO_QUERY ); if( xParserProps.is() ) { - xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) ); + xParserProps->setPropertyValue( OUString("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::OOO) ); } uno::Sequence<sheet::FormulaToken> aTokens = xParser->parseFormula( rRange, CellAddress( 0, 0, 0 ) ); if( xParserProps.is() ) { - xParserProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FormulaConvention")), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) ); + xParserProps->setPropertyValue( OUString("FormulaConvention"), uno::makeAny(::com::sun::star::sheet::AddressConvention::XL_OOX) ); } aResult = xParser->printFormula( aTokens, CellAddress( 0, 0, 0 ) ); } @@ -698,9 +698,9 @@ void ChartExport::InitRangeSegmentationProperties( const Reference< chart2::XCha { (void)ex; // avoid warning for pro build OSL_FAIL( rtl::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()); } } @@ -742,7 +742,7 @@ void ChartExport::_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()) @@ -752,13 +752,13 @@ void ChartExport::_ExportContent() { OUString sChartAddress; aAny = xProp->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ChartRangeAddress"))); + OUString("ChartRangeAddress")); aAny >>= msChartAddress; //maExportHelper.SetChartRangeAddress( sChartAddress ); OUString sTableNumberList; aAny = xProp->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("TableNumberList"))); + OUString("TableNumberList")); aAny >>= msTableNumberList; //maExportHelper.SetTableNumberList( sTableNumberList ); @@ -829,13 +829,13 @@ void ChartExport::exportChart( Reference< ::com::sun::star::chart::XChartDocumen 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; } catch( beans::UnknownPropertyException & ) @@ -912,7 +912,7 @@ void ChartExport::exportLegend( Reference< ::com::sun::star::chart::XChartDocume try { Any aAny( xProp->getPropertyValue( - OUString( RTL_CONSTASCII_USTRINGPARAM( "Alignment" )))); + OUString( "Alignment" ))); aAny >>= aLegendPos; } catch( beans::UnknownPropertyException & ) @@ -963,7 +963,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape ) Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); if( xPropSet.is()) { - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "String" ))) >>= sText; + xPropSet->getPropertyValue( OUString( "String" )) >>= sText; } if( sText.isEmpty() ) return; @@ -983,7 +983,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape ) // TODO: bodyPr const char* sWritingMode = NULL; sal_Bool bVertical = sal_False; - xPropSet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "StackedText" ))) >>= bVertical; + xPropSet->getPropertyValue( OUString( "StackedText" )) >>= bVertical; if( bVertical ) sWritingMode = "wordArtVert"; @@ -1461,7 +1461,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ sal_Bool bJapaneseCandleSticks = sal_False; Reference< beans::XPropertySet > xCTProp( xChartType, uno::UNO_QUERY ); if( xCTProp.is()) - xCTProp->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Japanese"))) >>= bJapaneseCandleSticks; + xCTProp->getPropertyValue( OUString("Japanese")) >>= bJapaneseCandleSticks; exportCandleStickSeries( xDSCnt->getDataSeries(), bJapaneseCandleSticks, nAttachedAxis ); return; @@ -1493,7 +1493,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ { 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 )) { @@ -1588,7 +1588,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ || (eChartType == chart::TYPEID_BUBBLE) ) { // export xVal - 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() ); @@ -1601,7 +1601,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ if( eChartType == chart::TYPEID_BUBBLE ) { // export yVal - 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() ) { Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() ); @@ -1840,39 +1840,39 @@ void ChartExport::InitPlotArea( ) if (xServiceInfo.is()) { if (xServiceInfo->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisXSupplier")))) + OUString("com.sun.star.chart.ChartAxisXSupplier"))) { xDiagramProperties->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasXAxis"))) >>= mbHasXAxis; + OUString("HasXAxis")) >>= mbHasXAxis; } if (xServiceInfo->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisYSupplier")))) + OUString("com.sun.star.chart.ChartAxisYSupplier"))) { xDiagramProperties->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasYAxis"))) >>= mbHasYAxis; + OUString("HasYAxis")) >>= mbHasYAxis; } if (xServiceInfo->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartAxisZSupplier")))) + OUString("com.sun.star.chart.ChartAxisZSupplier"))) { xDiagramProperties->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasZAxis"))) >>= mbHasZAxis; + OUString("HasZAxis")) >>= mbHasZAxis; } if (xServiceInfo->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisXSupplier")))) + OUString("com.sun.star.chart.ChartTwoAxisXSupplier"))) { xDiagramProperties->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryXAxis"))) >>= mbHasSecondaryXAxis; + OUString("HasSecondaryXAxis")) >>= mbHasSecondaryXAxis; } if (xServiceInfo->supportsService( - OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.chart.ChartTwoAxisYSupplier")))) + OUString("com.sun.star.chart.ChartTwoAxisYSupplier"))) { xDiagramProperties->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("HasSecondaryYAxis"))) >>= mbHasSecondaryYAxis; + OUString("HasSecondaryYAxis")) >>= mbHasSecondaryYAxis; } } xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("Dim3D"))) >>= mbIs3DChart; + OUString ("Dim3D")) >>= mbIs3DChart; Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY ); if( mbHasCategoryLabels && mxNewDiagram.is()) @@ -1912,29 +1912,29 @@ void ChartExport::exportAxis( AxisIdPair aAxisIdPair ) Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY); xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisTitle"))) >>= bHasXAxisTitle; + OUString ("HasXAxisTitle")) >>= bHasXAxisTitle; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisTitle"))) >>= bHasYAxisTitle; + OUString ("HasYAxisTitle")) >>= bHasYAxisTitle; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisTitle"))) >>= bHasZAxisTitle; + OUString ("HasZAxisTitle")) >>= bHasZAxisTitle; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryXAxisTitle"))) >>= bHasSecondaryXAxisTitle; + OUString ("HasSecondaryXAxisTitle")) >>= bHasSecondaryXAxisTitle; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasSecondaryYAxisTitle"))) >>= bHasSecondaryYAxisTitle; + OUString ("HasSecondaryYAxisTitle")) >>= bHasSecondaryYAxisTitle; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisGrid"))) >>= bHasXAxisMajorGrid; + OUString ("HasXAxisGrid")) >>= bHasXAxisMajorGrid; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisGrid"))) >>= bHasYAxisMajorGrid; + OUString ("HasYAxisGrid")) >>= bHasYAxisMajorGrid; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisGrid"))) >>= bHasZAxisMajorGrid; + OUString ("HasZAxisGrid")) >>= bHasZAxisMajorGrid; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasXAxisHelpGrid"))) >>= bHasXAxisMinorGrid; + OUString ("HasXAxisHelpGrid")) >>= bHasXAxisMinorGrid; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasYAxisHelpGrid"))) >>= bHasYAxisMinorGrid; + OUString ("HasYAxisHelpGrid")) >>= bHasYAxisMinorGrid; xDiagramProperties->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("HasZAxisHelpGrid"))) >>= bHasZAxisMinorGrid; + OUString ("HasZAxisHelpGrid")) >>= bHasZAxisMinorGrid; Reference< XPropertySet > xAxisProp; Reference< drawing::XShape > xAxisTitle; @@ -2105,7 +2105,7 @@ void ChartExport::_exportAxis( if( xAxisProp.is() ) { xAxisProp->getPropertyValue( - OUString (RTL_CONSTASCII_USTRINGPARAM ("Visible"))) >>= bVisible; + OUString ("Visible")) >>= bVisible; } if( !bVisible ) @@ -2322,10 +2322,10 @@ void ChartExport::exportDataPoints( 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; } const sal_Int32 * pPoints = aDataPointSeq.getConstArray(); |