diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:17:54 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-01 09:41:50 -0500 |
commit | a30795ce516b273a3a56a136b9b8802a23dd632a (patch) | |
tree | 846bde6b57b152adb4521bd569df8d13b020c853 /filter | |
parent | 9601b63509f07069b90144f53b2e55f74d04a483 (diff) |
targeted string re-work
Change-Id: I96ce39a3982d7d638283c18a5913c1df13979b1f
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/t602/t602filter.cxx | 20 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 44 |
2 files changed, 32 insertions, 32 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( |