[Libreoffice-commits] .: binfilter/bf_sd binfilter/bf_svx

[Gert Faller]

 binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx |    2 +-
 binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx |    4 ++--
 binfilter/bf_svx/source/unodraw/svx_unoshape.cxx |    4 ++--
 binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx     |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 346542a1c1bc1439aded5840ede4165ed5c57290
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Dec 4 19:45:43 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in filters 22

diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
index 8199915..350b4f6 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
@@ -189,7 +189,7 @@ void SAL_CALL SdUnoGraphicStyle::setPropertyValue( const ::rtl::OUString& aPrope
 
 uno::Any SAL_CALL SdUnoGraphicStyle::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
-    static OUString aStyleName( OUString::createFromAscii( UNO_NAME_STYLE_FAMILY ) );
+    static OUString aStyleName( RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_STYLE_FAMILY ) );
     if( PropertyName == aStyleName )
     {
         uno::Any aAny;
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
index 7e97ca1..154ad71 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshap4.cxx
@@ -265,7 +265,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
     sal_Bool            bOk = sal_False;
     String              aPersistName;
     OUString            aTmpStr;
-    Any                 aAny( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) );
+    Any                 aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) );
 
     if( aAny >>= aTmpStr )
         aPersistName = aTmpStr;
@@ -308,7 +308,7 @@ sal_Bool SvxOle2Shape::createObject( const SvGlobalName &aClassName )
     if( bOk )
     {
         aAny <<= ( aTmpStr = aPersistName );
-        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), aAny );
+        setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny );
     }
 
     static_cast< SdrOle2Obj* >( pObj )->SetObjRef( aIPObj );
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
index 8eff008..dee7540 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx
@@ -1517,7 +1517,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
                                 SvPersist*          pPersist = pModel->GetPersist();
                                 String              aPersistName;
                                 OUString            aTmpStr;
-                                Any                 aAny( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) );
+                                Any                 aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) );
                                 sal_Bool            bOk = sal_False;
 
                                 if( aAny >>= aTmpStr )
@@ -1560,7 +1560,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
                                 if( bOk )
                                 {
                                     aAny <<= ( aTmpStr = aPersistName );
-                                    setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), aAny );
+                                    setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny );
                                 }
 
                                 static_cast< SdrOle2Obj* >( pObj )->SetObjRef( aIPObj );
diff --git a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
index 88f6429..98e7c3b 100644
--- a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx
@@ -784,7 +784,7 @@ public:
 /*N*/ 
 /*N*/                 if( aId.getLength() )
 /*N*/                 {
-/*N*/                     aRet = OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
+/*N*/                     aRet = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ));
 /*N*/                     aRet += aId;
 /*N*/                 }
 /*N*/             }