diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /svx/source/inc/fmshimp.hxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'svx/source/inc/fmshimp.hxx')
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e56f9fd64a36..73fe666c3528 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -123,11 +123,11 @@ class FmFormPage; struct SAL_DLLPRIVATE FmLoadAction { FmFormPage* pPage; - ULONG nEventId; + sal_uLong nEventId; sal_uInt16 nFlags; FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { } - FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId ) + FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId ) :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags ) { } @@ -200,8 +200,8 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE SvLongs m_arrRelativeGridColumn; ::osl::Mutex m_aMutex; - ULONG m_nInvalidationEvent; - ULONG m_nActivationEvent; + sal_uLong m_nInvalidationEvent; + sal_uLong m_nActivationEvent; ::std::queue< FmLoadAction > m_aLoadingPages; |