[Libreoffice-commits] .: Branch 'integration/dev300_m106' - basic/source

[Jan Holesovsky]

 basic/source/comp/makefile.mk    |    1 -
 basic/source/inc/namecont.hxx    |   20 +++-----------------
 basic/source/inc/runtime.hxx     |    4 ++--
 basic/source/inc/scriptcont.hxx  |    2 +-
 basic/source/runtime/methods.cxx |    5 +++--
 basic/source/runtime/step1.cxx   |    6 +++---
 6 files changed, 12 insertions(+), 26 deletions(-)

New commits:
commit 30fbb7da8752466512f1ed2c20aebebda7a1031e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed May 4 16:52:03 2011 +0200

    Make 'basic' module compile again.

diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index d8b03c1..146c832 100755
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
@@ -41,7 +41,6 @@ SLOFILES= \
     $(SLO)$/exprnode.obj	\
     $(SLO)$/io.obj		\
     $(SLO)$/loops.obj		\
-    $(SLO)$/sbcomp.obj		\
     $(SLO)$/symtbl.obj		\
     $(SLO)$/token.obj
 
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index f377e15..5c19d3b 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -98,25 +98,11 @@ typedef ::cppu::WeakImplHelper3<
     ::com::sun::star::container::XContainer,
     ::com::sun::star::util::XChangesNotifier > NameContainer_BASE;
 
+//============================================================================
+
 class NameContainer : public ::cppu::BaseMutex, public NameContainer_BASE
 {
-    sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const
-    {
-        return ( Str1 == Str2 );
-    }
-};
-
-typedef boost::unordered_map
-<
-    ::rtl::OUString,
-    sal_Int32,
-    hashName_Impl,
-    eqName_Impl
->
-NameContainerNameMap;
-
-
-//============================================================================
+    typedef boost::unordered_map < ::rtl::OUString, sal_Int32, ::rtl::OUStringHash > NameContainerNameMap;
 
     NameContainerNameMap mHashMap;
     ::com::sun::star::uno::Sequence< ::rtl::OUString > mNames;
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index a2ed23e..d8c3565 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -358,7 +358,7 @@ class SbiRuntime
     // #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
     void DimImpl( SbxVariableRef refVar );
 
-    bool implIsClass( SbxObject* pObj, const String& aClass );
+    bool implIsClass( SbxObject* pObj, const rtl::OUString& aClass );
 
     void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
 
@@ -390,7 +390,7 @@ class SbiRuntime
     void StepGOSUB( sal_uInt32 ),   StepRETURN( sal_uInt32 );
     void StepTESTFOR( sal_uInt32 ), StepCASETO( sal_uInt32 ),   StepERRHDL( sal_uInt32 );
     void StepRESUME( sal_uInt32 ),  StepSETCLASS( sal_uInt32 ),	StepVBASETCLASS( sal_uInt32 ),	StepTESTCLASS( sal_uInt32 ), StepLIB( sal_uInt32 );
-    bool checkClass_Impl( const SbxVariableRef& refVal, const String& aClass, bool bRaiseErrors, bool bDefault = true );
+    bool checkClass_Impl( const SbxVariableRef& refVal, const rtl::OUString& aClass, bool bRaiseErrors, bool bDefault = true );
     void StepCLOSE( sal_uInt32 ),   StepPRCHAR( sal_uInt32 ),   StepARGTYP( sal_uInt32 );
     // Alle Opcodes mit zwei Operanden
     void StepRTL( sal_uInt32, sal_uInt32 ),		StepPUBLIC( sal_uInt32, sal_uInt32 ),	StepPUBLIC_P( sal_uInt32, sal_uInt32 );
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 949575a..63dd381 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -151,7 +151,7 @@ class SfxScriptLibrary : public SfxLibrary, public SfxScriptLibrary_BASE
 {
     friend class SfxScriptLibraryContainer;
 
-    typedef std::hash_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap;
+    typedef boost::unordered_map< ::rtl::OUString, ::com::sun::star::script::ModuleInfo, ::rtl::OUStringHash > ModuleInfoMap;
 
     sal_Bool mbLoadedSource;
     sal_Bool mbLoadedBinary;
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 379d321..d855310 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -111,8 +111,6 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 
 #include <basic/sbobjmod.hxx>
 
-#include <basic/sbobjmod.hxx>
-
 #ifdef WNT
 #define GradientStyle_RECT BLA_GradientStyle_RECT
 #include <windows.h>
@@ -121,6 +119,9 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 #undef GradientSyle_RECT
 #endif
 
+// from source/classes/sbxmod.cxx
+Reference< XModel > getDocumentModel( StarBASIC* );
+
 static void FilterWhiteSpace( String& rStr )
 {
     rStr.EraseAllChars( ' ' );
diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx
index cbb7d4d..27548af 100644
--- a/basic/source/runtime/step1.cxx
+++ b/basic/source/runtime/step1.cxx
@@ -436,15 +436,15 @@ void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 )
 
 // Check, ob TOS eine bestimmte Objektklasse ist (+StringID)
 
-bool SbiRuntime::implIsClass( SbxObject* pObj, const ::rtl::String& aClass )
+bool SbiRuntime::implIsClass( SbxObject* pObj, const ::rtl::OUString& aClass )
 {
     bool bRet = true;
 
-    if( aClass.getLenth() != 0 )
+    if( !aClass.isEmpty() )
     {
         bRet = pObj->IsClass( aClass );
         if( !bRet )
-            bRet = aClass.equalsIgnoreCaseAscii( String( RTL_CONSTASCII_USTRINGPARAM("object") ) );
+            bRet = aClass.equalsIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("object") );
         if( !bRet )
         {
             String aObjClass = pObj->GetClassName();