[Libreoffice-commits] .: binfilter/bf_basic binfilter/inc

Joseph Powers jpowers at kemper.freedesktop.org
Thu Jan 13 08:04:52 PST 2011


 binfilter/bf_basic/source/sbx/makefile.mk |   40 +++++++++++++++---------------
 binfilter/bf_basic/source/sbx/sbxbase.cxx |    2 -
 binfilter/bf_basic/source/sbx/sbxobj.cxx  |    5 +--
 binfilter/bf_basic/source/sbx/sbxscan.cxx |    3 --
 binfilter/bf_basic/source/sbx/sbxvar.cxx  |   26 -------------------
 binfilter/inc/bf_basic/sbxbase.hxx        |    8 ------
 6 files changed, 26 insertions(+), 58 deletions(-)

New commits:
commit 3f40905220fac8cc3b679af8534b6209c27132b6
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Jan 13 07:44:53 2011 -0800

    remove DECLARE_LIST(SbxVarList_Impl, SbxVariable*)
    
    It was only used during debug to print a list of variables created.

diff --git a/binfilter/bf_basic/source/sbx/makefile.mk b/binfilter/bf_basic/source/sbx/makefile.mk
index 33335d8..9ecd05f 100644
--- a/binfilter/bf_basic/source/sbx/makefile.mk
+++ b/binfilter/bf_basic/source/sbx/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -43,31 +43,31 @@ INC+= -I$(PRJ)$/inc$/bf_basic
 EXCEPTIONSFILES=$(SLO)$/sbxarray.obj
 
 SLOFILES=	\
-    $(EXCEPTIONSFILES) \
-    $(SLO)$/sbxbase.obj	\
+    $(EXCEPTIONSFILES)      \
+    $(SLO)$/sbxbase.obj     \
     $(SLO)$/sbxvar.obj      \
     $(SLO)$/sbxvalue.obj    \
-    $(SLO)$/sbxdec.obj \
-    $(SLO)$/sbxint.obj  \
+    $(SLO)$/sbxdec.obj      \
+    $(SLO)$/sbxint.obj      \
     $(SLO)$/sbxcurr.obj     \
-    $(SLO)$/sbxstr.obj  \
-    $(SLO)$/sbxbool.obj \
-    $(SLO)$/sbxdbl.obj  \
-    $(SLO)$/sbxdate.obj \
-    $(SLO)$/sbxsng.obj  \
-    $(SLO)$/sbxlng.obj  \
-    $(SLO)$/sbxobj.obj  \
+    $(SLO)$/sbxstr.obj      \
+    $(SLO)$/sbxbool.obj     \
+    $(SLO)$/sbxdbl.obj      \
+    $(SLO)$/sbxdate.obj     \
+    $(SLO)$/sbxsng.obj      \
+    $(SLO)$/sbxlng.obj      \
+    $(SLO)$/sbxobj.obj      \
     $(SLO)$/sbxscan.obj     \
-    $(SLO)$/sbxbyte.obj \
-    $(SLO)$/sbxchar.obj \
-    $(SLO)$/sbxulng.obj \
-    $(SLO)$/sbxuint.obj \
-    $(SLO)$/sbxcoll.obj \
+    $(SLO)$/sbxbyte.obj     \
+    $(SLO)$/sbxchar.obj     \
+    $(SLO)$/sbxulng.obj     \
+    $(SLO)$/sbxuint.obj     \
+    $(SLO)$/sbxcoll.obj     \
     $(SLO)$/sbxres.obj      \
-    $(SLO)$/sbxexec.obj \
+    $(SLO)$/sbxexec.obj
 
-#	$(SLO)$/sbxvals.obj	\
-    $(SLO)$/sbxmstrm.obj	\
+#	$(SLO)$/sbxvals.obj     \
+    $(SLO)$/sbxmstrm.obj
 
 
 # --- Targets -------------------------------------------------------------
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx
index 3a367fe..8443a08 100644
--- a/binfilter/bf_basic/source/sbx/sbxbase.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 316bdfd..e5fa237 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -29,7 +29,6 @@
 #include <tools/stream.hxx>
 #include <vcl/sound.hxx>
 #include "sbx.hxx"
-#include "sbxbase.hxx"
 #include "sbxres.hxx"
 
 #include <bf_svtools/brdcst.hxx>
@@ -308,7 +307,7 @@ BOOL SbxObject::Call( const XubString& rName, SbxArray* pParam )
     return FALSE;
 }
 
-SbxProperty* SbxObject::GetDfltProperty() 
+SbxProperty* SbxObject::GetDfltProperty()
 {
     if ( !pDfltProp && aDfltPropName.Len() )
     {
diff --git a/binfilter/bf_basic/source/sbx/sbxscan.cxx b/binfilter/bf_basic/source/sbx/sbxscan.cxx
index a5d4417..2ac8e1d 100644
--- a/binfilter/bf_basic/source/sbx/sbxscan.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxscan.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -42,7 +42,6 @@
 #include <ctype.h>
 
 #include "sbxres.hxx"
-#include "sbxbase.hxx"
 #include <bf_svtools/svtools.hrc>
 
 namespace binfilter {
diff --git a/binfilter/bf_basic/source/sbx/sbxvar.cxx b/binfilter/bf_basic/source/sbx/sbxvar.cxx
index 190b309..50814bf 100644
--- a/binfilter/bf_basic/source/sbx/sbxvar.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -31,7 +31,6 @@
 #include "bf_svtools/brdcst.hxx"
 
 #include "sbx.hxx"
-#include "sbxbase.hxx"
 #include "sbxres.hxx"
 #include "sbxconv.hxx"
 #include <math.h>
@@ -57,10 +56,6 @@ SbxVariable::SbxVariable() : SbxValue()
     pParent = NULL;
     nUserData = 0;
     nHash = 0;
-#ifdef DBG_UTIL
-    DbgOutf( "SbxVariable::Ctor %lx=%ld", (void*)this, ++nVar );
-    GetSbxData_Impl()->aVars.Insert( this, LIST_APPEND );
-#endif
 }
 
 SbxVariable::SbxVariable( const SbxVariable& r )
@@ -80,13 +75,6 @@ SbxVariable::SbxVariable( const SbxVariable& r )
         nUserData = 0;
         nHash = 0;
     }
-#ifdef DBG_UTIL
-    static sal_Char const aCellsStr[] = "Cells";
-    if ( maName.EqualsAscii( aCellsStr ) )
-        maName.AssignAscii( aCellsStr, sizeof( aCellsStr )-1 );
-    DbgOutf( "SbxVariable::Ctor %lx=%ld", (void*)this, ++nVar );
-    GetSbxData_Impl()->aVars.Insert( this, LIST_APPEND );
-#endif
 }
 
 SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
@@ -95,22 +83,10 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
     pParent = NULL;
     nUserData = 0;
     nHash = 0;
-#ifdef DBG_UTIL
-    DbgOutf( "SbxVariable::Ctor %lx=%ld", (void*)this, ++nVar );
-    GetSbxData_Impl()->aVars.Insert( this, LIST_APPEND );
-#endif
 }
 
 SbxVariable::~SbxVariable()
 {
-#ifdef DBG_UTIL
-    ByteString aBStr( (const UniString&)maName, RTL_TEXTENCODING_ASCII_US );
-    DbgOutf( "SbxVariable::Dtor %lx (%s)", (void*)this, aBStr.GetBuffer() );
-    static sal_Char const aCellsStr[] = "Cells";
-    if ( maName.EqualsAscii( aCellsStr ) )
-        maName.AssignAscii( aCellsStr, sizeof( aCellsStr )-1 );
-    GetSbxData_Impl()->aVars.Remove( this );
-#endif
     delete pCst;
 }
 
diff --git a/binfilter/inc/bf_basic/sbxbase.hxx b/binfilter/inc/bf_basic/sbxbase.hxx
index 8e385a9..651637f 100644
--- a/binfilter/inc/bf_basic/sbxbase.hxx
+++ b/binfilter/inc/bf_basic/sbxbase.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -44,18 +44,12 @@ class SbxVariable;
 class SbxBasicFormater;
 
 SV_DECL_PTRARR_DEL(SbxFacs,SbxFactory*,5,5)
-DECLARE_LIST(SbxVarList_Impl, SbxVariable*)
 
 // AppData-Struktur fuer SBX:
 struct SbxAppData
 {
     SbxError			eSbxError;	// Fehlercode
     SbxFacs 			aFacs;		// Factories
-    SbxVarList_Impl		aVars;		// fuer Dump
-                                            // Format()-Befehl
-    LanguageType        eBasicFormaterLangType;
-        // Bem.: es ist sinnvoll diese Klasse 'global' zu speichern, da
-        // 		 einige Resourcen (Strings) in der Klasse gehalten werden.
 
     SbxAppData() : eSbxError( SbxERR_OK ), aFacs() {}
 };


More information about the Libreoffice-commits mailing list