[Libreoffice-commits] .: filter/inc hwpfilter/source lotuswordpro/source

[Gert Faller]

 filter/inc/filter/msfilter/msocximex.hxx  |    4 ++--
 hwpfilter/source/hwpreader.hxx            |    6 +++---
 lotuswordpro/source/filter/lwpdrawobj.hxx |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 17a57647fff8ca6178676089df2aff758800ead3
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Nov 27 17:42:39 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in filters 11 (build problem in sal ?)

diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 345e29a..8c80070 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -721,7 +721,7 @@ public:
     OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
     {
         msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
-        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel"));
+        //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
         msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
         mnBackColor = 0x80000005L;
         mnForeColor = 0x80000008L;
@@ -848,7 +848,7 @@ class OCX_ListBox : public OCX_ModernControl
 public:
     OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
         msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
-        //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel"));
+        //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
         msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
         mnBackColor = 0x80000005;
         mnForeColor = 0x80000008;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 97d8337..3300c94 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -259,11 +259,11 @@ HwpImportFilter::HwpImportFilter( const Reference< XMultiServiceFactory > xFact
         p->setDocumentHandler( xHandler );
 
           Sequence< Any > aArgs( 2 );
-          aArgs[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
-          aArgs[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+          aArgs[0] <<= OUString::createFromAscii( "Local" );
+          aArgs[1] <<= OUString::createFromAscii( "Office" );
           Reference< XInterface > xUCB 
               ( xFact->createInstanceWithArguments
-                 (OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.UniversalContentBroker")),
+                 (OUString::createFromAscii("com.sun.star.ucb.UniversalContentBroker"),
                   aArgs));
           p->setUCB( xUCB );
 
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 30c3f60..80c124e 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -156,7 +156,7 @@ public:
 
 protected:
     virtual void Read() {}
-    virtual rtl::OUString RegisterStyle() { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); }
+    virtual rtl::OUString RegisterStyle() { return rtl::OUString::createFromAscii(""); }
     virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
     virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
 };
@@ -350,7 +350,7 @@ public:
 
 protected:
     virtual void Read();
-    virtual rtl::OUString RegisterStyle() {return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""));}
+    virtual rtl::OUString RegisterStyle() {return rtl::OUString::createFromAscii("");}
     virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
     virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
 };