Tag: cws_src680_asyncdialogs2 User: pb Date: 2008-09-02 05:59:03+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/AppController.hxx
Log: RESYNC: (1.63-1.65); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.37.34.15&r2=1.37.34.16 Delta lines: +56 -38 --------------------- --- AppController.cxx 2008-07-01 12:00:22+0000 1.37.34.15 +++ AppController.cxx 2008-09-02 05:58:30+0000 1.37.34.16 @@ -2090,12 +2090,15 @@ case E_REPORT: { ::std::auto_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); + if ( aHelper->isConnected() ) + { Reference< XComponent > xComponent,xDefinition; sal_Int32 nCommandType = -1; const ::rtl::OUString sName(getCurrentlySelectedName(nCommandType)); xComponent = aHelper->newDocument(_eType == E_FORM ? ID_FORM_NEW_TEXT : ID_REPORT_NEW_TEXT,xDefinition,nCommandType,sName); addDocumentListener(xComponent,xDefinition); } + } break; case E_QUERY: case E_TABLE: @@ -3092,12 +3095,27 @@ } break; } // if ( aFind->second.first.first == _nKind && aFind->second.first.second == _eOpenMode ) - } // while ( aFind != m_aSpecialSubFrames.end() ) + } return bFound; } - +// ----------------------------------------------------------------------------- +void OApplicationController::impl_deActivateSubFrame_throw(const ::rtl::OUString& _sName,const sal_Int32 _nKind) +{ + TFrames aCopy = m_aSpecialSubFrames; + TFrames::iterator aFind = aCopy.find(_sName); + for(;aFind != aCopy.end();++aFind) + { + if ( aFind->second.first.first == _nKind ) + { + Reference< XFrame> xFrame(aFind->second.second,UNO_QUERY); + if ( xFrame.is() ) + { + ::comphelper::disposeComponent(xFrame); + } + } // if ( aFind->second.first.first == _nKind && aFind->second.first.second == _eOpenMode ) + } +} //........................................................................ } // namespace dbaui //........................................................................ - Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.15.38.11&r2=1.15.38.12 Delta lines: +8 -14 -------------------- --- AppController.hxx 2008-07-01 12:00:30+0000 1.15.38.11 +++ AppController.hxx 2008-09-02 05:58:33+0000 1.15.38.12 @@ -139,7 +139,7 @@ TransferableClipboardListener* m_pClipbordNotifier; // notifier for changes in the clipboard mutable ::rtl::OUString m_sDatabaseName; - sal_Int32 m_nAsyncDrop; + ULONG m_nAsyncDrop; OAsyncronousLink m_aControllerConnectedEvent; OAsyncronousLink m_aSelectContainerEvent; PreviewMode m_ePreviewMode; // the mode of the preview @@ -165,6 +165,13 @@ @param _nKind the kind of the component */ bool impl_activateSubFrame_throw(const ::rtl::OUString& _sName,const sal_Int32 _nKind,const ElementOpenMode _eOpenMode) const; + + /** deactivates the current table or query frame when existing + @param _sName the name of the component + @param _nKind the kind of the component + */ + void impl_deActivateSubFrame_throw(const ::rtl::OUString& _sName,const sal_Int32 _nKind); + /** returns the database name @return the database name @@ -261,19 +268,6 @@ const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ); - /** deletes multiple elements from the given container - @param _rxNames - the object container - @param _rList - The names of the elements to delete - @param _bConfirm - determines whether the user must confirm the deletion - */ - void deleteObjects( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& _rxNames, - const ::std::vector< ::rtl::OUString>& _rList, - bool _bConfirm ); - - /** deletes tables. @param _rList The list of tables. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
