[Libreoffice-commits] .: 10 commits - basic/inc basic/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Jul 12 08:01:14 PDT 2011
basic/inc/basic/sbstar.hxx | 14 -----
basic/source/classes/sb.cxx | 101 ---------------------------------------
basic/source/comp/dim.cxx | 4 -
basic/source/runtime/iosys.cxx | 12 ----
basic/source/runtime/runtime.cxx | 11 ----
5 files changed, 3 insertions(+), 139 deletions(-)
New commits:
commit 1f0d86f32f4f50c3c86252727cf2e16417de804a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:31:47 2011 +0200
remove runsInSetup which has a const return value
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 60deac9..6105d51 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1601,12 +1601,6 @@ struct BasicStringList_Impl : private Resource
};
//----------------------------------------------------------------
-sal_Bool runsInSetup( void )
-{
- return sal_False;
-}
-
-
void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
{
SolarMutexGuard aSolarGuard;
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index f9d1879..ec02f2f 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -1088,8 +1088,6 @@ void SbiParser::SubFunc()
// Read in of a procedure
-sal_Bool runsInSetup( void );
-
void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
{
sal_uInt16 l1 = nLine, l2 = nLine;
@@ -1132,7 +1130,7 @@ void SbiParser::DefProc( sal_Bool bStatic, sal_Bool bPrivate )
}
// #100027: Multiple declaration -> Error
// #112787: Not for setup, REMOVE for 8
- else if( !runsInSetup() && pProc->IsUsedForProcDecl() )
+ else if( pProc->IsUsedForProcDecl() )
{
PropertyMode ePropMode = pDef->getPropertyMode();
if( ePropMode == PROPERTY_MODE_NONE || ePropMode == pProc->getPropertyMode() )
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index e1ae04b..65d1d20 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -203,9 +203,6 @@ void SbiStream::MapError()
return user;
}
-// Hack for #83750
-sal_Bool runsInSetup( void );
-
sal_Bool needSecurityRestrictions( void )
{
static sal_Bool bNeedInit = sal_True;
@@ -213,15 +210,6 @@ sal_Bool needSecurityRestrictions( void )
if( bNeedInit )
{
- // Hack for #83750, use internal flag until
- // setup provides own service manager
- if( runsInSetup() )
- {
- // Setup is not critical
- bRetVal = sal_False;
- return bRetVal;
- }
-
bNeedInit = sal_False;
// Get system user to compare to portal user
commit 7d3cdf750363def873923b7f6bf25c4500cbec3d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:18:14 2011 +0200
callcatcher: remove unused StarBASIC::StaticSuppressSfxResource
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 9b92fa9..24ecad6 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -190,9 +190,6 @@ public:
void SetVBAEnabled( sal_Bool bEnabled );
sal_Bool isVBAEnabled();
- // #60175 sal_True: SFX-Resource is not displayed on basic errors
- static void StaticSuppressSfxResource( sal_Bool bSuppress );
-
SbxObjectRef getRTL( void ) { return pRtl; }
sal_Bool IsDocBasic() { return bDocBasic; }
SbxVariable* VBAFind( const String& rName, SbxClassType t );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index cdbace7..60deac9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1601,31 +1601,15 @@ struct BasicStringList_Impl : private Resource
};
//----------------------------------------------------------------
-// Flag, that prevent the activation of the SFX-Resources at a Basic error
-static sal_Bool bStaticSuppressSfxResource = sal_False;
-
-void StarBASIC::StaticSuppressSfxResource( sal_Bool bSuppress )
-{
- bStaticSuppressSfxResource = bSuppress;
-}
-
-// Hack for #83750, use bStaticSuppressSfxResource as setup flag
sal_Bool runsInSetup( void )
{
- return bStaticSuppressSfxResource;
+ return sal_False;
}
void StarBASIC::MakeErrorText( SbError nId, const String& aMsg )
{
SolarMutexGuard aSolarGuard;
-
- if( bStaticSuppressSfxResource )
- {
- GetSbData()->aErrMsg = String( RTL_CONSTASCII_USTRINGPARAM("No resource: Error message not available") );
- return;
- }
-
sal_uInt16 nOldID = GetVBErrorCode( nId );
// intantiate the help class
commit d4082774bdd005473d474d172632ff9ee7d3ef41
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:10:42 2011 +0200
callcatcher: remove unused StarBASIC::StaticEnableReschedule
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 82c0427..9b92fa9 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -193,9 +193,6 @@ public:
// #60175 sal_True: SFX-Resource is not displayed on basic errors
static void StaticSuppressSfxResource( sal_Bool bSuppress );
- // #91147 sal_True: Reschedule is enabled (default>, sal_False: No reschedule
- static void StaticEnableReschedule( sal_Bool bReschedule );
-
SbxObjectRef getRTL( void ) { return pRtl; }
sal_Bool IsDocBasic() { return bDocBasic; }
SbxVariable* VBAFind( const String& rName, SbxClassType t );
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index a92ca12..f6c2fe0 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -61,13 +61,6 @@ bool SbiRuntime::isVBAEnabled()
return result;
}
-// #91147 Global reschedule flag
-static sal_Bool bStaticGlobalEnableReschedule = sal_True;
-
-void StarBASIC::StaticEnableReschedule( sal_Bool bReschedule )
-{
- bStaticGlobalEnableReschedule = bReschedule;
-}
void StarBASIC::SetVBAEnabled( sal_Bool bEnabled )
{
if ( bDocBasic )
@@ -715,7 +708,7 @@ sal_Bool SbiRuntime::Step()
if( bRun )
{
// Unbedingt gelegentlich die Kontrolle abgeben!
- if( !( ++nOps & 0xF ) && pInst->IsReschedule() && bStaticGlobalEnableReschedule )
+ if( !( ++nOps & 0xF ) && pInst->IsReschedule() )
{
sal_uInt32 nTime = osl_getGlobalTimer();
if (nTime - m_nLastTime > 5 ) // 20 ms
@@ -728,7 +721,7 @@ sal_Bool SbiRuntime::Step()
// #i48868 blocked by next call level?
while( bBlocked )
{
- if( pInst->IsReschedule() && bStaticGlobalEnableReschedule )
+ if( pInst->IsReschedule() )
Application::Reschedule();
}
commit 23038d10174adf4adc691abc6b92c040191a64e5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:08:03 2011 +0200
callcatcher: remove unused StarBASIC::SetGlobalLanguageMode
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 691aed6..82c0427 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -166,7 +166,6 @@ public:
static sal_Bool IsCompilerError();
static sal_uInt16 GetVBErrorCode( SbError nError );
static SbError GetSfxFromVBError( sal_uInt16 nError );
- static void SetGlobalLanguageMode( SbLanguageMode eLangMode );
// Local settings
void SetLanguageMode( SbLanguageMode eLangMode )
{ eLanguageMode = eLangMode; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index bc19aa3..cdbace7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1472,10 +1472,6 @@ sal_uInt16 StarBASIC::GetCol2() { return GetSbData()->nCol2; }
SbError StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
const String& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
sal_Bool StarBASIC::IsCompilerError() { return GetSbData()->bCompiler; }
-void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
-{
- GetSbData()->eLanguageMode = eLanguageMode;
-}
// From 1996-03-29:
// The mapping between the old and the new error codes take place by searching
commit 989104f6dffc582bfac88f264630cb324be5da00
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:07:38 2011 +0200
callcatcher: remove unused StarBASIC::LoadOldModules
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 3c1e2e3..691aed6 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -148,7 +148,6 @@ public:
void InitAllModules( StarBASIC* pBasicNotToInit = NULL );
void DeInitAllModules( void );
void ClearAllModuleVars( void );
- sal_Bool LoadOldModules( SvStream& );
// #43011 For TestTool; deletes global vars
void ClearGlobalVars( void );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e0392d1..bc19aa3 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1896,11 +1896,6 @@ sal_Bool StarBASIC::StoreData( SvStream& r ) const
return sal_True;
}
-sal_Bool StarBASIC::LoadOldModules( SvStream& )
-{
- return sal_False;
-}
-
bool StarBASIC::GetUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
{
bool bRes = false;
commit 7d7f1a33a223444b6c7463e14bfd4d5fe99e61be
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:07:17 2011 +0200
callcatcher: remove unused StarBASIC::GetLanguageMode
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 4636171..3c1e2e3 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -171,7 +171,6 @@ public:
// Local settings
void SetLanguageMode( SbLanguageMode eLangMode )
{ eLanguageMode = eLangMode; }
- SbLanguageMode GetLanguageMode();
// Specific for break handler
sal_Bool IsBreak() const { return bBreak; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c03f464..e0392d1 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1476,15 +1476,6 @@ void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
{
GetSbData()->eLanguageMode = eLanguageMode;
}
-// Local settings
-SbLanguageMode StarBASIC::GetLanguageMode()
-{
- // Use global settings?
- if( eLanguageMode == SB_LANG_GLOBAL )
- return GetSbData()->eLanguageMode;
- else
- return eLanguageMode;
-}
// From 1996-03-29:
// The mapping between the old and the new error codes take place by searching
commit c9a8dccbb3288b33b3ae11f3bc70022dbde492fe
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:06:52 2011 +0200
callcatcher: remove unused StarBASIC::GetGlobalLanguageMode
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index 3c61d8d..4636171 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -168,7 +168,6 @@ public:
static sal_uInt16 GetVBErrorCode( SbError nError );
static SbError GetSfxFromVBError( sal_uInt16 nError );
static void SetGlobalLanguageMode( SbLanguageMode eLangMode );
- static SbLanguageMode GetGlobalLanguageMode();
// Local settings
void SetLanguageMode( SbLanguageMode eLangMode )
{ eLanguageMode = eLangMode; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c563226..c03f464 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1476,10 +1476,6 @@ void StarBASIC::SetGlobalLanguageMode( SbLanguageMode eLanguageMode )
{
GetSbData()->eLanguageMode = eLanguageMode;
}
-SbLanguageMode StarBASIC::GetGlobalLanguageMode()
-{
- return GetSbData()->eLanguageMode;
-}
// Local settings
SbLanguageMode StarBASIC::GetLanguageMode()
{
commit 9984f32fbf9e5ca40dab687c992caa7496e355e4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:06:26 2011 +0200
callcatcher: remove unused StarBASIC::GetGlobalBreakHdl
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index eca9601..3c61d8d 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -182,7 +182,6 @@ public:
Link GetErrorHdl() const { return aErrorHdl; }
void SetErrorHdl( const Link& r ) { aErrorHdl = r; }
- static Link GetGlobalBreakHdl();
static void SetGlobalBreakHdl( const Link& rNewHdl );
Link GetBreakHdl() const { return aBreakHdl; }
void SetBreakHdl( const Link& r ) { aBreakHdl = r; }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 27912f2..c563226 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1818,12 +1818,6 @@ void StarBASIC::SetGlobalErrorHdl( const Link& rLink )
GetSbData()->aErrHdl = rLink;
}
-
-Link StarBASIC::GetGlobalBreakHdl()
-{
- return GetSbData()->aBreakHdl;
-}
-
void StarBASIC::SetGlobalBreakHdl( const Link& rLink )
{
GetSbData()->aBreakHdl = rLink;
commit a8a374aed13a2ea47e4276eb44bcdf10646d28aa
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:05:53 2011 +0200
callcatcher: remove unused StarBASIC::FindVarInCurrentScopy
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index eaf44d2..eca9601 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -190,8 +190,6 @@ public:
SbxArrayRef getUnoListeners( void );
static SbxBase* FindSBXInCurrentScope( const String& rName );
- static SbxVariable* FindVarInCurrentScopy
- ( const String& rName, sal_uInt16& rStatus );
static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 );
static SbModule* GetActiveModule();
void SetVBAEnabled( sal_Bool bEnabled );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e19630d..27912f2 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1394,23 +1394,6 @@ SbxBase* StarBASIC::FindSBXInCurrentScope( const String& rName )
return pINST->pRun->FindElementExtern( rName );
}
-// Preserve old interface
-SbxVariable* StarBASIC::FindVarInCurrentScopy
-( const String& rName, sal_uInt16& rStatus )
-{
- rStatus = 1; // Presumption: nothing found
- SbxVariable* pVar = NULL;
- SbxBase* pSbx = FindSBXInCurrentScope( rName );
- if( pSbx )
- {
- if( !pSbx->ISA(SbxMethod) && !pSbx->ISA(SbxObject) )
- pVar = PTR_CAST(SbxVariable,pSbx);
- }
- if( pVar )
- rStatus = 0; // We found something
- return pVar;
-}
-
void StarBASIC::QuitAndExitApplication()
{
Stop();
commit 576a0889a0295aa673e1ae823928eb91481c6b7e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jul 12 11:05:18 2011 +0200
callcatcher: remove unused StarBASIC::ActivateObject
diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx
index e94e193..eaf44d2 100644
--- a/basic/inc/basic/sbstar.hxx
+++ b/basic/inc/basic/sbstar.hxx
@@ -148,7 +148,6 @@ public:
void InitAllModules( StarBASIC* pBasicNotToInit = NULL );
void DeInitAllModules( void );
void ClearAllModuleVars( void );
- void ActivateObject( const String*, sal_Bool );
sal_Bool LoadOldModules( SvStream& );
// #43011 For TestTool; deletes global vars
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 4162df6..e19630d 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1434,40 +1434,6 @@ sal_Bool StarBASIC::IsRunning()
/**************************************************************************
*
-* Object factories and others
-*
-**************************************************************************/
-
-// Activation of an object. There is no need to access active objects
-// with name via BASIC. If NULL is given, everything is activated.
-void StarBASIC::ActivateObject( const String* pName, sal_Bool bActivate )
-{
- if( pName )
- {
- SbxObject* p = (SbxObject*) SbxObject::Find( *pName, SbxCLASS_OBJECT );
- if( p )
- {
- if( bActivate )
- p->SetFlag( SBX_EXTSEARCH );
- else
- p->ResetFlag( SBX_EXTSEARCH );
- }
- }
- else
- {
- for( sal_uInt16 i = 0; i < GetObjects()->Count(); i++ )
- {
- SbxObject* p = (SbxObject*) GetObjects()->Get( i );
- if( bActivate )
- p->SetFlag( SBX_EXTSEARCH );
- else
- p->ResetFlag( SBX_EXTSEARCH );
- }
- }
-}
-
-/**************************************************************************
-*
* Debugging and error handling
*
**************************************************************************/
More information about the Libreoffice-commits
mailing list