diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:17 +0200 |
| commit | 7c6061d701fb4c64ab998223fd4328435c23d994 (patch) | |
| tree | c78f6e9e3e5a219443226e6d4993a0c6e4055f07 /dbaccess/source/ui/inc | |
| parent | 3152eef8941e03eb9b25b4ad58241edc66f589df (diff) | |
| parent | 2452624487700f9aa0bc385f66d7ca7818e9544d (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
dbaccess/source/ui/app/makefile.mk
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_qry.hrc | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dsitems.hxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dsmeta.hxx | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index 04b2daa5d..e64a360dd 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -56,8 +56,8 @@ #define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 #define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 #define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 -#define STR_QUERY_FALSE RID_STR_QRY_START + 24 -#define STR_QUERY_TRUE RID_STR_QRY_START + 25 +// free +// free #define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 #define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 #define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 99cc689a2..425d04a2f 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -94,6 +94,7 @@ typedef sal_Int32 ItemID; #define DSID_NAMED_PIPE 58 #define DSID_PRIMARY_KEY_SUPPORT 59 #define DSID_MAX_ROW_SCAN 60 +#define DSID_RESPECTRESULTSETTYPE 61 // don't forget to adjust DSID_LAST_ITEM_ID below! @@ -101,7 +102,7 @@ typedef sal_Int32 ItemID; //= item range. Adjust this if you introduce new items above #define DSID_FIRST_ITEM_ID DSID_NAME -#define DSID_LAST_ITEM_ID DSID_MAX_ROW_SCAN +#define DSID_LAST_ITEM_ID DSID_RESPECTRESULTSETTYPE #endif // _DBAUI_DATASOURCEITEMS_HXX_ diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 67c17ff68..6d2ed5ed3 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -134,6 +134,7 @@ namespace dbaui || has( DSID_ESCAPE_DATETIME ) || has( DSID_PRIMARY_KEY_SUPPORT ) || has( DSID_MAX_ROW_SCAN ) + || has( DSID_RESPECTRESULTSETTYPE ) ; } |