[Libreoffice-commits] .: binfilter/bf_forms filter/source

[Gert Faller]

 binfilter/bf_forms/source/component/forms_RadioButton.cxx |    2 +-
 filter/source/config/cache/filterfactory.cxx              |    2 +-
 filter/source/msfilter/escherex.cxx                       |    2 +-
 filter/source/msfilter/eschesdo.cxx                       |    2 +-
 filter/source/msfilter/msocximex.cxx                      |    2 +-
 filter/source/xmlfilterdetect/filterdetect.cxx            |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 90bd9b58c25bd06aa4d9b2eb09747496454745f1
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Sat Nov 27 09:09:36 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in filters 1

diff --git a/binfilter/bf_forms/source/component/forms_RadioButton.cxx b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
index 2e705fd..5fdef78 100644
--- a/binfilter/bf_forms/source/component/forms_RadioButton.cxx
+++ b/binfilter/bf_forms/source/component/forms_RadioButton.cxx
@@ -91,7 +91,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>
     // (formerly this switch-off was done in the toolkit - but the correct place is here ...)
 //	Reference< XVclWindowPeer >  xVclWindowPeer( getPeer(), UNO_QUERY );
 //	if (xVclWindowPeer.is())
-//		xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False));
+//		xVclWindowPeer->setProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoToggle")), ::cppu::bool2any(sal_False));
     // new order: do _not_ switch off the auto toggle because:
     // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it)
     // * without auto toggle, the AccessibleEvents as fired by the radio buttons are
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 245b879..9ab826e 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -301,7 +301,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
             //-------------------------------------------
             // 1) getDefaultFilterForType=<internal_typename>
 
-            pIt = lTokens.find(::rtl::OUString::createFromAscii("getDefaultFilterForType"));
+            pIt = lTokens.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getDefaultFilterForType")));
             if (pIt != lTokens.end())
             {
                 // SAFE ->
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 1a33e3c..2ef33fa 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -580,7 +580,7 @@ void EscherPropertyContainer::CreateTextProperties(
 
 /*
     if ( rObj.ImplGetPropertyValue(
-        ::rtl::OUString::createFromAscii("TextWritingMode") ) )
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextWritingMode")) ) )
     {
         ::com::sun::star::text::WritingMode eMode;
         rObj.GetUsrAny() >>= eMode;
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 3152aa3..84f2835 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -223,7 +223,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
         {
 /*
-            if( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("BoundRect") ) )
+            if( rObj.ImplGetPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundRect")) ) )
             {
                 ::com::sun::star::awt::Rectangle aRect( *(::com::sun::star::awt::Rectangle*)rObj.GetUsrAny().getValue() );
                 rObj.SetRect( ImplMapPoint( Point( aRect.X, aRect.Y ) ),
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 308bc44..201cf52 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -4482,7 +4482,7 @@ sal_Bool SvxMSConvertOCXControls::WriteOCXStream( SvStorageRef& rSrc1,
 
 #if 0
     uno::Any aTmp = xPropSet->getPropertyValue(
-        OUString::createFromAscii("ClassId"));
+        OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId")));
     sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
 #endif
 
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index 1558d11..e00d022 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -191,7 +191,7 @@ Reference< com::sun::star::frame::XModel > xModel;
         }
         if(sTypeName.equalsAscii(""))
         {
-            //sTypeName=::rtl::OUString::createFromAscii("writer_Flat_XML_File");
+            //sTypeName=::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer_Flat_XML_File"));
         }
         else
         {