Tag: cws_dev300_dba30c User: fs Date: 2008-05-13 08:55:54+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.hxx
Log: joining changes from CWS odbmacros3 to CWS dba30c: 2008/05/07 08:32:49 fs 1.20.2.1: #i49133# XModel2 methods changed 2008/05/08 13:14:51 fs 1.20.2.2: #i49133# impl_createStorageFor now always throws in case of error, instead of silencing the error with an interaction handler File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.hxx?r1=1.20&r2=1.20.8.1 Delta lines: +11 -15 --------------------- --- databasedocument.hxx 2008-04-10 12:44:49+0000 1.20 +++ databasedocument.hxx 2008-05-13 08:55:51+0000 1.20.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.hxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.8.1 $ * * This file is part of OpenOffice.org. * @@ -259,8 +259,8 @@ // ::com::sun::star::frame::XModel2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL getControllers( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL createDefaultViewController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ComponentWindow ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL createViewController( const ::rtl::OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ComponentWindow ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createDefaultViewController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const ::rtl::OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; // ::com::sun::star::frame::XStorable virtual sal_Bool SAL_CALL hasLocation( ) throw (::com::sun::star::uno::RuntimeException) ; @@ -403,19 +403,15 @@ /** creates a storage for the given URL, truncating it if a file with this name already exists - @throws IOException - if the storage could not be created, and the error causing this could not be handled - by the document's interaction handler. The message of the IOException will note the failure, - and also the message of the originally thrown exception. + @throws Exception + if creating the storage failed @return - <TRUE/> if and only if the storage could be created. If <FALSE/> is returned, then the storage - could not be created, but the error had successfully been handled by the document's - interaction handler. + the newly created storage for the file at the given URL */ - bool impl_createStorageFor_throw( - const ::rtl::OUString& _rURL, - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _out_rxStorage + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > + impl_createStorageFor_throw( + const ::rtl::OUString& _rURL ) const; /** clears the guard before notifying. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
