Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:13:58 Modified: dba/dbaccess/inc/ToolBoxHelper.hxx dba/dbaccess/inc/documentcontroller.hxx
Log: cwsresync changes 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.2&r2=1.1.2.3 Delta lines: +4 -8 ------------------- --- ToolBoxHelper.hxx 25 Apr 2006 13:06:20 -0000 1.1.2.2 +++ ToolBoxHelper.hxx 4 Jul 2006 07:13:55 -0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ToolBoxHelper.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2006/04/25 13:06:20 $ + * last change: $Author: oj $ $Date: 2006/07/04 07:13:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -72,12 +72,12 @@ virtual void resizeControls(const Size& _rDiff) = 0; /** will be called when the image list is needed. - @param _eBitmapSet + @param _eSymbolsSize <svtools/imgdef.hxx> @param _bHiContast <TRUE/> when in high contrast mode. */ - virtual ImageList getImageList(sal_Int16 _nSymbolsSize,sal_Bool _bHiContast) const = 0; + virtual ImageList getImageList(sal_Int16 _eSymbolsSize,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 @@ -93,10 +93,6 @@ */ void checkImageList(); - /** retrieve the current symbol set from misc options - and system settings */ - sal_Int16 getCurrentSymbolSet(); - inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); File [changed]: documentcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/documentcontroller.hxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +5 -8 ------------------- --- documentcontroller.hxx 25 Apr 2006 13:06:20 -0000 1.1.2.2 +++ documentcontroller.hxx 4 Jul 2006 07:13:55 -0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: documentcontroller.hxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2006/04/25 13:06:20 $ + * last change: $Author: oj $ $Date: 2006/07/04 07:13:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -46,9 +46,6 @@ #endif /** === end UNO includes === **/ -#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX -#include <unotools/sharedunocomponent.hxx> -#endif #ifndef INCLUDED_DBACCESSDLLAPI_H #include "dbaccessdllapi.h" #endif @@ -72,7 +69,7 @@ class DBACCESS_DLLPUBLIC ModelControllerConnector { private: - typedef ::utl::SharedUNOComponent< ::com::sun::star::frame::XModel, ::utl::CloseableComponent > Model; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > Model; typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > Controller; Model m_xModel; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
