[Libreoffice-commits] .: desktop/source drawinglayer/source fileaccess/source

[Caolán McNamara]

 desktop/source/app/langselect.cxx                   |    2 +-
 drawinglayer/source/processor2d/canvasprocessor.cxx |   12 ++++++------
 fileaccess/source/FileAccess.cxx                    |    5 +----
 3 files changed, 8 insertions(+), 11 deletions(-)

New commits:
commit f4ed7a32c6d58e1dd0e666aaea7c121ef364f725
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Nov 20 16:45:27 2010 +0000

    RTL_CONSTASCII_USTRINGPARAM improvements

diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index e356360..c7c69fc 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -536,7 +536,7 @@ void LanguageSelection::resetUserLanguage()
     try
     {
         Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
-        xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString::createFromAscii("")));
+        xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString()));
         Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
     }
     catch ( PropertyVetoException& )
diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx
index 062363a..4da6322 100644
--- a/drawinglayer/source/processor2d/canvasprocessor.cxx
+++ b/drawinglayer/source/processor2d/canvasprocessor.cxx
@@ -1043,8 +1043,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD( 
                             aPoly, 
-                            rtl::OUString::createFromAscii( 
-                                "m-1 0 h2 m0 -1 v2" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-1 0 h2 m0 -1 v2" )));
                         mxCrossMarkerPoly = 
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
@@ -1059,8 +1059,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD( 
                             aPoly, 
-                            rtl::OUString::createFromAscii( 
-                                "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" )));
                         mxGluePointPoly = 
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
@@ -1071,8 +1071,8 @@ using namespace com::sun::star;
                         basegfx::B2DPolyPolygon aPoly;
                         basegfx::tools::importFromSvgD( 
                             aPoly, 
-                            rtl::OUString::createFromAscii( 
-                                "m-2 -2 l4 4 m-2 2 l4 -4" ));
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "m-2 -2 l4 4 m-2 2 l4 -4" )));
                         mxGluePointHighlightPoly = 
                             basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(
                                 mxCanvas->getDevice(),
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index c6b93b1..0a4ba3e 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -537,9 +537,6 @@ Sequence< rtl::OUString > OFileAccess::getFolderContents( const rtl::OUString& F
     ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment );
     Reference< XResultSet > xResultSet;
     Sequence< rtl::OUString > aProps(0);
-    //Sequence< rtl::OUString > aProps(1);
-    //rtl::OUString* pProps = aProps.getArray();
-    //pProps[0] == rtl::OUString::createFromAscii( "Url" );
 
     ucbhelper::ResultSetInclude eInclude = bIncludeFolders ? ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ucbhelper::INCLUDE_DOCUMENTS_ONLY;
 
@@ -858,7 +855,7 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
         if( !pNames )
         {
             static Sequence< rtl::OUString > seqNames(1);
-            seqNames.getArray()[0] = rtl::OUString::createFromAscii( SERVICE_NAME );
+            seqNames.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
             pNames = &seqNames;
         }
     }