Tag: cws_src680_hsqlcsv User: fs Date: 2006/12/17 23:51:05 Modified: dba/dbaccess/source/ui/app/AppControllerGen.cxx
Log: RESYNC: (1.22-1.24); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppControllerGen.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppControllerGen.cxx?r1=1.20.36.2&r2=1.20.36.3 Delta lines: +6 -2 ------------------- --- AppControllerGen.cxx 11 Oct 2006 08:50:48 -0000 1.20.36.2 +++ AppControllerGen.cxx 18 Dec 2006 07:51:02 -0000 1.20.36.3 @@ -619,7 +619,8 @@ try { Reference< XNameAccess > xContainer = const_cast<OApplicationController*>(this)->getElements(eType); - if ( (bEnabled = (xContainer.is() && xContainer->hasByName(*aList.begin()))) ) + bEnabled = (xContainer.is() && xContainer->hasByName(*aList.begin())); + if ( bEnabled ) bEnabled = Reference<XRename>(xContainer->getByName(*aList.begin()),UNO_QUERY).is(); } catch(Exception&) @@ -664,7 +665,10 @@ if ( SID_DB_APP_CONVERTTOVIEW == _nId ) convertToView(*aIter); else - aCompoments.push_back( ::std::pair< ::rtl::OUString ,Reference< XModel > >(*aIter,Reference< XModel >(openElement(*aIter,eType, _eOpenMode ),UNO_QUERY))); + { + Reference< XModel > xModel( openElement( *aIter, eType, _eOpenMode, _nId ), UNO_QUERY ); + aCompoments.push_back( ::std::pair< ::rtl::OUString, Reference< XModel > >( *aIter, xModel ) ); + } } // special handling for mail, if more than one document is selected attach them all --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
