INTEGRATION: CWS obo30 (1.42.22); FILE MERGED

2008/05/30 09:44:46 obo 1.42.22.1: #i90100# ambigous Reference during ENABLE_PCH build

1 files changed, 28 insertions, 29 deletions

diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 35c0aaa239..e97ca6bc91 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1,13 +1,13 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sbxmod.cxx,v $
- * $Revision: 1.42 $
+ * $Revision: 1.43 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -245,8 +245,8 @@ BOOL SbModule::IsCompiled() const
 }
 
 const SbxObject* SbModule::FindType( String aTypeName ) const
-{ 
-    return pImage ? pImage->FindType( aTypeName ) : NULL; 
+{
+    return pImage ? pImage->FindType( aTypeName ) : NULL;
 }
 
 
@@ -530,7 +530,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
                 if( eCurTok == OPTION )
                 {
                     eCurTok = aTok.Next();
-                    if( eCurTok == COMPATIBLE 
+                    if( eCurTok == COMPATIBLE
                     || ( ( eCurTok == VBASUPPORT ) && ( aTok.Next() == NUMBER ) && ( aTok.GetDbl()== 1 ) ) )
                         aTok.SetCompatible( true );
                 }
@@ -662,7 +662,7 @@ void ClearUnoObjectsInRTL_Impl( StarBASIC* pBasic )
 {
     // #67781 Rueckgabewerte der Uno-Methoden loeschen
     clearUnoMethods();
-    
+
     ClearUnoObjectsInRTL_Impl_Rek( pBasic );
 
     // Oberstes Basic suchen
@@ -719,18 +719,18 @@ USHORT SbModule::Run( SbMethod* pMeth )
         rErrStack = NULL;
 
         if( nMaxCallLevel == 0 )
-        { 
+        {
 #ifdef UNX
           struct rlimit rl;
           getrlimit ( RLIMIT_STACK, &rl );
           // printf( "RLIMIT_STACK = %ld\n", rl.rlim_cur );
 #endif
 #if defined LINUX
-          // Empiric value, 900 = needed bytes/Basic call level 
+          // Empiric value, 900 = needed bytes/Basic call level
           // for Linux including 10% safety margin
           nMaxCallLevel = rl.rlim_cur / 900;
 #elif defined SOLARIS
-          // Empiric value, 1650 = needed bytes/Basic call level 
+          // Empiric value, 1650 = needed bytes/Basic call level
           // for Solaris including 10% safety margin
           nMaxCallLevel = rl.rlim_cur / 1650;
 #elif defined WIN32
@@ -1004,7 +1004,7 @@ const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol
     return FindNextStmnt( p, nLine, nCol, FALSE );
 }
 
-const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol, 
+const BYTE* SbModule::FindNextStmnt( const BYTE* p, USHORT& nLine, USHORT& nCol,
     BOOL bFollowJumps, const SbiImage* pImg ) const
 {
     UINT32 nPC = (UINT32) ( p - (const BYTE*) pImage->GetCode() );
@@ -1143,7 +1143,7 @@ void SbModule::ClearAllBP()
 
 void
 SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
-{	
+{
         if ( !pImg )
             pImg = pImage;
         for( UINT32 i = 0; i < pMethods->Count(); i++ )
@@ -1158,7 +1158,7 @@ SbModule::fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg ) const
                     pMeth->nStart = pImg->CalcNewOffset( (USHORT)pMeth->nStart );
             }
         }
-    
+
 }
 
 BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
@@ -1181,7 +1181,7 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
             return FALSE;
         }
         // If the image is in old format, we fix up the method start offsets
-        if ( nImgVer < B_EXT_IMG_VERSION ) 
+        if ( nImgVer < B_EXT_IMG_VERSION )
         {
             fixUpMethodStart( false, p );
             p->ReleaseLegacyBuffer();
@@ -1191,14 +1191,14 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
         if( p->GetCodeSize() )
         {
             aOUSource = p->aOUSource;
-            // Alte Version: Image weg 
-            if( nVer == 1 ) 
+            // Alte Version: Image weg
+            if( nVer == 1 )
             {
                 SetSource32( p->aOUSource );
                 delete p;
             }
             else
-                pImage = p; 
+                pImage = p;
         }
         else
         {
@@ -1212,12 +1212,12 @@ BOOL SbModule::LoadData( SvStream& rStrm, USHORT nVer )
 BOOL SbModule::StoreData( SvStream& rStrm ) const
 {
     BOOL bFixup = ( pImage && !pImage->ExceedsLegacyLimits() );
-    if ( bFixup ) 
+    if ( bFixup )
         fixUpMethodStart( true );
     BOOL bRet = SbxObject::StoreData( rStrm );
-    if ( !bRet )	
+    if ( !bRet )
         return FALSE;
-    
+
     if( pImage )
     {
         pImage->aOUSource = aOUSource;
@@ -1229,10 +1229,10 @@ BOOL SbModule::StoreData( SvStream& rStrm ) const
         // It would be better not to store the image ( more flexible with
         // formats )
         bool bRes = pImage->Save( rStrm, B_LEGACYVERSION );
-        if ( bFixup ) 
+        if ( bFixup )
             fixUpMethodStart( false ); // restore method starts
         return bRes;
-        
+
     }
     else
     {
@@ -1269,11 +1269,11 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
         BOOL bFixup = ( !nVer && !pImage->ExceedsLegacyLimits() );// save in old image format, fix up method starts
 
         if ( bFixup ) // save in old image format, fix up method starts
-            fixUpMethodStart( true ); 
+            fixUpMethodStart( true );
          bRet = SbxObject::StoreData( rStrm );
         if( bRet )
         {
-            pImage->aOUSource = OUString();
+            pImage->aOUSource = ::rtl::OUString();
             pImage->aComment = aComment;
             pImage->aName = GetName();
 
@@ -1284,7 +1284,7 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
                         bRet = pImage->Save( rStrm, B_LEGACYVERSION );
                     if ( bFixup )
                         fixUpMethodStart( false ); // restore method starts
-            
+
             pImage->aOUSource = aOUSource;
         }
     }
@@ -1292,11 +1292,11 @@ BOOL SbModule::StoreBinaryData( SvStream& rStrm, USHORT nVer )
 }
 
 // Called for >= OO 1.0 passwd protected libraries only
-// 
+//
 
 BOOL SbModule::LoadBinaryData( SvStream& rStrm )
 {
-    OUString aKeepSource = aOUSource;
+    ::rtl::OUString aKeepSource = aOUSource;
     bool bRet = LoadData( rStrm, 2 );
     LoadCompleted();
     aOUSource = aKeepSource;
@@ -1866,7 +1866,7 @@ const Range SyntaxHighlighter::notifyChange( UINT32 nLine, INT32 nLineCountDiffe
                                 const String* pChangedLines, UINT32 nArrayLength)
 {
     (void)nLineCountDifference;
-    
+
     for( UINT32 i=0 ; i < nArrayLength ; i++ )
         m_pSimpleTokenizer->parseLine(nLine+i, &pChangedLines[i]);
 
@@ -1890,7 +1890,7 @@ SbJScriptModule::SbJScriptModule( const String& rName )
 BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT nVer )
 {
     (void)nVer;
-    
+
     Clear();
     if( !SbxObject::LoadData( rStrm, 1 ) )
         return FALSE;
@@ -2108,4 +2108,3 @@ SbProperty::~SbProperty()
 SbProcedureProperty::~SbProcedureProperty()
 {}
 
-