Tag: cws_dev300_odbmacros3 User: fs Date: 2008-08-02 11:49:03+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: allow to disable the pick-list entry of the document via Model-Arg (useful for complex test cases to not pollute the pick list) 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.56.6.9&r2=1.56.6.10 Delta lines: +19 -13 --------------------- --- AppController.cxx 2008-07-29 20:21:25+0000 1.56.6.9 +++ AppController.cxx 2008-08-02 11:49:00+0000 1.56.6.10 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppController.cxx,v $ - * $Revision: 1.56.6.9 $ + * $Revision: 1.56.6.10 $ * * This file is part of OpenOffice.org. * @@ -265,6 +265,7 @@ using namespace ::com::sun::star::task; using ::com::sun::star::document::XEmbeddedScripts; using ::com::sun::star::document::XDocumentEventBroadcaster; +using ::com::sun::star::document::DocumentEvent; using ::com::sun::star::sdb::application::NamedDatabaseObject; namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; @@ -515,6 +516,9 @@ ::rtl::OUString sUrl = m_xModel->getURL(); if ( sUrl.getLength() ) { + ::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() ); + if ( true == aArgs.getOrDefault( "PickListEntry", true ) ) + { ::rtl::OUString aFilter; INetURLObject aURL( m_xModel->getURL() ); const SfxFilter* pFilter = getStandardDatabaseFilter(); @@ -528,6 +532,7 @@ getStrippedDatabaseName(), ::rtl::OUString() ); } + } m_aModelConnector.clear(); m_xModel.clear(); @@ -535,6 +540,7 @@ } catch(Exception) { + DBG_UNHANDLED_EXCEPTION(); } m_pView = NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
