connectivity/source/drivers/mork/MStatement.cxx | 2 -- connectivity/source/drivers/mozab/MStatement.cxx | 2 -- 2 files changed, 4 deletions(-)
New commits: commit 256badfa65df6b2082d4f7556de3dfd1a5fcdf6e Author: Julien Nabet <[email protected]> Date: Sun Jun 15 07:00:01 2014 +0200 Resolves: fdo#80025 Crash with Thunderbird/Icedove address book There's no property USEBOOKMARKS for mork/moz (regression from 0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c) Cherry-picked from 488f31200094d7237d45545ab227014831a1f8e6 Change-Id: If81f063fad2d702c9d8b0bb4147757655cb016cf Reviewed-on: https://gerrit.libreoffice.org/9787 Reviewed-by: Thomas Arnhold <[email protected]> Tested-by: Thomas Arnhold <[email protected]> diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index c9a06ff..c6af093 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -404,8 +404,6 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), - PROPERTY_ID_USEBOOKMARKS, ::getBooleanCppuType(), 0); return new ::cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 56637f1..7b1c839 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -402,8 +402,6 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0); pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0); - pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), - PROPERTY_ID_USEBOOKMARKS, ::getBooleanCppuType(), 0); return new ::cppu::OPropertyArrayHelper(aProps); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
