diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 17:37:28 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 17:37:28 +0100 |
commit | 22d71781ea77d1950641354699dc1dd7dcd97a8d (patch) | |
tree | 912c90e2223b77807036e4e61a70b2000b3e11ae /writerfilter/qa | |
parent | 17e4b5ee63d8ba0a597d1b490c5a1d28b35b350b (diff) |
RTL_CONSTASCII_USTRINGPARAM in filters 9 (build problem in sal ?)
Diffstat (limited to 'writerfilter/qa')
-rw-r--r-- | writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 16 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/sl/testOD_SL.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx index 3bff8817e845..a24ed6ba8afd 100644 --- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx +++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx @@ -49,7 +49,7 @@ OString getTempFileName(const OUString& fileName) OUString ousTmpUrl; FileBase::getTempDirURL(ousTmpUrl); if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1)) - ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + ousTmpUrl += OUString::createFromAscii("/"); ousTmpUrl += fileName; OUString sysTmpPath; @@ -273,12 +273,12 @@ public: pool->insert(ps4); - OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_int.dot"))); + OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropertyPool_int.dot")); printf("Pool dump: %s\n", tmpFileName.getStr()); FileLoggerImpl fl(tmpFileName.getStr()); pool->dump(&fl); - OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_ext.dot"))); + OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropertyPool_ext.dot")); printf("Pool dump: %s\n", tmpFileName2.getStr()); ExternalViewLoggerImpl evl(tmpFileName2.getStr()); pool->dump(&evl); @@ -373,12 +373,12 @@ public: CPPUNIT_ASSERT_MESSAGE("paraProps == failed failed", paraProps == paragraphProps); - OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_int.dot"))); + OString tmpFileName = getTempFileName(OUString::createFromAscii("testComplexParaProps_int.dot")); printf("Pool dump: %s\n", tmpFileName.getStr()); FileLoggerImpl fl(tmpFileName.getStr()); pool->dump(&fl); - OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_ext.dot"))); + OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testComplexParaProps_ext.dot")); printf("Pool dump: %s\n", tmpFileName2.getStr()); ExternalViewLoggerImpl evl(tmpFileName2.getStr()); pool->dump(&evl); @@ -505,21 +505,21 @@ public: pb2->insert(createStringProperty(NS_style::LN_font_face, "Roman")); PropertyPoolHandle_Pointer_t ph2 = pool->insert(pb2); - OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_1.dot"))); + OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_1.dot")); printf("Pool dump: %s\n", tmpFileName.getStr()); FileLoggerImpl fl(tmpFileName.getStr()); pool->dump(&fl); } - OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_2.dot"))); + OString tmpFileName = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_2.dot")); printf("Pool dump: %s\n", tmpFileName.getStr()); FileLoggerImpl fl(tmpFileName.getStr()); pool->dump(&fl); pool->garbageCollection(); - OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_after.dot"))); + OString tmpFileName2 = getTempFileName(OUString::createFromAscii("testPropPoolGarbageColl_after.dot")); printf("Pool dump: %s\n", tmpFileName2.getStr()); FileLoggerImpl fl2(tmpFileName2.getStr()); pool->dump(&fl2); diff --git a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx index 5a8a0a00a7c7..ac9db8378dfb 100644 --- a/writerfilter/qa/cppunittests/sl/testOD_SL.cxx +++ b/writerfilter/qa/cppunittests/sl/testOD_SL.cxx @@ -75,7 +75,7 @@ OString getTempFileName(const OUString& fileName) OUString ousTmpUrl; FileBase::getTempDirURL(ousTmpUrl); if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1)) - ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + ousTmpUrl += OUString::createFromAscii("/"); ousTmpUrl += fileName; OUString sysTmpPath; @@ -94,12 +94,12 @@ public: std::auto_ptr<xxml::XXmlReader> reader=xxml::XXmlReader::createXXmlReader(*handler); reader->read("helloworld.odt.flat.xml"); - OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_int.dot"))); + OString tmpFileName = getTempFileName(OUString::createFromAscii("dumpSlPool_int.dot")); printf("Pool dump: %s\n", tmpFileName.getStr()); FileLoggerImpl fl(tmpFileName.getStr()); propertyPool->dump(&fl); - OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("dumpSlPool_ext.dot"))); + OString tmpFileName2 = getTempFileName(OUString::createFromAscii("dumpSlPool_ext.dot")); printf("Pool dump: %s\n", tmpFileName2.getStr()); ExternalViewLoggerImpl evl(tmpFileName2.getStr()); propertyPool->dump(&evl); |