[Libreoffice-commits] core.git: ucb/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 29 16:34:13 UTC 2020


 ucb/source/sorter/sortdynres.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ec7feef1bcd055098e49e55df3737148e62b75cb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 29 14:41:45 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 29 17:33:31 2020 +0100

    SortedResultSet uses sal_IntPtr instead of long
    
    ...(which had now been changed to tools::Long with
    4fbd63860500b2db76df4d5aedbe5e3aa31fac69 "switching long to a 64-bit type on
    64-bit windows") since 9eb4e4dc51a4448d59ee80f39144387c7b3cffaf "Some more
    modules at least building with mingw64"
    
    Change-Id: Iea4a68452f22a3c1d4515294e7dab5148e80da05
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105009
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index c848e306a45d..dc7ad5ea64fc 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp>
 #include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp>
 #include <com/sun/star/ucb/XSourceInitialization.hpp>
-#include <tools/long.hxx>
 
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
@@ -282,7 +281,7 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     catch (const UnknownPropertyException&) {}
     catch (const WrappedTargetException&) {}
 
-    tools::Long nOldCount = pCurSet->GetCount();
+    sal_IntPtr nOldCount = pCurSet->GetCount();
     bool bWasFinal = false;
 
     aRet >>= bWasFinal;


More information about the Libreoffice-commits mailing list