User: kz Date: 2008-04-04 14:54:25+0000 Modified: dba/dbaccess/source/ui/app/AppController.hxx
Log: INTEGRATION: CWS titles02 (1.22.8); FILE MERGED 2008/03/13 10:45:31 oj 1.22.8.3: #i45909# #i45617# #i71469# title changes 2008/02/12 13:24:51 as 1.22.8.2: RESYNC: (1.22-1.23); FILE MERGED 2007/12/10 11:38:43 oj 1.22.8.1: #i45909# #i45617# #i71469# change title handling File Changes: 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.25&r2=1.26 Delta lines: +23 -1 -------------------- --- AppController.hxx 2008-03-06 18:09:44+0000 1.25 +++ AppController.hxx 2008-04-04 14:54:23+0000 1.26 @@ -108,6 +108,10 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > TComponent; typedef ::std::map< TComponent, TComponent > TDocuments; + typedef ::std::pair<sal_Int32,OLinkedDocumentsAccess::EOpenMode> TTypeOpenMode; + typedef ::std::pair< TTypeOpenMode , TComponent > TTypeFrame; + typedef ::std::multimap< ::rtl::OUString, TTypeFrame > TFrames; + private: OTableCopyHelper::DropDescriptor m_aAsyncDrop; @@ -127,6 +131,7 @@ m_aModelConnector; TContainerVector m_aCurrentContainers; // the containers where we are listener on TDocuments m_aDocuments; + TFrames m_aSpecialSubFrames; // contains the query, table and relation frame ODsnTypeCollection m_aTypeCollection; OTableCopyHelper m_aTableCopyHelper; TransferableClipboardListener* @@ -143,6 +148,12 @@ OApplicationView* getContainer() const; + + /** activates the current table, query or relation design frame when existing + @param _sName the name of the component + @param _nKind the kind of the component + */ + bool impl_activateSubFrame_throw(const ::rtl::OUString& _sName,const sal_Int32 _nKind,const OLinkedDocumentsAccess::EOpenMode _eOpenMode) const; /** returns the database name @return the database name @@ -416,6 +427,13 @@ void impl_migrateScripts_nothrow(); protected: + // ---------------------------------------------------------------- + // initalizing members + /** forces usage of a connection which we do not own + <p>To be used from within XInitialization::initialize only.</p> + */ + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature @@ -429,9 +447,13 @@ virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // OGenericUnoController - virtual void updateTitle( ); virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const + { + return m_xModel; + } + virtual ~OApplicationController(); public: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
