[Libreoffice-commits] .: writerfilter/qa writerfilter/source

[Gert Faller]

 writerfilter/qa/cppunittests/doctok/testdoctok.cxx |    4 +--
 writerfilter/source/doctok/WW8DocumentImpl.cxx     |   24 ++++++++++-----------
 writerfilter/source/doctok/WW8StreamImpl.cxx       |    4 +--
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit c2ecc99db9bed699867222f32d82928039a08295
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Tue Nov 30 22:37:54 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in filters 15

diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
index 2423ceb..df77336 100644
--- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
+++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx
@@ -80,8 +80,8 @@ namespace testdoctok
                 {
                     uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >
                         xNameContainer(xFactory->createInstanceWithContext
-                                       (::rtl::OUString::createFromAscii
-                                        ("com.sun.star.ucb.SimpleFileAccess" ),
+                                       (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                        ("com.sun.star.ucb.SimpleFileAccess" )),
                                         xComponentContext), uno::UNO_QUERY );
 
                     if (xNameContainer.is())
diff --git a/writerfilter/source/doctok/WW8DocumentImpl.cxx b/writerfilter/source/doctok/WW8DocumentImpl.cxx
index 0435593..0fcee9f 100644
--- a/writerfilter/source/doctok/WW8DocumentImpl.cxx
+++ b/writerfilter/source/doctok/WW8DocumentImpl.cxx
@@ -185,16 +185,16 @@ WW8DocumentImpl::WW8DocumentImpl(WW8Stream::Pointer_t rpStream)
 : bSubDocument(false), mfcPicLoc(0), mbPicIsData(false), mpStream(rpStream),
 mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
 { 
-    mpDocStream = getSubStream(::rtl::OUString::createFromAscii
-                               ("WordDocument"));
+    mpDocStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                               ("WordDocument")));
 
-    mpSummaryInformationStream = getSubStream(::rtl::OUString::createFromAscii
-                                              ("\5SummaryInformation"));
+    mpSummaryInformationStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                              ("\5SummaryInformation")));
 
     try
     {
-        mpDataStream = getSubStream(::rtl::OUString::createFromAscii
-                                    ("Data"));
+        mpDataStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                    ("Data")));
     }
     catch (ExceptionNotFound e)
     {        
@@ -202,8 +202,8 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
 
     try
     {
-        mpCompObjStream = getSubStream(::rtl::OUString::createFromAscii
-                                       ("\1CompObj"));
+        mpCompObjStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                       ("\1CompObj")));
     }
     catch (ExceptionNotFound e)
     {
@@ -219,14 +219,14 @@ mbInSection(false), mbInParagraphGroup(false), mbInCharacterGroup(false)
     switch (mpFib->get_fWhichTblStm())
     {
     case 0:
-        mpTableStream = getSubStream(::rtl::OUString::createFromAscii
-                                     ("0Table"));
+        mpTableStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                     ("0Table")));
 
         break;
 
     case 1:
-        mpTableStream = getSubStream(::rtl::OUString::createFromAscii
-                                     ("1Table"));
+        mpTableStream = getSubStream(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                                     ("1Table")));
 
         break;
 
diff --git a/writerfilter/source/doctok/WW8StreamImpl.cxx b/writerfilter/source/doctok/WW8StreamImpl.cxx
index 6045f56..2dfb795 100644
--- a/writerfilter/source/doctok/WW8StreamImpl.cxx
+++ b/writerfilter/source/doctok/WW8StreamImpl.cxx
@@ -60,8 +60,8 @@ WW8StreamImpl::WW8StreamImpl(uno::Reference<uno::XComponentContext> rContext,
         
     xOLESimpleStorage = uno::Reference<container::XNameContainer>
         (xFactory->createInstanceWithArgumentsAndContext
-         (::rtl::OUString::createFromAscii
-          ("com.sun.star.embed.OLESimpleStorage"),
+         (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+          ("com.sun.star.embed.OLESimpleStorage")),
           aArgs, mrComponentContext ),
          uno::UNO_QUERY );