more merge fixes, compiles and links now

2011-03-15 09:56:18 +00:00
parent 1a5aaf0b88
commit 970dfb78ae
4 changed files with 18 additions and 18 deletions
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -183,6 +183,11 @@ ScVbaApplication::~ScVbaApplication()
 {
 }

+/*static*/ bool ScVbaApplication::getDocumentEventsEnabled()
+{
+    return ScVbaStaticAppSettings::get().mbEnableEvents;
+}
+
 SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
 {
    return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) );