[Libreoffice-commits] .: 4 commits - starmath/inc

[Jan Holesovsky]

 starmath/inc/node.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35b0db863a6a663302fd96577cf317f20571700a
Merge: 1731843... ae8f9d1...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Nov 16 09:38:38 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit ae8f9d101f760d7ee96f515a941716999dfae4bb
Author: Jonas Finnemann Jensen <jopsen at gmail.com>
Date:   Mon Nov 15 19:30:44 2010 +0100

    Commenting out defintion of DEBUG_ENABLE_DUMPASDOT

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 7f7981d..153db2d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -52,7 +52,7 @@
 #endif
 
 // Comment out below to disable dumpasdot
-#define DEBUG_ENABLE_DUMPASDOT
+//#define DEBUG_ENABLE_DUMPASDOT
 
 #include "parse.hxx"
 #include "types.hxx"
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 );
     }