dbaccess/source/ui/inc/sbagrid.hxx | 2 +-
external/libgltf/patches/extern-C.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ce53796bfaf6df5c4415fda8f641cad8a3e144a6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 6 18:14:30 2014 +0200
Application::PostUserEvent returns a pointer dressed as sal_uLong
Change-Id: Ia5ca45e35766a7cebf0b53bcac1bd9dff29ad6ea
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index 49b9497..a1e1032 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -217,7 +217,7 @@ namespace dbaui
::svx::ODataAccessDescriptor m_aDataDescriptor;
SbaGridListener* m_pMasterListener;
- sal_Int32 m_nAsyncDropEvent;
+ sal_uLong m_nAsyncDropEvent;
sal_uInt16 m_nCurrentActionColId;
// ui actions (e.g. a context menu) may be performed on columns
which aren't the current one
commit 7c5e0e714fa25a486c1295e5e8dc204d2c1f3629
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 6 18:13:34 2014 +0200
Beautify patch
Change-Id: I91f403a39a7fea23f30fb64c4f9e4c3937f0401d
diff --git a/external/libgltf/patches/extern-C.patch
b/external/libgltf/patches/extern-C.patch
index a9eadf6..88587b0 100644
--- a/external/libgltf/patches/extern-C.patch
+++ b/external/libgltf/patches/extern-C.patch
@@ -9,7 +9,7 @@
/*get camera position information*/
extern "C"
--- libgltf/src/libgltf.cpp
-+++ /src/libgltf.cpp
++++ libgltf/src/libgltf.cpp
@@ -59,7 +59,6 @@
return;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
