[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source forms/source fpicker/source include/svx sd/source

[Stephan Bergmann]

 dbaccess/source/ui/inc/sbagrid.hxx            |    2 +-
 forms/source/component/Edit.hxx               |    2 +-
 forms/source/component/FormattedField.hxx     |    2 +-
 fpicker/source/office/commonpicker.hxx        |    2 +-
 include/svx/gridctrl.hxx                      |    4 ++--
 sd/source/ui/inc/slideshow.hxx                |    2 +-
 sd/source/ui/slideshow/SlideShowRestarter.hxx |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f18882b8a75017295c10fec276aa4488aa2af45a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 6 18:14:30 2014 +0200

    Application::PostUserEvent returns a pointer dressed as sal_uLong
    
    cherry picked from commit ce53796bfaf6df5c4415fda8f641cad8a3e144a6, plus more
    cases from 93f5d5a9190e0e03bf4822663652a4b068c44f75: "The opaque PostUserEvent
    IDs are actually pointers so declare them as such.  This avoids the recurring
    mistake of storing such IDs as sal_uInt32, truncating in 64 bit environments,
    causing RemoveUserEvent to potentially not remove the event, it thus firing 'too
    late' and probably causing a crash."
    
    Change-Id: Ia5ca45e35766a7cebf0b53bcac1bd9dff29ad6ea
    Reviewed-on: https://gerrit.libreoffice.org/9259
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 2d482a3..9cd7015 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -222,7 +222,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
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 4e280eda..5dcb173 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -132,7 +132,7 @@ class OEditControl : public OBoundControl
                         m_aChangeListeners;
 
     OUString         m_aHtmlChangeValue;
-    sal_uInt32              m_nKeyEvent;
+    sal_uLong              m_nKeyEvent;
 
 public:
     OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 1ea82f6..737402a 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -151,7 +151,7 @@ namespace frm
     class OFormattedControl :    public OBoundControl
                                 ,public OFormattedControl_BASE
     {
-        sal_uInt32              m_nKeyEvent;
+        sal_uLong              m_nKeyEvent;
 
     public:
         OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 5008f68..fb5bc56 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -65,7 +65,7 @@ namespace svt
         // </properties>
 
         SvtFileDialog*      m_pDlg;
-        sal_uInt32          m_nCancelEvent;
+        sal_uLong           m_nCancelEvent;
         sal_Bool            m_bExecuting;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >  m_xDialogParent;
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e3e59f1..905b9cd 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -233,7 +233,7 @@ private:
 
                     m_xEmptyRow;        // record set to insert
 
-    sal_uInt32          m_nAsynAdjustEvent;
+    sal_uLong          m_nAsynAdjustEvent;
 
     // if we modify the row for the new record, we automatically insert a "new new row".
     // But if somebody else inserts a new record into the data source, we have to do the same.
@@ -272,7 +272,7 @@ private:
 
     BrowserMode         m_nMode;
     sal_Int32           m_nCurrentPos;      // Current position;
-    sal_uInt32          m_nDeleteEvent;     // EventId for asychronous deletion of rows
+    sal_uLong           m_nDeleteEvent;     // EventId for asychronous deletion of rows
     sal_uInt16          m_nOptions;         // What is the able to do (Insert, Update, Delete)
                                         // default readonly
     sal_uInt16          m_nOptionMask;      // the mask of options to be enabled in setDataSource
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index f6567e1..19b5256 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -214,7 +214,7 @@ private:
     ViewShellBase* mpCurrentViewShellBase;
     ViewShellBase* mpFullScreenViewShellBase;
     FrameView* mpFullScreenFrameView;
-    sal_Int32   mnInPlaceConfigEvent;
+    sal_uLong   mnInPlaceConfigEvent;
 };
 
 namespace slideshowhelp
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 928f1d1..b8bc7bb 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -59,7 +59,7 @@ public:
     void Restart (bool bForce);
 
 private:
-    sal_Int32 mnEventId;
+    sal_uLong mnEventId;
     ::rtl::Reference<SlideShow> mpSlideShow;
     ViewShellBase* mpViewShellBase;
     ::boost::shared_ptr<SlideShowRestarter> mpSelf;