Tag: cws_src680_oj14 User: oj Date: 2006/11/13 05:23:59 Modified: dba/dbaccess/inc/genericcontroller.hxx dba/dbaccess/inc/singledoccontroller.hxx dba/dbaccess/prj/d.lst dba/dbaccess/source/ui/browser/genericcontroller.cxx dba/dbaccess/source/ui/misc/singledoccontroller.cxx
Log: merge conflicts File Changes: Directory: /dba/dbaccess/inc/ ============================= File [changed]: genericcontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/genericcontroller.hxx?r1=1.1.2.7&r2=1.1.2.8 Delta lines: +3 -3 ------------------- --- genericcontroller.hxx 13 Nov 2006 11:48:00 -0000 1.1.2.7 +++ genericcontroller.hxx 13 Nov 2006 13:23:55 -0000 1.1.2.8 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.hxx,v $ * - * $Revision: 1.1.2.7 $ + * $Revision: 1.1.2.8 $ * - * last change: $Author: oj $ $Date: 2006/11/13 11:48:00 $ + * last change: $Author: oj $ $Date: 2006/11/13 13:23:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -183,7 +183,7 @@ sal_Bool bEnabled; optional< bool > bChecked; - optional< sal_Int32 > nValue; + ::com::sun::star::uno::Any aValue; optional< ::rtl::OUString > sTitle; FeatureState() : bEnabled(sal_False) { } File [changed]: singledoccontroller.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/inc/singledoccontroller.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +2 -5 ------------------- --- singledoccontroller.hxx 8 Nov 2006 11:15:41 -0000 1.1.2.3 +++ singledoccontroller.hxx 13 Nov 2006 13:23:55 -0000 1.1.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.hxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2006/11/08 11:15:41 $ + * last change: $Author: oj $ $Date: 2006/11/13 13:23:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,9 +56,6 @@ #endif #ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include <com/sun/star/sdbc/XDataSource.hpp> -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ -#include "commontypes.hxx" #endif #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> Directory: /dba/dbaccess/prj/ ============================= File [changed]: d.lst Url: http://dba.openoffice.org/source/browse/dba/dbaccess/prj/d.lst?r1=1.18.130.3&r2=1.18.130.4 Delta lines: +2 -0 ------------------- --- d.lst 7 Nov 2006 08:35:22 -0000 1.18.130.3 +++ d.lst 13 Nov 2006 13:23:55 -0000 1.18.130.4 @@ -70,4 +70,6 @@ ..\uiconfig\dbquery\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbquery\accelerator\en-US\*.xml ..\uiconfig\dbrelation\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbrelation\toolbar\*.xml ..\uiconfig\dbtable\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\dbtable\toolbar\*.xml +..\inc\*.hxx %_DEST%\inc%_EXT%\dbaccess\*.hxx +..\inc\*.h %_DEST%\inc%_EXT%\dbaccess\*.h Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: genericcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/genericcontroller.cxx?r1=1.66.4.5&r2=1.66.4.6 Delta lines: +4 -2 ------------------- --- genericcontroller.cxx 8 Nov 2006 11:31:08 -0000 1.66.4.5 +++ genericcontroller.cxx 13 Nov 2006 13:23:56 -0000 1.66.4.6 @@ -4,9 +4,9 @@ * * $RCSfile: genericcontroller.cxx,v $ * - * $Revision: 1.66.4.5 $ + * $Revision: 1.66.4.6 $ * - * last change: $Author: oj $ $Date: 2006/11/08 11:31:08 $ + * last change: $Author: oj $ $Date: 2006/11/13 13:23:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -463,6 +463,8 @@ _out_rStates.push_back( makeAny( *_rFeatureState.sTitle ) ); if ( !!_rFeatureState.bChecked ) _out_rStates.push_back( makeAny( (sal_Bool)*_rFeatureState.bChecked ) ); + if ( _rFeatureState.aValue.hasValue() ) + _out_rStates.push_back( _rFeatureState.aValue ); if ( _out_rStates.empty() ) _out_rStates.push_back( Any() ); } Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: singledoccontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/singledoccontroller.cxx?r1=1.16.4.6&r2=1.16.4.7 Delta lines: +5 -2 ------------------- --- singledoccontroller.cxx 8 Nov 2006 11:15:28 -0000 1.16.4.6 +++ singledoccontroller.cxx 13 Nov 2006 13:23:56 -0000 1.16.4.7 @@ -4,9 +4,9 @@ * * $RCSfile: singledoccontroller.cxx,v $ * - * $Revision: 1.16.4.6 $ + * $Revision: 1.16.4.7 $ * - * last change: $Author: oj $ $Date: 2006/11/08 11:15:28 $ + * last change: $Author: oj $ $Date: 2006/11/13 13:23:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -95,6 +95,9 @@ #endif #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" +#endif +#ifndef _DBAUI_COMMON_TYPES_HXX_ +#include "commontypes.hxx" #endif //........................................................................ namespace dbaui --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
