summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
commit006b8504d7c633a61b4953151e71b83fda8e204d (patch)
tree80bcda35b0c8e37304e4a08d952a4bba130a4c9b /svx/source/inc
parent2ccbdca418fccd80bcab976a8033a1c62dc60da2 (diff)
removetooltypes01: #i112600# remove tooltypes from svx
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/delayedevent.hxx2
-rw-r--r--svx/source/inc/filtnav.hxx2
-rw-r--r--svx/source/inc/fmexpl.hxx6
-rw-r--r--svx/source/inc/fmobj.hxx2
-rw-r--r--svx/source/inc/fmpgeimp.hxx2
-rw-r--r--svx/source/inc/fmshimp.hxx16
-rw-r--r--svx/source/inc/formcontroller.hxx10
-rw-r--r--svx/source/inc/gridcell.hxx16
8 files changed, 28 insertions, 28 deletions
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index d2a928bffb63..5dd531de8090 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -69,7 +69,7 @@ namespace svxform
private:
Link m_aHandler;
- ULONG m_nEventId;
+ sal_uLong m_nEventId;
private:
DECL_LINK( OnCall, void* );
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index df4e2b8559a6..10a290cd2b04 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -318,7 +318,7 @@ private:
@param _pTargetItems
The target where to insert the items.
@param _bCopy
- If <TRUE/> the items will not be removed from the model, otherwise they will.
+ If <sal_True/> the items will not be removed from the model, otherwise they will.
*/
void insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy = sal_False);
SvLBoxEntry* getPrevEntry(SvLBoxEntry* _pStartWith = NULL);
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 487c9287c972..598e9d61196a 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -390,7 +390,7 @@ namespace svxform
void ClearBranch( FmFormData* pParentData );
void UpdateContent( FmFormShell* pNewShell );
- void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND,
+ void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND,
sal_Bool bAlterModel = sal_False );
void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False );
@@ -440,7 +440,7 @@ namespace svxform
SvLBoxEntry* m_pRootEntry;
SvLBoxEntry* m_pEditEntry;
- ULONG nEditEvent;
+ sal_uLong nEditEvent;
SELDATA_ITEMS m_sdiState;
Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde
@@ -465,7 +465,7 @@ namespace svxform
sal_Bool IsDeleteAllowed();
FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True );
void NewForm( SvLBoxEntry* pParentEntry );
- SvLBoxEntry* Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND );
+ SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND );
void Remove( FmEntryData* pEntryData );
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 5398973cb6b3..fae15aeb18df 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -45,7 +45,7 @@ class FmFormObj: public SdrUnoObj
// m_pEnvironmentHistory was created
FmFormView* m_pControlCreationView;
- ULONG m_nControlCreationEvent;
+ sal_uLong m_nControlCreationEvent;
// Informationen fuer die Controlumgebung
// werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 755c754853dc..6f3e37e96c3a 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -150,7 +150,7 @@ private:
If <member>xCurrentForm</member> is not valid anymore, it is reset to <NULL/>.
@return
- <TRUE/> if and only if xCurrentForm is valid.
+ <sal_True/> if and only if xCurrentForm is valid.
@since #i40086#
*/
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
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index b0f42a0e97ea..6ed0a8512158 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -460,7 +460,7 @@ namespace svxform
one will be used. Else, an attempt is made to create an <type scope="com::sun::star::sdb">InteractionHandler</type>
is made.
- @return <TRUE/>
+ @return <sal_True/>
if and only if <member>m_xInteractionHandler</member> is valid when the method returns
*/
bool ensureInteractionHandler();
@@ -476,7 +476,7 @@ namespace svxform
@param _rxNewControl
The control which should replace the existent control.
@return
- <TRUE/> if and only if the control was successfully replaced
+ <sal_True/> if and only if the control was successfully replaced
*/
bool replaceControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl,
@@ -552,15 +552,15 @@ namespace svxform
valid.
@param _rFirstInvalidityExplanation
- if the method returns <FALSE/> (i.e. if there is an invalid control), this string contains
+ if the method returns <sal_False/> (i.e. if there is an invalid control), this string contains
the explanation for the invalidity, as obtained from the validator.
@param _rxFirstInvalidModel
- if the method returns <FALSE/> (i.e. if there is an invalid control), this contains
+ if the method returns <sal_False/> (i.e. if there is an invalid control), this contains
the control model
@return
- <TRUE/> if and only if all controls belonging to our form are valid
+ <sal_True/> if and only if all controls belonging to our form are valid
*/
bool checkFormComponentValidity(
::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation,
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index acead19ba9ee..67c76e9142b2 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -831,7 +831,7 @@ public:
protected:
virtual Window* getEventWindow() const;
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
// default implementations call our focus listeners, don't forget to call them if you override this
virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -871,15 +871,15 @@ protected:
/** determines whether the text of this cell can be painted directly, without
using the painter control
- If this is <TRUE/>, the <member>PaintCell</member> method will simply use the text as returned
+ If this is <sal_True/>, the <member>PaintCell</member> method will simply use the text as returned
by <member>GetText</member>, and draw it onto the device passed to <member>PaintFieldToCell</member>,
while respecting the current alignment settings.
- If this is <FALSE/>, the <member>PaintFieldToCell</member> request will be forwarded to the painter
+ If this is <sal_False/>, the <member>PaintFieldToCell</member> request will be forwarded to the painter
control (<member>m_pPainter</member>). This is more expensive, but the only option
if your painting involves more that a simple DrawText.
- This member is <TRUE/> by default, and can be modified by derived classes.
+ This member is <sal_True/> by default, and can be modified by derived classes.
*/
sal_Bool m_bFastPaint;
@@ -947,7 +947,7 @@ public:
virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent );
virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent );
@@ -999,7 +999,7 @@ public:
protected:
virtual Window* getEventWindow() const;
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
};
//==================================================================
@@ -1051,7 +1051,7 @@ public:
virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
DECL_LINK( OnDoubleClick, void* );
};
@@ -1096,7 +1096,7 @@ public:
virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException);
protected:
- virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData );
+ virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData );
};
//==================================================================