Tag: cws_src680_oj14 User: oj Date: 06/04/25 06:06:24 Modified: /dba/dbaccess/inc/ ToolBoxHelper.hxx, documentcontroller.hxx, genericcontroller.hxx, singledoccontroller.hxx
Log: new hlper methods File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: ToolBoxHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/ToolBoxHelper.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -4 ------------------- --- ToolBoxHelper.hxx 3 Jan 2006 08:30:57 -0000 1.1.2.1 +++ ToolBoxHelper.hxx 25 Apr 2006 13:06:20 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ToolBoxHelper.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2006/01/03 08:30:57 $ + * last change: $Author: oj $ $Date: 2006/04/25 13:06:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -59,7 +59,7 @@ class DBACCESS_DLLPUBLIC OToolBoxHelper { sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode - sal_Int16 m_nBitmapSet; // shows the toolbox large or small bitmaps + sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps ToolBox* m_pToolBox; // our toolbox (may be NULL) public: OToolBoxHelper(); @@ -77,7 +77,7 @@ @param _bHiContast <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _eBitmapSet,sal_Bool _bHiContast) const = 0; + virtual ImageList getImageList(sal_Int16 _nSymbolsSize,sal_Bool _bHiContast) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. @param _pTB File [changed]: documentcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/documentcontroller.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +22 -47 --------------------- --- documentcontroller.hxx 3 Jan 2006 08:29:48 -0000 1.1.2.1 +++ documentcontroller.hxx 25 Apr 2006 13:06:20 -0000 1.1.2.2 @@ -1,22 +1,20 @@ /************************************************************************* * - * $RCSfile: documentcontroller.hxx,v $ + * OpenOffice.org - a multi-platform office productivity suite * - * $Revision: 1.1.2.1 $ + * $RCSfile: documentcontroller.hxx,v $ * - * last change: $Author: oj $ $Date: 2006/01/03 08:29:48 $ + * $Revision: 1.1.2.2 $ * - * The Contents of this file are made available subject to the terms of - * either of the following licenses + * last change: $Author: oj $ $Date: 2006/04/25 13:06:20 $ * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * Sun Microsystems Inc., October, 2000 * * GNU Lesser General Public License Version 2.1 * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. + * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or @@ -33,31 +31,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (the "License"); You may not use this file - * except in compliance with the License. You may obtain a copy of the - * License at http://www.openoffice.org/license.html. - * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. - * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. - * - * Copyright: 2000 by Sun Microsystems, Inc. - * - * All Rights Reserved. - * - * Contributor(s): _______________________________________ - * - * ************************************************************************/ + #ifndef DBACCESS_SOURCE_UI_INC_DOCUMENTCONTROLLER_HXX #define DBACCESS_SOURCE_UI_INC_DOCUMENTCONTROLLER_HXX File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -6 ------------------- --- genericcontroller.hxx 3 Jan 2006 08:29:59 -0000 1.1.2.1 +++ genericcontroller.hxx 25 Apr 2006 13:06:21 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2006/01/03 08:29:59 $ + * last change: $Author: oj $ $Date: 2006/04/25 13:06:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -84,9 +84,6 @@ #ifndef DBAUI_ASYNCRONOUSLINK_HXX #include "AsyncronousLink.hxx" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif @@ -313,6 +310,8 @@ // gets the URL which the given id is assigned to ::com::sun::star::util::URL getURLForId(sal_Int32 _nId) const; + + void fillSupportedFeatures(); // connect to a datasource ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > connect( File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/singledoccontroller.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +18 -30 --------------------- --- singledoccontroller.hxx 3 Jan 2006 08:30:47 -0000 1.1.2.1 +++ singledoccontroller.hxx 25 Apr 2006 13:06:21 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2006/01/03 08:30:47 $ + * last change: $Author: oj $ $Date: 2006/04/25 13:06:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -86,6 +86,7 @@ typedef ::comphelper::OPropertyArrayUsageHelper < OSingleDocumentController > OSingleDocumentController_PABASE; + struct OSingleDocumentControllerImpl; class DBACCESS_DLLPUBLIC OSingleDocumentController :public OSingleDocumentController_CBASE ,public OSingleDocumentController_PBASE @@ -94,23 +95,8 @@ { friend class OConnectionChangeBroadcaster; private: - OModuleClient m_aModuleClient; - ::com::sun::star::uno::Any m_aCurrentError; // contains the current error which can be set through IEnvironment - // <properties> - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; - // </properties> - ::rtl::OUString m_sDataSourceName; // the data source we're working for - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xDataSource; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > - m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier - ModelControllerConnector - m_aModelConnector; - sal_Bool m_bOwnConnection : 1; // is true when we created our own connection - sal_Bool m_bSuspended : 1; // is true when the controller was already suspended - sal_Bool m_bEditable : 1; // is the control readonly or not - sal_Bool m_bModified : 1; // is the data modified + ::std::auto_ptr<OSingleDocumentControllerImpl> m_pImpl; + protected: SfxUndoManager m_aUndoManager; @@ -130,12 +116,13 @@ public: - inline sal_Bool isReadOnly() const { return !m_bEditable; } - inline sal_Bool isEditable() const { return m_bEditable; } - inline sal_Bool isModified() const { return m_bModified; } + sal_Bool isReadOnly() const; + sal_Bool isEditable() const; + void setEditable(sal_Bool _bEditable); + sal_Bool isModified() const; virtual void setModified(sal_Bool _bModified=sal_True); - inline void setEditable(sal_Bool _bEditable) { m_bEditable = _bEditable; } + // need for undo's and redo's SfxUndoManager* getUndoMgr(); @@ -148,16 +135,16 @@ // ---------------------------------------------------------------- // asking for connection-related stuff - inline sal_Bool isConnected() const { return m_xConnection.is(); } + sal_Bool isConnected() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > - getMetaData( ) const { return isConnected() ? m_xConnection->getMetaData() : ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >(); } + getMetaData( ) const; // ---------------------------------------------------------------- // access to the data source ::rtl::OUString getDataSourceName() const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& - getDataSource() const { return m_xDataSource; } - inline sal_Bool haveDataSource() const { return m_xDataSource.is(); } + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& + getDataSource() const; + sal_Bool haveDataSource() const; // IEnvironment /** appends an error in the current environment. @@ -194,7 +181,7 @@ /** returns the number formatter */ - inline ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const { return m_xFormatter; } + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -203,6 +190,7 @@ protected: OSingleDocumentController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxORB); + virtual ~OSingleDocumentController(); virtual void disconnect(); virtual void reconnect( sal_Bool _bUI ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
