summaryrefslogtreecommitdiff
path: root/basctl/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'basctl/source/inc')
-rw-r--r--basctl/source/inc/baside3.hxx16
-rw-r--r--basctl/source/inc/basidesh.hxx56
-rw-r--r--basctl/source/inc/basobj.hxx10
-rw-r--r--basctl/source/inc/bastypes.hxx90
-rw-r--r--basctl/source/inc/dlged.hxx32
-rw-r--r--basctl/source/inc/dlgeddef.hxx56
-rw-r--r--basctl/source/inc/dlgedfunc.hxx22
-rw-r--r--basctl/source/inc/dlgedmod.hxx2
-rw-r--r--basctl/source/inc/dlgedpage.hxx4
-rw-r--r--basctl/source/inc/dlgedview.hxx2
-rw-r--r--basctl/source/inc/iderid.hxx2
-rw-r--r--basctl/source/inc/sbxitem.hxx22
12 files changed, 157 insertions, 157 deletions
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 606b33d3e..6cc9f1abb 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -75,7 +75,7 @@ protected:
virtual void DoInit();
virtual void DoScroll( ScrollBar* pCurScrollBar );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- void InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground);
+ void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground);
public:
TYPEINFO();
@@ -91,20 +91,20 @@ public:
DlgEdModel* GetModel() const;
DlgEdPage* GetPage() const;
DlgEdView* GetView() const;
- BOOL RenameDialog( const String& rNewName );
+ sal_Bool RenameDialog( const String& rNewName );
void DisableBrowser();
void UpdateBrowser();
- BOOL SaveDialog();
- BOOL ImportDialog();
+ sal_Bool SaveDialog();
+ sal_Bool ImportDialog();
virtual String GetTitle();
virtual BasicEntryDescriptor CreateEntryDescriptor();
- virtual void SetReadOnly( BOOL bReadOnly );
- virtual BOOL IsReadOnly();
+ virtual void SetReadOnly( sal_Bool bReadOnly );
+ virtual sal_Bool IsReadOnly();
virtual void StoreData();
- virtual BOOL IsModified();
- virtual BOOL IsPasteAllowed();
+ virtual sal_Bool IsModified();
+ virtual sal_Bool IsPasteAllowed();
virtual ::svl::IUndoManager*
GetUndoManager();
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index d983f93bf..413c84d53 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -50,7 +50,7 @@
//----------------------------------------------------------------------------
-const ULONG BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
+const sal_uLong BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
//----------------------------------------------------------------------------
@@ -84,13 +84,13 @@ class BasicIDEShell :public SfxViewShell
{
friend class JavaDebuggingListenerImpl;
friend class LocalizationMgr;
-friend BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
+friend sal_Bool implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName );
friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
ObjectCatalog* pObjectCatalog;
IDEWindowTable aIDEWindowTable;
- USHORT nCurKey;
+ sal_uInt16 nCurKey;
IDEBaseWindow* pCurWin;
ScriptDocument m_aCurDocument;
String m_aCurLibName;
@@ -100,10 +100,10 @@ friend bool BasicIDE::RemoveDialog( const ScriptDocument& rDocument, const Strin
ScrollBar aVScrollBar;
ScrollBarBox aScrollBarBox;
BasicIDETabBar* pTabBar;
- BOOL bTabBarSplitted;
- BOOL bCreatingWindow;
+ sal_Bool bTabBarSplitted;
+ sal_Bool bCreatingWindow;
ModulWindowLayout* pModulLayout;
- BOOL m_bAppBasicModified;
+ sal_Bool m_bAppBasicModified;
::basctl::DocumentEventNotifier
m_aNotifier;
friend class ContainerListenerImpl;
@@ -114,13 +114,13 @@ friend class ContainerListenerImpl;
void InitTabBar();
void InitScrollBars();
void CheckWindows();
- void RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, BOOL bDestroy );
+ void RemoveWindows( const ScriptDocument& rDocument, const String& rLibName, sal_Bool bDestroy );
void UpdateWindows();
- void ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy );
+ void ShowObjectDialog( sal_Bool bShow, sal_Bool bCreateOrDestroy );
void InvalidateBasicIDESlots();
- void StoreAllWindowData( BOOL bPersistent = TRUE );
+ void StoreAllWindowData( sal_Bool bPersistent = sal_True );
void SetMDITitle();
- void EnableScrollbars( BOOL bEnable );
+ void EnableScrollbars( sal_Bool bEnable );
void SetCurLib( const ScriptDocument& rDocument, String aLibName, bool bUpdateWindows = true , bool bCheck = true );
void SetCurLibForLocalization( const ScriptDocument& rDocument, String aLibName );
@@ -136,28 +136,28 @@ protected:
virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize );
virtual void OuterResizePixel( const Point &rPos, const Size &rSize );
virtual Size GetOptimalSizePixel() const;
- USHORT InsertWindowInTable( IDEBaseWindow* pNewWin );
- virtual USHORT PrepareClose( BOOL bUI, BOOL bForBrowsing );
+ sal_uInt16 InsertWindowInTable( IDEBaseWindow* pNewWin );
+ virtual sal_uInt16 PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing );
- void SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar = FALSE, BOOL bRememberAsCurrent = TRUE );
+ void SetCurWindow( IDEBaseWindow* pNewWin, sal_Bool bUpdateTabBar = sal_False, sal_Bool bRememberAsCurrent = sal_True );
void ManageToolbars();
- void RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow = TRUE );
+ void RemoveWindow( IDEBaseWindow* pWindow, sal_Bool bDestroy, sal_Bool bAllowChangeCurWindow = sal_True );
void ArrangeTabBar();
ModulWindow* CreateBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName );
DialogWindow* CreateDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName );
- ModulWindow* FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
+ ModulWindow* FindBasWin( const ScriptDocument& rDocument, const String& rLibName, const String& rModName, sal_Bool bCreateIfNotExist, sal_Bool bFindSuspended = sal_False );
ModulWindow* ShowActiveModuleWindow( StarBASIC* pBasic );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- virtual void Activate(BOOL bMDI);
- virtual void Deactivate(BOOL bMDI);
+ virtual void Activate(sal_Bool bMDI);
+ virtual void Deactivate(sal_Bool bMDI);
virtual void Move();
- virtual void ShowCursor( FASTBOOL bOn = TRUE );
+ virtual void ShowCursor( FASTBOOL bOn = sal_True );
void CreateModulWindowLayout();
void DestroyModulWindowLayout();
@@ -202,11 +202,11 @@ public:
virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
- // virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 );
- virtual SfxPrinter* GetPrinter( BOOL bCreate );
- virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
- virtual String GetSelectionText( BOOL bCompleteWords );
- virtual BOOL HasSelection( BOOL bText ) const;
+ // virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 );
+ virtual SfxPrinter* GetPrinter( sal_Bool bCreate );
+ virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
+ virtual String GetSelectionText( sal_Bool bCompleteWords );
+ virtual sal_Bool HasSelection( sal_Bool bText ) const;
void GetState( SfxItemSet& );
void ExecuteGlobal( SfxRequest& rReq );
@@ -221,13 +221,13 @@ public:
ModulWindowLayout* GetLayoutWindow() const { return pModulLayout; }
- IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), USHORT nType = BASICIDE_TYPE_UNKNOWN, BOOL bFindSuspended = FALSE );
- DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, BOOL bCreateIfNotExist, BOOL bFindSuspended = FALSE );
+ IDEBaseWindow* FindWindow( const ScriptDocument& rDocument, const String& rLibName = String(), const String& rName = String(), sal_uInt16 nType = BASICIDE_TYPE_UNKNOWN, sal_Bool bFindSuspended = sal_False );
+ DialogWindow* FindDlgWin( const ScriptDocument& rDocument, const String& rLibName, const String& rDlgName, sal_Bool bCreateIfNotExist, sal_Bool bFindSuspended = sal_False );
IDEBaseWindow* FindApplicationWindow();
- BOOL NextPage( BOOL bPrev = FALSE );
+ sal_Bool NextPage( sal_Bool bPrev = sal_False );
- BOOL IsAppBasicModified() const { return m_bAppBasicModified; }
- void SetAppBasicModified( BOOL bModified = TRUE ) { m_bAppBasicModified = bModified; }
+ sal_Bool IsAppBasicModified() const { return m_bAppBasicModified; }
+ void SetAppBasicModified( sal_Bool bModified = sal_True ) { m_bAppBasicModified = bModified; }
// For Dialog Drag&Drop in Dialog Organizer
static void CopyDialogResources(
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index eb1115440..45ddf1b8a 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -51,7 +51,7 @@ struct BasicIDE_Impl;
namespace BasicIDE
{
- void Organize( INT16 tabId );
+ void Organize( sal_Int16 tabId );
// Hilfsmethoden fuer den allg. Gebrauch:
@@ -61,10 +61,10 @@ namespace BasicIDE
StarBASIC* FindBasic( const SbxVariable* pVar );
void StopBasic();
long HandleBasicError( StarBASIC* pBasic );
- void BasicStopped( BOOL* pbAppWindowDisabled = 0, BOOL* pbDispatcherLocked = 0, USHORT* pnWaitCount = 0,
+ void BasicStopped( sal_Bool* pbAppWindowDisabled = 0, sal_Bool* pbDispatcherLocked = 0, sal_uInt16* pnWaitCount = 0,
SfxUInt16Item** ppSWActionCount = 0, SfxUInt16Item** ppSWLockViewCount = 0 );
- BOOL IsValidSbxName( const String& rName );
+ sal_Bool IsValidSbxName( const String& rName );
BasicManager* FindBasicManager( StarBASIC* pLib );
@@ -95,13 +95,13 @@ namespace BasicIDE
// new methods for macros
::rtl::OUString ChooseMacro( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument,
- BOOL bChooseOnly, const ::rtl::OUString& rMacroDesc );
+ sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc );
::com::sun::star::uno::Sequence< ::rtl::OUString > GetMethodNames(
const ScriptDocument& rDocument, const String& rLibName, const String& rModName )
throw( ::com::sun::star::container::NoSuchElementException );
- BOOL HasMethod(
+ sal_Bool HasMethod(
const ScriptDocument& rDocument, const String& rLibName, const String& rModName, const String& rMethName );
// new methods for dialogs
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index f4b4ce6d7..bcf20cc4f 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -70,26 +70,26 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
struct BasicStatus
{
-// BOOL bCompiled : 1;
- BOOL bIsRunning : 1;
- BOOL bError : 1;
- BOOL bIsInReschedule : 1;
- USHORT nBasicFlags;
+// sal_Bool bCompiled : 1;
+ sal_Bool bIsRunning : 1;
+ sal_Bool bError : 1;
+ sal_Bool bIsInReschedule : 1;
+ sal_uInt16 nBasicFlags;
BasicStatus() {
- bIsRunning = FALSE; bError = FALSE;
- nBasicFlags = 0; bIsInReschedule = FALSE; }
+ bIsRunning = sal_False; bError = sal_False;
+ nBasicFlags = 0; bIsInReschedule = sal_False; }
};
struct BreakPoint
{
- BOOL bEnabled;
- BOOL bTemp;
- ULONG nLine;
- ULONG nStopAfter;
- ULONG nHitCount;
+ sal_Bool bEnabled;
+ sal_Bool bTemp;
+ sal_uLong nLine;
+ sal_uLong nStopAfter;
+ sal_uLong nHitCount;
- BreakPoint( ULONG nL ) { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = TRUE; bTemp = FALSE; }
+ BreakPoint( sal_uLong nL ) { nLine = nL; nStopAfter = 0; nHitCount = 0; bEnabled = sal_True; bTemp = sal_False; }
};
@@ -98,10 +98,10 @@ class BasicDockingWindow : public DockingWindow
Rectangle aFloatingPosAndSize;
protected:
- virtual BOOL Docking( const Point& rPos, Rectangle& rRect );
- virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode );
+ virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect );
+ virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode );
virtual void ToggleFloatingMode();
- virtual BOOL PrepareToggleFloatingMode();
+ virtual sal_Bool PrepareToggleFloatingMode();
virtual void StartDocking();
public:
@@ -126,8 +126,8 @@ public:
void transfer(BreakPointList & rList);
void InsertSorted( BreakPoint* pBrk );
- BreakPoint* FindBreakPoint( ULONG nLine );
- void AdjustBreakPoints( ULONG nLine, BOOL bInserted );
+ BreakPoint* FindBreakPoint( sal_uLong nLine );
+ void AdjustBreakPoints( sal_uLong nLine, sal_Bool bInserted );
void SetBreakPointsInBasic( SbModule* pModule );
void ResetHitCount();
};
@@ -136,7 +136,7 @@ public:
class TabBarSortHelper
{
public:
- USHORT nPageId;
+ sal_uInt16 nPageId;
String aPageText;
bool operator<(const TabBarSortHelper& rComp) const { return (aPageText.CompareIgnoreCaseToAscii( rComp.aPageText ) == COMPARE_LESS); }
@@ -178,7 +178,7 @@ private:
ScrollBar* pShellVScrollBar;
DECL_LINK( ScrollHdl, ScrollBar * );
- BYTE nStatus;
+ sal_uInt8 nStatus;
ScriptDocument m_aDocument;
String m_aLibName;
@@ -206,7 +206,7 @@ public:
virtual void StoreData();
virtual void UpdateData();
- virtual BOOL CanClose();
+ virtual sal_Bool CanClose();
// return number of pages to be printed
virtual sal_Int32 countPages( Printer* pPrinter ) = 0;
@@ -217,31 +217,31 @@ public:
String CreateQualifiedName();
virtual BasicEntryDescriptor CreateEntryDescriptor() = 0;
- virtual BOOL IsModified();
- virtual BOOL IsPasteAllowed();
+ virtual sal_Bool IsModified();
+ virtual sal_Bool IsPasteAllowed();
- virtual BOOL AllowUndo();
+ virtual sal_Bool AllowUndo();
- virtual void SetReadOnly( BOOL bReadOnly );
- virtual BOOL IsReadOnly();
+ virtual void SetReadOnly( sal_Bool bReadOnly );
+ virtual sal_Bool IsReadOnly();
- BYTE GetStatus() { return nStatus; }
- void SetStatus( BYTE n ) { nStatus = n; }
- void AddStatus( BYTE n ) { nStatus = nStatus | n; }
- void ClearStatus( BYTE n ) { nStatus = nStatus & ~n; }
+ sal_uInt8 GetStatus() { return nStatus; }
+ void SetStatus( sal_uInt8 n ) { nStatus = n; }
+ void AddStatus( sal_uInt8 n ) { nStatus = nStatus | n; }
+ void ClearStatus( sal_uInt8 n ) { nStatus = nStatus & ~n; }
virtual Window* GetLayoutWindow();
virtual ::svl::IUndoManager*
GetUndoManager();
- virtual USHORT GetSearchOptions();
+ virtual sal_uInt16 GetSearchOptions();
virtual void BasicStarted();
virtual void BasicStopped();
- BOOL IsSuspended() const
- { return ( nStatus & BASWIN_SUSPENDED ) ? TRUE : FALSE; }
+ sal_Bool IsSuspended() const
+ { return ( nStatus & BASWIN_SUSPENDED ) ? sal_True : sal_False; }
const ScriptDocument&
GetDocument() const { return m_aDocument; }
@@ -279,10 +279,10 @@ private:
ScriptDocument m_aDocument;
String m_aLibName;
String m_aCurrentName;
- USHORT m_nCurrentType;
+ sal_uInt16 m_nCurrentType;
public:
- LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType );
+ LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, sal_uInt16 nCurrentType );
~LibInfoItem();
LibInfoItem( const LibInfoItem& rItem );
@@ -292,7 +292,7 @@ public:
GetDocument() const { return m_aDocument; }
const String& GetLibName() const { return m_aLibName; }
const String& GetCurrentName() const { return m_aCurrentName; }
- USHORT GetCurrentType() const { return m_nCurrentType; }
+ sal_uInt16 GetCurrentType() const { return m_nCurrentType; }
};
class LibInfos
@@ -322,16 +322,16 @@ public:
LibInfoItem* GetInfo( const LibInfoKey& rKey );
};
-void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, BOOL bEraseTrailingEmptyLines = FALSE );
+void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines = sal_False );
String CreateMgrAndLibStr( const String& rMgrName, const String& rLibName );
-ULONG CalcLineCount( SvStream& rStream );
-
-BOOL QueryReplaceMacro( const String& rName, Window* pParent = 0 );
-BOOL QueryDelMacro( const String& rName, Window* pParent = 0 );
-BOOL QueryDelDialog( const String& rName, Window* pParent = 0 );
-BOOL QueryDelModule( const String& rName, Window* pParent = 0 );
-BOOL QueryDelLib( const String& rName, BOOL bRef = FALSE, Window* pParent = 0 );
-BOOL QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, BOOL bRepeat = FALSE, BOOL bNewTitle = FALSE );
+sal_uLong CalcLineCount( SvStream& rStream );
+
+sal_Bool QueryReplaceMacro( const String& rName, Window* pParent = 0 );
+sal_Bool QueryDelMacro( const String& rName, Window* pParent = 0 );
+sal_Bool QueryDelDialog( const String& rName, Window* pParent = 0 );
+sal_Bool QueryDelModule( const String& rName, Window* pParent = 0 );
+sal_Bool QueryDelLib( const String& rName, sal_Bool bRef = sal_False, Window* pParent = 0 );
+sal_Bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const String& rLibName, String& rPassword, sal_Bool bRepeat = sal_False, sal_Bool bNewTitle = sal_False );
class ModuleInfoHelper
{
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index a8adcda94..83807ee5a 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -117,15 +117,15 @@ protected:
Window* pWindow;
DlgEdFunc* pFunc;
DlgEdMode eMode;
- USHORT eActObj;
- BOOL bFirstDraw;
+ sal_uInt16 eActObj;
+ sal_Bool bFirstDraw;
Size aGridSize;
- BOOL bGridVisible;
- BOOL bGridSnap;
- BOOL bCreateOK;
+ sal_Bool bGridVisible;
+ sal_Bool bGridSnap;
+ sal_Bool bCreateOK;
Timer aPaintTimer;
Rectangle aPaintRect;
- BOOL bDialogModelChanged;
+ sal_Bool bDialogModelChanged;
Timer aMarkTimer;
long mnPaintGuard;
@@ -167,33 +167,33 @@ public:
void ShowDialog();
- BOOL UnmarkDialog();
- BOOL RemarkDialog();
+ sal_Bool UnmarkDialog();
+ sal_Bool RemarkDialog();
- void SetDialogModelChanged( BOOL bChanged = TRUE ) { bDialogModelChanged = bChanged; }
- BOOL IsDialogModelChanged() const { return bDialogModelChanged; }
+ void SetDialogModelChanged( sal_Bool bChanged = sal_True ) { bDialogModelChanged = bChanged; }
+ sal_Bool IsDialogModelChanged() const { return bDialogModelChanged; }
- BOOL IsModified() const;
+ sal_Bool IsModified() const;
void ClearModifyFlag();
void MouseButtonDown( const MouseEvent& rMEvt );
void MouseButtonUp( const MouseEvent& rMEvt );
void MouseMove( const MouseEvent& rMEvt );
void Paint( const Rectangle& rRect );
- BOOL KeyInput( const KeyEvent& rKEvt );
+ sal_Bool KeyInput( const KeyEvent& rKEvt );
void SetMode( DlgEdMode eMode );
- void SetInsertObj( USHORT eObj );
- USHORT GetInsertObj() const;
+ void SetInsertObj( sal_uInt16 eObj );
+ sal_uInt16 GetInsertObj() const;
void CreateDefaultObject();
DlgEdMode GetMode() const { return eMode; }
- BOOL IsCreateOK() const { return bCreateOK; }
+ sal_Bool IsCreateOK() const { return bCreateOK; }
void Cut();
void Copy();
void Paste();
void Delete();
- BOOL IsPasteAllowed();
+ sal_Bool IsPasteAllowed();
void ShowProperties();
void UpdatePropertyBrowserDelayed();
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 451398518..bdf55a7a7 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -31,36 +31,36 @@
#include <tools/solar.h>
-const UINT32 DlgInventor = UINT32('D')*0x00000001+
- UINT32('L')*0x00000100+
- UINT32('G')*0x00010000+
- UINT32('1')*0x01000000;
+const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+
+ sal_uInt32('L')*0x00000100+
+ sal_uInt32('G')*0x00010000+
+ sal_uInt32('1')*0x01000000;
-#define OBJ_DLG_CONTROL ((UINT16) 1)
-#define OBJ_DLG_DIALOG ((UINT16) 2)
-#define OBJ_DLG_PUSHBUTTON ((UINT16) 3)
-#define OBJ_DLG_RADIOBUTTON ((UINT16) 4)
-#define OBJ_DLG_CHECKBOX ((UINT16) 5)
-#define OBJ_DLG_LISTBOX ((UINT16) 6)
-#define OBJ_DLG_COMBOBOX ((UINT16) 7)
-#define OBJ_DLG_GROUPBOX ((UINT16) 8)
-#define OBJ_DLG_EDIT ((UINT16) 9)
-#define OBJ_DLG_FIXEDTEXT ((UINT16)10)
-#define OBJ_DLG_IMAGECONTROL ((UINT16)11)
-#define OBJ_DLG_PROGRESSBAR ((UINT16)12)
-#define OBJ_DLG_HSCROLLBAR ((UINT16)13)
-#define OBJ_DLG_VSCROLLBAR ((UINT16)14)
-#define OBJ_DLG_HFIXEDLINE ((UINT16)15)
-#define OBJ_DLG_VFIXEDLINE ((UINT16)16)
-#define OBJ_DLG_DATEFIELD ((UINT16)17)
-#define OBJ_DLG_TIMEFIELD ((UINT16)18)
-#define OBJ_DLG_NUMERICFIELD ((UINT16)19)
-#define OBJ_DLG_CURRENCYFIELD ((UINT16)20)
-#define OBJ_DLG_FORMATTEDFIELD ((UINT16)21)
-#define OBJ_DLG_PATTERNFIELD ((UINT16)22)
-#define OBJ_DLG_FILECONTROL ((UINT16)23)
-#define OBJ_DLG_TREECONTROL ((UINT16)24)
+#define OBJ_DLG_CONTROL ((sal_uInt16) 1)
+#define OBJ_DLG_DIALOG ((sal_uInt16) 2)
+#define OBJ_DLG_PUSHBUTTON ((sal_uInt16) 3)
+#define OBJ_DLG_RADIOBUTTON ((sal_uInt16) 4)
+#define OBJ_DLG_CHECKBOX ((sal_uInt16) 5)
+#define OBJ_DLG_LISTBOX ((sal_uInt16) 6)
+#define OBJ_DLG_COMBOBOX ((sal_uInt16) 7)
+#define OBJ_DLG_GROUPBOX ((sal_uInt16) 8)
+#define OBJ_DLG_EDIT ((sal_uInt16) 9)
+#define OBJ_DLG_FIXEDTEXT ((sal_uInt16)10)
+#define OBJ_DLG_IMAGECONTROL ((sal_uInt16)11)
+#define OBJ_DLG_PROGRESSBAR ((sal_uInt16)12)
+#define OBJ_DLG_HSCROLLBAR ((sal_uInt16)13)
+#define OBJ_DLG_VSCROLLBAR ((sal_uInt16)14)
+#define OBJ_DLG_HFIXEDLINE ((sal_uInt16)15)
+#define OBJ_DLG_VFIXEDLINE ((sal_uInt16)16)
+#define OBJ_DLG_DATEFIELD ((sal_uInt16)17)
+#define OBJ_DLG_TIMEFIELD ((sal_uInt16)18)
+#define OBJ_DLG_NUMERICFIELD ((sal_uInt16)19)
+#define OBJ_DLG_CURRENCYFIELD ((sal_uInt16)20)
+#define OBJ_DLG_FORMATTEDFIELD ((sal_uInt16)21)
+#define OBJ_DLG_PATTERNFIELD ((sal_uInt16)22)
+#define OBJ_DLG_FILECONTROL ((sal_uInt16)23)
+#define OBJ_DLG_TREECONTROL ((sal_uInt16)24)
// control properties
#define DLGED_PROP_BACKGROUNDCOLOR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ) )
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index b89aff1e2..80b3e6ca3 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -52,10 +52,10 @@ public:
DlgEdFunc( DlgEditor* pParent );
virtual ~DlgEdFunc();
- virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
- virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
- virtual BOOL MouseMove( const MouseEvent& rMEvt );
- virtual BOOL KeyInput( const KeyEvent& rKEvt );
+ virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
+ virtual sal_Bool KeyInput( const KeyEvent& rKEvt );
};
//============================================================================
@@ -68,9 +68,9 @@ public:
DlgEdFuncInsert( DlgEditor* pParent );
~DlgEdFuncInsert();
- virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
- virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
- virtual BOOL MouseMove( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
};
//============================================================================
@@ -80,15 +80,15 @@ public:
class DlgEdFuncSelect : public DlgEdFunc
{
protected:
- BOOL bMarkAction;
+ sal_Bool bMarkAction;
public:
DlgEdFuncSelect( DlgEditor* pParent );
~DlgEdFuncSelect();
- virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
- virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
- virtual BOOL MouseMove( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+ virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
};
diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx
index 1930fe30c..3acb2bee0 100644
--- a/basctl/source/inc/dlgedmod.hxx
+++ b/basctl/source/inc/dlgedmod.hxx
@@ -54,7 +54,7 @@ public:
DlgEdModel();
virtual ~DlgEdModel();
- virtual void DlgEdModelChanged( FASTBOOL bChanged = TRUE );
+ virtual void DlgEdModelChanged( FASTBOOL bChanged = sal_True );
virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx
index 0229b5d44..125d80b30 100644
--- a/basctl/source/inc/dlgedpage.hxx
+++ b/basctl/source/inc/dlgedpage.hxx
@@ -45,7 +45,7 @@ private:
public:
TYPEINFO();
- DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage=FALSE );
+ DlgEdPage( DlgEdModel& rModel, FASTBOOL bMasterPage=sal_False );
DlgEdPage( const DlgEdPage& );
virtual ~DlgEdPage();
@@ -55,7 +55,7 @@ public:
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
- virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
+ virtual SdrObject* SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum);
};
#endif //_BASCTL_DLGEDPAGE_HXX
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 59a5a1340..ef84aede7 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -54,7 +54,7 @@ public:
protected:
// overloaded to handle HitTest for some objects special
using SdrView::CheckSingleSdrObjectHit;
- virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
+ virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const;
};
#endif //_BASCTL_DLGEDVIEW_HXX
diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx
index 57632a926..3c28179ae 100644
--- a/basctl/source/inc/iderid.hxx
+++ b/basctl/source/inc/iderid.hxx
@@ -33,7 +33,7 @@
class IDEResId: public ResId
{
public:
- IDEResId( USHORT nId );
+ IDEResId( sal_uInt16 nId );
};
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 2dcd692c8..f4ac1c0ff 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -30,12 +30,12 @@
#include "scriptdocument.hxx"
#include <svl/poolitem.hxx>
-const USHORT BASICIDE_TYPE_UNKNOWN = 0;
-const USHORT BASICIDE_TYPE_SHELL = 1;
-const USHORT BASICIDE_TYPE_LIBRARY = 2;
-const USHORT BASICIDE_TYPE_MODULE = 3;
-const USHORT BASICIDE_TYPE_DIALOG = 4;
-const USHORT BASICIDE_TYPE_METHOD = 5;
+const sal_uInt16 BASICIDE_TYPE_UNKNOWN = 0;
+const sal_uInt16 BASICIDE_TYPE_SHELL = 1;
+const sal_uInt16 BASICIDE_TYPE_LIBRARY = 2;
+const sal_uInt16 BASICIDE_TYPE_MODULE = 3;
+const sal_uInt16 BASICIDE_TYPE_DIALOG = 4;
+const sal_uInt16 BASICIDE_TYPE_METHOD = 5;
class SbxItem : public SfxPoolItem
@@ -44,12 +44,12 @@ class SbxItem : public SfxPoolItem
String m_aLibName;
String m_aName;
String m_aMethodName;
- USHORT m_nType;
+ sal_uInt16 m_nType;
public:
TYPEINFO();
- SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, USHORT nType );
- SbxItem( USHORT nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, USHORT nType );
+ SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, sal_uInt16 nType );
+ SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const String& aLibName, const String& aName, const String& aMethodName, sal_uInt16 nType );
SbxItem( const SbxItem& );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -68,8 +68,8 @@ public:
const String& GetMethodName() const { return m_aMethodName; }
void SetMethodName( const String& aMethodName ) { m_aMethodName = aMethodName; }
- USHORT GetType() const { return m_nType; }
- void SetType( USHORT nType ) { m_nType = nType; }
+ sal_uInt16 GetType() const { return m_nType; }
+ void SetType( sal_uInt16 nType ) { m_nType = nType; }
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 09:44:32 +0000