summaryrefslogtreecommitdiff
path: root/writerfilter/unocomponent/debugservices
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/unocomponent/debugservices')
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx12
-rw-r--r--writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx10
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx13
-rw-r--r--writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx8
-rw-r--r--writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx16
5 files changed, 29 insertions, 30 deletions
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index b01702da8378..c4bc24cfc7e0 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -96,8 +96,8 @@ public:
xContext), uno::UNO_QUERY_THROW);
xInputStream = xFileAccess->openFileRead(absFileUrl) ;
- mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
- mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
+ mLF = rtl::OUString("\n");
+ mCRLF = rtl::OUString("\r\n");
}
rtl::OUString getURL()
@@ -154,9 +154,9 @@ sal_Int32 SAL_CALL AnalyzeService::run
throw (uno::RuntimeException)
{
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
aUcbInitSequence[1] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory>
xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiComponentFactory>
@@ -267,7 +267,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
::rtl::OUString AnalyzeService_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( AnalyzeService::IMPLEMENTATION_NAME ));
+ return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName )
@@ -278,7 +278,7 @@ uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( AnalyzeService::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(AnalyzeService::SERVICE_NAME );
return aRet;
}
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
index 809aafac79cf..6bb3ff34b799 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
@@ -76,8 +76,8 @@ xContext( xContext_ )
sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
{
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
+ aUcbInitSequence[1] <<= rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
@@ -86,7 +86,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
+ ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
xContext), uno::UNO_QUERY_THROW );
rtl_uString *dir=NULL;
@@ -123,14 +123,14 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
::rtl::OUString ScannerTestService_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::IMPLEMENTATION_NAME ));
+ return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
}
uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException)
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME );
return aRet;
}
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 229ef036ed8a..44c106bc6b5a 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -97,8 +97,8 @@ public:
xContext), uno::UNO_QUERY_THROW);
xInputStream = xFileAccess->openFileRead(absFileUrl) ;
- mLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"));
- mCRLF = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\r\n"));
+ mLF = rtl::OUString("\n");
+ mCRLF = rtl::OUString("\r\n");
}
rtl::OUString getURL()
@@ -155,9 +155,8 @@ sal_Int32 SAL_CALL AnalyzeService::run
throw (uno::RuntimeException)
{
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<=
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
+ aUcbInitSequence[1] <<= rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory>
xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiComponentFactory>
@@ -265,7 +264,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
::rtl::OUString AnalyzeService_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( AnalyzeService::IMPLEMENTATION_NAME ));
+ return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName )
@@ -276,7 +275,7 @@ uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( AnalyzeService::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(AnalyzeService::SERVICE_NAME );
return aRet;
}
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
index 86dfa649d61f..3681549fe1af 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
@@ -83,8 +83,8 @@ xContext( xContext_ )
sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
{
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
+ aUcbInitSequence[1] <<= rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
@@ -155,14 +155,14 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
::rtl::OUString ScannerTestService_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::IMPLEMENTATION_NAME ));
+ return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
}
uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames( ) throw (uno::RuntimeException)
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME );
return aRet;
}
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
index d0d1ca515c97..916e42f9a4fc 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
@@ -200,7 +200,7 @@ public:
bytesTotal=xSeekable->getLength();
if (xStatusIndicator.is() && xSeekable.is())
{
- xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
+ xStatusIndicator->start(::rtl::OUString("Converting"), 100);
}
}
@@ -249,8 +249,8 @@ xContext( xContext_ )
sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
{
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
+ aUcbInitSequence[1] <<= rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
@@ -259,7 +259,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
+ ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
xContext), uno::UNO_QUERY_THROW );
rtl_uString *dir=NULL;
@@ -269,7 +269,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
rtl_uString_release(dir);
uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
- xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
+ xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
#if 0
rtl::OUString outFileUrl;
@@ -285,7 +285,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
aArgs[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs), uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
- xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
+ xPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.oasis.opendocument.text")));
#endif
uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
uno::Reference< task::XStatusIndicator > xStatusIndicator;
@@ -310,7 +310,7 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
::rtl::OUString XMLScanner_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( XMLScanner::IMPLEMENTATION_NAME ));
+ return rtl::OUString(XMLScanner::IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL XMLScanner_supportsService( const ::rtl::OUString& ServiceName )
@@ -321,7 +321,7 @@ uno::Sequence< rtl::OUString > SAL_CALL XMLScanner_getSupportedServiceNames( )
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( XMLScanner::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(XMLScanner::SERVICE_NAME );
return aRet;
}