author | Noel Grandin <noel@peralex.com> | 2016-01-11 08:40:36 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-01-11 10:49:24 +0200 |
commit | f7c23897a354d9856ecaa5f7252520a350229bfa (patch) | |
tree | 1e8a006460cdd49683d410eb6352211d38b6f9f7 /dbaccess | |
parent | 889fc93087ae1b57348803014c0a6090fd48c06f (diff) |
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 9487dfe36b7c..58e450859e7b 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2269,12 +2269,12 @@ void ORowSet::impl_resetTables_nothrow() DELETEZ( m_pTables ); } -bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute ) +void ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute ) { bool bUseEscapeProcessing = impl_buildActiveCommand_throw( ); _out_rCommandToExecute = m_aActiveCommand; if ( !bUseEscapeProcessing ) - return bUseEscapeProcessing; + return; if (m_bCommandFacetsDirty) m_xComposer = nullptr; @@ -2319,8 +2319,6 @@ bool ORowSet::impl_initComposer_throw( OUString& _out_rCommandToExecute ) _out_rCommandToExecute = m_xComposer->getQueryWithSubstitution(); m_bCommandFacetsDirty = false; - - return bUseEscapeProcessing; } bool ORowSet::impl_buildActiveCommand_throw() diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index f8d52df8e839..75822a4b0732 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -156,13 +156,6 @@ namespace dbaccess The command which is to be executed, according to the current settings - it is built from our active command plus our current filter/order criterions. - @return - whether we should use escape processing before executing the actual command. This is determined - from our own EscapeProcessing property, and possibly overruled by the respective property - of a query we're based on. - Effectively, this value determines whether or not we actually have an composer (m_xComposer) - and dependent information (such as the parameters container). - @precond m_xActiveConnection points to a valid SDB-level connection @@ -172,7 +165,7 @@ namespace dbaccess @throws css::uno::RuntimeException if any of the components involved throws a css::uno::RuntimeException */ - bool impl_initComposer_throw( OUString& _out_rCommandToExecute ); + void impl_initComposer_throw( OUString& _out_rCommandToExecute ); /** returns the table container of our active connection diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 1ba973ce8b6c..f1b81a11b577 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -834,7 +834,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos) // If m_nPosition is out of the current window, // move it and update m_nStartPos and m_nEndPos // Caller is responsible for updating m_aMatrixIter -bool ORowSetCache::moveWindow() +void ORowSetCache::moveWindow() { OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less than 0!"); OSL_ENSURE(m_nEndPos >= m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos"); @@ -870,7 +870,7 @@ bool ORowSetCache::moveWindow() m_bRowCountFinal = true; } } - return true; + return; } bool bRet = true; @@ -958,7 +958,7 @@ bool ORowSetCache::moveWindow() else { // normally this should never happen OSL_FAIL("What the hell is happen here!"); - return false; + return; } } else @@ -1084,8 +1084,6 @@ bool ORowSetCache::moveWindow() OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less than 0!"); OSL_ENSURE(m_nEndPos > m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos"); OSL_ENSURE(m_nEndPos-m_nStartPos <= m_nFetchSize,"ORowSetCache::moveWindow: m_nStartPos and m_nEndPos too far apart"); - - return bRet; } bool ORowSetCache::first( ) |