From 9b6906bbf3cdc3fc100339b39755bbbe02594e4f Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Wed, 24 Oct 2018 18:13:56 +0200 Subject: tdf#120713 correctly handle boolean values in filters This commit has two parts: - Hardcode the correct BooleanComparisonMode in the firebird-sdbc driver (this fixes on Firebird databases, among others, the AutoFilter for bools) - Generic to all DBMS, have the "form-based filter" obey the BooleanComparisonMode Change-Id: Ib14e6c3d5cb773ae1f972840f8b53062f0224396 Reviewed-on: https://gerrit.libreoffice.org/62319 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane --- svx/source/fmcomp/gridcell.cxx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'svx/source/fmcomp') diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index da44c4e55591..ae0690c23c4f 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3100,20 +3100,27 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co IMPL_LINK_NOARG(DbFilterField, OnClick, VclPtr, void) { TriState eState = static_cast(m_pWindow.get())->GetBox().GetState(); - OUString aText; + OUStringBuffer aTextBuf; + + Reference< XRowSet > xDataSourceRowSet( + Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY); + Reference< XConnection > xConnection(getConnection(xDataSourceRowSet)); + const sal_Int32 nBooleanComparisonMode = ::dbtools::DatabaseMetaData( xConnection ).getBooleanComparisonMode(); switch (eState) { case TRISTATE_TRUE: - aText = "1"; + ::dbtools::getBooleanComparisonPredicate("", true, nBooleanComparisonMode, aTextBuf); break; case TRISTATE_FALSE: - aText = "0"; + ::dbtools::getBooleanComparisonPredicate("", false, nBooleanComparisonMode, aTextBuf); break; case TRISTATE_INDET: break; } + const OUString aText(aTextBuf.makeStringAndClear()); + if (m_aText != aText) { m_aText = aText; -- cgit