[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/wrtw8nds.cxx |    4 ++--
 sw/source/ui/vba/vbafield.cxx     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4042911879463849fc8a63a85cf445da316e4e49
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 12 11:17:56 2010 +0000

    RTL_CONSTASCII_USTRINGPARAM used with nonarray

diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index ebd01c6..c92dd11 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -508,7 +508,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
         if( aDocProperty.EqualsIgnoreCaseAscii( pTable->sDocPropertyName ) )
         {
             if( pTable->sFieldService != NULL )
-                sFieldService = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( pTable->sFieldService ) );
+                sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService);
             bCustom = sal_False;
             break;
         }
commit 2e0ffc349acb5aa74528fbd57b57d5cf6d4e1d40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 12 11:18:52 2010 +0000

    RTL_CONSTASCII_STRINGPARAM -> RTL_CONSTASCII_USTRINGPARAM

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 277387a..884cd77 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -796,7 +796,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge
 
                 if ( bkmkName == sLink )
                 {
-                    sMark = String( RTL_CONSTASCII_STRINGPARAM( "_toc" ) );
+                    sMark = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
                     sMark += String::CreateFromInt32( aIter->second );
                 }
             }
@@ -1767,7 +1767,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
 
     if ( aAttrIter.RequiresImplicitBookmark() )
     {
-        String sBkmkName = String( RTL_CONSTASCII_STRINGPARAM( "_toc" ) );
+        String sBkmkName = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
         sBkmkName += String::CreateFromInt32( rNode.GetIndex() );
         AppendWordBookmark( sBkmkName );
     }