diff options
Diffstat (limited to 'svx/source/inc/fmshimp.hxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/inc/fmshimp.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 727c8c53c9c2..b6d4454dab90 100644..100755 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -61,7 +61,7 @@ #include <svl/svstdarr.hxx> #include <sfx2/mnuitem.hxx> #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <cppuhelper/component.hxx> @@ -118,11 +118,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 ) { } @@ -199,8 +199,8 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE std::vector<long> 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; |