ucb/source/cacher/cachedcontentresultset.cxx | 5 ++--- ucb/source/sorter/sortdynres.cxx | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit 9bf85adc3e6474ebe36b3a06b985a481e75f3567 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Oct 29 10:17:03 2020 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Oct 29 14:03:27 2020 +0100 Fix some confusion between UNOIDL long (i.e., sal_Int32) and C++ long ...dating back to before d3329bacd8a925ec070ad06ea3d9a6a026a3696b "Moved here from module 'chaos'", in the meantime hit by 4fbd63860500b2db76df4d5aedbe5e3aa31fac69 "switching long to a 64-bit type on 64-bit windows" Change-Id: I378379abf520ce914f1ba2789d788ab726038c50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104992 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index ae000b2e79fc..483b7e3fcb74 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -32,7 +32,6 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <ucbhelper/macros.hxx> -#include <tools/long.hxx> #include <memory> using namespace com::sun::star::beans; @@ -366,8 +365,8 @@ class CCRS_PropertySetInfo : std::unique_ptr<Sequence< css::beans::Property >> m_pProperties; - tools::Long m_nFetchSizePropertyHandle; - tools::Long m_nFetchDirectionPropertyHandle; + sal_Int32 m_nFetchSizePropertyHandle; + sal_Int32 m_nFetchDirectionPropertyHandle; private: sal_Int32 diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 671c61cc9501..c848e306a45d 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -336,7 +336,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) } case ListActionType::MOVED: { - tools::Long nOffset = 0; + sal_Int32 nOffset = 0; if ( aAction.ActionInfo >>= nOffset ) { pCurSet->Move( aAction.Position, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
