Merge branch 'master' of /home/bjoern/.jenkins/jobs/repo-mirror/workspace/core

14 files changed, 35 insertions, 35 deletions

diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 03de66f68d46..8268b60159ad 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -65,7 +65,6 @@ public:
     SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
     TYPEINFO();
     virtual SbxInfo* GetInfo();
-    SbxArray* GetLocals();
     SbxArray* GetStatics();
     void      ClearStatics();
     SbModule* GetModule()                { return pMod;        }
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
index 1586c1fe10a6..26ec1184916c 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/basic/inc/basic/vbahelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -134,3 +135,5 @@ BASIC_DLLPUBLIC ::rtl::OUString getCurrentDirectory(
 } // namespace basic
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 555e1162580b..267626f4d0de 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -264,3 +265,5 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c
 
 } // namespace vba
 } // namespace basic
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 57ad90b177e0..b503f85a117d 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2028,9 +2028,8 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
         SbxVariable* pVar = pMethods->Get( i );
         if( pVar )
         {
-            ::rtl::OUStringBuffer aPropStr;
             if( (i % nPropsPerLine) == 0 )
-                aPropStr.appendAscii( "\n" );
+                aRet.appendAscii( "\n" );
 
             // address the method
             const Reference< XIdlMethod >& rxMethod = pUnoMethods[i];
@@ -2044,10 +2043,10 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
                     eType = (SbxDataType) ( SbxOBJECT | SbxARRAY );
             }
             // output the name and the type
-            aPropStr.append( Dbg_SbxDataType2String( eType ) );
-            aPropStr.appendAscii( " " );
-            aPropStr.append ( pVar->GetName() );
-            aPropStr.appendAscii( " ( " );
+            aRet.append( Dbg_SbxDataType2String( eType ) );
+            aRet.appendAscii( " " );
+            aRet.append ( pVar->GetName() );
+            aRet.appendAscii( " ( " );
 
             // the get-method mustn't have a parameter
             Sequence< Reference< XIdlClass > > aParamsSeq = rxMethod->getParameterTypes();
@@ -2058,22 +2057,20 @@ bool checkUnoObjectType( SbUnoObject* pUnoObj, const ::rtl::OUString& rClass )
             {
                 for( sal_uInt16 j = 0; j < nParamCount; j++ )
                 {
-                    aPropStr.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
+                    aRet.append ( Dbg_SbxDataType2String( unoToSbxType( pParams[ j ] ) ) );
                     if( j < nParamCount - 1 )
-                        aPropStr.appendAscii( ", " );
+                        aRet.appendAscii( ", " );
                 }
             }
             else
-                aPropStr.appendAscii( "void" );
+                aRet.appendAscii( "void" );
 
-            aPropStr.appendAscii( " ) " );
+            aRet.appendAscii( " ) " );
 
             if( i == nMethodCount - 1 )
-                aPropStr.appendAscii( "\n" );
+                aRet.appendAscii( "\n" );
             else
-                aPropStr.appendAscii( "; " );
-
-            aRet.append( aPropStr );
+                aRet.appendAscii( "; " );
         }
     }
     return aRet.makeStringAndClear();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2fd6fbf0fc7e..3c2f1f2a2116 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2063,14 +2063,6 @@ SbMethod::~SbMethod()
 {
 }
 
-SbxArray* SbMethod::GetLocals()
-{
-    if( pINST )
-        return pINST->GetLocals( this );
-    else
-        return NULL;
-}
-
 void SbMethod::ClearStatics()
 {
     refStatics = new SbxArray;
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index b81e88b2db64..b23a0b1b1612 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -210,7 +210,6 @@ public:
 
     SbMethod* GetCaller( sal_uInt16 );
     SbModule* GetActiveModule();
-    SbxArray* GetLocals( SbMethod* );
 
     SbiIoSystem* GetIoSystem() { return pIosys; }
     SbiDdeControl* GetDdeControl() { return pDdeCtrl; }
diff --git a/basic/source/inc/sbdiagnose.hxx b/basic/source/inc/sbdiagnose.hxx
index 065efdb183e1..2422da2e5064 100644
--- a/basic/source/inc/sbdiagnose.hxx
+++ b/basic/source/inc/sbdiagnose.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,3 +33,5 @@ void    ResetCapturedAssertions();
 #endif
 
 #endif // BASIC_SBDIAGNOSE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx
index 1f450d542b5d..1cf1774b74bc 100644
--- a/basic/source/inc/sbtrace.hxx
+++ b/basic/source/inc/sbtrace.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ void RTL_Impl_TraceCommand( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite );
 #endif
 
 #endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx
index 45e3a5f45376..5fb3c32970ac 100644
--- a/basic/source/runtime/comenumwrapper.cxx
+++ b/basic/source/runtime/comenumwrapper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,3 +80,4 @@ uno::Any SAL_CALL ComEnumerationWrapper::nextElement()
 }
 
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx
index b2464d686f67..99057df66af2 100644
--- a/basic/source/runtime/comenumwrapper.hxx
+++ b/basic/source/runtime/comenumwrapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ public:
 
 #endif // _COMENUMWRAPPER_HXX
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index af18d7129ce5..f778fbb92b26 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -516,17 +516,6 @@ SbMethod* SbiInstance::GetCaller( sal_uInt16 nLevel )
         return NULL;
 }
 
-SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
-{
-    SbiRuntime* p = pRun;
-    while( p && p->GetMethod() != pMeth )
-        p = p->pNext;
-    if( p )
-        return p->GetLocals();
-    else
-        return NULL;
-}
-
 //                              SbiInstance                             //
 
 // Attention: pMeth can also be NULL (on a call of the init-code)
diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx
index 97bfb0a00814..3516425c8533 100644
--- a/basic/source/runtime/sbdiagnose.cxx
+++ b/basic/source/runtime/sbdiagnose.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -132,3 +133,4 @@ RTLFUNC(CaptureAssertions)
 #endif
 }
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxvals.cxx b/basic/source/sbx/sbxvals.cxx
index 71a3bfc7f0d8..b3dede2262cf 100644
--- a/basic/source/sbx/sbxvals.cxx
+++ b/basic/source/sbx/sbxvals.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -107,3 +108,5 @@ BigInt::BigInt( const SbxUINT64 &r )
     *this *= a10000;
     *this += (sal_uInt16)r.nLow;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/workben/mgrtest.cxx b/basic/workben/mgrtest.cxx
index 49d63ad6ee3f..4d8112c0f048 100644
--- a/basic/workben/mgrtest.cxx
+++ b/basic/workben/mgrtest.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -588,3 +589,5 @@ void __EXPORT TestApp::Main( int, char*[] )
 
 
 TestApp aTestApp;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */