From 006b8504d7c633a61b4953151e71b83fda8e204d Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Thu, 13 Jan 2011 16:27:50 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from svx
---
svx/source/inc/fmshimp.hxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'svx/source/inc/fmshimp.hxx')
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index e56f9fd64a36..73956dc2925c 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;
@@ -364,7 +364,7 @@ protected:
::std::vector< String >& _out_rNames );
/** checks whether the instance is already disposed, if so, this is reported as assertion error (debug
- builds only) and <TRUE/> is returned.
+ builds only) and <sal_True/> is returned.
*/
bool impl_checkDisposed() const;
@@ -383,7 +383,7 @@ public:
/** announces a new "current selection"
@return
- <TRUE/> if and only if the to-bet-set selection was different from the previous selection
+ <sal_True/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelection( const InterfaceBag& _rSelection );
@@ -397,7 +397,7 @@ public:
/** sets a new current selection as indicated by a mark list
@return
- <TRUE/> if and only if the to-bet-set selection was different from the previous selection
+ <sal_True/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
@@ -450,7 +450,7 @@ public:
/// executes a control conversion slot for a given object
bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId );
/** executes a control conversion slot for the current selection
- @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/>
+ @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <sal_True/>
*/
bool executeControlConversionSlot( sal_uInt16 _nSlotId );
/// checks whether the given slot id denotes a control conversion slot
--
cgit
From 94eae11e9ee5956df320078b759ad86459df6694 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Fri, 14 Jan 2011 11:20:36 +0100
Subject: removetooltypes01: #i112600# fix TRUE/FALSE autodoc tags
---
svx/source/inc/fmshimp.hxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'svx/source/inc/fmshimp.hxx')
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 73956dc2925c..73fe666c3528 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -364,7 +364,7 @@ protected:
::std::vector< String >& _out_rNames );
/** checks whether the instance is already disposed, if so, this is reported as assertion error (debug
- builds only) and <sal_True/> is returned.
+ builds only) and <TRUE/> is returned.
*/
bool impl_checkDisposed() const;
@@ -383,7 +383,7 @@ public:
/** announces a new "current selection"
@return
- <sal_True/> if and only if the to-bet-set selection was different from the previous selection
+ <TRUE/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelection( const InterfaceBag& _rSelection );
@@ -397,7 +397,7 @@ public:
/** sets a new current selection as indicated by a mark list
@return
- <sal_True/> if and only if the to-bet-set selection was different from the previous selection
+ <TRUE/> if and only if the to-bet-set selection was different from the previous selection
*/
bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
@@ -450,7 +450,7 @@ public:
/// executes a control conversion slot for a given object
bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId );
/** executes a control conversion slot for the current selection
- @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <sal_True/>
+ @precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> ) must return <TRUE/>
*/
bool executeControlConversionSlot( sal_uInt16 _nSlotId );
/// checks whether the given slot id denotes a control conversion slot
--
cgit