[dba-cvs] CVS update [cws_src680_dba24]: /dba/dbaccess/source/ui/browser/

[oj]

Tag: cws_src680_dba24
User: oj      
Date: 05/02/10 03:32:29

Modified:
 /dba/dbaccess/source/ui/browser/
  unodatbr.cxx

Log:
 #i42316# set the model as args for loadComponentFromURL call

File Changes:

Directory: /dba/dbaccess/source/ui/browser/
===========================================

File [changed]: unodatbr.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.165.4.1&r2=1.165.4.2
Delta lines:  +7 -14
--------------------
--- unodatbr.cxx        4 Feb 2005 08:47:32 -0000       1.165.4.1
+++ unodatbr.cxx        10 Feb 2005 11:32:25 -0000      1.165.4.2
@@ -3378,7 +3378,6 @@
                // get the desktop object
                sal_Int32 nFrameSearchFlag = FrameSearchFlag::ALL | 
FrameSearchFlag::GLOBAL ;
                Reference< XComponentLoader > 
xFrameLoader(getORB()->createInstance(SERVICE_FRAME_DESKTOP),UNO_QUERY);
-               ::rtl::OUString sTarget = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default"));
 
                if ( xFrameLoader.is() )
                {
@@ -3390,25 +3389,19 @@
                        if (pTopLevelSelected)
                                sInitialSelection = getDataSourceAcessor( 
pTopLevelSelected );
 
-            INetURLObject aURLParser( sInitialSelection );
-            ::rtl::OUString sURL;
-            if ( aURLParser.GetProtocol() != INET_PROT_NOT_VALID )
-                sURL = aURLParser.GetMainURL( INetURLObject::NO_DECODE );
-            else if ( m_xDatabaseContext->hasByName( sInitialSelection ) )
-            {
                 Reference< XModel > xDocumentModel =
                     getDataSourceByName_displayError( m_xDatabaseContext, 
sInitialSelection, getView(), getORB(), true );
-                if ( xDocumentModel.is() )
-                    sURL = xDocumentModel->getURL();
-            }
 
-            if ( sURL.getLength() )
+            if ( xDocumentModel.is() )
                        {
+                               Sequence<PropertyValue > aArgs(1);
+                               aArgs[0].Name = 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model"));
+                               aArgs[0].Value <<= xDocumentModel;
                                xFrameLoader->loadComponentFromURL(
-                                       sURL,
+                                       xDocumentModel->getURL(),
                                        
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")),
                                        nFrameSearchFlag,
-                                       Sequence<PropertyValue >()
+                                       aArgs
                                );
                        }
                }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]