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 | e88a4fb61318f2282e21f4f55bf6e67075200fd4 (patch) | |
| tree | 263707c9f24ee81aa9485267fa9ad80a1ede2052 /dbaccess/source/core/api/OptimisticSet.hxx | |
| parent | 7e8a4888be548390148cc932a5d0b899e4fdd318 (diff) | |
| parent | a446d943bae5ca14030ca2ea18f8a8ff895fbcaf (diff) | |
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/core/api/OptimisticSet.hxx')
| -rw-r--r-- | dbaccess/source/core/api/OptimisticSet.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index bcada376a..b9b8fbe11 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -77,7 +77,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache, - sal_Int32 i_nMaxRows); + sal_Int32 i_nMaxRows, + sal_Int32& o_nRowCount); // late ctor which can throw exceptions virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); |