Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


regards
MPL/ GPLv3+ / LGPLv3+
pjacquod

From 6b4b3c28474ab96a8d938c3a5e0e1dc86415da22 Mon Sep 17 00:00:00 2001
From: pjacquod <pjacquod@alumni.ethz.ch>
Date: Sun, 14 Nov 2010 21:27:39 +0100
Subject: [PATCH] RTL_CONSTASCII_USTRINGPARAM cleaing in components - dialogs

/home/pjacquod/LibO_dev/build/clone/components/cui/source/dialogs
and some dead code cleaned up
---
 cui/source/dialogs/hltpbase.cxx  |    2 +-
 cui/source/dialogs/hyphen.cxx    |    2 +-
 cui/source/dialogs/insdlg.cxx    |   50 ++++++++++++++++-------------------
 cui/source/dialogs/plfilter.cxx  |    2 +-
 cui/source/dialogs/scriptdlg.cxx |   53 ++++++++++++++++++-------------------
 5 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 0426634..202da71 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -530,7 +530,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
             Content            aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), 
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
             ::rtl::OUString    aTitle;
 
-            aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Title" ) ) >>= aTitle;
+            aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ) >>= 
aTitle;
             bRet = ( aTitle.getLength() > 0 );
         }
         catch( ... )
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index fd2481e..f53e66f 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -512,7 +512,7 @@ IMPL_LINK( SvxHyphenWordDialog_Impl, HyphenateAllHdl_Impl, Button *, EMPTYARG /*
         try
         {
             uno::Reference< beans::XPropertySet >  xProp( SvxGetLinguPropertySet() );
-            const rtl::OUString aName( rtl::OUString::createFromAscii( "IsHyphAuto" ) );
+            const rtl::OUString aName( RTL_CONSTASCII_USTRINGPARAM( "IsHyphAuto" ) );
             uno::Any aAny;
         
             aAny <<= sal_True;
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index cf5a0d5..f32d4d5 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -529,11 +529,11 @@ short SvInsertPlugInDialog::Execute()
             uno::Reference < beans::XPropertySet > xSet( m_xObj->getComponent(), uno::UNO_QUERY );
             if ( xSet.is() )
             {
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginURL"),
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginURL") ),
                         makeAny( ::rtl::OUString( m_pURL->GetMainURL( INetURLObject::NO_DECODE ) ) 
) );
                 uno::Sequence< beans::PropertyValue > aCommandSequence;
                 Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("PluginCommands"), 
makeAny( aCommandSequence ) );
+                xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PluginCommands") ), makeAny( aCommandSequence ) );
             }
         }
         else
@@ -658,14 +658,14 @@ short SvInsertAppletDialog::Execute()
                 m_xObj->changeState( embed::EmbedStates::RUNNING );
             xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY 
);
             ::rtl::OUString aStr;
-            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCode") 
);
+            uno::Any aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") ) );
             if ( aAny >>= aStr )
                 SetClass( aStr );
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ) );
             if ( aAny >>= aStr )
                 SetClassLocation( aStr );
             uno::Sequence< beans::PropertyValue > aCommands;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ) );
             if ( aAny >>= aCommands )
             {
                 SvCommandList aList;
@@ -712,17 +712,17 @@ short SvInsertAppletDialog::Execute()
 
                 // Hack, aFileName wird auch fuer Class benutzt
                 m_aClass = GetClass();
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCode"), makeAny( 
::rtl::OUString( m_aClass ) ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCode") 
), makeAny( ::rtl::OUString( m_aClass ) ) );
 
                 ::rtl::OUString tmp = aClassLocation;
                 ::osl::File::getFileURLFromSystemPath(tmp, tmp);
                 aClassLocation = tmp;
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCodeBase"), 
makeAny( tmp ) );
+                xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCodeBase") ), makeAny( tmp ) );
                 m_aCommands = GetAppletOptions();
 
                 uno::Sequence< beans::PropertyValue > aCommandSequence;
                 Plugin_ImplFillCommandSequence( m_aCommands, aCommandSequence );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), 
makeAny( aCommandSequence ) );
+                xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AppletCommands") ), makeAny( aCommandSequence ) );
 
                 if ( bIPActive )
                     m_xObj->changeState( embed::EmbedStates::INPLACE_ACTIVE );
@@ -841,15 +841,15 @@ short SfxInsertFloatingFrameDialog::Execute()
                 m_xObj->changeState( embed::EmbedStates::RUNNING );
             xSet = uno::Reference < beans::XPropertySet >( m_xObj->getComponent(), uno::UNO_QUERY 
);
             ::rtl::OUString aStr;
-            uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameURL") );
+            uno::Any aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ) );
             if ( aAny >>= aStr )
                 aEDURL.SetText( aStr );
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") ) );
             if ( aAny >>= aStr )
                 aEDName.SetText( aStr );
 
             sal_Int32 nSize = SIZE_NOT_SET;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ) );
             aAny >>= nSize;
 
             if ( nSize == SIZE_NOT_SET )
@@ -862,7 +862,7 @@ short SfxInsertFloatingFrameDialog::Execute()
             else
                 aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) );
 
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ) );
             aAny >>= nSize;
 
             if ( nSize == SIZE_NOT_SET )
@@ -880,11 +880,11 @@ short SfxInsertFloatingFrameDialog::Execute()
             BOOL bScrollAuto = FALSE;
 
             sal_Bool bSet = sal_False;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ) );
             aAny >>= bSet;
             if ( !bSet )
             {
-                aAny = xSet->getPropertyValue( 
::rtl::OUString::createFromAscii("FrameIsScrollingMode") );
+                aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ) );
                 aAny >>= bSet;
                 bScrollOn = bSet;
                 bScrollOff = !bSet;
@@ -897,11 +897,11 @@ short SfxInsertFloatingFrameDialog::Execute()
             aRBScrollingAuto.Check( bScrollAuto );
 
             bSet = sal_False;
-            aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder") );
+            aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder") ) );
             aAny >>= bSet;
             if ( !bSet )
             {
-                aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder") );
+                aAny = xSet->getPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ) );
                 aAny >>= bSet;
                 aRBFrameBorderOn.Check( bSet );
                 aRBFrameBorderOff.Check( !bSet );
@@ -975,27 +975,23 @@ short SfxInsertFloatingFrameDialog::Execute()
                 else
                     lMarginHeight = SIZE_NOT_SET;
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameURL"), makeAny( 
aURL ) );
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameName"), makeAny( 
aName ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL") ), 
makeAny( aURL ) );
+                xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName") 
), makeAny( aName ) );
 
                 if ( eScroll == ScrollingAuto )
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll"),
+                    xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll") ),
                         makeAny( sal_True ) );
                 else
-                    xSet->setPropertyValue( 
::rtl::OUString::createFromAscii("FrameIsScrollingMode"),
+                    xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode") ),
                         makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
 
-                //if ( aFrmDescr.IsFrameBorderSet() )
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsBorder"),
+                    xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder") ),
                         makeAny( bHasBorder ) );
-                /*else
-                    xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoBorder"),
-                        makeAny( sal_True ) );*/
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth"),
+                xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth") ),
                     makeAny( sal_Int32( lMarginWidth ) ) );
 
-                xSet->setPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight"),
+                xSet->setPropertyValue( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight") ),
                     makeAny( sal_Int32( lMarginHeight ) ) );
 
                 if ( bIPActive )
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index da079a8..2ce4449 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -62,7 +62,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
 {
     Reference< XMultiServiceFactory > xMan( ::utl::getProcessServiceFactory() );
     Reference< XPluginManager > xPMgr( xMan->createInstance(
-        rtl::OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), UNO_QUERY );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager") ) ), 
UNO_QUERY );
 
     if ( xPMgr.is() )
     {
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index bf62b09..560a4b7 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -172,11 +172,10 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
 
     Sequence< Reference< browse::XBrowseNode > > children;
 
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user") );
+    ::rtl::OUString shareStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("share") );
 
-    ::rtl::OUString singleton = ::rtl::OUString::createFromAscii(
-        "/singletons/com.sun.star.script.browse.theBrowseNodeFactory" );
+    ::rtl::OUString singleton = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.script.browse.theBrowseNodeFactory"
 ) );
 
     try
     {
@@ -231,7 +230,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language  )
             {
                 Reference< ::com::sun::star::frame::XModuleManager >
                     xModuleManager( xCtx->getServiceManager()->createInstanceWithContext(
-                        ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"), xCtx 
),
+                        
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager") ), xCtx ),
                                     UNO_QUERY_THROW );
 
                 Reference<container::XNameAccess> xModuleConfig(
@@ -278,7 +277,7 @@ SFTreeListBox::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OU
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"),                 xCtx ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ),           
      xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -837,7 +836,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                         try
                         {
                             // ISSUE need code to run script here
-                            xInv->invoke( ::rtl::OUString::createFromAscii( "Editable" ), args, 
outIndex, outArgs );
+                            xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Editable" ) 
), args, outIndex, outArgs );
                         }
                         catch( Exception& e )
                         {
@@ -902,7 +901,7 @@ SvxScriptOrgDialog::getDocumentModel( Reference< XComponentContext >& xCtx, ::rt
             xCtx->getServiceManager();
     Reference< frame::XDesktop > desktop (
         mcf->createInstanceWithContext(
-            ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ), xCtx ),
             UNO_QUERY );
 
     Reference< container::XEnumerationAccess > componentsAccess =
@@ -940,11 +939,11 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
         USHORT nMode = INPUTMODE_NEWLIB;
         if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
         {
-            aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ;
+            aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Library") ) ;
         }
         else
         {
-            aNewStdName = ::rtl::OUString::createFromAscii( "Macro" ) ;
+            aNewStdName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Macro") ) ;
             nMode = INPUTMODE_NEWMACRO;
         }
         //do we need L10N for this? ie somethng like:
@@ -1048,7 +1047,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Creatable" ), args, 
outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Creatable") ), 
args, outIndex, outArgs );
             Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
             aChildNode = newNode;
 
@@ -1156,7 +1155,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Renamable" ), args, 
outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Renamable") ), 
args, outIndex, outArgs );
             Reference< browse::XBrowseNode > newNode( aResult, UNO_QUERY );
             aChildNode = newNode;
 
@@ -1207,7 +1206,7 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
         try
         {
             Any aResult;
-            aResult = xInv->invoke( ::rtl::OUString::createFromAscii( "Deletable" ), args, 
outIndex, outArgs );
+            aResult = xInv->invoke( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deletable") ), 
args, outIndex, outArgs );
             aResult >>= result; // or do we just assume true if no exception ?
         }
         catch( Exception& e )
@@ -1332,8 +1331,8 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
 BOOL SFTreeListBox::dialogSort1( Reference< browse::XBrowseNode > node1,
     Reference< browse::XBrowseNode > node2 )
 {
-    ::rtl::OUString userStr = ::rtl::OUString::createFromAscii("user");
-    ::rtl::OUString shareStr = ::rtl::OUString::createFromAscii("share");
+    ::rtl::OUString userStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user") );
+    ::rtl::OUString shareStr = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("share") );
     if( node1->getName().equals( userStr ) )
         return true;
     if( node2->getName().equals( userStr ) )
@@ -1379,25 +1378,25 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString result = unformatted.copy( 0 );
 
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language );
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%SCRIPTNAME" ), script );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%SCRIPTNAME") ), script );
     result = ReplaceString(
-        result, ::rtl::OUString::createFromAscii( "%LINENUMBER" ), line );
+        result, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LINENUMBER") ), line );
 
     if ( type.getLength() != 0 )
     {
-        result += ::rtl::OUString::createFromAscii( "\n\n" );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") );
         result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_TYPE_LABEL)));
-        result += ::rtl::OUString::createFromAscii( " " );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
         result += type;
     }
 
     if ( message.getLength() != 0 )
     {
-        result += ::rtl::OUString::createFromAscii( "\n\n" );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n\n") );
         result += ::rtl::OUString(String(CUI_RES(RID_SVXSTR_ERROR_MESSAGE_LABEL)));
-        result += ::rtl::OUString::createFromAscii( " " );
+        result += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") );
         result += message;
     }
 
@@ -1409,7 +1408,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
 {
     ::rtl::OUString unformatted = String( CUI_RES( RID_SVXSTR_ERROR_AT_LINE ) );
 
-    ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString unknown = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
     ::rtl::OUString language = unknown;
     ::rtl::OUString script = unknown;
     ::rtl::OUString line = unknown;
@@ -1452,7 +1451,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
     ::rtl::OUString unformatted =
           String( CUI_RES( RID_SVXSTR_EXCEPTION_AT_LINE ) );
 
-    ::rtl::OUString unknown = ::rtl::OUString::createFromAscii( "UNKNOWN" );
+    ::rtl::OUString unknown = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
     ::rtl::OUString language = unknown;
     ::rtl::OUString script = unknown;
     ::rtl::OUString line = unknown;
@@ -1501,10 +1500,10 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         CUI_RES( RID_SVXSTR_FRAMEWORK_ERROR_RUNNING ) );
 
     ::rtl::OUString language =
-        ::rtl::OUString::createFromAscii( "UNKNOWN" );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
 
     ::rtl::OUString script =
-        ::rtl::OUString::createFromAscii( "UNKNOWN" );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNKNOWN") );
 
     ::rtl::OUString message;
 
@@ -1521,7 +1520,7 @@ BOOL SFTreeListBox::dialogSort2( Reference< browse::XBrowseNode > node1,
         message = String(
             CUI_RES(  RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED ) );
         message =  ReplaceString(
-            message, ::rtl::OUString::createFromAscii( "%LANGUAGENAME" ), language );
+            message, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%LANGUAGENAME") ), language );
 
     }
     else
-- 
1.7.1



Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.