subject:"\[Libreoffice\-commits\] .\: basic\/inc"

[Libreoffice-commits] .: basic/inc

2012-03-06 Thread Takeshi Abe

 basic/inc/sb.hxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 033d98557e182330d8daa148fff705be0447471c
Author: Takeshi Abe 
Date:   Tue Mar 6 21:52:34 2012 +0900

Removed useless #ifdef guard

diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index b54d779..c4b4fde 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -29,11 +29,7 @@
 #ifndef _SB_HXX
 #define _SB_HXX
 
-#ifndef _SBERRORS_HXX
- #include 
-#endif
-
-
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/Library_sb.mk basic/source

2012-03-05 Thread Tor Lillqvist

 basic/Library_sb.mk   |1 
 basic/inc/basic/sbxmstrm.hxx  |   53 --
 basic/source/sbx/sbxmstrm.cxx |   40 ---
 3 files changed, 94 deletions(-)

New commits:
commit c5bf9b10b9060b750d3651e9c0022ad0261612f8
Author: Tor Lillqvist 
Date:   Mon Mar 5 22:58:20 2012 +0200

Remove unused SbxMemoryStream

diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 4ba93cb..7ea3d59 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/step0 \
basic/source/runtime/step1 \
basic/source/runtime/step2 \
-   basic/source/sbx/sbxmstrm \
 ))
 
 endif
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
deleted file mode 100644
index 12e1795..000
--- a/basic/inc/basic/sbxmstrm.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SBXMSTRM_HXX
-#define _SBXMSTRM_HXX 1
-
-#include 
-#include 
-#include 
-#include "basicdllapi.h"
-
-SV_DECL_REF(SbxMemoryStream)
-
-class BASIC_DLLPUBLIC SbxMemoryStream : public SbxBase, public SvMemoryStream
-{
-  public:
-SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
-SvMemoryStream(nInitSize_,nResize_) {}
-~SbxMemoryStream();
-
-virtual SbxDataType  GetType()  const;
-};
-
-SV_IMPL_REF(SbxMemoryStream)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
deleted file mode 100644
index 9b62a04..000
--- a/basic/source/sbx/sbxmstrm.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include 
-
-SbxDataType  SbxMemoryStream::GetType()  const
-{
-return SbxMEMORYSTREAM;
-}
-
-SbxMemoryStream::~SbxMemoryStream()
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy

2012-03-05 Thread Tor Lillqvist

 basic/inc/basic/vbahelper.hxx |   16 -
 basic/source/basmgr/vbahelper.cxx |   19 ---
 basic/source/inc/namecont.hxx |5 --
 basic/source/uno/namecont.cxx |   64 --
 unusedcode.easy   |2 -
 5 files changed, 106 deletions(-)

New commits:
commit 99ff0ab0b2f4f6b8718b4dfa1bfc2c598ac25c4c
Author: Elton Chung 
Date:   Mon Mar 5 23:30:31 2012 +0800

Remove unused code from basic

diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
index 4655897..8530c95 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/basic/inc/basic/vbahelper.hxx
@@ -100,22 +100,6 @@ BASIC_DLLPUBLIC void registerCurrentDirectory(
 
 // 
 
-/** Returns the working directory of the application the passed document
-belongs to.
-
-@param rxModel
-A document model determining the type of the application whose working
-directory is querried.
-
-@return
-The working directory of the specified application, or an empty string
-on error (e.g. if the passed document reference is empty).
- */
-BASIC_DLLPUBLIC ::rtl::OUString getCurrentDirectory(
-const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& 
rxModel );
-
-// 
-
 } // namespace vba
 } // namespace basic
 
diff --git a/basic/source/basmgr/vbahelper.cxx 
b/basic/source/basmgr/vbahelper.cxx
index 16e7222..b711a96 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -235,25 +235,6 @@ void registerCurrentDirectory( const uno::Reference< 
frame::XModel >& rxModel, c
 
 // 
 
-::rtl::OUString getCurrentDirectory( const uno::Reference< frame::XModel >& 
rxModel )
-{
-::rtl::OUString aPath;
-CurrDirPool& rPool = StaticCurrDirPool::get();
-::osl::MutexGuard aGuard( rPool.maMutex );
-try
-{
-uno::Reference< frame::XModuleManager > xModuleManager( 
lclCreateModuleManager(), uno::UNO_SET_THROW );
-::rtl::OUString aIdentifier = xModuleManager->identify( rxModel );
-aPath = rPool.maCurrDirs[ aIdentifier ];
-}
-catch(const uno::Exception& )
-{
-}
-return aPath;
-}
-
-// 
-
 } // namespace vba
 } // namespace basic
 
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 8f585b5..833fc81 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -757,11 +757,6 @@ public:
 ScriptExtensionIterator( void );
 rtl::OUString nextBasicOrDialogLibrary( bool& rbPureDialogLib );
 
-private:
-com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > 
implGetScriptPackageFromPackage
-( const com::sun::star::uno::Reference< 
com::sun::star::deployment::XPackage > xPackage,
-  bool& rbPureDialogLib );
-
 protected:
 com::sun::star::uno::Reference< com::sun::star::deployment::XPackage >
 implGetNextUserScriptPackage( bool& rbPureDialogLib );
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index fbc52ea..f6544b5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3358,70 +3358,6 @@ Reference< deployment::XPackage > 
ScriptSubPackageIterator::implDetectScriptPack
 return xScriptPackage;
 }
 
-Reference< deployment::XPackage > 
ScriptExtensionIterator::implGetScriptPackageFromPackage
-( const Reference< deployment::XPackage > xPackage, bool& rbPureDialogLib )
-{
-rbPureDialogLib = false;
-
-Reference< deployment::XPackage > xScriptPackage;
-if( !xPackage.is() )
-return xScriptPackage;
-
-// Check if parent package is registered
-beans::Optional< beans::Ambiguous > option( 
xPackage->isRegistered
-( Reference(), 
Reference() ) );
-bool bRegistered = false;
-if( option.IsPresent )
-{
-beans::Ambiguous const & reg = option.Value;
-if( !reg.IsAmbiguous && reg.Value )
-bRegistered = true;
-}
-if( bRegistered )
-{
-if( xPackage->isBundle() )
-{
-Sequence< Reference< deployment::XPackage > > aPkgSeq = 
xPackage->getBundle
-( Reference(), 
Reference() );
-sal_Int32 nPkgCount = aPkgSeq.getLength();
-const Reference< deployment::XPackage >* pSeq = 
aPkgSeq.getConstArray();
-for( sal_Int32 iPkg = 0 ; iPkg < nPkgCount ; ++iPkg )
-{
-const Reference< deployment::XPackage > xSubPkg = pSeq[ iPkg ];
-const Reference< deployment::XPackageTypeInfo > 
xPackageTypeInfo = xSubPkg->getPackageType();
-rtl::OUString aMediaType = xPackageTypeInfo->getMediaType();
-if( 
aMediaT

[Libreoffice-commits] .: basic/inc basic/source

2012-01-30 Thread Takeshi Abe

 basic/inc/basic/sbstar.hxx|4 ++--
 basic/source/classes/sb.cxx   |8 
 basic/source/comp/scanner.cxx |6 +++---
 basic/source/comp/token.cxx   |4 ++--
 basic/source/inc/scanner.hxx  |5 ++---
 basic/source/inc/token.hxx|2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit 6073c31fe8c500066bb033cdb646e9d1cca9b94a
Author: Takeshi Abe 
Date:   Tue Jan 31 02:18:11 2012 +0900

Replaced String by rtl::OUString in SbiScanner

diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index dc6622e..7cf87ea 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -82,7 +82,7 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
 BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC* 
pDeletedBasic );
 
 protected:
-sal_BoolCError( SbError, const String&, xub_StrLen, 
xub_StrLen, xub_StrLen );
+sal_BoolCError( SbError, const ::rtl::OUString&, xub_StrLen, 
xub_StrLen, xub_StrLen );
 private:
 BASIC_DLLPRIVATE sal_Bool   RTError( SbError, xub_StrLen, 
xub_StrLen, xub_StrLen );
 BASIC_DLLPRIVATE sal_Bool   RTError( SbError, const String& rMsg, 
xub_StrLen, xub_StrLen, xub_StrLen );
@@ -154,7 +154,7 @@ public:
   sal_uInt16 nCol1, sal_uInt16 nCol2 );
 
 // Specific to error handler
-static void MakeErrorText( SbError, const String& aMsg );
+static void MakeErrorText( SbError, const ::rtl::OUString& aMsg );
 static constString& GetErrorText();
 static SbError  GetErrorCode();
 static sal_Bool IsCompilerError();
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a0b3bb8..816c7d3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1575,7 +1575,7 @@ struct BasicStringList_Impl : private Resource
 };
 //
 
-void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
+void StarBASIC::MakeErrorText( SbError nId, const ::rtl::OUString& aMsg )
 {
 SolarMutexGuard aSolarGuard;
 sal_uInt16 nOldID = GetVBErrorCode( nId );
@@ -1612,7 +1612,7 @@ void StarBASIC::MakeErrorText( SbError nId, const String& 
aMsg )
 }
 
 sal_Bool StarBASIC::CError
-( SbError code, const String& rMsg, sal_uInt16 l, sal_uInt16 c1, 
sal_uInt16 c2 )
+( SbError code, const ::rtl::OUString& rMsg, sal_uInt16 l, sal_uInt16 c1, 
sal_uInt16 c2 )
 {
 SolarMutexGuard aSolarGuard;
 
@@ -1634,8 +1634,8 @@ sal_Bool StarBASIC::CError
 MakeErrorText( code, rMsg );
 
 // Implementation of the code for the string transport to SFX-Error
-if( rMsg.Len() )
-code = (sal_uIntPtr)*new StringErrorInfo( code, String(rMsg) );
+if( !rMsg.isEmpty() )
+code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
 
 SetErrorData( code, l, c1, c2 );
 GetSbData()->bCompiler = sal_True;
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 5768ed4..872bdd7 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -369,7 +369,7 @@ bool SbiScanner::NextSym()
 aSym = p; bNumber = true;
 
 if( comma > 1 || exp > 1 )
-{   aError = '.';
+{   aError = ::rtl::OUString('.');
 GenError( SbERR_BAD_CHAR_IN_NUMBER );   }
 
 // #57844 use localized function
@@ -437,7 +437,7 @@ bool SbiScanner::NextSym()
 *p++ = ch;
 else
 {
-aError = ch;
+aError = ::rtl::OUString(ch);
 GenError( SbERR_BAD_CHAR_IN_NUMBER );
 }
 }
@@ -474,7 +474,7 @@ bool SbiScanner::NextSym()
 {
 pLine++; nCol++;
 if( *pLine != cSep || cSep == ']' ) break;
-} else aError = cSep, GenError( SbERR_EXPECTED );
+} else aError = ::rtl::OUString(cSep), GenError( SbERR_EXPECTED );
 }
 // If VBA Interop then doen't eat the [] chars
 if ( cSep == ']' && bVBASupportOn )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index d18953d..63c9867 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -244,11 +244,11 @@ void SbiTokenizer::Push( SbiToken t )
 
 void SbiTokenizer::Error( SbError code, const char* pMsg )
 {
-aError = String::CreateFromAscii( pMsg );
+aError = ::rtl::OUString::createFromAscii( pMsg );
 Error( code );
 }
 
-void SbiTokenizer::Error( SbError code, String aMsg )
+void SbiTokenizer::Error( SbError code, const ::rtl::OUString &aMsg )
 {
 aError = aMsg;
 Error( code );
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index 69c3d87..926706c 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -29,12 +29,11 @@
 #ifndef _SCANNER_HXX
 #define _SCANNER_HXX
 
-#include 
 #include 
 
 // The scanner is stand-alone, i. e

[Libreoffice-commits] .: basic/inc

2012-01-24 Thread Takeshi Abe

 basic/inc/basic/sbxvar.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit ebe3e061ac80584b5ff9b6b190b1fe2a78b73c99
Author: Takeshi Abe 
Date:   Wed Jan 25 03:07:13 2012 +0900

Removed unused field and non-existent class

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 08e8002..2416216 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -106,12 +106,8 @@ struct SbxValues
 
 struct SbxValues;
 
-class SbxValueImpl;
-
 class BASIC_DLLPUBLIC SbxValue : public SbxBase
 {
-SbxValueImpl* mpSbxValueImplImpl;   // Impl data
-
 // #55226 Transport additional infos
 BASIC_DLLPRIVATE SbxValue* TheRealValue( sal_Bool bObjInObjError ) const;
 BASIC_DLLPRIVATE SbxValue* TheRealValue() const;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/source

2012-01-20 Thread August Sodora

 basic/inc/basic/basmgr.hxx |   13 +--
 basic/source/basmgr/basicmanagerrepository.cxx |9 --
 basic/source/basmgr/basmgr.cxx |  101 ++---
 3 files changed, 21 insertions(+), 102 deletions(-)

New commits:
commit 81605eaafa4cd645ca92013120f8da0c753cdf42
Author: August Sodora 
Date:   Fri Jan 20 15:20:55 2012 -0500

Replace BasicErrorManager with std::vector

diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index f5ac0aa..04820ad 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include "basicdllapi.h"
+#include 
 
 // Basic XML Import/Export
 BASIC_DLLPUBLIC com::sun::star::uno::Reference< 
com::sun::star::script::XStarBasicAccess >
@@ -72,12 +73,10 @@ public:
 voidSetErrorStr( const String& rStr){ aErrStr = rStr; }
 };
 
-
-
 class BasicLibs;
 class ErrorManager;
 class BasicLibInfo;
-class BasicErrorManager;
+
 namespace basic { class BasicManagerCleaner; }
 
 // Library password handling for 5.0 documents
@@ -127,7 +126,7 @@ class BASIC_DLLPUBLIC BasicManager : public SfxBroadcaster
 
 private:
 BasicLibs*  pLibs;
-BasicErrorManager*  pErrorMgr;
+std::vector aErrors;
 
 String  aName;
 String  maStorageName;
@@ -140,7 +139,7 @@ private:
 
 protected:
 sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo ) const;
-sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* 
pCurStorage, sal_Bool bInfosOnly = sal_False ) const;
+sal_BoolImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* 
pCurStorage, sal_Bool bInfosOnly = sal_False );
 voidImpCreateStdLib( StarBASIC* pParentFromStdLib );
 voidImpMgrNotLoaded(  const String& rStorageName  );
 BasicLibInfo*   CreateLibInfo();
@@ -198,9 +197,7 @@ public:
 sal_BoolIsModified() const;
 sal_BoolIsBasicModified() const;
 
-sal_BoolHasErrors();
-BasicError* GetFirstError();
-BasicError* GetNextError();
+std::vector& GetErrors();
 
 /** sets a global constant in the basic library, referring to some UNO 
object, to a new value.
 
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index fa219ad..8d0c2eb 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -454,21 +454,20 @@ namespace basic
 _out_rpBasicManager = new BasicManager( *xDummyStor, String() /* 
TODO/LATER: xStorage */,
 pAppBasic,
 &aAppBasicDir, 
sal_True );
-if ( _out_rpBasicManager->HasErrors() )
+if ( !_out_rpBasicManager->GetErrors().empty() )
 {
 // handle errors
-BasicError* pErr = _out_rpBasicManager->GetFirstError();
-while ( pErr )
+std::vector& aErrors = 
_out_rpBasicManager->GetErrors();
+for(std::vector::const_iterator i = 
aErrors.begin(); i != aErrors.end(); ++i)
 {
 // show message to user
-if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
pErr->GetErrorId() ) )
+if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError( 
i->GetErrorId() ) )
 {
 // user wants to break loading of BASIC-manager
 BasicManagerCleaner::deleteBasicManager( 
_out_rpBasicManager );
 xStorage.clear();
 break;
 }
-pErr = _out_rpBasicManager->GetNextError();
 }
 }
 }
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3e5a0dd..234a196 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -382,68 +382,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( 
const ContainerEvent&
 }
 }
 
-
-//=
-
-class BasicErrorManager
-{
-private:
-BasErrorLst aErrorList;
-size_t CurrentError;
-
-public:
-BasicErrorManager();
-~BasicErrorManager();
-
-voidReset();
-voidInsertError( const BasicError& rError );
-
-boolHasErrors() { return !aErrorList.empty(); }
-BasicError* GetFirstError();
-BasicError* GetNextError();
-};
-
-BasicErrorManager::BasicErrorManager()
-: CurrentError( 0 )
-{
-}
-
-BasicErrorManager::~BasicErrorManager()
-{
-Reset();
-}
-
-void BasicErrorManager::Reset()
-{
-for ( size_t i = 0, n = aErrorList.size(); i < n; ++i )
-delete aErrorList[ i ];
-aErrorList.clear();
-}

[Libreoffice-commits] .: basic/inc

2012-01-17 Thread August Sodora

 basic/inc/basic/basmgr.hxx |   14 --
 1 file changed, 14 deletions(-)

New commits:
commit 9746244229613cd5da87a268cff80ca8c8c3ec89
Author: August Sodora 
Date:   Tue Jan 17 17:45:31 2012 -0500

Remove unused macros

diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 4b4bf38..f5ac0aa 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -35,26 +35,12 @@
 #include 
 #include "basicdllapi.h"
 
-
 // Basic XML Import/Export
 BASIC_DLLPUBLIC com::sun::star::uno::Reference< 
com::sun::star::script::XStarBasicAccess >
 getStarBasicAccess( BasicManager* pMgr );
 
-
-
 class SotStorage;
 
-#define BASERR_ID_STDLIBOPENERRCODE_BASMGR_STDLIBOPEN
-#define BASERR_ID_STDLIBSAVEERRCODE_BASMGR_STDLIBSAVE
-#define BASERR_ID_LIBLOAD   ERRCODE_BASMGR_LIBLOAD
-#define BASERR_ID_LIBCREATE ERRCODE_BASMGR_LIBCREATE
-#define BASERR_ID_LIBSAVE   ERRCODE_BASMGR_LIBSAVE
-#define BASERR_ID_LIBDELERRCODE_BASMGR_LIBDEL
-#define BASERR_ID_MGROPEN   ERRCODE_BASMGR_MGROPEN
-#define BASERR_ID_MGRSAVE   ERRCODE_BASMGR_MGRSAVE
-#define BASERR_ID_REMOVELIB ERRCODE_BASMGR_REMOVELIB
-#define BASERR_ID_UNLOADLIB ERRCODE_BASMGR_UNLOADLIB
-
 #define BASERR_REASON_OPENSTORAGE   0x0001
 #define BASERR_REASON_OPENLIBSTORAGE0x0002
 #define BASERR_REASON_OPENMGRSTREAM 0x0004
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

2011-12-08 Thread August Sodora

 basic/Package_inc.mk|1 
 basic/inc/basic/process.hxx |   70 
 2 files changed, 71 deletions(-)

New commits:
commit da35c131feba086d66b5aad2764a5c611cfde401
Author: August Sodora 
Date:   Thu Dec 8 13:56:03 2011 -0500

Removed basic/process.hxx

diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 0f6b253..0c9c5b2 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -34,7 +34,6 @@ $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basmgr.hxx,basic/basmgr.hx
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basrdll.hxx,basic/basrdll.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/dispdefs.hxx,basic/dispdefs.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/modsizeexceeded.hxx,basic/modsizeexceeded.hxx))
-$(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/process.hxx,basic/process.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbdef.hxx,basic/sbdef.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sberrors.hxx,basic/sberrors.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbmeth.hxx,basic/sbmeth.hxx))
diff --git a/basic/inc/basic/process.hxx b/basic/inc/basic/process.hxx
deleted file mode 100644
index e795407..000
--- a/basic/inc/basic/process.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _PROCESS_HXX
-#define _PROCESS_HXX
-
-#include 
-#include 
-#include "basicdllapi.h"
-
-#include 
-
-typedef std::map< String, String > Environment;
-typedef Environment::value_type EnvironmentVariable;
-
-class Process
-{
-// Internal members and methods
-sal_uInt32  m_nArgumentCount;
-rtl_uString   **m_pArgumentList;
-sal_uInt32  m_nEnvCount;
-rtl_uString   **m_pEnvList;
-rtl::OUString   m_aProcessName;
-oslProcess  m_pProcess;
-sal_BoolImplIsRunning();
-longImplGetExitCode();
-sal_Bool bWasGPF;
-sal_Bool bHasBeenStarted;
-
-public:
-Process();
-~Process();
-// methods
-void SetImage( const String &aAppPath, const String &aAppParams, const 
Environment *pEnv = NULL );
-sal_Bool Start();
-sal_uIntPtr GetExitCode();
-sal_Bool IsRunning();
-sal_Bool WasGPF();
-
-sal_Bool Terminate();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

2011-12-07 Thread August Sodora

 basic/Package_inc.mk|1 
 basic/inc/basic/mybasic.hxx |  104 
 2 files changed, 105 deletions(-)

New commits:
commit 003dbb74921f09c29528357340ac8f26f1de2513
Author: August Sodora 
Date:   Thu Dec 8 01:29:19 2011 -0500

Remove basic/mybasic.hxx

diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 28817fb..0f6b253 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -34,7 +34,6 @@ $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basmgr.hxx,basic/basmgr.hx
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basrdll.hxx,basic/basrdll.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/dispdefs.hxx,basic/dispdefs.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/modsizeexceeded.hxx,basic/modsizeexceeded.hxx))
-$(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/mybasic.hxx,basic/mybasic.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/process.hxx,basic/process.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sbdef.hxx,basic/sbdef.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/sberrors.hxx,basic/sberrors.hxx))
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
deleted file mode 100644
index aae5fd7..000
--- a/basic/inc/basic/mybasic.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _MYBASIC_HXX
-#define _MYBASIC_HXX
-
-#include 
-#include 
-#include "basicdllapi.h"
-
-class BasicApp;
-class AppBasEd;
-class ErrorEntry;
-
-#define SBXID_MYBASIC   0x594D  // MyBasic: MY
-#define SBXCR_TEST  0x54534554  // TEST
-
-//-
-class BasicError {
-AppBasEd* pWin;
-sal_uInt16  nLine, nCol1, nCol2;
-String aText;
-public:
-BasicError( AppBasEd*, sal_uInt16, const String&, sal_uInt16, sal_uInt16, 
sal_uInt16 );
-void Show();
-};
-
-//-
-class MyBasic : public StarBASIC
-{
-SbError nError;
-virtual sal_Bool ErrorHdl();
-virtual sal_uInt16 BreakHdl();
-
-protected:
-::std::vector< BasicError* > aErrors;
-size_t CurrentError;
-Link GenLogHdl();
-Link GenWinInfoHdl();
-Link GenModuleWinExistsHdl();
-Link GenWriteStringHdl();
-
-virtual void StartListeningTT( SfxBroadcaster &rBroadcaster );
-
-String GenRealString( const String &aResString );
-
-public:
-SBX_DECL_PERSIST_NODATA(SBXCR_TEST,SBXID_MYBASIC,1);
-TYPEINFO();
-MyBasic();
-virtual ~MyBasic();
-virtual sal_Bool Compile( SbModule* );
-void Reset();
-SbError GetErrors() { return nError; }
-size_t GetCurrentError() { return CurrentError; }
-BasicError* FirstError();
-BasicError* NextError();
-BasicError* PrevError();
-
-// Do not use #ifdefs here because this header file is both used for 
testtool and basic
-SbxObject *pTestObject; // for Testool; otherwise NULL
-
-virtual void LoadIniFile();
-
-// Determines the extended symbol type for syntax highlighting
-virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool 
bWasTTControl );
-virtual const String GetSpecialErrorText();
-virtual void ReportRuntimeError( AppBasEd *pEditWin );
-virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
-
-static void SetCompileModule( SbModule *pMod );
-static SbModule *GetCompileModule();
-};
-
-SV_DECL_IMPL_REF(MyBasic)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

2011-12-07 Thread August Sodora

 basic/Package_inc.mk|1 
 basic/inc/basic/basicrt.hxx |   82 
 2 files changed, 83 deletions(-)

New commits:
commit f5ba057f24c322d32614b1f040cd9c8255c92255
Author: August Sodora 
Date:   Thu Dec 8 01:26:09 2011 -0500

Remove basic/basicrt.hxx

diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 26fb8df..28817fb 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -30,7 +30,6 @@ $(eval $(call 
gb_Package_Package,basic_inc,$(SRCDIR)/basic/inc))
 
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basicdllapi.h,basic/basicdllapi.h))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basicmanagerrepository.hxx,basic/basicmanagerrepository.hxx))
-$(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basicrt.hxx,basic/basicrt.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basmgr.hxx,basic/basmgr.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/basrdll.hxx,basic/basrdll.hxx))
 $(eval $(call 
gb_Package_add_file,basic_inc,inc/basic/dispdefs.hxx,basic/dispdefs.hxx))
diff --git a/basic/inc/basic/basicrt.hxx b/basic/inc/basic/basicrt.hxx
deleted file mode 100644
index 4e6b4de..000
--- a/basic/inc/basic/basicrt.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-#ifndef _BASICRT_HXX
-#define _BASICRT_HXX
-
-#include 
-#include 
-#include "basicdllapi.h"
-
-class SbiRuntime;
-class SbErrorStackEntry;
-
-class BasicRuntime
-{
-SbiRuntime* pRun;
-public:
-BasicRuntime( SbiRuntime* p ) : pRun ( p ){;}
-const String GetSourceRevision();
-const String GetModuleName( SbxNameType nType );
-const String GetMethodName( SbxNameType nType );
-xub_StrLen GetLine();
-xub_StrLen GetCol1();
-xub_StrLen GetCol2();
-sal_Bool IsRun();
-sal_Bool IsValid() { return pRun != NULL; }
-BasicRuntime GetNextRuntime();
-};
-
-class BasicErrorStackEntry
-{
-SbErrorStackEntry *pEntry;
-public:
-BasicErrorStackEntry( SbErrorStackEntry *p ) : pEntry ( p ){;}
-const String GetSourceRevision();
-const String GetModuleName( SbxNameType nType );
-const String GetMethodName( SbxNameType nType );
-xub_StrLen GetLine();
-xub_StrLen GetCol1();
-xub_StrLen GetCol2();
-};
-
-class BasicRuntimeAccess
-{
-public:
-static BasicRuntime GetRuntime();
-static bool HasRuntime();
-static sal_uInt16 GetStackEntryCount();
-static BasicErrorStackEntry GetStackEntry( sal_uInt16 nIndex );
-static sal_Bool HasStack();
-static void DeleteStack();
-
-static sal_Bool IsRunInit();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/source

2011-11-15 Thread Fridrich Strba

 basic/inc/basic/sbxvar.hxx|1 +
 basic/source/sbx/sbxvalue.cxx |   14 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 1f2d0c83d07b2c877722069c0075ba35860a0400
Author: Fridrich Å trba 
Date:   Tue Nov 15 13:19:24 2011 +0100

Put back a method needed by Windows and reformat a bit

diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 485c33e..08e8002 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -212,6 +212,7 @@ public:
 
 // Special methods
 sal_Bool PutDecimal( com::sun::star::bridge::oleautomation::Decimal& 
rAutomationDec );
+sal_Bool PutDecimal( SbxDecimal* pDecimal ); // This function is needed 
for Windows build, don't remove
 sal_Bool fillAutomationDecimal( 
com::sun::star::bridge::oleautomation::Decimal& rAutomationDec );
 sal_Bool PutCurrency( const sal_Int64& );
 // Interface for CDbl in Basic
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index f279374..f617318 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -755,21 +755,21 @@ sal_Bool SbxValue::PutString( const ::rtl::OUString& r )
 sal_Bool SbxValue::p( t n ) \
 { SbxValues aRes(e); aRes.m = n; Put( aRes ); return sal_Bool( !IsError() ); }
 
-PUT( PutByte, SbxBYTE,   sal_uInt8, nByte )
+PUT( PutByte, SbxBYTE,   sal_uInt8,nByte )
 PUT( PutChar, SbxCHAR,   sal_Unicode,  nChar )
 PUT( PutCurrency, SbxCURRENCY,   const sal_Int64&, nInt64 )
 PUT( PutDate, SbxDATE,   double,   nDouble )
 PUT( PutDouble,   SbxDOUBLE, double,   nDouble )
-PUT( PutErr,  SbxERROR,  sal_uInt16,   nUShort )
-PUT( PutInteger,  SbxINTEGER,sal_Int16,nInteger )
-PUT( PutLong, SbxLONG,   sal_Int32,nLong )
+PUT( PutErr,  SbxERROR,  sal_uInt16,   nUShort )
+PUT( PutInteger,  SbxINTEGER,sal_Int16,nInteger )
+PUT( PutLong, SbxLONG,   sal_Int32,nLong )
 PUT( PutObject,   SbxOBJECT, SbxBase*, pObj )
 PUT( PutSingle,   SbxSINGLE, float,nSingle )
-PUT( PutULong,SbxULONG,  sal_uInt32,   nULong )
-PUT( PutUShort,   SbxUSHORT, sal_uInt16,   nUShort )
+PUT( PutULong,SbxULONG,  sal_uInt32,   nULong )
+PUT( PutUShort,   SbxUSHORT, sal_uInt16,   nUShort )
 PUT( PutInt64,SbxSALINT64,   sal_Int64,nInt64 )
 PUT( PutUInt64,   SbxSALUINT64,  sal_uInt64,   uInt64 )
-
+PUT( PutDecimal,  SbxDECIMAL,SbxDecimal*,  pDecimal )
 
 // Setting of the data type ///
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy

2011-11-15 Thread Noel Power

 basic/inc/basic/sbx.hxx   |7 --
 basic/inc/basic/sbxobj.hxx|9 ---
 basic/inc/basic/sbxvar.hxx|   10 ---
 basic/source/sbx/sbxarray.cxx |   30 ---
 basic/source/sbx/sbxbase.cxx  |7 --
 basic/source/sbx/sbxobj.cxx   |  109 --
 basic/source/sbx/sbxvalue.cxx |   45 -
 basic/source/sbx/sbxvar.cxx   |   10 ---
 unusedcode.easy   |   23 
 9 files changed, 250 deletions(-)

New commits:
commit e5f5167e848237e7ca4cfc00fa916d07f8b73f1a
Author: Julien Chaffraix 
Date:   Sun Nov 13 22:35:28 2011 -0800

FDO#39446 [EasyHack] Bloat Removal. Removing uncallable code with 
callcatcher

Removed most unused symbols in basic/. The remaining symbols (SdxDecimal) 
are
Windows specific and thus should be double-checked on a Windows machine 
prior
to removal.

diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index efe4297..7a74e25 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -100,7 +100,6 @@ public:
 SbxInfo( const String&, sal_uInt32 );
 
 voidAddParam( const String&, SbxDataType, 
sal_uInt16=SBX_READ );
-voidAddParam( const SbxParamInfo& );
 const SbxParamInfo* GetParam( sal_uInt16 n ) const; // index starts with 1!
 const String&   GetComment() const  { return aComment; }
 const String&   GetHelpFile() const { return aHelpFile; }
@@ -139,7 +138,6 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public 
SfxListener
 virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
  const SfxHint& rHint, const TypeId& rHintType );
 public:
-SbxAlias( const String& rName, SbxVariable* pOriginal );
 SbxAlias( const SbxAlias& );
 SbxAlias& operator=( const SbxAlias& );
 };
@@ -227,7 +225,6 @@ class BASIC_DLLPUBLIC SbxDimArray : public SbxArray
 protected:
 sal_uInt16  Offset( const short* );
 sal_uInt32  Offset32( const sal_Int32* );
-sal_uInt16  Offset( SbxArray* );
 sal_uInt32  Offset32( SbxArray* );
 virtual sal_Bool LoadData( SvStream&, sal_uInt16 );
 virtual sal_Bool StoreData( SvStream& ) const;
@@ -240,14 +237,11 @@ public:
 SbxDimArray& operator=( const SbxDimArray& );
 virtual void Clear();
 using SbxArray::GetRef;
-SbxVariableRef& GetRef( const short* );
 using SbxArray::Get;
 SbxVariable* Get( const short* );
 using SbxArray::Put;
 void Put( SbxVariable*, const short* );
-SbxVariableRef& GetRef( SbxArray* );
 SbxVariable* Get( SbxArray* );
-void Put( SbxVariable*, SbxArray* );
 
 short  GetDims() const;
 void   AddDim( short, short );
@@ -255,7 +249,6 @@ public:
 sal_Bool   GetDim( short, short&, short& ) const;
 
 using SbxArray::GetRef32;
-SbxVariableRef& GetRef32( const sal_Int32* );
 using SbxArray::Get32;
 SbxVariable* Get32( const sal_Int32* );
 using SbxArray::Put32;
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 0a4e875..653437e 100644
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -44,8 +44,6 @@ class BASIC_DLLPUBLIC SbxObject : public SbxVariable, public 
SfxListener
 SbxObjectImpl* mpSbxObjectImpl; // Impl data
 
 BASIC_DLLPRIVATE SbxArray* FindVar( SbxVariable*, sal_uInt16& );
-// AB 23.3.1997, special method for VCPtrRemove (see below)
-BASIC_DLLPRIVATE SbxArray* VCPtrFindVar( SbxVariable*, sal_uInt16& );
 protected:
 SbxArrayRef  pMethods;  // Methods
 SbxArrayRef  pProps;// Properties
@@ -91,13 +89,8 @@ public:
 // AB 23.4.1997, Optimization, Insertion without check for duplicate 
Entries and
 // without Broadcasts, only used in SO2/auto.cxx
 void QuickInsert( SbxVariable* );
-// AB 23.3.1997, Special-Method, allow corresponding controls
-void VCPtrInsert( SbxVariable* );
 virtual void Remove( const String&, SbxClassType );
 virtual void Remove( SbxVariable* );
-// AB 23.3.1997, deletion per pointer for controls (duplicate names!)
-void VCPtrRemove( SbxVariable* );
-void SetPos( SbxVariable*, sal_uInt16 );
 
 // Macro-Recording
 virtual String GenerateSource( const String &rLinePrefix,
@@ -110,8 +103,6 @@ public:
 virtual SvDispatch* GetSvDispatch();
 // Debugging
 void Dump( SvStream&, sal_Bool bDumpAll=sal_False );
-
-static void GarbageCollection( sal_uIntPtr nObjects = 0 /* ::= all */ );
 };
 
 #ifndef __SBX_SBXOBJECTREF_HXX
diff --git a/basic/inc/basic/sbxvar.hxx b/basic/inc/basic/sbxvar.hxx
index 350dcf6..485c33e 100644
--- a/basic/inc/basic/sbxvar.hxx
+++ b/basic/inc/basic/sbxvar.hxx
@@ -164,7 +164,6 @@ public:
 sal_Bool SetType( SbxDataType );
 
 virtual sal_Bool Get( SbxValues& ) const;
-sal_Bool GetNoBroadcast( SbxValues& );
 const SbxValues& GetValues_Impl() const { return aData; }
 virtual sal_Bool Pu

[Libreoffice-commits] .: basic/inc

[Libreoffice-commits] .: basic/inc basic/Library_sb.mk basic/source

[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy

[Libreoffice-commits] .: basic/inc basic/source

[Libreoffice-commits] .: basic/inc

[Libreoffice-commits] .: basic/inc basic/source

[Libreoffice-commits] .: basic/inc

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

[Libreoffice-commits] .: basic/inc basic/Package_inc.mk

[Libreoffice-commits] .: basic/inc basic/source

[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy

12 matches

Site Navigation

Mail list logo

Footer information