diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-12 11:31:47 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-12 17:01:19 +0200 |
| commit | 01ea434011fdf868c612539179bb30aedb0495d0 (patch) | |
| tree | ef1cee291f7256de6d347f7fc23fc8c31c0bbae3 | |
| parent | 7884de47a5ffb43bcfc418828de50547d5b5901c (diff) | |
remove runsInSetup which has a const return value
| -rw-r--r-- | basic/source/classes/sb.cxx | 6 | ||||
| -rw-r--r-- | basic/source/comp/dim.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 12 |
3 files changed, 1 insertions, 21 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index b598576294c6..fca2841bcaee 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 e1e56101e937..f3cf7334b6bb 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 b71558b0fb7e..6f3af60aedd5 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 |