Tag: cws_src680_dba24b User: fs Date: 2007-08-27 10:37:55+0000 Modified: dba/dbaccess/source/ui/inc/dsntypes.hxx dba/dbaccess/source/ui/inc/dbu_dlg.hrc dba/dbaccess/source/ui/inc/dbu_resource.hrc
Log: in preparation of #i80930#: some cleanup/re-factoring File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.22&r2=1.22.46.1 Delta lines: +6 -11 -------------------- --- dsntypes.hxx 2007-05-10 10:32:28+0000 1.22 +++ dsntypes.hxx 2007-08-27 10:37:52+0000 1.22.46.1 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.22.46.1 $ * - * last change: $Author: kz $ $Date: 2007/05/10 10:32:28 $ + * last change: $Author: fs $ $Date: 2007/08/27 10:37:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,15 +36,11 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #define _DBAUI_DSNTYPES_HXX_ -#ifndef _SFXPOOLITEM_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> + #include <svtools/poolitem.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ + #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //......................................................................... namespace dbaui @@ -96,7 +92,6 @@ DST_UNKNOWN /// unrecognized type }; - //========================================================================= //= ODsnTypeCollection //========================================================================= File [changed]: dbu_dlg.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_dlg.hrc?r1=1.13&r2=1.13.28.1 Delta lines: +3 -4 ------------------- --- dbu_dlg.hrc 2007-07-06 08:27:58+0000 1.13 +++ dbu_dlg.hrc 2007-08-27 10:37:53+0000 1.13.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_dlg.hrc,v $ * - * $Revision: 1.13 $ + * $Revision: 1.13.28.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:27:58 $ + * last change: $Author: fs $ $Date: 2007/08/27 10:37:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,7 +57,6 @@ #define BUTTON_WIDTH 50 //constants for the wizards -#define INIT_X 6 #define INIT_Y 28 #define INDENTED_X 6 #define INDENT_BELOW_RADIO 10 File [changed]: dbu_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_resource.hrc?r1=1.97&r2=1.97.28.1 Delta lines: +9 -9 ------------------- --- dbu_resource.hrc 2007-07-06 08:28:17+0000 1.97 +++ dbu_resource.hrc 2007-08-27 10:37:53+0000 1.97.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_resource.hrc,v $ * - * $Revision: 1.97 $ + * $Revision: 1.97.28.1 $ * - * last change: $Author: rt $ $Date: 2007/07/06 08:28:17 $ + * last change: $Author: fs $ $Date: 2007/08/27 10:37:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -150,15 +150,15 @@ #define PAGE_USERDRIVER RID_PAGE_START + 19 #define PAGE_MYSQL_JDBC RID_PAGE_START + 20 #define PAGE_GENERATED_VALUES RID_PAGE_START + 22 +#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 + // FREE + // FREE // FREE -#define PAGE_DS_ADABAS_SETTINGS RID_PAGE_START + 24 -#define PAGE_DS_FULL_ADVANCED_SETTINGS RID_PAGE_START + 25 -#define PAGE_DS_PROPERTIES_FILE RID_PAGE_START + 26 #define PAGE_ORACLE_JDBC RID_PAGE_START + 27 #define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 -#define PAGE_DS_ADO_SETTINGS RID_PAGE_START + 29 -#define PAGE_DS_PROPERTIES_ACCESS RID_PAGE_START + 30 -#define PAGE_DS_MYSQL_SETTINGS RID_PAGE_START + 31 + // FREE + // FREE + // FREE #define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
