From dd7703d3d5da474f2ccdb6b193d875141ea21a7c Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Tue, 1 Dec 2009 09:53:35 +0000
Subject: CWS-TOOLING: integrate CWS dba32j 2009-11-26 09:30:10 +0100 msc 
 r277648 : #100000 fix urgent testscript error 2009-11-25 10:27:56 +0100 msc 
 r277625 : #i100000 fix urgent testscript error 2009-11-17 22:16:46 +0100 fs 
 r277544 : CWS-TOOLING: rebase CWS dba32j to branches/OOO320@277531
 (milestone: OOO320:m5) 2009-11-17 14:26:47 +0100 fs  r277535 : ooops, didn't
 mean to commit this uncommented line 2009-11-14 20:50:29 +0100 fs  r277505 :
 add a --disable-pango switch to SM's configure options, and add a patch which
 makes certain code respect it (well, respect it better than currently, by not
 using some pango_x_* functions, which are not always available, even when
 pango itself is present) 2009-11-14 20:47:41 +0100 fs  r277504 : spelling
 2009-11-13 14:04:00 +0100 fs  r277502 : #i100764# (commit approved by
 ab@openoffice.org): getModelFromBasic: do not start with the parent's parent
 when looking for ThisComponent, but walk up the anchestor chain, starting
 with the immediate parent 2009-11-13 11:04:15 +0100 fs  r277496 : #i100764#
 better heuristics for determining whether or not to participate in the
 ThisComponent game 2009-11-13 11:02:30 +0100 fs  r277495 : #i100764# set the
 WB_EXT_DOCUMENT style at the backing component's container window, when
 creating it without the TaskCreator (which would normally do this) 2009-11-11
 13:49:11 +0100 fs  r277452 : #i106816# 2009-11-11 13:48:53 +0100 fs  r277451
 : fix the CREATETARBAL target, which is expected to create the zips used as
 prebuilts. The *inc.zip missed the NSS files in case NSS was built externally
 2009-11-11 12:15:34 +0100 fs  r277449 : update ignore list 2009-11-11
 12:09:23 +0100 fs  r277448 : add a link to the Mozilla build tools download
 location 2009-11-11 12:07:16 +0100 fs  r277447 : add a link to the Mozilla
 build tools download location 2009-11-06 16:23:12 +0100 fs  r277393 :
 #i106643# 2009-11-03 23:20:29 +0100 fs  r277328 : #i106574# reverted the
 recent fix for issue #i105235#, and implemented a better one. 2009-11-02
 12:59:48 +0100 fs  r277294 : #i106550# errorOccured: also display the error
 when we're not in a nested form action - form actions are allowed to be
 triggered by other instances as well

---
 basic/source/classes/eventatt.cxx | 71 ++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 38 deletions(-)

(limited to 'basic')

diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 7776b57829c9..b0c8f4b3c36c 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -95,53 +95,48 @@ Any sbxToUnoValue( SbxVariable* pVar );
 
 Reference< frame::XModel >  getModelFromBasic( SbxObject* pBasic )
 {
-    Reference< frame::XModel > xModel;
-
-    SbxObject* basicChosen = pBasic;
-
-    if ( basicChosen == NULL)
+    OSL_PRECOND( pBasic != NULL, "getModelFromBasic: illegal call!" );
+    if ( !pBasic )
+        return NULL;
+
+    // look for the ThisComponent variable, first in the parent (which
+    // might be the document's Basic), then in the parent's parent (which might be
+    // the application Basic)
+    const ::rtl::OUString sThisComponent( RTL_CONSTASCII_USTRINGPARAM( "ThisComponent" ) );
+    SbxVariable* pThisComponent = NULL;
+
+    SbxObject* pLookup = pBasic->GetParent();
+    while ( pLookup && !pThisComponent )
     {
-        OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
-        return xModel;
+        pThisComponent = pLookup->Find( sThisComponent, SbxCLASS_OBJECT );
+        pLookup = pLookup->GetParent();
     }
-    SbxObject* p = pBasic;
-    SbxObject* pParent = p->GetParent();
-    SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
-
-    if( pParentParent )
+    if ( !pThisComponent )
     {
-        basicChosen = pParentParent;
+        OSL_TRACE("Failed to get ThisComponent");
+            // the application Basic, at the latest, should have this variable
+        return NULL;
     }
-    else if( pParent )
+
+    Any aThisComponent( sbxToUnoValue( pThisComponent ) );
+    Reference< frame::XModel > xModel( aThisComponent, UNO_QUERY );
+    if ( !xModel.is() )
     {
-        basicChosen = pParent;
+        // it's no XModel. Okay, ThisComponent nowadays is allowed to be a controller.
+        Reference< frame::XController > xController( aThisComponent, UNO_QUERY );
+        if ( xController.is() )
+            xModel = xController->getModel();
     }
 
+    if ( !xModel.is() )
+        return NULL;
 
-    Any aModel;
-    SbxVariable *pCompVar = basicChosen->Find(  UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
+#if OSL_DEBUG_LEVEL > 0
+    OSL_TRACE("Have model ThisComponent points to url %s",
+        ::rtl::OUStringToOString( xModel->getURL(),
+            RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+#endif
 
-    if ( pCompVar )
-    {
-         aModel = sbxToUnoValue( pCompVar );
-         if ( sal_False == ( aModel >>= xModel ) ||
-              !xModel.is() )
-         {
-             OSL_TRACE("Failed to extract model from thisComponent ");
-             return xModel;
-         }
-         else
-         {
-             OSL_TRACE("Have model ThisComponent points to url %s",
-                 ::rtl::OUStringToOString( xModel->getURL(),
-                     RTL_TEXTENCODING_ASCII_US ).pData->buffer );
-
-         }
-    }
-    else
-    {
-        OSL_TRACE("Failed to get ThisComponent");
-    }
     return xModel;
 }
 
-- 
cgit