diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-10 11:04:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-20 07:40:21 +0000 |
| commit | af6daec72b71b1d72a2555efdc5b2fb2e0ba2b90 (patch) | |
| tree | 1f16be1fd99edcdc3237ee3fa038ca0f1b88b4fd /sfx2/source/appl/appbas.cxx | |
| parent | 00754461516416f8ee59ec97632bff84f4d9b155 (diff) | |
more config skipping stuff and a tester tool
Change-Id: I5e93a4c84b3a0940239213766eb24d21fb5fd649
Reviewed-on: https://gerrit.libreoffice.org/17863
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/appl/appbas.cxx')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index becd677efcaf..df23fcd9b4a6 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -69,6 +69,7 @@ #include <sfx2/sfxhelp.hxx> #include <basic/basmgr.hxx> #include <svtools/svtools.hrc> +#include <unotools/configmgr.hxx> #include "sorgitm.hxx" #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> @@ -99,17 +100,19 @@ BasicManager* SfxApplication::GetBasicManager() #if !HAVE_FEATURE_SCRIPTING return 0; #else + if (utl::ConfigManager::IsAvoidConfig()) + return 0; return BasicManagerRepository::getApplicationBasicManager( true ); #endif } - - XLibraryContainer * SfxApplication::GetDialogContainer() { #if !HAVE_FEATURE_SCRIPTING return NULL; #else + if (utl::ConfigManager::IsAvoidConfig()) + return NULL; if ( !pAppData_Impl->pBasicManager->isValid() ) GetBasicManager(); return pAppData_Impl->pBasicManager->getLibraryContainer( SfxBasicManagerHolder::DIALOGS ); @@ -123,6 +126,8 @@ XLibraryContainer * SfxApplication::GetBasicContainer() #if !HAVE_FEATURE_SCRIPTING return NULL; #else + if (utl::ConfigManager::IsAvoidConfig()) + return NULL; if ( !pAppData_Impl->pBasicManager->isValid() ) GetBasicManager(); return pAppData_Impl->pBasicManager->getLibraryContainer( SfxBasicManagerHolder::SCRIPTS ); @@ -134,6 +139,8 @@ StarBASIC* SfxApplication::GetBasic() #if !HAVE_FEATURE_SCRIPTING return 0; #else + if (utl::ConfigManager::IsAvoidConfig()) + return 0; return GetBasicManager()->GetLib(0); #endif } |