diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-07 11:49:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-07 11:49:46 +0200 |
commit | 93f5d5a9190e0e03bf4822663652a4b068c44f75 (patch) | |
tree | 9ac61601b056acad6a6c83d728c684661d3f3271 /dbaccess | |
parent | c6fdd34c16f415629222348631141c3e13af6d4a (diff) |
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.
While at it, consolidate the trivially unnecessary overloads of both
Application::PostUserEvent and Window::PostUserEvent. And in each of them, it
looks like deleting the mpLink member was missing from the failure branch.
Change-Id: Iab13afbb06e12ac15dec6a6b5b85a7e402a3c654
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/filter/xml/dbloader2.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableWindowListBox.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/unodatbr.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 11 |
8 files changed, 12 insertions, 14 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 92eaf50056a5..8aaeb3b510fd 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -229,7 +229,7 @@ private: const Reference< XComponentContext > m_aContext; Reference< XFrameLoader > m_xMySelf; OUString m_sCurrentURL; - sal_uLong m_nStartWizard; + ImplSVEvent * m_nStartWizard; DECL_LINK( OnStartTableWizard, void* ); public: diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index ad56c3a29206..38a21763113b 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -116,7 +116,7 @@ namespace dbaui OTableCopyHelper m_aTableCopyHelper; TransferableClipboardListener* m_pClipbordNotifier; // notifier for changes in the clipboard - sal_uLong m_nAsyncDrop; + ImplSVEvent * m_nAsyncDrop; OAsyncronousLink m_aSelectContainerEvent; PreviewMode m_ePreviewMode; // the mode of the preview ElementType m_eCurrentType; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 5a97c39cc275..d3ad8835ae84 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -56,7 +56,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox ::svt::CheckBoxControl* m_pCheckCell; Edit* m_pEdit; long m_nDataPos; - sal_uLong m_nDeactivateEvent; + ImplSVEvent * m_nDeactivateEvent; public: OTableGrantControl( Window* pParent,const ResId& _RsId); diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 70e807dc156e..13f30c6437fb 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -57,8 +57,8 @@ namespace dbaui Point m_aMousePos; OTableWindow* m_pTabWin; - sal_uLong m_nDropEvent; - sal_uLong m_nUiEvent; + ImplSVEvent * m_nDropEvent; + ImplSVEvent * m_nUiEvent; OJoinDropData m_aDropInfo; bool m_bReallyScrolled : 1; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index a1e10326711c..e9c7e3ba586e 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_uLong m_nAsyncDropEvent; + ImplSVEvent * 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/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 1b35d2f406b6..b86083aab07a 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -104,7 +104,7 @@ namespace dbaui Splitter* m_pSplitter; SvTreeList* m_pTreeModel; // contains the datasources of the registry SvTreeListEntry* m_pCurrentlyDisplayed; - sal_uLong m_nAsyncDrop; + ImplSVEvent * m_nAsyncDrop; sal_Int16 m_nBorder; // sal_True when border should be shown diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 310e2b55ee8c..0954b2098a2b 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -145,7 +145,6 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) ,pHelpTextCell(NULL) ,pDescrCell(NULL) ,pDescrWin(NULL) - ,nIndexEvent(0) ,nCutEvent(0) ,nPasteEvent(0) ,nDeleteEvent(0) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 3a8064e908b7..af84754d2080 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -54,12 +54,11 @@ namespace dbaui ::boost::shared_ptr<OTableRow> pActRow; - sal_uLong nIndexEvent; - sal_uLong nCutEvent; - sal_uLong nPasteEvent; - sal_uLong nDeleteEvent; - sal_uLong nInsNewRowsEvent; - sal_uLong nInvalidateTypeEvent; + ImplSVEvent * nCutEvent; + ImplSVEvent * nPasteEvent; + ImplSVEvent * nDeleteEvent; + ImplSVEvent * nInsNewRowsEvent; + ImplSVEvent * nInvalidateTypeEvent; ChildFocusState m_eChildFocus; long nOldDataPos; |