diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:40 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:40 +0200 |
commit | bc3bbd2bb4b629ec612beeeeadd959a2fb6426c2 (patch) | |
tree | 230225ef40deb8214edb308a21876f642b341942 /dbaccess/source/ui/dlg/dbadmin.cxx | |
parent | Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2) (diff) | |
parent | CWS-TOOLING: integrate CWS dba34d (diff) | |
download | core-bc3bbd2bb4b629ec612beeeeadd959a2fb6426c2.tar.gz core-bc3bbd2bb4b629ec612beeeeadd959a2fb6426c2.zip |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
dbaccess/source/core/api/CacheSet.cxx
dbaccess/source/core/api/KeySet.cxx
dbaccess/source/core/api/KeySet.hxx
dbaccess/source/core/api/OptimisticSet.hxx
dbaccess/source/core/api/RowSet.cxx
dbaccess/source/core/api/RowSetCache.cxx
dbaccess/source/core/api/query.cxx
dbaccess/source/core/dataaccess/SharedConnection.cxx
dbaccess/source/ui/app/AppController.cxx
dbaccess/source/ui/app/makefile.mk
dbaccess/source/ui/control/FieldDescControl.cxx
dbaccess/source/ui/querydesign/query.src
dbaccess/source/ui/tabledesign/TEditControl.cxx
reportdesign/source/ui/report/ReportController.cxx
reportdesign/source/ui/report/ReportSection.cxx
reportdesign/source/ui/report/SectionWindow.cxx
reportdesign/source/ui/report/StartMarker.cxx
reportdesign/source/ui/report/ViewsWindow.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/dbadmin.cxx')
-rw-r--r-- | dbaccess/source/ui/dlg/dbadmin.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 510b1864eb0b..65929fb204d6 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -410,6 +410,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); + *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); // create the pool static SfxItemInfo const aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] = @@ -473,6 +474,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp {0,0}, {0,0}, {0,0}, + {0,0}, {0,0} }; |