basic/inc/basic/sbdef.hxx | 33 +-------------------------------- basic/inc/basic/sbmod.hxx | 1 - basic/inc/basic/sbstar.hxx | 6 ------ basic/source/classes/sbintern.cxx | 1 - basic/source/inc/sbintern.hxx | 1 - basic/source/runtime/methods.cxx | 5 ++--- 6 files changed, 3 insertions(+), 44 deletions(-)
New commits: commit 9a2859df2d908774399b4041b47f2c390d030b31 Author: August Sodora <aug...@gmail.com> Date: Mon Jan 16 00:51:20 2012 -0500 Remove invalid friend declaration diff --git a/basic/inc/basic/sbmod.hxx b/basic/inc/basic/sbmod.hxx index 443ecde..24700e9 100644 --- a/basic/inc/basic/sbmod.hxx +++ b/basic/inc/basic/sbmod.hxx @@ -55,7 +55,6 @@ class SbModuleImpl; class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable { - friend class TestToolObj; // allows module initialisation at runtime friend class SbiCodeGen; friend class SbMethod; friend class SbiRuntime; commit ad5bc7a1ecbe41ae49860c7223fd9f99cb3c4697 Author: August Sodora <aug...@gmail.com> Date: Sun Jan 15 23:55:04 2012 -0500 String->OUString diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index fefdc37..d3a8615 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -30,13 +30,12 @@ #define _SB_SBDEF_HXX #include <basic/sbxdef.hxx> -#include <svl/svarray.hxx> #include <rtl/ustring.hxx> #include "basicdllapi.h" // Returns type name for Basic type, array flag is ignored // implementation: basic/source/runtime/methods.cxx -BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType ); +BASIC_DLLPUBLIC ::rtl::OUString getBasicTypeName( SbxDataType eType ); // Returns type name for Basic objects, especially // important for SbUnoObj instances diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index e6aef79..e457b2e 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3414,7 +3414,7 @@ RTLFUNC(VarType) } // Exported function -String getBasicTypeName( SbxDataType eType ) +rtl::OUString getBasicTypeName( SbxDataType eType ) { static const char* pTypeNames[] = { @@ -3462,8 +3462,7 @@ String getBasicTypeName( SbxDataType eType ) sal_uInt16 nTypeNameCount = sizeof( pTypeNames ) / sizeof( char* ); if ( nPos < 0 || nPos >= nTypeNameCount ) nPos = nTypeNameCount - 1; - String aRetStr = String::CreateFromAscii( pTypeNames[nPos] ); - return aRetStr; + return rtl::OUString::createFromAscii(pTypeNames[nPos]); } String getObjectTypeName( SbxVariable* pVar ) commit 0ced88ad440995e1f84ba0712df1092bfc225c84 Author: August Sodora <aug...@gmail.com> Date: Sun Jan 15 23:47:54 2012 -0500 Remove unused enum SbLanguageMode diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index 82dfd65..fefdc37 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -34,15 +34,6 @@ #include <rtl/ustring.hxx> #include "basicdllapi.h" -// Active language -enum SbLanguageMode -{ - SB_LANG_GLOBAL, // As in SbiGlobals struct - SB_LANG_BASIC, // StarBasic (Default) - SB_LANG_VBSCRIPT, // Visual-Basic-Script - SB_LANG_JAVASCRIPT // JavaScript -}; - // Returns type name for Basic type, array flag is ignored // implementation: basic/source/runtime/methods.cxx BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType ); diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index f71bf51..dc6622e 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -74,7 +74,6 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject sal_Bool bDocBasic; sal_Bool bVBAEnabled; BasicLibInfo* pLibInfo; // Info block for basic manager - SbLanguageMode eLanguageMode; // LanguageMode of the basic object sal_Bool bQuit; SbxObjectRef pVBAGlobals; @@ -161,11 +160,6 @@ public: static sal_Bool IsCompilerError(); static sal_uInt16 GetVBErrorCode( SbError nError ); static SbError GetSfxFromVBError( sal_uInt16 nError ); - // Local settings - void SetLanguageMode( SbLanguageMode eLangMode ) - { eLanguageMode = eLangMode; } - - // Specific for break handler sal_Bool IsBreak() const { return bBreak; } static Link GetGlobalErrorHdl(); diff --git a/basic/source/classes/sbintern.cxx b/basic/source/classes/sbintern.cxx index 9160c11..1993aa6 100644 --- a/basic/source/classes/sbintern.cxx +++ b/basic/source/classes/sbintern.cxx @@ -63,7 +63,6 @@ SbiGlobals::SbiGlobals() bCompiler = sal_False; bGlobalInitErr = sal_False; bRunInit = sal_False; - eLanguageMode = SB_LANG_BASIC; pErrStack = NULL; pTransliterationWrapper = NULL; bBlockCompilerError = sal_False; diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index 6d6143b..ac6b883 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -172,7 +172,6 @@ struct SbiGlobals sal_Bool bGlobalInitErr; sal_Bool bRunInit; // sal_True, if RunInit active from the Basic String aErrMsg; // buffer for GetErrorText() - SbLanguageMode eLanguageMode; // flag for Visual-Basic-Script-Modus SbErrorStack* pErrStack; // for the SbiRuntime chain ::utl::TransliterationWrapper* pTransliterationWrapper; // For StrComp sal_Bool bBlockCompilerError; commit 2a3d61a0be85301c2629cb561730aa73741aa428 Author: August Sodora <aug...@gmail.com> Date: Sun Jan 15 23:42:57 2012 -0500 Remove unused enum SbTextType diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index 5db849e..82dfd65 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -34,18 +34,6 @@ #include <rtl/ustring.hxx> #include "basicdllapi.h" -// Type of a text token (syntax highlighting) -enum SbTextType -{ - SB_KEYWORD = 1, // Keywords - SB_SYMBOL, // Symbols - SB_STRING, // Strings - SB_NUMBER, // Numbers - SB_PUNCTUATION, // Brackets, points, etc. - SB_COMMENT, // Comments - SB_DUMMY = 255 // workaround for #i31479 -}; - // Active language enum SbLanguageMode { commit a29901ae3245081a115e3b3d64c14642684cb686 Author: August Sodora <aug...@gmail.com> Date: Sun Jan 15 23:41:12 2012 -0500 Remove unused struct SbTextPortion diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index c3503da..5db849e 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -55,13 +55,6 @@ enum SbLanguageMode SB_LANG_JAVASCRIPT // JavaScript }; -struct SbTextPortion -{ // Syntax Highlighting: a text portion - xub_StrLen nLine; // Line number - xub_StrLen nStart, nEnd; // 1st and last column - SbTextType eType; // Type of the portion -}; - // Returns type name for Basic type, array flag is ignored // implementation: basic/source/runtime/methods.cxx BASIC_DLLPUBLIC String getBasicTypeName( SbxDataType eType ); commit 64c8a11cc5f29720ed12d9a18aae6ac36e714ed9 Author: August Sodora <aug...@gmail.com> Date: Sun Jan 15 23:38:17 2012 -0500 Remove unnecessary using declaration diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index baa8d50..c3503da 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -34,8 +34,6 @@ #include <rtl/ustring.hxx> #include "basicdllapi.h" -using rtl::OUString; - // Type of a text token (syntax highlighting) enum SbTextType { _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits