summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/charmapacc.hxx4
-rw-r--r--svx/source/inc/datanavi.hxx16
-rw-r--r--svx/source/inc/docrecovery.hxx4
-rw-r--r--svx/source/inc/fmgroup.hxx12
-rw-r--r--svx/source/inc/fmslotinvalidator.hxx2
-rw-r--r--svx/source/inc/fmtextcontroldialogs.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx6
-rw-r--r--svx/source/inc/formtoolbars.hxx8
-rw-r--r--svx/source/inc/frmselimpl.hxx2
-rw-r--r--svx/source/inc/stringlistresource.hxx2
-rw-r--r--svx/source/inc/svdoimp.hxx6
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/tbxform.hxx26
14 files changed, 47 insertions, 47 deletions
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 395d3d511841..1d29cba30c8c 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -184,7 +184,7 @@ public:
//===== IAccessibleViewforwarder ========================================
- virtual BOOL IsValid (void) const;
+ virtual sal_Bool IsValid (void) const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel (const Point& rPoint) const;
virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index f7eba57bd8fb..5bd5714b8039 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -109,14 +109,14 @@ namespace svx
struct SvxShowCharSetItem
{
SvxShowCharSet& mrParent;
- USHORT mnId;
+ sal_uInt16 mnId;
XubString maText;
Rectangle maRect;
SvxShowCharSetItemAcc* m_pItem;
SvxShowCharSetAcc* m_pParent;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc;
- SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos );
+ SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos );
~SvxShowCharSetItem();
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible();
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index ab8bda588c5a..a8bfad89090b 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -129,7 +129,7 @@ namespace svxform
~DataTreeListBox();
virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry );
+ virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -166,7 +166,7 @@ namespace svxform
void AddChildren( SvLBoxEntry* _pParent,
const ImageList& _rImgLst,
const XNode_ref& _xNode );
- bool DoToolBoxAction( USHORT _nToolBoxID );
+ bool DoToolBoxAction( sal_uInt16 _nToolBoxID );
SvLBoxEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement );
SvLBoxEntry* AddEntry( const XPropertySet_ref& _rPropSet );
void EditEntry( const XPropertySet_ref& _rPropSet );
@@ -182,12 +182,12 @@ namespace svxform
virtual void Resize();
inline bool HasModel() const { return m_bHasModel; }
- String SetModel( const XModel_ref& _xModel, USHORT _nPagePos );
+ String SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
void ClearModel();
String LoadInstance( const PropertyValue_seq& _xPropSeq,
const ImageList& _rImgLst );
- bool DoMenuAction( USHORT _nMenuID );
+ bool DoMenuAction( sal_uInt16 _nMenuID );
void EnableMenuItems( Menu* _pMenu );
inline SvLBoxEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); }
@@ -227,7 +227,7 @@ namespace svxform
long m_nMinWidth;
long m_nMinHeight;
long m_nBorderHeight;
- USHORT m_nLastSelectedPos;
+ sal_uInt16 m_nLastSelectedPos;
bool m_bShowDetails;
bool m_bIsNotifyDisabled;
Size m_a2Size;
@@ -250,14 +250,14 @@ namespace svxform
DECL_LINK( ActivatePageHdl, TabControl* );
DECL_LINK( UpdateHdl, Timer* );
- XFormsPage* GetCurrentPage( USHORT& rCurId );
+ XFormsPage* GetCurrentPage( sal_uInt16& rCurId );
void LoadModels();
void SetPageModel();
void ClearAllPageModels( bool bClearPages );
void InitPages();
void CreateInstancePage( const PropertyValue_seq& _xPropSeq );
bool HasFirstInstancePage() const;
- USHORT GetNewPageId() const;
+ sal_uInt16 GetNewPageId() const;
protected:
virtual void Resize();
@@ -574,7 +574,7 @@ namespace svxform
inline void SetName( const String& _rName ) { m_aNameED.SetText( _rName );}
inline String GetURL() const { return m_aURLED.GetText(); }
inline void SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );}
- inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); }
+ inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); }
inline void SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); }
};
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b35b46a941aa..ebe104058509 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -591,14 +591,14 @@ class RecovDocListEntry : public SvLBoxString
//---------------------------------------
/** @short TODO */
RecovDocListEntry( SvLBoxEntry* pEntry,
- USHORT nFlags,
+ sal_uInt16 nFlags,
const String& sText );
//---------------------------------------
/** @short TODO */
virtual void Paint(const Point& aPos ,
SvLBox& aDevice,
- USHORT nFlags ,
+ sal_uInt16 nFlags ,
SvLBoxEntry* pEntry );
};
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index 109a445dca70..5cad571dee7b 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -63,9 +63,9 @@ public:
virtual XIdlClassRef getIdlClass();
// XGroup
- virtual INT32 getFormControlCount();
+ virtual sal_Int32 getFormControlCount();
virtual XFormControlRef getFormControlByName( const XubString& sName ) const;
- virtual XFormControlRef getFormControlByIndex( INT32 Index ) const;
+ virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const;
virtual void appendFormControl( const XFormControlRef& FormControl );
virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl );
@@ -93,11 +93,11 @@ public:
// PropertySetInterface
virtual FmXPropertySetInfo* createPropertySetInfo() const;
- virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName,
+ virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName,
const UsrAny& aValue,
PropertyChangeEventSequence* pSeq,
- INT32 nIndex );
- virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const;
+ sal_Int32 nIndex );
+ virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const;
virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
};
@@ -112,7 +112,7 @@ class FmXGroupModelInfo : public FmXControlModelInfo
protected:
FmXGroupModelInfo( const FmXGroupModel* pCp );
- virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const;
+ virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const;
};
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index 7baa4f451a3f..d37099f40cf4 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -35,7 +35,7 @@ namespace svx
{
//........................................................................
- typedef USHORT SfxSlotId;
+ typedef sal_uInt16 SfxSlotId;
//====================================================================
//= ISlotInvalidator
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index afb737864bd8..2b6ccb09d89d 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -50,7 +50,7 @@ namespace svx
~TextControlCharAttribDialog();
protected:
- virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage );
+ virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage );
};
//====================================================================
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 8bb682690b36..9641db8c8a19 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -252,7 +252,7 @@ private:
void addWindow(const SdrPageWindow&);
void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
void Activate(sal_Bool bSync = sal_False);
- void Deactivate(BOOL bDeactivateController = TRUE);
+ void Deactivate(sal_Bool bDeactivateController = sal_True);
SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -266,8 +266,8 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
sal_uInt16 _nControlObjectID,
const ::rtl::OUString& _rFieldPostfix,
- UINT32 _nInventor,
- UINT16 _nLabelObjectID,
+ sal_uInt32 _nInventor,
+ sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage,
SdrPage* _pControlPage,
SdrModel* _pModel,
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 96da1c9aa5af..db21979ab756 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -63,19 +63,19 @@ namespace svxform
on the type of our document
*/
SVX_DLLPUBLIC ::rtl::OUString
- getToolboxResourceName( USHORT _nSlotId ) const;
+ getToolboxResourceName( sal_uInt16 _nSlotId ) const;
/** toggles the toolbox associated with the given slot
*/
- SVX_DLLPUBLIC void toggleToolbox( USHORT _nSlotId ) const;
+ SVX_DLLPUBLIC void toggleToolbox( sal_uInt16 _nSlotId ) const;
/** determines whether the toolbox associated with the given slot is currently visible
*/
- SVX_DLLPUBLIC bool isToolboxVisible( USHORT _nSlotId ) const;
+ SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const;
/** ensures that a given toolbox is visible
*/
- inline void showToolbox( USHORT _SlotId ) const
+ inline void showToolbox( sal_uInt16 _SlotId ) const
{
if ( !isToolboxVisible( _SlotId ) )
toggleToolbox( _SlotId );
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index f9e3727988af..77554da2587e 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -75,7 +75,7 @@ public:
void SetKeyboardNeighbors(
FrameBorderType eLeft, FrameBorderType eRight,
FrameBorderType eTop, FrameBorderType eBottom );
- FrameBorderType GetKeyboardNeighbor( USHORT nKeyCode ) const;
+ FrameBorderType GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const;
private:
const FrameBorderType meType; /// Frame border type (position in control).
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 2f7b60073200..5fdcfb320443 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -65,7 +65,7 @@ namespace svx
@return String
The string.
*/
- String getString( USHORT _nResId )
+ String getString( sal_uInt16 _nResId )
{
return String( ResId( _nResId, *m_pResMgr ) );
}
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 3014b42d4721..91add6aaa48e 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -98,9 +98,9 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
const Size& rBmpSize,
const Size& rBmpPerCent,
const Size& rBmpOffPerCent,
- BOOL bBmpLogSize,
- BOOL bBmpTile,
- BOOL bBmpStretch,
+ sal_Bool bBmpLogSize,
+ sal_Bool bBmpTile,
+ sal_Bool bBmpStretch,
RECT_POINT eBmpRectPoint );
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index b62a71e56525..bbb5cb261b46 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -60,7 +60,7 @@ protected:
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
// SvLBox
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
using SvLBox::ExecuteDrop;
};
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 79fee9082999..774e786b80f7 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -59,7 +59,7 @@ private:
DECL_LINK( TbxSelectHdl, ToolBox* );
public:
- SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx );
+ SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx );
~SvxFmConfigWin();
void Update();
@@ -71,7 +71,7 @@ public:
class SvxFmTbxCtlConfig : public SfxToolBoxControl
{
private:
- UINT16 nLastSlot;
+ sal_uInt16 nLastSlot;
protected:
using SfxToolBoxControl::Select;
@@ -79,11 +79,11 @@ protected:
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlConfig() {}
- virtual void Select( USHORT nModifier );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void Select( sal_uInt16 nModifier );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -96,12 +96,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlAbsRec();
virtual Window* CreateItemWindow( Window* pParent );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -111,7 +111,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecText();
virtual Window* CreateItemWindow( Window* pParent );
@@ -123,7 +123,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecFromText();
virtual Window* CreateItemWindow( Window* pParent );
@@ -137,11 +137,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecTotal();
virtual Window* CreateItemWindow( Window* pParent );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -150,7 +150,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
//========================================================================
@@ -158,7 +158,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
generated by cgit (git 2.34.1) at 2024-12-28 08:54:35 +0000