[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source fpicker/source

[Caolán McNamara]

 basic/source/classes/sb.cxx     |    3 +++
 fpicker/source/office/iodlg.src |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0f5a2ad6aca673c43abb7228df9e80e2eac3c372
Author: Noel Power <nopower at suse.com>
Date:   Wed Sep 21 14:42:05 2011 +0100

    fdo#37164 get testtool working

diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 4541089..f9cbab6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -478,6 +478,9 @@ SbxBase* SbFormFactory::Create( sal_uInt16, sal_uInt32 )
 
 SbxObject* SbFormFactory::CreateObject( const String& rClassName )
 {
+    if ( !SbiRuntime::isVBAEnabled() )
+        return NULL;
+
     if( SbModule* pMod = pMOD )
     {
         if( SbxVariable* pVar = pMod->Find( rClassName, SbxCLASS_OBJECT ) )
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4a3c2f6..d966faa 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -92,7 +92,7 @@ ModalDialog DLG_SVT_EXPLORERFILE
         };
         QuickHelpText [ en-US ] = "List";
     };
-        HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
+
     MenuButton BTN_EXPLORERFILE_UP
     {
         HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";