diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2010-11-20 16:45:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-20 16:45:27 +0000 |
| commit | 88118c8a4e3d62a1c5ff2c8f4acc91d99e0ce357 (patch) | |
| tree | 804d655e22cf24343e3f53eb3ab4d0d9a4bdeafd | |
| parent | c44fdc7a1f6d787bb8eea8c39c10b97f70012dc2 (diff) | |
RTL_CONSTASCII_USTRINGPARAM improvements
| -rw-r--r-- | desktop/source/app/langselect.cxx | 2 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/canvasprocessor.cxx | 12 | ||||
| -rw-r--r-- | fileaccess/source/FileAccess.cxx | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index ae4a9f4bacd1..1ccfb42c2a2a 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 eeb9e8e5bd19..460cc76487e6 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 860df5ba6ad1..4242d41066df 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; } } |