diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-07 17:35:15 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-07 17:35:15 +0100 |
| commit | c5b727675460581258489d3bd569a61184ad69cd (patch) | |
| tree | 6e9cb2940cb74b5cd060a57e1db0065b07b4935c /sfx2 | |
| parent | dcd8e4664d9a284c24ceb0360cab0606b22cf86d (diff) | |
removetooltypes: #i112600# remove tooltypes
Diffstat (limited to 'sfx2')
67 files changed, 1097 insertions, 1097 deletions
diff --git a/sfx2/inc/about.hxx b/sfx2/inc/about.hxx index b3b347917ddc..aa4a8e21bd4f 100644 --- a/sfx2/inc/about.hxx +++ b/sfx2/inc/about.hxx @@ -64,10 +64,10 @@ private: long m_nDeltaWidth; int m_nPendingScrolls; - BOOL bNormal; + sal_Bool bNormal; protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Paint( const Rectangle& ); public: diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx index 48a03c96229e..3fbf4eecffbd 100644 --- a/sfx2/inc/bitset.hxx +++ b/sfx2/inc/bitset.hxx @@ -35,54 +35,54 @@ class BitSet { private: void CopyFrom( const BitSet& rSet ); - USHORT nBlocks; - USHORT nCount; - ULONG* pBitmap; + sal_uInt16 nBlocks; + sal_uInt16 nCount; + sal_uIntPtr* pBitmap; public: - BitSet operator<<( USHORT nOffset ) const; - BitSet operator>>( USHORT nOffset ) const; - static USHORT CountBits( ULONG nBits ); - BOOL operator!() const; + BitSet operator<<( sal_uInt16 nOffset ) const; + BitSet operator>>( sal_uInt16 nOffset ) const; + static sal_uInt16 CountBits( sal_uIntPtr nBits ); + sal_Bool operator!() const; BitSet(); BitSet( const BitSet& rOrig ); - BitSet( USHORT* pArray, USHORT nSize ); + BitSet( sal_uInt16* pArray, sal_uInt16 nSize ); ~BitSet(); BitSet( const Range& rRange ); - USHORT Count() const; + sal_uInt16 Count() const; BitSet& operator=( const BitSet& rOrig ); - BitSet& operator=( USHORT nBit ); + BitSet& operator=( sal_uInt16 nBit ); BitSet operator|( const BitSet& rSet ) const; - BitSet operator|( USHORT nBit ) const; + BitSet operator|( sal_uInt16 nBit ) const; BitSet& operator|=( const BitSet& rSet ); - BitSet& operator|=( USHORT nBit ); + BitSet& operator|=( sal_uInt16 nBit ); BitSet operator-( const BitSet& rSet ) const; - BitSet operator-( USHORT nId ) const; + BitSet operator-( sal_uInt16 nId ) const; BitSet& operator-=( const BitSet& rSet ); - BitSet& operator-=( USHORT nBit ); + BitSet& operator-=( sal_uInt16 nBit ); BitSet operator&( const BitSet& rSet ) const; BitSet& operator&=( const BitSet& rSet ); BitSet operator^( const BitSet& rSet ) const; - BitSet operator^( USHORT nBit ) const; + BitSet operator^( sal_uInt16 nBit ) const; BitSet& operator^=( const BitSet& rSet ); - BitSet& operator^=( USHORT nBit ); - BOOL IsRealSubSet( const BitSet& rSet ) const; - BOOL IsSubSet( const BitSet& rSet ) const; - BOOL IsRealSuperSet( const BitSet& rSet ) const; - BOOL Contains( USHORT nBit ) const; - BOOL IsSuperSet( const BitSet& rSet ) const; - BOOL operator==( const BitSet& rSet ) const; - BOOL operator==( USHORT nBit ) const; - BOOL operator!=( const BitSet& rSet ) const; - BOOL operator!=( USHORT nBit ) const; + BitSet& operator^=( sal_uInt16 nBit ); + sal_Bool IsRealSubSet( const BitSet& rSet ) const; + sal_Bool IsSubSet( const BitSet& rSet ) const; + sal_Bool IsRealSuperSet( const BitSet& rSet ) const; + sal_Bool Contains( sal_uInt16 nBit ) const; + sal_Bool IsSuperSet( const BitSet& rSet ) const; + sal_Bool operator==( const BitSet& rSet ) const; + sal_Bool operator==( sal_uInt16 nBit ) const; + sal_Bool operator!=( const BitSet& rSet ) const; + sal_Bool operator!=( sal_uInt16 nBit ) const; }; //-------------------------------------------------------------------- -// returns TRUE if the set is empty +// returns sal_True if the set is empty -inline BOOL BitSet::operator!() const +inline sal_Bool BitSet::operator!() const { return nCount == 0; } @@ -90,7 +90,7 @@ inline BOOL BitSet::operator!() const // returns the number of bits in the bitset -inline USHORT BitSet::Count() const +inline sal_uInt16 BitSet::Count() const { return nCount; } @@ -106,7 +106,7 @@ inline BitSet BitSet::operator|( const BitSet& rSet ) const // creates the union of a bitset with a single bit -inline BitSet BitSet::operator|( USHORT nBit ) const +inline BitSet BitSet::operator|( sal_uInt16 nBit ) const { return BitSet(*this) |= nBit; } @@ -123,7 +123,7 @@ inline BitSet BitSet::operator-( const BitSet& ) const // creates the asymetric difference with a single bit -inline BitSet BitSet::operator-( USHORT ) const +inline BitSet BitSet::operator-( sal_uInt16 ) const { return BitSet(); } @@ -164,7 +164,7 @@ inline BitSet BitSet::operator^( const BitSet& ) const // creates the symetric difference with a single bit -inline BitSet BitSet::operator^( USHORT ) const +inline BitSet BitSet::operator^( sal_uInt16 ) const { return BitSet(); } @@ -180,7 +180,7 @@ inline BitSet& BitSet::operator^=( const BitSet& ) #ifdef BITSET_READY // builds the symetric difference with a single bit -inline BitSet& BitSet::operator^=( USHORT ) +inline BitSet& BitSet::operator^=( sal_uInt16 ) { // crash!!! return BitSet(); @@ -190,48 +190,48 @@ inline BitSet& BitSet::operator^=( USHORT ) // determines if the other bitset is a real superset -inline BOOL BitSet::IsRealSubSet( const BitSet& ) const +inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // detsermines if the other bitset is a superset or equal -inline BOOL BitSet::IsSubSet( const BitSet& ) const +inline sal_Bool BitSet::IsSubSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the other bitset is a real subset -inline BOOL BitSet::IsRealSuperSet( const BitSet& ) const +inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the other bitset is a subset or equal -inline BOOL BitSet::IsSuperSet( const BitSet& ) const +inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the bit is the only one in the bitset -inline BOOL BitSet::operator==( USHORT ) const +inline sal_Bool BitSet::operator==( sal_uInt16 ) const { - return FALSE; + return sal_False; } //-------------------------------------------------------------------- // determines if the bitsets aren't equal -inline BOOL BitSet::operator!=( const BitSet& rSet ) const +inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const { return !( *this == rSet ); } @@ -239,7 +239,7 @@ inline BOOL BitSet::operator!=( const BitSet& rSet ) const // determines if the bitset doesn't contain only this bit -inline BOOL BitSet::operator!=( USHORT nBit ) const +inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const { return !( *this == nBit ); } @@ -248,8 +248,8 @@ inline BOOL BitSet::operator!=( USHORT nBit ) const class IndexBitSet : BitSet { public: - USHORT GetFreeIndex(); - void ReleaseIndex(USHORT i){*this-=i;} + sal_uInt16 GetFreeIndex(); + void ReleaseIndex(sal_uInt16 i){*this-=i;} }; diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx index 1bdbdf98161d..9e252123348b 100644 --- a/sfx2/inc/docvor.hxx +++ b/sfx2/inc/docvor.hxx @@ -66,27 +66,27 @@ friend class SfxOrganizeDlg_Impl; SfxOrganizeMgr* pMgr; SfxOrganizeDlg_Impl* pDlg; - static BOOL bDropMoveOk; + static sal_Bool bDropMoveOk; DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* ); protected: - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection & ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); - virtual BOOL NotifyMoving(SvLBoxEntry *pSource, + virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection & ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const String& rNewText ); + virtual sal_Bool NotifyMoving(SvLBoxEntry *pSource, SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, ULONG &); - virtual BOOL NotifyCopying(SvLBoxEntry *pSource, + SvLBoxEntry *&pNewParent, sal_uIntPtr &); + virtual sal_Bool NotifyCopying(SvLBoxEntry *pSource, SvLBoxEntry* pTarget, - SvLBoxEntry *&pNewParent, ULONG &); + SvLBoxEntry *&pNewParent, sal_uIntPtr &); virtual void RequestingChilds( SvLBoxEntry* pParent ); virtual long ExpandingHdl(); - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); + virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); using SvLBox::ExecuteDrop; // new d&d virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void DragFinished( sal_Int8 nDropAction ); @@ -105,34 +105,34 @@ public: inline void SetBitmaps( const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp, const Image &rOFolderBmpHC, const Image &rCFolderBmpHC, const Image &rODocBmpHC, const Image &rCDocBmpHC ); - const Image &GetClosedBmp(USHORT nLevel) const; - const Image &GetOpenedBmp(USHORT nLevel) const; + const Image &GetClosedBmp(sal_uInt16 nLevel) const; + const Image &GetOpenedBmp(sal_uInt16 nLevel) const; virtual PopupMenu* CreateContextMenu(); private: - BOOL IsStandard_Impl( SvLBoxEntry *) const; - BOOL MoveOrCopyTemplates(SvLBox *pSourceBox, + sal_Bool IsStandard_Impl( SvLBoxEntry *) const; + sal_Bool MoveOrCopyTemplates(SvLBox *pSourceBox, SvLBoxEntry *pSource, SvLBoxEntry* pTarget, SvLBoxEntry *&pNewParent, - ULONG &rIdx, - BOOL bCopy); - BOOL MoveOrCopyContents(SvLBox *pSourceBox, + sal_uIntPtr &rIdx, + sal_Bool bCopy); + sal_Bool MoveOrCopyContents(SvLBox *pSourceBox, SvLBoxEntry *pSource, SvLBoxEntry* pTarget, SvLBoxEntry *&pNewParent, - ULONG &rIdx, - BOOL bCopy); - inline USHORT GetDocLevel() const; + sal_uIntPtr &rIdx, + sal_Bool bCopy); + inline sal_uInt16 GetDocLevel() const; SfxObjectShellRef GetObjectShell( const Path& ); - BOOL IsUniqName_Impl( const String &rText, + sal_Bool IsUniqName_Impl( const String &rText, SvLBoxEntry* pParent, SvLBoxEntry* pEntry = 0 ) const; - USHORT GetLevelCount_Impl( SvLBoxEntry* pParent ) const; + sal_uInt16 GetLevelCount_Impl( SvLBoxEntry* pParent ) const; SvLBoxEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType, - SvLBoxEntry* pParent = NULL, BOOL bChildsOnDemand = FALSE, - ULONG nPos = LIST_APPEND, void* pUserData = NULL ); + SvLBoxEntry* pParent = NULL, sal_Bool bChildsOnDemand = sal_False, + sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL ); }; #endif // _SFX_HXX diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx index bb16fb203437..b8e605b6ef13 100644 --- a/sfx2/inc/idpool.hxx +++ b/sfx2/inc/idpool.hxx @@ -35,25 +35,25 @@ class IdPool: private BitSet { private: - USHORT nNextFree; - USHORT nRange; - USHORT nOffset; + sal_uInt16 nNextFree; + sal_uInt16 nRange; + sal_uInt16 nOffset; public: - BOOL Lock( const BitSet& rLockSet ); - BOOL IsLocked( USHORT nId ) const; - IdPool( USHORT nMin = 1, USHORT nMax = USHRT_MAX ); - USHORT Get(); - BOOL Put( USHORT nId ); - BOOL Lock( const Range& rRange ); - BOOL Lock( USHORT nId ); + sal_Bool Lock( const BitSet& rLockSet ); + sal_Bool IsLocked( sal_uInt16 nId ) const; + IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX ); + sal_uInt16 Get(); + sal_Bool Put( sal_uInt16 nId ); + sal_Bool Lock( const Range& rRange ); + sal_Bool Lock( sal_uInt16 nId ); }; //------------------------------------------------------------------------ -// returns TRUE if the id is locked +// returns sal_True if the id is locked -inline BOOL IdPool::IsLocked( USHORT nId ) const +inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const { return ( this->Contains(nId-nOffset) ); } diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index fe8358bfe646..97b5275711f1 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -48,7 +48,7 @@ private: ::svt::AcceleratorExecute* pAccExec; SvtURLBox* GetURLBox() const; - void OpenURL( const String& rName, BOOL bNew ) const; + void OpenURL( const String& rName, sal_Bool bNew ) const; DECL_LINK( OpenHdl, void* ); DECL_LINK( SelectHdl, void* ); @@ -67,11 +67,11 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SfxURLToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxURLToolBoxControl_Impl(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; #endif diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx index 79af6b7302dc..b77ec981011b 100644 --- a/sfx2/inc/macro.hxx +++ b/sfx2/inc/macro.hxx @@ -19,14 +19,14 @@ class SfxMacroStatement USHORT nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // aktuelle Parameter, falls nSlotId != 0 String aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF) - BOOL bDone; // auskommentieren wenn kein Done() gerufen + sal_Bool bDone; // auskommentieren wenn kein Done() gerufen void* pDummy; // f"ur alle F"alle zum kompatibel bleiben #ifdef _SFXMACRO_HXX private: void GenerateNameAndArgs_Impl( SfxMacro *pMacro, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); #endif @@ -35,28 +35,28 @@ public: SfxMacroStatement( const String &rTarget, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const SfxShell &rShell, const String &rTarget, - BOOL bAbsolute, + sal_Bool bAbsolute, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const String &rStatment ); ~SfxMacroStatement(); - USHORT GetSlotId() const; + sal_uInt16 GetSlotId() const; const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const; - BOOL IsDone() const; + sal_Bool IsDone() const; const String& GetStatement() const; }; //-------------------------------------------------------------------- -inline USHORT SfxMacroStatement::GetSlotId() const +inline sal_uInt16 SfxMacroStatement::GetSlotId() const /* [Beschreibung] @@ -89,7 +89,7 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property //-------------------------------------------------------------------- -inline BOOL SfxMacroStatement::IsDone() const +inline sal_Bool SfxMacroStatement::IsDone() const /* [Beschreibung] diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index 85248e07996c..99a87f75f860 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -44,8 +44,8 @@ public: SfxObjectList(); ~SfxObjectList(); - const String& GetBaseName( USHORT nId ) const; - const String& GetFileName( USHORT nId ) const; + const String& GetBaseName( sal_uInt16 nId ) const; + const String& GetFileName( sal_uInt16 nId ) const; }; class IntlWrapper; @@ -66,8 +66,8 @@ private: SfxDocumentTemplates* pTemplates; SfxOrganizeListBox_Impl* pLeftBox; SfxOrganizeListBox_Impl* pRightBox; - BOOL bDeleteTemplates :1; - BOOL bModified :1; + sal_Bool bDeleteTemplates :1; + sal_Bool bModified :1; SfxOrganizeListBox_Impl* GetOther( SfxOrganizeListBox_Impl* ); @@ -77,27 +77,27 @@ public: SfxDocumentTemplates* pTempl = NULL ); ~SfxOrganizeMgr(); - BOOL Copy( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx ); - BOOL Move( USHORT nTargetRegion, USHORT nTargetIdx, USHORT nSourceRegion, USHORT nSourceIdx ); - BOOL Delete( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx ); - BOOL InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, USHORT nRegion ); - BOOL SetName( const String& rName, USHORT nRegion, USHORT nIdx = USHRT_MAX ); - BOOL CopyTo( USHORT nRegion, USHORT nIdx, const String& rName ) const; - BOOL CopyFrom( SfxOrganizeListBox_Impl* pCaller, USHORT nRegion, USHORT nIdx, String& rName ); + sal_Bool Copy( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx ); + sal_Bool Move( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx ); + sal_Bool Delete( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx ); + sal_Bool InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, sal_uInt16 nRegion ); + sal_Bool SetName( const String& rName, sal_uInt16 nRegion, sal_uInt16 nIdx = USHRT_MAX ); + sal_Bool CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String& rName ) const; + sal_Bool CopyFrom( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx, String& rName ); - BOOL Rescan(); - BOOL InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName ); + sal_Bool Rescan(); + sal_Bool InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName ); - BOOL IsModified() const { return bModified ? TRUE : FALSE; } + sal_Bool IsModified() const { return bModified ? sal_True : sal_False; } const SfxDocumentTemplates* GetTemplates() const { return pTemplates; } SfxObjectList& GetObjectList() { return *pImpl->pDocList; } const SfxObjectList& GetObjectList() const { return *pImpl->pDocList; } - SfxObjectShellRef CreateObjectShell( USHORT nIdx ); - SfxObjectShellRef CreateObjectShell( USHORT nRegion, USHORT nIdx ); - BOOL DeleteObjectShell( USHORT ); - BOOL DeleteObjectShell( USHORT, USHORT ); + SfxObjectShellRef CreateObjectShell( sal_uInt16 nIdx ); + SfxObjectShellRef CreateObjectShell( sal_uInt16 nRegion, sal_uInt16 nIdx ); + sal_Bool DeleteObjectShell( sal_uInt16 ); + sal_Bool DeleteObjectShell( sal_uInt16, sal_uInt16 ); void SaveAll( Window* pParent ); }; diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 980eec04cfa6..2bfd38d51276 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -114,7 +114,7 @@ public: { return new SfxLinkItem( *this ); } virtual int operator==( const SfxPoolItem& rL) const { return ((SfxLinkItem&)rL).aLink == aLink; } - SfxLinkItem( USHORT nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) + SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } const Link& GetValue() const { return aLink; } }; @@ -136,7 +136,7 @@ public: SfxItemFactory_Impl* GetFactory_Impl( TypeId ) const; const SvGlobalName* GetGlobalName( const SfxPoolItem* pItem ) const; SfxPoolItem* Create( - const SvGlobalName& rName, USHORT nId, SvStream* pStrm = 0) const; + const SvGlobalName& rName, sal_uInt16 nId, SvStream* pStrm = 0) const; void RegisterItemFactory( const SvGlobalName& rName, SfxItemCreateFunc ); }; @@ -161,15 +161,15 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell //#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* ); - SAL_DLLPRIVATE BOOL SaveAll_Impl(BOOL bPrompt = FALSE, BOOL bAutoSave = FALSE); - SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, BOOL bAutoSave = FALSE); + SAL_DLLPRIVATE sal_Bool SaveAll_Impl(sal_Bool bPrompt = sal_False, sal_Bool bAutoSave = sal_False); + SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False); SAL_DLLPRIVATE void InitializeDisplayName_Impl(); //#endif static SfxApplication* Create(); void Init(); void Exit(); - void SettingsChange( USHORT, const AppSettings & ); + void SettingsChange( sal_uInt16, const AppSettings & ); void Main( ); void PreInit( ); void Quit(); @@ -201,14 +201,14 @@ public: const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); ::sfx2::SvLinkSource* DdeCreateLinkSource( const String& rItem ); - BOOL InitializeDde(); + sal_Bool InitializeDde(); const DdeService* GetDdeService() const; DdeService* GetDdeService(); void AddDdeTopic( SfxObjectShell* ); void RemoveDdeTopic( SfxObjectShell* ); // "static" methods - ULONG LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, BOOL bCopy=TRUE, SfxItemSet* pArgs = 0 ); + sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 ); ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const; SfxTemplateDialog* GetTemplateDialog(); Window* GetTopWindow() const; @@ -221,40 +221,40 @@ public: SfxMacroConfig* GetMacroConfig() const; SfxProgress* GetProgress() const; const String& GetLastSaveDirectory() const; - USHORT GetFreeIndex(); - void ReleaseIndex(USHORT i); + sal_uInt16 GetFreeIndex(); + void ReleaseIndex(sal_uInt16 i); SfxEventConfiguration* GetEventConfig() const; // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); static ::rtl::OUString ChooseScript(); - static void MacroOrganizer( INT16 nTabId ); + static void MacroOrganizer( sal_Int16 nTabId ); BasicManager* GetBasicManager(); com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetDialogContainer(); com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer > GetBasicContainer(); StarBASIC* GetBasic(); - USHORT SaveBasicManager() const; - USHORT SaveBasicAndDialogContainer() const; + sal_uInt16 SaveBasicManager() const; + sal_uInt16 SaveBasicAndDialogContainer() const; void EnterBasicCall(); - FASTBOOL IsInBasicCall() const; + int IsInBasicCall() const; void LeaveBasicCall(); void RegisterBasicConstants( const char *pPrefix, const SfxConstant *pConsts, - USHORT nCount ); + sal_uInt16 nCount ); // misc. - BOOL GetOptions(SfxItemSet &); + sal_Bool GetOptions(SfxItemSet &); void SetOptions(const SfxItemSet &); - virtual void Invalidate(USHORT nId = 0); - void NotifyEvent(const SfxEventHint& rEvent, FASTBOOL bSynchron = TRUE ); - BOOL IsDowning() const; - BOOL IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; + virtual void Invalidate(sal_uInt16 nId = 0); + void NotifyEvent(const SfxEventHint& rEvent, int bSynchron = sal_True ); + sal_Bool IsDowning() const; + sal_Bool IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; static SfxObjectShellRef DocAlreadyLoaded( const String &rName, - BOOL bSilent, - BOOL bActivate, - BOOL bForbidVisible = FALSE, + sal_Bool bSilent, + sal_Bool bActivate, + sal_Bool bForbidVisible = sal_False, const String* pPostStr = 0); void ResetLastDir(); @@ -263,15 +263,15 @@ public: SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl(); SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl(); - SAL_DLLPRIVATE BOOL QueryExit_Impl(); + SAL_DLLPRIVATE sal_Bool QueryExit_Impl(); SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &); - SAL_DLLPRIVATE FASTBOOL Initialize_Impl(); + SAL_DLLPRIVATE int Initialize_Impl(); SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; } // Object-Factories/global arrays SAL_DLLPRIVATE void RegisterChildWindow_Impl(SfxModule*, SfxChildWinFactory*); - SAL_DLLPRIVATE void RegisterChildWindowContext_Impl(SfxModule*, USHORT, SfxChildWinContextFactory*); + SAL_DLLPRIVATE void RegisterChildWindowContext_Impl(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); SAL_DLLPRIVATE void RegisterStatusBarControl_Impl(SfxModule*, SfxStbCtrlFactory*); SAL_DLLPRIVATE void RegisterMenuControl_Impl(SfxModule*, SfxMenuCtrlFactory*); SAL_DLLPRIVATE void RegisterToolBoxControl_Impl( SfxModule*, SfxTbxCtrlFactory*); @@ -306,7 +306,7 @@ public: SAL_DLLPRIVATE void PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas ); SAL_DLLPRIVATE void EnterAsynchronCall_Impl(); - SAL_DLLPRIVATE FASTBOOL IsInAsynchronCall_Impl() const; + SAL_DLLPRIVATE int IsInAsynchronCall_Impl() const; SAL_DLLPRIVATE void LeaveAsynchronCall_Impl(); SAL_DLLPRIVATE void Registrations_Impl(); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const; diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index fc7b318965b0..979cfe5693a9 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -115,7 +115,7 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, WinBits nWinStyle = WB_STDMODELESS ); ~SfxModelessDialog(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); @@ -154,7 +154,7 @@ protected: ~SfxFloatingWindow(); virtual void StateChanged( StateChangedType nStateChange ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Move(); virtual long Notify( NotifyEvent& rNEvt ); @@ -186,14 +186,14 @@ struct SingleTabDlgImpl m_pTabPage( NULL ), m_pSfxPage( NULL ), m_pLine( NULL ), m_pInfoImage( NULL ) {} }; -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte +typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog { public: - SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId ); - SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const SfxItemSet* pInSet = 0 ); - SfxSingleTabDialog( Window* pParent, USHORT nUniqueId, const String& rInfoURL ); + SfxSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId ); + SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const SfxItemSet* pInSet = 0 ); + SfxSingleTabDialog( Window* pParent, sal_uInt16 nUniqueId, const String& rInfoURL ); virtual ~SfxSingleTabDialog(); @@ -201,7 +201,7 @@ public: void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 ); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } - const USHORT* GetInputRanges( const SfxItemPool& rPool ); + const sal_uInt16* GetInputRanges( const SfxItemPool& rPool ); // void SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; } // const SfxItemSet* GetOutputItemSet() const { return pOutSet; } OKButton* GetOKButton() const { return pOKBtn; } @@ -210,7 +210,7 @@ public: private: GetTabPageRanges fnGetRanges; - USHORT* pRanges; + sal_uInt16* pRanges; OKButton* pOKBtn; CancelButton* pCancelBtn; diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx index e568fe7305f0..32a5fb1dd223 100644 --- a/sfx2/inc/sfx2/bindings.hxx +++ b/sfx2/inc/sfx2/bindings.hxx @@ -120,7 +120,7 @@ friend class SfxBindings_Impl; //#if 0 // _SOLAR__PRIVATE private: SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi, - SfxCallMode nCall, const SfxPoolItem **pInternalArgs, BOOL bGlobalOnly=FALSE); + SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False); SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* ); SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // SlotServer aktualisieren SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache, @@ -142,7 +142,7 @@ public: ~SfxBindings(); void HidePopups( bool bHide = true ); - SAL_DLLPRIVATE void HidePopupCtrls_Impl( FASTBOOL bHide = sal_True ); + SAL_DLLPRIVATE void HidePopupCtrls_Impl( int bHide = sal_True ); void SetDispatcher(SfxDispatcher *pDisp); @@ -202,18 +202,18 @@ public: SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId ); SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); } SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding ); - SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, BOOL ); + SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, sal_Bool ); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* ); SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( sal_Bool bTop = sal_False ) const; SAL_DLLPRIVATE void InvalidateUnoControllers_Impl(); SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* ); SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* ); - SAL_DLLPRIVATE BOOL ExecuteCommand_Impl( const String& rCommand ); + SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand ); SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& ); - SAL_DLLPRIVATE void ExecuteGlobal_Impl( USHORT nId ); + SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId ); SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl(); - SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( USHORT nId ); + SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId ); //#endif }; diff --git a/sfx2/inc/sfx2/chalign.hxx b/sfx2/inc/sfx2/chalign.hxx index 37df69d08ca6..26b13ee34bd7 100644 --- a/sfx2/inc/sfx2/chalign.hxx +++ b/sfx2/inc/sfx2/chalign.hxx @@ -55,7 +55,7 @@ enum SfxChildAlignment }; // "Uberpr"uft, ob ein g"ultiges Alignment verwendet wird -inline BOOL SfxChildAlignValid( SfxChildAlignment eAlign ) +inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign ) { return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT ); } diff --git a/sfx2/inc/sfx2/childwin.hxx b/sfx2/inc/sfx2/childwin.hxx index fd1eb65d54df..5570506b2c89 100644 --- a/sfx2/inc/sfx2/childwin.hxx +++ b/sfx2/inc/sfx2/childwin.hxx @@ -164,7 +164,7 @@ public: virtual void Resizing( Size& rSize ); virtual sal_Bool Close(); - static void RegisterChildWindowContext(SfxModule*, USHORT, SfxChildWinContextFactory*); + static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; class SFX2_DLLPUBLIC SfxChildWindow @@ -204,7 +204,7 @@ public: { return pWindow->GetPosPixel(); } //<!--Modified by PengYunQuan for Validity Cell Range Picker virtual void Hide(); - virtual void Show( USHORT nFlags ); + virtual void Show( sal_uInt16 nFlags ); //-->Modified by PengYunQuan for Validity Cell Range Picker sal_uInt16 GetFlags() const { return GetInfo().nFlags; } @@ -233,7 +233,7 @@ public: void SetHideAtToggle( sal_Bool bOn ); sal_Bool IsHideAtToggle() const; sal_Bool IsVisible() const; - void SetWantsFocus( BOOL ); + void SetWantsFocus( sal_Bool ); sal_Bool WantsFocus() const; virtual sal_Bool QueryClose(); @@ -274,7 +274,7 @@ public: SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent, \ - /* cast is safe here! */static_cast< USHORT >(ShellClass::GetInterfaceId()), \ + /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()), \ pBindings,pInfo); \ return pContext; \ } \ diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx index 579d7b1299d3..ed962342b6e3 100644 --- a/sfx2/inc/sfx2/controlwrapper.hxx +++ b/sfx2/inc/sfx2/controlwrapper.hxx @@ -50,9 +50,9 @@ namespace sfx { // ============================================================================ /** List position type of VCL ListBox. */ -typedef USHORT ListBoxPosType; +typedef sal_uInt16 ListBoxPosType; /** List position type of SVTOOLS ValueSet. */ -typedef USHORT ValueSetPosType; +typedef sal_uInt16 ValueSetPosType; // ============================================================================ // Helpers @@ -247,7 +247,7 @@ public: /** A wrapper for the VCL CheckBox. */ class SFX2_DLLPUBLIC CheckBoxWrapper: - public SingleControlWrapper< CheckBox, BOOL > + public SingleControlWrapper< CheckBox, sal_Bool > { public: explicit CheckBoxWrapper( CheckBox& rCheckBox ); @@ -255,8 +255,8 @@ public: virtual bool IsControlDontKnow() const; virtual void SetControlDontKnow( bool bSet ); - virtual BOOL GetControlValue() const; - virtual void SetControlValue( BOOL bValue ); + virtual sal_Bool GetControlValue() const; + virtual void SetControlValue( sal_Bool bValue ); }; // ---------------------------------------------------------------------------- @@ -317,13 +317,13 @@ public: // ---------------------------------------------------------------------------- -typedef NumericFieldWrapper< INT16 > Int16NumericFieldWrapper; -typedef NumericFieldWrapper< UINT16 > UInt16NumericFieldWrapper; -typedef NumericFieldWrapper< INT32 > Int32NumericFieldWrapper; -typedef NumericFieldWrapper< UINT32 > UInt32NumericFieldWrapper; +typedef NumericFieldWrapper< sal_Int16 > Int16NumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt16 > UInt16NumericFieldWrapper; +typedef NumericFieldWrapper< sal_Int32 > Int32NumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt32 > UInt32NumericFieldWrapper; -typedef NumericFieldWrapper< USHORT > UShortNumericFieldWrapper; -typedef NumericFieldWrapper< ULONG > ULongNumericFieldWrapper; +typedef NumericFieldWrapper< sal_uInt16 > UShortNumericFieldWrapper; +typedef NumericFieldWrapper< sal_uIntPtr > ULongNumericFieldWrapper; // ============================================================================ @@ -352,13 +352,13 @@ private: // ---------------------------------------------------------------------------- -typedef MetricFieldWrapper< INT16 > Int16MetricFieldWrapper; -typedef MetricFieldWrapper< UINT16 > UInt16MetricFieldWrapper; -typedef MetricFieldWrapper< INT32 > Int32MetricFieldWrapper; -typedef MetricFieldWrapper< UINT32 > UInt32MetricFieldWrapper; +typedef MetricFieldWrapper< sal_Int16 > Int16MetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt16 > UInt16MetricFieldWrapper; +typedef MetricFieldWrapper< sal_Int32 > Int32MetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt32 > UInt32MetricFieldWrapper; -typedef MetricFieldWrapper< USHORT > UShortMetricFieldWrapper; -typedef MetricFieldWrapper< ULONG > ULongMetricFieldWrapper; +typedef MetricFieldWrapper< sal_uInt16 > UShortMetricFieldWrapper; +typedef MetricFieldWrapper< sal_uIntPtr > ULongMetricFieldWrapper; // ============================================================================ @@ -394,13 +394,13 @@ public: // ---------------------------------------------------------------------------- -typedef ListBoxWrapper< INT16 > Int16ListBoxWrapper; -typedef ListBoxWrapper< UINT16 > UInt16ListBoxWrapper; -typedef ListBoxWrapper< INT32 > Int32ListBoxWrapper; -typedef ListBoxWrapper< UINT32 > UInt32ListBoxWrapper; +typedef ListBoxWrapper< sal_Int16 > Int16ListBoxWrapper; +typedef ListBoxWrapper< sal_uInt16 > UInt16ListBoxWrapper; +typedef ListBoxWrapper< sal_Int32 > Int32ListBoxWrapper; +typedef ListBoxWrapper< sal_uInt32 > UInt32ListBoxWrapper; -typedef ListBoxWrapper< USHORT > UShortListBoxWrapper; -typedef ListBoxWrapper< ULONG > ULongListBoxWrapper; +typedef ListBoxWrapper< sal_uInt16 > UShortListBoxWrapper; +typedef ListBoxWrapper< sal_uIntPtr > ULongListBoxWrapper; // ============================================================================ @@ -436,13 +436,13 @@ public: // ---------------------------------------------------------------------------- -typedef ValueSetWrapper< INT16 > Int16ValueSetWrapper; -typedef ValueSetWrapper< UINT16 > UInt16ValueSetWrapper; -typedef ValueSetWrapper< INT32 > Int32ValueSetWrapper; -typedef ValueSetWrapper< UINT32 > UInt32ValueSetWrapper; +typedef ValueSetWrapper< sal_Int16 > Int16ValueSetWrapper; +typedef ValueSetWrapper< sal_uInt16 > UInt16ValueSetWrapper; +typedef ValueSetWrapper< sal_Int32 > Int32ValueSetWrapper; +typedef ValueSetWrapper< sal_uInt32 > UInt32ValueSetWrapper; -typedef ValueSetWrapper< USHORT > UShortValueSetWrapper; -typedef ValueSetWrapper< ULONG > ULongValueSetWrapper; +typedef ValueSetWrapper< sal_uInt16 > UShortValueSetWrapper; +typedef ValueSetWrapper< sal_uIntPtr > ULongValueSetWrapper; // ============================================================================ // Multi control wrappers @@ -641,7 +641,7 @@ ValueT ListBoxWrapper< ValueT >::GetControlValue() const template< typename ValueT > void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue ) { - USHORT nPos = GetPosFromValue( nValue ); + sal_uInt16 nPos = GetPosFromValue( nValue ); if( nPos != this->GetNotFoundPos() ) this->GetControl().SelectEntryPos( nPos ); } @@ -657,7 +657,7 @@ ValueT ValueSetWrapper< ValueT >::GetControlValue() const template< typename ValueT > void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue ) { - USHORT nPos = GetPosFromValue( nValue ); + sal_uInt16 nPos = GetPosFromValue( nValue ); if( nPos != this->GetNotFoundPos() ) this->GetControl().SelectItem( nPos ); } diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx index 53667fbf0aa7..4ceb2d940f52 100644 --- a/sfx2/inc/sfx2/ctrlitem.hxx +++ b/sfx2/inc/sfx2/ctrlitem.hxx @@ -39,14 +39,14 @@ class SvStream; class SFX2_DLLPUBLIC SfxControllerItem { private: - USHORT nId; + sal_uInt16 nId; SfxControllerItem* pNext; // zu benachrichtigendes weiteres ControllerItem SfxBindings* pBindings; protected: //#if defined( DBG_UTIL ) && defined( _SOLAR__PRIVATE ) #if defined( DBG_UTIL ) - SAL_DLLPRIVATE void CheckConfigure_Impl( ULONG nType ); + SAL_DLLPRIVATE void CheckConfigure_Impl( sal_uIntPtr nType ); #endif public: @@ -60,13 +60,13 @@ public: } SfxControllerItem(); // fuer arrays - SfxControllerItem( USHORT nId, SfxBindings & ); + SfxControllerItem( sal_uInt16 nId, SfxBindings & ); virtual ~SfxControllerItem(); - void Bind( USHORT nNewId, SfxBindings * = 0); // in SfxBindings registrieren + void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // in SfxBindings registrieren void UnBind(); void ReBind(); - BOOL IsBound() const; + sal_Bool IsBound() const; void UpdateSlot(); void ClearCache(); void SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; } @@ -74,10 +74,10 @@ public: SfxControllerItem* GetItemLink(); SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewLink ); - void SetId( USHORT nItemId ); - USHORT GetId() const { return nId; } + void SetId( sal_uInt16 nItemId ); + sal_uInt16 GetId() const { return nId; } - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void DeleteFloatingWindow(); @@ -86,9 +86,9 @@ public: static SfxItemState GetItemState( const SfxPoolItem* pState ); //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE BOOL IsBindable_Impl() const + SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const { return pBindings != NULL; } - SAL_DLLPRIVATE void BindInternal_Impl( USHORT nNewId, SfxBindings* ); + SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* ); //#endif }; @@ -99,11 +99,11 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem SfxControllerItem* pMaster; protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SfxStatusForwarder( USHORT nSlotId, + SfxStatusForwarder( sal_uInt16 nSlotId, SfxControllerItem&rMaster ); }; diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 4a33afde24d5..8cf17e3f6e4f 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -162,8 +162,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; // class SfxDocumentPage ------------------------------------------------- @@ -207,7 +207,7 @@ private: String aUnknownSize; String aMultiSignedStr; - BOOL bEnableUseUserData : 1, + sal_Bool bEnableUseUserData : 1, bHandleDelete : 1; DECL_LINK( DeleteHdl, PushButton * ); @@ -217,7 +217,7 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -244,7 +244,7 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -290,9 +290,9 @@ private: void ChangeState( STATE eNewState ); // S_Init is not a valid value here // also checks corresponding radiobutton - void EnableNoUpdate( BOOL bEnable ); - void EnableReload( BOOL bEnable ); - void EnableForward( BOOL bEnable ); + void EnableNoUpdate( sal_Bool bEnable ); + void EnableReload( sal_Bool bEnable ); + void EnableForward( sal_Bool bEnable ); DECL_LINK( ClickHdlNoUpdate, Control* ); DECL_LINK( ClickHdlReload, Control* ); @@ -306,7 +306,7 @@ protected: SfxInternetPage( Window* pParent, const SfxItemSet& ); ~SfxInternetPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -319,7 +319,7 @@ public: class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog { protected: - virtual void PageCreated( USHORT nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); public: SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); @@ -430,7 +430,7 @@ public: inline void CheckYes() { m_aYesButton.Check(); } inline void CheckNo() { m_aNoButton.Check(); } - inline bool IsYesChecked() const { return m_aYesButton.IsChecked() != FALSE; } + inline bool IsYesChecked() const { return m_aYesButton.IsChecked() != sal_False; } }; // struct CustomPropertyLine --------------------------------------------- @@ -502,7 +502,7 @@ public: ~CustomPropertiesWindow(); void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar ); - USHORT GetVisibleLineCount() const; + sal_uInt16 GetVisibleLineCount() const; inline sal_Int32 GetLineHeight() const { return m_nLineHeight; } void AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny ); bool AreAllLinesValid() const; @@ -563,7 +563,7 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index 8d99d6efd9f4..4a027bba78c8 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -82,23 +82,23 @@ typedef SfxItemPtrArray SfxItemArray_Impl; class SfxExecuteItem : public SfxItemPtrArray, public SfxPoolItem { - USHORT nSlot; + sal_uInt16 nSlot; SfxCallMode eCall; - USHORT nModifier; + sal_uInt16 nModifier; public: - USHORT GetSlot() const { return nSlot; } - USHORT GetModifier() const { return nModifier; } - void SetModifier( USHORT nModifierP ) { nModifier = nModifierP; } + sal_uInt16 GetSlot() const { return nSlot; } + sal_uInt16 GetModifier() const { return nModifier; } + void SetModifier( sal_uInt16 nModifierP ) { nModifier = nModifierP; } SfxCallMode GetCallMode() const { return eCall; } void SetCallMode( SfxCallMode eMode ) { eCall = eMode; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; SfxExecuteItem( - USHORT nWhich, USHORT nSlot, SfxCallMode eMode, + sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode, const SfxPoolItem *pArg1, ... ); SfxExecuteItem( - USHORT nWhich, USHORT nSlot, SfxCallMode eMode ); + sal_uInt16 nWhich, sal_uInt16 nSlot, SfxCallMode eMode ); SfxExecuteItem( const SfxExecuteItem& ); }; @@ -107,11 +107,11 @@ public: class SFX2_DLLPUBLIC SfxDispatcher { SfxDispatcher_Impl* pImp; - BOOL bFlushed; + sal_Bool bFlushed; private: // auf temporaer ausgewerteten Todos suchen - SAL_DLLPRIVATE BOOL CheckVirtualStack( const SfxShell& rShell, BOOL bDeep ); + SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep ); #ifndef _SFX_HXX @@ -121,8 +121,8 @@ friend class SfxViewFrame; DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * ); DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * ); - SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord ); - SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); + SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord ); + SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*); SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: @@ -132,15 +132,15 @@ friend class SfxPopupMenuManager; friend class SfxHelp; // Fuer die Bindings: Finden einer Message; Level fuer // erneuten Zugriff - SAL_DLLPRIVATE BOOL _TryIntercept_Impl( USHORT nId, SfxSlotServer &rServer, BOOL bModal ); - BOOL _FindServer( USHORT nId, SfxSlotServer &rServer, BOOL bModal ); - BOOL _FillState( const SfxSlotServer &rServer, + SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); + sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal ); + sal_Bool _FillState( const SfxSlotServer &rServer, SfxItemSet &rState, const SfxSlot *pRealSlot ); const SfxPoolItem* _Execute( const SfxSlotServer &rServer ); void _Execute( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, SfxCallMode eCall = SFX_CALLMODE_STANDARD); - const SfxPoolItem* _Execute( USHORT nSlot, SfxCallMode eCall, + const SfxPoolItem* _Execute( sal_uInt16 nSlot, SfxCallMode eCall, va_list pArgs, const SfxPoolItem *pArg1 ); #endif @@ -156,48 +156,48 @@ public: virtual ~SfxDispatcher(); const SfxPoolItem* Execute( const SfxExecuteItem& rItem ); - virtual USHORT ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs=0, USHORT nMode=0 ); - USHORT ExecuteFunction( USHORT nSID, const SfxItemSet& rArgs , USHORT nMode=0 ); + virtual sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs=0, sal_uInt16 nMode=0 ); + sal_uInt16 ExecuteFunction( sal_uInt16 nSID, const SfxItemSet& rArgs , sal_uInt16 nMode=0 ); - virtual void SetExecuteMode( USHORT ); + virtual void SetExecuteMode( sal_uInt16 ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall = SFX_CALLMODE_SLOT, const SfxPoolItem **pArgs = 0, - USHORT nModi = 0, + sal_uInt16 nModi = 0, const SfxPoolItem **pInternalArgs = 0); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, SfxItemSet* pArgs, SfxItemSet* pInternalArgs, - USHORT nModi = 0); + sal_uInt16 nModi = 0); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, const SfxPoolItem *pArg1, ... ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, const SfxItemSet &rArgs ); - const SfxPoolItem* Execute( USHORT nSlot, + const SfxPoolItem* Execute( sal_uInt16 nSlot, SfxCallMode nCall, - USHORT nModi, + sal_uInt16 nModi, const SfxItemSet &rArgs ); - USHORT GetSlotId( const String& rCommand ); + sal_uInt16 GetSlotId( const String& rCommand ); const SfxSlot* GetSlot( const String& rCommand ); - BOOL IsActive( const SfxShell& rShell ); - BOOL IsOnTop( const SfxShell& rShell ); - USHORT GetShellLevel( const SfxShell &rShell ); + sal_Bool IsActive( const SfxShell& rShell ); + sal_Bool IsOnTop( const SfxShell& rShell ); + sal_uInt16 GetShellLevel( const SfxShell &rShell ); SfxBindings* GetBindings() const; void Push( SfxShell& rShell ); - void Pop( SfxShell& rShell, USHORT nMode = 0 ); + void Pop( SfxShell& rShell, sal_uInt16 nMode = 0 ); - SfxShell* GetShell(USHORT nIdx) const; + SfxShell* GetShell(sal_uInt16 nIdx) const; SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; // caller has to clean up the Manager on his own @@ -205,65 +205,65 @@ public: void ExecutePopup( const ResId &rId, Window *pWin = 0, const Point *pPosPixel = 0 ); - static void ExecutePopup( USHORT nConfigId = 0, + static void ExecutePopup( sal_uInt16 nConfigId = 0, Window *pWin = 0, const Point *pPosPixel = 0 ); - static void ExecutePopup( USHORT nConfigId, + static void ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPosPixel, const SfxPoolItem *pArg1, ... ); void EnterAction( const String& rName ); void LeaveAction(); - BOOL IsAppDispatcher() const; - BOOL IsFlushed() const; + sal_Bool IsAppDispatcher() const; + sal_Bool IsFlushed() const; void Flush(); - void Lock( BOOL bLock ); - BOOL IsLocked( USHORT nSID = 0 ) const; - void SetSlotFilter( BOOL bEnable = FALSE, - USHORT nCount = 0, const USHORT *pSIDs = 0 ); + void Lock( sal_Bool bLock ); + sal_Bool IsLocked( sal_uInt16 nSID = 0 ) const; + void SetSlotFilter( sal_Bool bEnable = sal_False, + sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 ); - void HideUI( BOOL bHide = TRUE ); - void ShowObjectBar(USHORT nId, SfxShell *pShell=0) const; - sal_uInt32 GetObjectBarId( USHORT nPos ) const; + void HideUI( sal_Bool bHide = sal_True ); + void ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const; + sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const; - SfxItemState QueryState( USHORT nSID, const SfxPoolItem* &rpState ); - SfxItemState QueryState( USHORT nSID, ::com::sun::star::uno::Any& rAny ); + SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState ); + SfxItemState QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny ); - BOOL IsAllowed( USHORT nSlot ) const; + sal_Bool IsAllowed( sal_uInt16 nSlot ) const; ::com::sun::star::frame::XDispatch* GetDispatchInterface( const String& ); void SetDisableFlags( sal_uInt32 nFlags ); sal_uInt32 GetDisableFlags() const; //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT ); + SAL_DLLPRIVATE sal_Bool HasSlot_Impl( sal_uInt16 ); SAL_DLLPRIVATE void SetMenu_Impl(); - SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. - SAL_DLLPRIVATE BOOL IsUpdated_Impl() const; + SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc. + SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const; SAL_DLLPRIVATE void DebugOutput_Impl() const; SAL_DLLPRIVATE void ResetObjectBars_Impl(); - SAL_DLLPRIVATE int GetShellAndSlot_Impl( USHORT nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, - BOOL bOwnShellsOnly, BOOL bModal, BOOL bRealSlot=TRUE ); - SAL_DLLPRIVATE void LockUI_Impl( BOOL bLock = TRUE ); - SAL_DLLPRIVATE void SetReadOnly_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL GetReadOnly_Impl() const; - SAL_DLLPRIVATE BOOL IsSlotEnabledByFilter_Impl( USHORT nSID ) const; - SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL bOn ); - SAL_DLLPRIVATE void SetModalMode_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL IsReadOnlyShell_Impl( USHORT nShell ) const; + SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, + sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True ); + SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True ); + SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const; + SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const; + SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE void SetModalMode_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const; SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); - SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, USHORT nPos ); + SAL_DLLPRIVATE void InsertShell_Impl( SfxShell& rShell, sal_uInt16 nPos ); SAL_DLLPRIVATE void DoParentActivate_Impl(); SAL_DLLPRIVATE void DoParentDeactivate_Impl(); - SAL_DLLPRIVATE void DoActivate_Impl( BOOL bMDI, SfxViewFrame* pOld ); - SAL_DLLPRIVATE void DoDeactivate_Impl( BOOL bMDI, SfxViewFrame* pNew ); - SAL_DLLPRIVATE void InvalidateBindings_Impl(BOOL); - SAL_DLLPRIVATE USHORT GetNextToolBox_Impl( USHORT nPos, USHORT nType, String *pStr ); + SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld ); + SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ); + SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool); + SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, String *pStr ); //#endif }; //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsFlushed() const +inline sal_Bool SfxDispatcher::IsFlushed() const /* [Beschreibung] @@ -284,9 +284,9 @@ inline void SfxDispatcher::Flush() Diese Methode f"uhrt ausstehenden Push- und Pop-Befehle aus. F"ur <SfxShell>s, die dabei neu auf den Stack kommen, wird - <SfxShell::Activate(BOOL)> mit bMDI == TRUE aufgerufen, f"ur - SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(BOOL)> - mit bMDI == TRUE aufgerufen. + <SfxShell::Activate(sal_Bool)> mit bMDI == sal_True aufgerufen, f"ur + SfxShells, die vom Stack entfernt werden, wird <SfxShell::Deactivate(sal_Bool)> + mit bMDI == sal_True aufgerufen. */ { @@ -313,7 +313,7 @@ inline void SfxDispatcher::Push( SfxShell& rShell ) //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell ) +inline sal_Bool SfxDispatcher::IsActive( const SfxShell& rShell ) /* [Beschreibung] @@ -322,22 +322,22 @@ inline BOOL SfxDispatcher::IsActive( const SfxShell& rShell ) [R"uckgabewert] - BOOL TRUE + sal_Bool sal_True Die SfxShell-Instanz befindet sich auf dem SfxDispatcher. - FALSE + sal_False Die SfxShell-Instanz befindet sich nicht auf dem SfxDispatcher. */ { - return CheckVirtualStack( rShell, TRUE ); + return CheckVirtualStack( rShell, sal_True ); } //-------------------------------------------------------------------- -inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell ) +inline sal_Bool SfxDispatcher::IsOnTop( const SfxShell& rShell ) /* [Beschreibung] @@ -346,18 +346,18 @@ inline BOOL SfxDispatcher::IsOnTop( const SfxShell& rShell ) [R"uckgabewert] - BOOL TRUE + sal_Bool sal_True Die SfxShell-Instanz befindet sich als oberste SfxShell auf dem SfxDispatcher. - FALSE + sal_False Die SfxShell-Instanz befindet sich nicht als oberste SfxShell auf dem SfxDispatcher. */ { - return CheckVirtualStack( rShell, FALSE ); + return CheckVirtualStack( rShell, sal_False ); } //-------------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx index 89062d7b7263..bc2d9bfc7be2 100644 --- a/sfx2/inc/sfx2/docfac.hxx +++ b/sfx2/inc/sfx2/docfac.hxx @@ -87,12 +87,12 @@ public: String GetModuleName() const; void SetDocumentTypeNameResource( const ResId& rId ); String GetDocumentTypeName() const; - SfxFilterContainer *GetFilterContainer( BOOL bForceLoad = TRUE) const; + SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const; // Views void RegisterViewFactory(SfxViewFactory &rFactory); - USHORT GetViewFactoryCount() const; - SfxViewFactory& GetViewFactory(USHORT i = 0) const; + sal_uInt16 GetViewFactoryCount() const; + SfxViewFactory& GetViewFactory(sal_uInt16 i = 0) const; /// returns the view factory whose GetAPIViewName or GetLegacyViewName delivers the requested logical name SfxViewFactory* GetViewFactoryByViewName( const String& i_rViewName ) const; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index 35656202650f..04239a7a1b56 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -122,7 +122,7 @@ public: SfxMedium(); SfxMedium( const String &rName, StreamMode nOpenMode, - sal_Bool bDirect=FALSE, + sal_Bool bDirect=sal_False, const SfxFilter *pFilter = 0, SfxItemSet *pSet = 0 ); @@ -136,7 +136,7 @@ public: ~SfxMedium(); - void UseInteractionHandler( BOOL ); + void UseInteractionHandler( sal_Bool ); ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > GetInteractionHandler(); @@ -240,7 +240,7 @@ public: ::rtl::OUString GetBaseURL( bool bForSaving=false ); #if _SOLAR__PRIVATE - SAL_DLLPRIVATE BOOL HasStorage_Impl() const; + SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const; SAL_DLLPRIVATE void StorageBackup_Impl(); SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl(); diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index 83bad4d1d01c..7a6af9040066 100644 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -49,16 +49,16 @@ class SFX2_DLLPUBLIC SfxFilter friend class SfxFilterContainer; WildCard aWildCard; - ULONG lFormat; + sal_uIntPtr lFormat; String aTypeName; String aUserData; SfxFilterFlags nFormatType; - USHORT nDocIcon; + sal_uInt16 nDocIcon; String aServiceName; String aMimeType; String aFilterName; String aPattern; - ULONG nVersion; + sal_uIntPtr nVersion; String aUIName; String aDefaultTemplate; @@ -68,7 +68,7 @@ public: SfxFilterFlags nFormatType, sal_uInt32 lFormat, const String &rTypeName, - USHORT nDocIcon, + sal_uInt16 nDocIcon, const String &rMimeType, const String &rUserData, const String& rServiceName ); @@ -87,19 +87,19 @@ public: const String& GetName() const { return aFilterName; } const WildCard& GetWildcard() const { return aWildCard; } const String& GetRealTypeName() const { return aTypeName; } - ULONG GetFormat() const { return lFormat; } + sal_uIntPtr GetFormat() const { return lFormat; } const String& GetTypeName() const { return aTypeName; } const String& GetUIName() const { return aUIName; } - USHORT GetDocIconId() const { return nDocIcon; } + sal_uInt16 GetDocIconId() const { return nDocIcon; } const String& GetUserData() const { return aUserData; } const String& GetDefaultTemplate() const { return aDefaultTemplate; } void SetDefaultTemplate( const String& rStr ) { aDefaultTemplate = rStr; } - BOOL UsesStorage() const { return GetFormat() != 0; } + sal_Bool UsesStorage() const { return GetFormat() != 0; } void SetURLPattern( const String& rStr ) { aPattern = rStr; aPattern.ToLowerAscii(); } String GetURLPattern() const { return aPattern; } void SetUIName( const String& rName ) { aUIName = rName; } - void SetVersion( ULONG nVersionP ) { nVersion = nVersionP; } - ULONG GetVersion() const { return nVersion; } + void SetVersion( sal_uIntPtr nVersionP ) { nVersion = nVersionP; } + sal_uIntPtr GetVersion() const { return nVersion; } String GetSuffixes() const; String GetDefaultExtension() const; const String& GetServiceName() const { return aServiceName; } @@ -110,7 +110,7 @@ public: static String GetTypeFromStorage( const SotStorage& rStg ); static String GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, - BOOL bTemplate = FALSE, + sal_Bool bTemplate = sal_False, String* pName=0 ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, diff --git a/sfx2/inc/sfx2/dockwin.hxx b/sfx2/inc/sfx2/dockwin.hxx index 254bd622d9bc..c9138988fa45 100644 --- a/sfx2/inc/sfx2/dockwin.hxx +++ b/sfx2/inc/sfx2/dockwin.hxx @@ -66,14 +66,14 @@ protected: CheckAlignment(SfxChildAlignment,SfxChildAlignment); virtual void Resize(); - virtual BOOL PrepareToggleFloatingMode(); + virtual sal_Bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void StartDocking(); - 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 Resizing( Size& rSize ); virtual void Paint( const Rectangle& rRect ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Move(); //#if 0 // _SOLAR__PRIVATE @@ -100,7 +100,7 @@ public: const Rectangle& GetInnerRect() const { return aInnerRect; } const Rectangle& GetOuterRect() const { return aOuterRect; } SfxBindings& GetBindings() const { return *pBindings; } - USHORT GetType() const { return pMgr->GetType(); } + sal_uInt16 GetType() const { return pMgr->GetType(); } SfxChildAlignment GetAlignment() const { return pMgr->GetAlignment(); } void SetAlignment(SfxChildAlignment eAlign) { pMgr->SetAlignment(eAlign); } Size GetFloatingSize() const { return aFloatSize; } @@ -109,20 +109,20 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; virtual long Notify( NotifyEvent& rNEvt ); - virtual void FadeIn( BOOL ); - void AutoShow( BOOL bShow = TRUE ); + virtual void FadeIn( sal_Bool ); + void AutoShow( sal_Bool bShow = sal_True ); DECL_LINK( TimerHdl, Timer* ); //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void Initialize_Impl(); - SAL_DLLPRIVATE USHORT GetWinBits_Impl() const; + SAL_DLLPRIVATE sal_uInt16 GetWinBits_Impl() const; SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize ); SAL_DLLPRIVATE void Disappear_Impl(); SAL_DLLPRIVATE void Reappear_Impl(); - SAL_DLLPRIVATE BOOL IsAutoHide_Impl() const; - SAL_DLLPRIVATE BOOL IsPinned_Impl() const; - SAL_DLLPRIVATE void AutoShow_Impl( BOOL bShow = TRUE ); - SAL_DLLPRIVATE void Pin_Impl( BOOL bPinned ); + SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const; + SAL_DLLPRIVATE sal_Bool IsPinned_Impl() const; + SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True ); + SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned ); SAL_DLLPRIVATE SfxSplitWindow* GetSplitWindow_Impl() const; SAL_DLLPRIVATE void ReleaseChildWindow_Impl(); //#endif @@ -132,7 +132,7 @@ class SfxDockingWrapper : public SfxChildWindow { public: SfxDockingWrapper( Window* pParent , - USHORT nId , + sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx index 43ab94b4b28e..92ffe90269e6 100644 --- a/sfx2/inc/sfx2/doctempl.hxx +++ b/sfx2/inc/sfx2/doctempl.hxx @@ -56,70 +56,70 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates private: SfxDocTemplate_ImplRef pImp; - SAL_DLLPRIVATE BOOL CopyOrMove( USHORT nTargetRegion, USHORT nTargetIdx, - USHORT nSourceRegion, USHORT nSourceIdx, BOOL bMove ); + SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove ); public: SfxDocumentTemplates(); SfxDocumentTemplates(const SfxDocumentTemplates &); ~SfxDocumentTemplates(); - BOOL IsConstructed() { return pImp != NULL; } + sal_Bool IsConstructed() { return pImp != NULL; } void Construct(); - static BOOL SaveDir( /*SfxTemplateDir &rEntry */ ) ; + static sal_Bool SaveDir( /*SfxTemplateDir &rEntry */ ) ; const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &); - BOOL Rescan( ); // Aktualisieren + sal_Bool Rescan( ); // Aktualisieren void ReInitFromComponent(); - BOOL IsRegionLoaded( USHORT nIdx ) const; - USHORT GetRegionCount() const; - const String& GetRegionName(USHORT nIdx) const; //dv! - String GetFullRegionName(USHORT nIdx) const; - USHORT GetRegionNo( const String &rRegionName ) const; + sal_Bool IsRegionLoaded( sal_uInt16 nIdx ) const; + sal_uInt16 GetRegionCount() const; + const String& GetRegionName(sal_uInt16 nIdx) const; //dv! + String GetFullRegionName(sal_uInt16 nIdx) const; + sal_uInt16 GetRegionNo( const String &rRegionName ) const; - USHORT GetCount(USHORT nRegion) const; - USHORT GetCount( const String &rName) const; - const String& GetName(USHORT nRegion, USHORT nIdx) const; //dv! - String GetFileName(USHORT nRegion, USHORT nIdx) const; - String GetPath(USHORT nRegion, USHORT nIdx) const; + sal_uInt16 GetCount(sal_uInt16 nRegion) const; + sal_uInt16 GetCount( const String &rName) const; + const String& GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const; //dv! + String GetFileName(sal_uInt16 nRegion, sal_uInt16 nIdx) const; + String GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const; String GetDefaultTemplatePath(const String &rLongName); // Pfad zur Vorlage geben lassen; logischer Name muss angegeben // werden, damit beim Ueberschreiben einer Vorlage der // richtige Dateiname gefunden werden kann - String GetTemplatePath(USHORT nRegion, const String &rLongName) const; + String GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const; // Allows to retrieve the target template URL from the UCB ::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, const ::rtl::OUString& aTitle ); // Speichern als Vorlage hat geklappt -> Aktualisieren - void NewTemplate(USHORT nRegion, + void NewTemplate(sal_uInt16 nRegion, const String &rLongName, const String &rFileName); - BOOL Copy(USHORT nTargetRegion, - USHORT nTargetIdx, - USHORT nSourceRegion, - USHORT nSourceIdx); - BOOL Move(USHORT nTargetRegion, - USHORT nTargetIdx, - USHORT nSourceRegion, - USHORT nSourceIdx); - BOOL Delete(USHORT nRegion, USHORT nIdx); - BOOL InsertDir(const String &rText, USHORT nRegion); - BOOL SetName(const String &rName, USHORT nRegion, USHORT nIdx); + sal_Bool Copy(sal_uInt16 nTargetRegion, + sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, + sal_uInt16 nSourceIdx); + sal_Bool Move(sal_uInt16 nTargetRegion, + sal_uInt16 nTargetIdx, + sal_uInt16 nSourceRegion, + sal_uInt16 nSourceIdx); + sal_Bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool InsertDir(const String &rText, sal_uInt16 nRegion); + sal_Bool SetName(const String &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); - BOOL CopyTo(USHORT nRegion, USHORT nIdx, const String &rName) const; - BOOL CopyFrom(USHORT nRegion, USHORT nIdx, String &rName); + sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const String &rName) const; + sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, String &rName); - SfxObjectShellRef CreateObjectShell(USHORT nRegion, USHORT nIdx); - BOOL DeleteObjectShell(USHORT, USHORT); + SfxObjectShellRef CreateObjectShell(sal_uInt16 nRegion, sal_uInt16 nIdx); + sal_Bool DeleteObjectShell(sal_uInt16, sal_uInt16); - BOOL GetFull( const String& rRegion, const String& rName, String& rPath ); - BOOL GetLogicNames( const String& rPath, String& rRegion, String& rName ) const; + sal_Bool GetFull( const String& rRegion, const String& rName, String& rPath ); + sal_Bool GetLogicNames( const String& rPath, String& rRegion, String& rName ) const; /** updates the configuration where the document templates structure is stored. @@ -134,7 +134,7 @@ public: In case the update is needed, the additional check made it somewhat more expensive. In case it's not necessary (which should be the usual case), the check alone is (much) less expensive than the real update. <br/> - So set <arg>_bSmart</arg> to <TRUE/> to do a check for necessity first. + So set <arg>_bSmart</arg> to <sal_True/> to do a check for necessity first. */ void Update( sal_Bool _bSmart = sal_True ); diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index 17080ec2d51e..0606209777d1 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -56,11 +56,11 @@ class SvxMacroTableDtor; struct SFX2_DLLPUBLIC SfxEventName { - USHORT mnId; + sal_uInt16 mnId; String maEventName; String maUIName; - SfxEventName( USHORT nId, + SfxEventName( sal_uInt16 nId, const String& rEventName, const String& rUIName ) : mnId( nId ) @@ -73,7 +73,7 @@ DECLARE_LIST( _SfxEventNamesList, SfxEventName* ) class SFX2_DLLPUBLIC SfxEventNamesList : public _SfxEventNamesList { public: - SfxEventNamesList( const USHORT nInitSz = 0, const USHORT nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {} + SfxEventNamesList( const sal_uInt16 nInitSz = 0, const sal_uInt16 nReSz = 1 ): _SfxEventNamesList( nInitSz, nReSz ) {} SfxEventNamesList( const SfxEventNamesList &rCpy ) : _SfxEventNamesList() { *this = rCpy; } ~SfxEventNamesList() { DelDtor(); } SfxEventNamesList& operator=( const SfxEventNamesList &rCpy ); @@ -87,7 +87,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem public: TYPEINFO(); - SfxEventNamesItem ( const USHORT nId ) : SfxPoolItem( nId ) {} + SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -96,13 +96,13 @@ public: XubString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxEventNamesList& GetEvents() const { return aEventsList;} void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; } - void AddEvent( const String&, const String&, USHORT ); + void AddEvent( const String&, const String&, sal_uInt16 ); }; // ----------------------------------------------------------------------- @@ -117,7 +117,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration { public: static void ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh); - static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp ); + static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp ); }; #endif diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index c80d61aa81d1..90c43c1ff774 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -49,7 +49,7 @@ class SfxFilterContainer_Impl; class SfxFrame; //#define SFX_FILTER_CONTAINER_FACTORY 1 -typedef USHORT SfxFilterContainerFlags; +typedef sal_uInt16 SfxFilterContainerFlags; class SfxRefItem : public SfxPoolItem { @@ -59,7 +59,7 @@ public: { return new SfxRefItem( *this ); } virtual int operator==( const SfxPoolItem& rL) const { return ((SfxRefItem&)rL).aRef == aRef; } - SfxRefItem( USHORT nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) + SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) { aRef = rValue; } const SvRefBaseRef& GetValue() const { return aRef; } @@ -92,7 +92,7 @@ public: FactoryFunc GetFactory() { return pFunc; } }; -typedef ULONG (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); +typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); class SFX2_DLLPUBLIC SfxFilterContainer { @@ -116,11 +116,11 @@ public: const SfxFilter* GetFilter4UIName( const String& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE static void ReadFilters_Impl( BOOL bUpdate=FALSE ); + SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False ); SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const ::rtl::OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, - BOOL bUpdate ); + sal_Bool bUpdate ); SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const String& ); //#endif }; @@ -137,14 +137,14 @@ public: ~SfxFilterMatcher(); //#if 0 // _SOLAR__PRIVATE - SAL_DLLPRIVATE static BOOL IsFilterInstalled_Impl( const SfxFilter* pFilter ); + SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter ); DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, String* ); //#endif sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const; - sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, BOOL bPlugIn, BOOL bAPI = FALSE ) const; + sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const; const SfxFilter* GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; @@ -161,7 +161,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter { SfxFilterFlags nOrMask; SfxFilterFlags nAndMask; - USHORT nCurrent; + sal_uInt16 nCurrent; const SfxFilterMatcher_Impl *pMatch; //#if 0 // _SOLAR__PRIVATE diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index b94e9038e8bb..622be188072a 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -138,7 +138,7 @@ public: static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > CreateBlankFrame(); - static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewId, bool bHidden ); + static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); SvCompatWeakHdl* GetHdl(); Window& GetWindow() const; @@ -149,7 +149,7 @@ public: SfxFrame* GetParentFrame() const { return pParentFrame; } - void SetPresentationMode( BOOL bSet ); + void SetPresentationMode( sal_Bool bSet ); SystemWindow* GetSystemWindow() const; static SfxFrame* GetFirst(); @@ -219,9 +219,9 @@ public: SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool ); SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc ); - SAL_DLLPRIVATE void LockResize_Impl( BOOL bLock ); - SAL_DLLPRIVATE void SetMenuBarOn_Impl( BOOL bOn ); - SAL_DLLPRIVATE BOOL IsMenuBarOn_Impl() const; + SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock ); + SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn ); + SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const; SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const; SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const; SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const; @@ -267,8 +267,8 @@ public: virtual String GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); sal_Bool FrameKilled() const { return &wFrame != pFrame; } @@ -286,8 +286,8 @@ public: { return aValue; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem @@ -304,8 +304,8 @@ public: { return m_xFrame; } virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; typedef SfxUsrAnyItem SfxUnoAnyItem; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 4cb52d1b53c6..cc6ae5f4cb7e 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -90,12 +90,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor long nWidth; ScrollingMode eScroll; SizeSelector eSizeSelector; - USHORT nHasBorder; - USHORT nItemId; - BOOL bResizeHorizontal; - BOOL bResizeVertical; - BOOL bHasUI; - BOOL bReadOnly; + sal_uInt16 nHasBorder; + sal_uInt16 nItemId; + sal_Bool bResizeHorizontal; + sal_Bool bResizeVertical; + sal_Bool bHasUI; + sal_Bool bReadOnly; SfxFrameDescriptor_Impl* pImp; SvStrings* pScripts; SvStrings* pComments; @@ -117,13 +117,13 @@ public: { return aActualURL; } void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const String& rURL ); - BOOL CheckContent() const; - BOOL CompareOriginal( SfxFrameDescriptor& rSet ) const; - void UnifyContent( BOOL ); - void SetReadOnly( BOOL bSet ) { bReadOnly = bSet;} - BOOL IsReadOnly( ) const { return bReadOnly;} - void SetEditable( BOOL bSet ); - BOOL IsEditable() const; + sal_Bool CheckContent() const; + sal_Bool CompareOriginal( SfxFrameDescriptor& rSet ) const; + void UnifyContent( sal_Bool ); + void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;} + sal_Bool IsReadOnly( ) const { return bReadOnly;} + void SetEditable( sal_Bool bSet ); + sal_Bool IsEditable() const; // Size void SetWidth( long n ) @@ -138,9 +138,9 @@ public: { return nWidth; } SizeSelector GetSizeSelector() const { return eSizeSelector; } - BOOL IsResizable() const + sal_Bool IsResizable() const { return bResizeHorizontal && bResizeVertical; } - void SetResizable( BOOL bRes ) + void SetResizable( sal_Bool bRes ) { bResizeHorizontal = bResizeVertical = bRes; } // FrameName @@ -162,38 +162,38 @@ public: // FrameBorder void SetWallpaper( const Wallpaper& rWallpaper ); const Wallpaper* GetWallpaper() const; - BOOL HasFrameBorder() const; + sal_Bool HasFrameBorder() const; - BOOL IsFrameBorderOn() const + sal_Bool IsFrameBorderOn() const { return ( nHasBorder & BORDER_YES ) != 0; } - void SetFrameBorder( BOOL bBorder ) + void SetFrameBorder( sal_Bool bBorder ) { nHasBorder = bBorder ? BORDER_YES | BORDER_SET : BORDER_NO | BORDER_SET; } - BOOL IsFrameBorderSet() const + sal_Bool IsFrameBorderSet() const { return (nHasBorder & BORDER_SET) != 0; } void ResetBorder() { nHasBorder = 0; } - BOOL HasUI() const + sal_Bool HasUI() const { return bHasUI; } - void SetHasUI( BOOL bOn ) + void SetHasUI( sal_Bool bOn ) { bHasUI = bOn; } // Attribute f"ur das Splitwindow - USHORT GetItemId() const + sal_uInt16 GetItemId() const { return nItemId; } - void SetItemId( USHORT nId ) + void SetItemId( sal_uInt16 nId ) { nItemId = nId; } - USHORT GetWinBits() const; + sal_uInt16 GetWinBits() const; long GetSize() const; - USHORT GetItemPos() const; + sal_uInt16 GetItemPos() const; // Kopie z.B. f"ur die Views - SfxFrameDescriptor* Clone( BOOL bWithIds = TRUE ) const; + SfxFrameDescriptor* Clone( sal_Bool bWithIds = sal_True ) const; }; // Kein Bock, einen operator= zu implementieren... @@ -210,13 +210,13 @@ struct SfxFrameProperties ScrollingMode eScroll; SizeSelector eSizeSelector; SizeSelector eSetSizeSelector; - BOOL bHasBorder; - BOOL bBorderSet; - BOOL bResizable; - BOOL bSetResizable; - BOOL bIsRootSet; - BOOL bIsInColSet; - BOOL bHasBorderInherited; + sal_Bool bHasBorder; + sal_Bool bBorderSet; + sal_Bool bResizable; + sal_Bool bSetResizable; + sal_Bool bIsRootSet; + sal_Bool bIsInColSet; + sal_Bool bHasBorderInherited; SfxFrameDescriptor* pFrame; private: @@ -232,13 +232,13 @@ public: eScroll( ScrollingAuto ), eSizeSelector( SIZE_REL ), eSetSizeSelector( SIZE_REL ), - bHasBorder( TRUE ), - bBorderSet( TRUE ), - bResizable( TRUE ), - bSetResizable( TRUE ), - bIsRootSet( FALSE ), - bIsInColSet( FALSE ), - bHasBorderInherited( TRUE ), + bHasBorder( sal_True ), + bBorderSet( sal_True ), + bResizable( sal_True ), + bSetResizable( sal_True ), + bIsRootSet( sal_False ), + bIsInColSet( sal_False ), + bHasBorderInherited( sal_True ), pFrame( 0 ) {} SfxFrameProperties( const SfxFrameDescriptor *pD ); @@ -254,12 +254,12 @@ class SfxFrameDescriptorItem : public SfxPoolItem public: TYPEINFO(); - SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const USHORT nId = SID_FRAMEDESCRIPTOR ) + SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) , aProperties( pD ) {} - SfxFrameDescriptorItem ( const USHORT nId = SID_FRAMEDESCRIPTOR ) + SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) {} @@ -280,9 +280,9 @@ public: UniString &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - //virtual SfxPoolItem* Create(SvStream &, USHORT) const; - //virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; - //virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + //virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + //virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + //virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; const SfxFrameProperties& GetProperties() const { return aProperties; } diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx index e3e9c4f9f781..9c3ff64e688a 100644 --- a/sfx2/inc/sfx2/frmhtml.hxx +++ b/sfx2/inc/sfx2/frmhtml.hxx @@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser friend class _SfxFrameHTMLContext; protected: - SfxFrameHTMLParser( SvStream& rStream, BOOL bIsNewDoc=TRUE, SfxMedium *pMediumPtr=0 ): + SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ): SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {}; public: diff --git a/sfx2/inc/sfx2/frmhtmlw.hxx b/sfx2/inc/sfx2/frmhtmlw.hxx index 93f45f092ba9..e6b681c57f93 100644 --- a/sfx2/inc/sfx2/frmhtmlw.hxx +++ b/sfx2/inc/sfx2/frmhtmlw.hxx @@ -53,12 +53,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter SAL_DLLPRIVATE static const sal_Char sNewLine[]; SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const String& rName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars = 0 ); SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const sal_Char *pName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars = 0 ); @@ -81,7 +81,7 @@ public: inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, const sal_Char *pIndent, const sal_Char *pName, - const String& rContent, BOOL bHTTPEquiv, + const String& rContent, sal_Bool bHTTPEquiv, rtl_TextEncoding eDestEnc, String *pNonConvertableChars ) { diff --git a/sfx2/inc/sfx2/genlink.hxx b/sfx2/inc/sfx2/genlink.hxx index 0edf8e3b9dd6..35a7534e6294 100644 --- a/sfx2/inc/sfx2/genlink.hxx +++ b/sfx2/inc/sfx2/genlink.hxx @@ -46,8 +46,8 @@ public: GenLink& operator = ( const GenLink& rOrig ) { pFunc = rOrig.pFunc; aLink = rOrig.aLink; return *this; } - BOOL operator!() const { return !aLink && !pFunc; } - BOOL IsSet() const { return aLink.IsSet() || pFunc; } + sal_Bool operator!() const { return !aLink && !pFunc; } + sal_Bool IsSet() const { return aLink.IsSet() || pFunc; } long Call( void* pCaller ) { return pFunc ? (*pFunc)(pCaller) : aLink.Call(pCaller); } diff --git a/sfx2/inc/sfx2/imagemgr.hxx b/sfx2/inc/sfx2/imagemgr.hxx index 79dc724210c4..fb5337f63b5a 100644 --- a/sfx2/inc/sfx2/imagemgr.hxx +++ b/sfx2/inc/sfx2/imagemgr.hxx @@ -33,4 +33,4 @@ #include <rtl/ustring.hxx> #include <vcl/image.hxx> -SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, BOOL bBig, BOOL bHiContrast ); +SFX2_DLLPUBLIC Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& aURL, sal_Bool bBig, sal_Bool bHiContrast ); diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index ae1f8a23ddc9..555cd37939b3 100644 --- a/sfx2/inc/sfx2/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx @@ -50,18 +50,18 @@ public: SfxImageManager( SfxModule* pModule = 0 ); ~SfxImageManager(); - void RegisterToolBox( ToolBox *pBox, USHORT nFlags=0xFFFF); + void RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF); void ReleaseToolBox( ToolBox *pBox ); // get images from resources void SetImages( ToolBox& rToolBox ); - void SetImages( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); - void SetImagesForceSize( ToolBox& rToolBox, BOOL bHiContrast, BOOL bLarge ); + void SetImages( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge ); + void SetImagesForceSize( ToolBox& rToolBox, sal_Bool bHiContrast, sal_Bool bLarge ); - Image GetImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; - Image GetImage( USHORT nId, BOOL bHiContrast ) const; - Image SeekImage( USHORT nId, BOOL bLarge, BOOL bHiContrast ) const; - Image SeekImage( USHORT nId, BOOL bHiContrast ) const; + Image GetImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const; + Image GetImage( sal_uInt16 nId, sal_Bool bHiContrast ) const; + Image SeekImage( sal_uInt16 nId, sal_Bool bLarge, sal_Bool bHiContrast ) const; + Image SeekImage( sal_uInt16 nId, sal_Bool bHiContrast ) const; }; #endif diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx index 960c6629b8d2..d302bc53442e 100644 --- a/sfx2/inc/sfx2/ipclient.hxx +++ b/sfx2/inc/sfx2/ipclient.hxx @@ -81,7 +81,7 @@ public: sal_Bool IsObjectInPlaceActive() const; sal_Bool IsObjectActive() const; void DeactivateObject(); - BOOL SetObjArea( const Rectangle & ); + sal_Bool SetObjArea( const Rectangle & ); Rectangle GetObjArea() const; Rectangle GetScaledObjArea() const; void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); @@ -96,7 +96,7 @@ public: ErrCode DoVerb( long nVerb ); void VisAreaChanged(); void ResetObject(); - BOOL IsUIActive(); + sal_Bool IsUIActive(); // used in Writer // Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const; diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx index 6d5cc4d3986b..939182eae12d 100644 --- a/sfx2/inc/sfx2/itemwrapper.hxx +++ b/sfx2/inc/sfx2/itemwrapper.hxx @@ -47,20 +47,20 @@ class SFX2_DLLPUBLIC ItemWrapperHelper { public: /** Returns the WID of the passed SID in the item set. */ - static USHORT GetWhichId( const SfxItemSet& rItemSet, USHORT nSlot ); + static sal_uInt16 GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns true, if the passed item set supports the SID. */ - static bool IsKnownItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static bool IsKnownItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns an item from an item set, if it is not in "don't know" state. @return Pointer to item, or 0 if it has "don't know" state. */ - static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static const SfxPoolItem* GetUniqueItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Returns the default item from the pool of the passed item set. */ - static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, USHORT nSlot ); + static const SfxPoolItem& GetDefaultItem( const SfxItemSet& rItemSet, sal_uInt16 nSlot ); /** Removes an item from rDestSet, if it is default in rOldSet. */ - static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, USHORT nSlot ); + static void RemoveDefaultItem( SfxItemSet& rDestSet, const SfxItemSet& rOldSet, sal_uInt16 nSlot ); }; // ============================================================================ @@ -102,10 +102,10 @@ public: typedef ValueT ItemValueType; typedef SingleItemWrapper< ItemT, ValueT > SingleItemWrapperType; - inline explicit SingleItemWrapper( USHORT nSlot ) : mnSlot( nSlot ) {} + inline explicit SingleItemWrapper( sal_uInt16 nSlot ) : mnSlot( nSlot ) {} /** Returns the SID this wrapper works on. */ - inline USHORT GetSlotId() const { return mnSlot; } + inline sal_uInt16 GetSlotId() const { return mnSlot; } /** Returns the item from an item set, if it is not in "don't know" state. @descr Similar to ItemWrapperHelper::GetUniqueItem(), but works always @@ -123,7 +123,7 @@ public: virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const = 0; private: - USHORT mnSlot; /// The SID of this item wrapper. + sal_uInt16 mnSlot; /// The SID of this item wrapper. }; // ============================================================================ @@ -142,7 +142,7 @@ template< typename ItemT, typename ValueT, typename InternalValueT = ValueT > class ValueItemWrapper : public SingleItemWrapper< ItemT, ValueT > { public: - inline explicit ValueItemWrapper( USHORT nSlot ) : + inline explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} virtual ValueT GetItemValue( const ItemT& rItem ) const @@ -153,11 +153,11 @@ public: // ---------------------------------------------------------------------------- -typedef ValueItemWrapper< SfxBoolItem, BOOL > BoolItemWrapper; -typedef ValueItemWrapper< SfxInt16Item, INT16 > Int16ItemWrapper; -typedef ValueItemWrapper< SfxUInt16Item, UINT16 > UInt16ItemWrapper; -typedef ValueItemWrapper< SfxInt32Item, INT32 > Int32ItemWrapper; -typedef ValueItemWrapper< SfxUInt32Item, UINT32 > UInt32ItemWrapper; +typedef ValueItemWrapper< SfxBoolItem, sal_Bool > BoolItemWrapper; +typedef ValueItemWrapper< SfxInt16Item, sal_Int16 > Int16ItemWrapper; +typedef ValueItemWrapper< SfxUInt16Item, sal_uInt16 > UInt16ItemWrapper; +typedef ValueItemWrapper< SfxInt32Item, sal_Int32 > Int32ItemWrapper; +typedef ValueItemWrapper< SfxUInt32Item, sal_uInt32 > UInt32ItemWrapper; typedef ValueItemWrapper< SfxStringItem, const String& > StringItemWrapper; // ============================================================================ @@ -167,7 +167,7 @@ template< typename ItemT > class IdentItemWrapper : public SingleItemWrapper< ItemT, const ItemT& > { public: - inline explicit IdentItemWrapper( USHORT nSlot ) : + inline explicit IdentItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, const ItemT& >( nSlot ) {} virtual const ItemT& GetItemValue( const ItemT& rItem ) const diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index 7dc779e2ba6e..5a1dd1b15bd7 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC LinkManager SfxObjectShell *pPersist; // LinkMgr muss vor SfxObjectShell freigegeben werden protected: - BOOL InsertLink( SvBaseLink* pLink, USHORT nObjType, USHORT nUpdateType, + sal_Bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType, const String* pName = 0 ); public: @@ -78,30 +78,30 @@ public: void SetPersist( SfxObjectShell * p ) { pPersist = p; } void Remove( SvBaseLink *pLink ); - void Remove( USHORT nPos, USHORT nCnt = 1 ); - BOOL Insert( SvBaseLink* pLink ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ); + sal_Bool Insert( SvBaseLink* pLink ); // den Link mit einem SvLinkSource verbinden und in die Liste eintragen - BOOL InsertDDELink( SvBaseLink*, + sal_Bool InsertDDELink( SvBaseLink*, const String& rServer, const String& rTopic, const String& rItem ); // falls am Link schon alles eingestellt ist ! - BOOL InsertDDELink( SvBaseLink* ); + sal_Bool InsertDDELink( SvBaseLink* ); // den Link mit einem PseudoObject verbinden und in die Liste eintragen - BOOL InsertFileLink( sfx2::SvBaseLink&, - USHORT nFileType, + sal_Bool InsertFileLink( sfx2::SvBaseLink&, + sal_uInt16 nFileType, const String& rTxt, const String* pFilterNm = 0, const String* pRange = 0 ); // falls am Link schon alles eingestellt ist ! - BOOL InsertFileLink( sfx2::SvBaseLink& ); + sal_Bool InsertFileLink( sfx2::SvBaseLink& ); // erfrage die Strings fuer den Dialog - BOOL GetDisplayNames( const SvBaseLink *, + sal_Bool GetDisplayNames( const SvBaseLink *, String* pType, String* pFile = 0, String* pLink = 0, @@ -109,9 +109,9 @@ public: SvLinkSourceRef CreateObj( SvBaseLink* ); - void UpdateAllLinks( BOOL bAskUpdate = TRUE, - BOOL bCallErrHdl = TRUE, - BOOL bUpdateGrfLinks = FALSE, + void UpdateAllLinks( sal_Bool bAskUpdate = sal_True, + sal_Bool bCallErrHdl = sal_True, + sal_Bool bUpdateGrfLinks = sal_False, Window* pParentWin = 0 ); // Liste aller Links erfragen (z.B. fuer Verknuepfungs-Dialog) @@ -122,9 +122,9 @@ public: // Liste der zu serviereden Links erfragen const SvLinkSources& GetServers() const { return aServerTbl; } // einen zu servierenden Link eintragen/loeschen - BOOL InsertServer( SvLinkSource* rObj ); + sal_Bool InsertServer( SvLinkSource* rObj ); void RemoveServer( SvLinkSource* rObj ); - void RemoveServer( USHORT nPos, USHORT nCnt = 1 ) + void RemoveServer( sal_uInt16 nPos, sal_uInt16 nCnt = 1 ) { aServerTbl.Remove( nPos, nCnt ); } // eine Uebertragung wird abgebrochen, also alle DownloadMedien canceln @@ -136,11 +136,11 @@ public: // dann die entsprechenden Informationen als String. // Wird zur Zeit fuer FileObject in Verbindung mit JavaScript benoetigt // - das braucht Informationen ueber Load/Abort/Error - static ULONG RegisterStatusInfoId(); + static sal_uIntPtr RegisterStatusInfoId(); // if the mimetype says graphic/bitmap/gdimetafile then get the // graphic from the Any. Return says no errors - static BOOL GetGraphicFromAny( const String& rMimeType, + static sal_Bool GetGraphicFromAny( const String& rMimeType, const ::com::sun::star::uno::Any & rValue, Graphic& rGrf ); diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index 1c538112760c..16e9af685c8e 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -75,12 +75,12 @@ public: virtual ~SvLinkSource(); // SvBaseLink* GetDataBaseLink() const; - BOOL HasDataLinks( const SvBaseLink* = 0 ) const; + sal_Bool HasDataLinks( const SvBaseLink* = 0 ) const; void Closed(); - ULONG GetUpdateTimeout() const; - void SetUpdateTimeout( ULONG nTime ); + sal_uIntPtr GetUpdateTimeout() const; + void SetUpdateTimeout( sal_uIntPtr nTime ); // notify the sink, the mime type is not // a selection criterion void DataChanged( const String & rMimeType, @@ -88,22 +88,22 @@ public: void SendDataChanged(); void NotifyDataChanged(); - virtual BOOL Connect( SvBaseLink* ); - virtual BOOL GetData( ::com::sun::star::uno::Any & rData /*out param*/, + virtual sal_Bool Connect( SvBaseLink* ); + virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const String & rMimeType, - BOOL bSynchron = FALSE ); + sal_Bool bSynchron = sal_False ); - // TRUE => waitinmg for data - virtual BOOL IsPending() const; - // TRUE => data complete loaded - virtual BOOL IsDataComplete() const; + // sal_True => waitinmg for data + virtual sal_Bool IsPending() const; + // sal_True => data complete loaded + virtual sal_Bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const String & rMimeType, - USHORT nAdviceMode ); + sal_uInt16 nAdviceMode ); void RemoveAllDataAdvise( SvBaseLink * ); void AddConnectAdvise( SvBaseLink * ); diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx index 62e49a1592e8..ffd3020fa9d0 100644 --- a/sfx2/inc/sfx2/lnkbase.hxx +++ b/sfx2/inc/sfx2/lnkbase.hxx @@ -85,18 +85,18 @@ private: SvLinkSourceRef xObj; String aLinkName; BaseLink_Impl* pImpl; - USHORT nObjType; - BOOL bVisible : 1; - BOOL bSynchron : 1; - BOOL bUseCache : 1; // fuer GrafikLinks! - BOOL bWasLastEditOK : 1; + sal_uInt16 nObjType; + sal_Bool bVisible : 1; + sal_Bool bSynchron : 1; + sal_Bool bUseCache : 1; // fuer GrafikLinks! + sal_Bool bWasLastEditOK : 1; DECL_LINK( EndEditHdl, String* ); bool ExecuteEdit( const String& _rNewName ); protected: - void SetObjType( USHORT ); + void SetObjType( sal_uInt16 ); // setzen des LinkSourceName ohne aktion void SetName( const String & rLn ); @@ -110,10 +110,10 @@ protected: m_xInputStreamToLoadFrom; SvBaseLink(); - SvBaseLink( USHORT nLinkType, ULONG nContentType = FORMAT_STRING ); + SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING ); virtual ~SvBaseLink(); - void _GetRealObject( BOOL bConnect = TRUE ); + void _GetRealObject( sal_Bool bConnect = sal_True ); SvLinkSource* GetRealObject() { @@ -126,10 +126,10 @@ public: TYPEINFO(); // ask JP virtual void Closed(); - SvBaseLink( const String& rNm, USHORT nObjectType, + SvBaseLink( const String& rNm, sal_uInt16 nObjectType, SvLinkSource* ); - USHORT GetObjType() const { return nObjType; } + sal_uInt16 GetObjType() const { return nObjType; } void SetObj( SvLinkSource * pObj ); SvLinkSource* GetObj() const { return xObj; } @@ -140,30 +140,30 @@ public: virtual void DataChanged( const String & rMimeType, const ::com::sun::star::uno::Any & rValue ); - void SetUpdateMode( USHORT ); - USHORT GetUpdateMode() const; - ULONG GetContentType() const; - BOOL SetContentType( ULONG nType ); + void SetUpdateMode( sal_uInt16 ); + sal_uInt16 GetUpdateMode() const; + sal_uIntPtr GetContentType() const; + sal_Bool SetContentType( sal_uIntPtr nType ); LinkManager* GetLinkManager(); const LinkManager* GetLinkManager() const; void SetLinkManager( LinkManager* _pMgr ); - BOOL Update(); + sal_Bool Update(); void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this virtual void Edit( Window*, const Link& rEndEditHdl ); // soll der Link im Dialog angezeigt werden ? (Links im Link im ...) - BOOL IsVisible() const { return bVisible; } - void SetVisible( BOOL bFlag ) { bVisible = bFlag; } + sal_Bool IsVisible() const { return bVisible; } + void SetVisible( sal_Bool bFlag ) { bVisible = bFlag; } // soll der Link synchron oder asynchron geladen werden? - BOOL IsSynchron() const { return bSynchron; } - void SetSynchron( BOOL bFlag ) { bSynchron = bFlag; } + sal_Bool IsSynchron() const { return bSynchron; } + void SetSynchron( sal_Bool bFlag ) { bSynchron = bFlag; } - BOOL IsUseCache() const { return bUseCache; } - void SetUseCache( BOOL bFlag ) { bUseCache = bFlag; } + sal_Bool IsUseCache() const { return bUseCache; } + void SetUseCache( sal_Bool bFlag ) { bUseCache = bFlag; } void setStreamToLoadFrom( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, @@ -174,7 +174,7 @@ public: void clearStreamToLoadFrom(); // <-- - inline BOOL WasLastEditOK() const { return bWasLastEditOK; } + inline sal_Bool WasLastEditOK() const { return bWasLastEditOK; } FileDialogHelper* GetFileDialog( sal_uInt32 nFlags, const String& rFactory ) const; }; diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx index d9d886cdfd5f..fda2e3feaf96 100644 --- a/sfx2/inc/sfx2/macropg.hxx +++ b/sfx2/inc/sfx2/macropg.hxx @@ -81,7 +81,7 @@ public: virtual ~_SfxMacroTabPage(); - void AddEvent( const String & rEventName, USHORT nEventId ); + void AddEvent( const String & rEventName, sal_uInt16 nEventId ); const SvxMacroTableDtor& GetMacroTbl() const; void SetMacroTbl( const SvxMacroTableDtor& rTbl ); @@ -96,12 +96,12 @@ public: FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const; // --------- Erben aus der Basis ------------- - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - void SetReadOnly( BOOL bSet ); - BOOL IsReadOnly() const; - void SelectEvent( const String& rEventName, USHORT nEventId ); + void SetReadOnly( sal_Bool bSet ); + sal_Bool IsReadOnly() const; + void SelectEvent( const String& rEventName, sal_uInt16 nEventId ); }; inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx index a63f665c1071..60375f5272c0 100644 --- a/sfx2/inc/sfx2/mgetempl.hxx +++ b/sfx2/inc/sfx2/mgetempl.hxx @@ -78,13 +78,13 @@ class SfxManageStyleSheetPage : public SfxTabPage SfxStyleFamilies *pFamilies; const SfxStyleFamilyItem *pItem; String aBuf; - BOOL bModified; + sal_Bool bModified; // initiale Daten des Styles String aName; String aFollow; String aParent; - USHORT nFlags; + sal_uInt16 nFlags; private: friend class SfxStyleDialog; @@ -103,7 +103,7 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual BOOL FillItemSet(SfxItemSet &); + virtual sal_Bool FillItemSet(SfxItemSet &); virtual void Reset(const SfxItemSet &); using TabPage::ActivatePage; diff --git a/sfx2/inc/sfx2/mieclip.hxx b/sfx2/inc/sfx2/mieclip.hxx index 562bca7940e2..7a00cabd307e 100644 --- a/sfx2/inc/sfx2/mieclip.hxx +++ b/sfx2/inc/sfx2/mieclip.hxx @@ -48,8 +48,8 @@ public: ~MSE40HTMLClipFormatObj(); //JP 31.01.2001: old interfaces - SAL_DLLPRIVATE BOOL GetData( SotDataObject& ); - SAL_DLLPRIVATE BOOL GetData( SvData& ); + SAL_DLLPRIVATE sal_Bool GetData( SotDataObject& ); + SAL_DLLPRIVATE sal_Bool GetData( SvData& ); //JP 31.01.2001: the new one SvStream* IsValid( SvStream& ); diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx index e0a8c398b215..6ccd7e0081c4 100644 --- a/sfx2/inc/sfx2/minarray.hxx +++ b/sfx2/inc/sfx2/minarray.hxx @@ -47,42 +47,42 @@ class ARR\ {\ private:\ T* pData;\ - USHORT nUsed;\ - BYTE nGrow;\ - BYTE nUnused;\ + sal_uInt16 nUsed;\ + sal_uInt8 nGrow;\ + sal_uInt8 nUnused;\ public:\ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG );\ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG );\ ARR( const ARR& rOrig );\ ~ARR();\ \ ARR& operator= ( const ARR& rOrig );\ \ - const T& GetObject( USHORT nPos ) const; \ - T& GetObject( USHORT nPos ); \ + const T& GetObject( sal_uInt16 nPos ) const; \ + T& GetObject( sal_uInt16 nPos ); \ \ - void Insert( USHORT nPos, ARR& rIns, USHORT nStart = 0, USHORT nEnd = USHRT_MAX );\ - void Insert( USHORT nPos, const T& rElem );\ - void Insert( USHORT nPos, const T& rElems, USHORT nLen );\ + void Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart = 0, sal_uInt16 nEnd = USHRT_MAX );\ + void Insert( sal_uInt16 nPos, const T& rElem );\ + void Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen );\ void Append( const T& rElem );\ \ - BOOL Remove( const T& rElem );\ - USHORT Remove( USHORT nPos, USHORT nLen );\ + sal_Bool Remove( const T& rElem );\ + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );\ \ - USHORT Count() const { return nUsed; }\ + sal_uInt16 Count() const { return nUsed; }\ T* operator*();\ - const T& operator[]( USHORT nPos ) const;\ - T& operator[]( USHORT nPos );\ + const T& operator[]( sal_uInt16 nPos ) const;\ + T& operator[]( sal_uInt16 nPos );\ \ - BOOL Contains( const T& rItem ) const;\ + sal_Bool Contains( const T& rItem ) const;\ void Clear() { Remove( 0, Count() ); }\ };\ \ -inline void ARR::Insert( USHORT nPos, ARR& rIns, USHORT nStart, USHORT nEnd )\ +inline void ARR::Insert( sal_uInt16 nPos, ARR& rIns, sal_uInt16 nStart, sal_uInt16 nEnd )\ {\ Insert( nPos, *(rIns.pData+(sizeof(T)*nStart)), nStart-nEnd+1 );\ }\ \ -inline void ARR::Insert( USHORT nPos, const T& rElem )\ +inline void ARR::Insert( sal_uInt16 nPos, const T& rElem )\ {\ Insert( nPos, rElem, 1 );\ }\ @@ -91,24 +91,24 @@ inline T* ARR::operator*()\ {\ return ( nUsed==0 ? 0 : pData );\ } \ -inline const T& ARR::operator[]( USHORT nPos ) const\ +inline const T& ARR::operator[]( sal_uInt16 nPos ) const\ {\ DBG_ASSERT( nPos < nUsed, "" ); \ return *(pData+nPos);\ } \ -inline T& ARR::operator [] (USHORT nPos) \ +inline T& ARR::operator [] (sal_uInt16 nPos) \ {\ DBG_ASSERT( nPos < nUsed, "" ); \ return *(pData+nPos); \ } \ -inline const T& ARR::GetObject( USHORT nPos ) const { return operator[](nPos); } \ -inline T& ARR::GetObject( USHORT nPos ) { return operator[](nPos); } \ +inline const T& ARR::GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ +inline T& ARR::GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ #ifndef _lint // String too long #define IMPL_OBJARRAY( ARR, T ) \ -ARR::ARR( BYTE nInitSize, BYTE nGrowSize ): \ +ARR::ARR( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ): \ nUsed(0), \ nGrow( nGrowSize ? nGrowSize : 1 ), \ nUnused(nInitSize) \ @@ -134,7 +134,7 @@ ARR::ARR( const ARR& rOrig ) \ size_t nBytes = (nUsed + nUnused) * sizeof(T); \ pData = (T*) new char [ nBytes ]; \ memset( pData, 0, nBytes ); \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ *(pData+n) = *(rOrig.pData+n); \ } \ else \ @@ -143,14 +143,14 @@ ARR::ARR( const ARR& rOrig ) \ \ ARR::~ARR() \ { \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ ( pData+n )->T::~T(); \ delete[] (char*) pData;\ } \ \ ARR& ARR::operator= ( const ARR& rOrig )\ { \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ ( pData+n )->T::~T(); \ delete[] (char*) pData;\ \ @@ -163,7 +163,7 @@ ARR& ARR::operator= ( const ARR& rOrig )\ size_t nBytes = (nUsed + nUnused) * sizeof(T); \ pData = (T*) new char[ nBytes ]; \ memset( pData, 0, nBytes ); \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ *(pData+n) = *(rOrig.pData+n); \ } \ else \ @@ -176,7 +176,7 @@ void ARR::Append( const T& aElem ) \ \ if ( nUnused == 0 ) \ { \ - USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \ + sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow; \ size_t nBytes = nNewSize * sizeof(T); \ T* pNewData = (T*) new char[ nBytes ]; \ memset( pNewData, 0, nBytes ); \ @@ -185,7 +185,7 @@ void ARR::Append( const T& aElem ) \ memcpy( pNewData, pData, nUsed * sizeof(T) ); \ delete[] (char*) pData;\ } \ - nUnused = (BYTE)(nNewSize-nUsed); \ + nUnused = (sal_uInt8)(nNewSize-nUsed); \ pData = pNewData; \ } \ \ @@ -195,17 +195,17 @@ void ARR::Append( const T& aElem ) \ --nUnused; \ } \ \ -USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ +sal_uInt16 ARR::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) \ { \ DBG_ASSERT( (nPos+nLen) < (nUsed+1), "" ); \ DBG_ASSERT( nLen > 0, "" ); \ \ - nLen = Min( (USHORT)(nUsed-nPos), (USHORT)nLen ); \ + nLen = Min( (sal_uInt16)(nUsed-nPos), (sal_uInt16)nLen ); \ \ if ( nLen == 0 ) \ return 0; \ \ - for ( USHORT n = nPos; n < (nPos+nLen); ++n ) \ + for ( sal_uInt16 n = nPos; n < (nPos+nLen); ++n ) \ ( pData+n )->T::~T(); \ \ if ( (nUsed-nLen) == 0 ) \ @@ -219,8 +219,8 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ \ if ( (nUnused+nLen) >= nGrow ) \ { \ - USHORT nNewUsed = nUsed-nLen; \ - USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \ + sal_uInt16 nNewUsed = nUsed-nLen; \ + sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow; \ DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize, \ "shrink size computation failed" ); \ size_t nBytes = nNewSize * sizeof(T); \ @@ -233,7 +233,7 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ delete[] (char*) pData;\ pData = pNewData; \ nUsed = nNewUsed; \ - nUnused = (BYTE)(nNewSize - nNewUsed); \ + nUnused = (sal_uInt8)(nNewSize - nNewUsed); \ return nLen; \ } \ \ @@ -243,39 +243,39 @@ USHORT ARR::Remove( USHORT nPos, USHORT nLen ) \ memmove(pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen) * sizeof(T));\ } \ nUsed = nUsed - nLen; \ - nUnused = sal::static_int_cast< BYTE >(nUnused + nLen); \ + nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen); \ return nLen; \ } \ \ -BOOL ARR::Remove( const T& aElem ) \ +sal_Bool ARR::Remove( const T& aElem ) \ { \ if ( nUsed == 0 ) \ - return FALSE; \ + return sal_False; \ \ const T *pIter = pData + nUsed - 1; \ - for ( USHORT n = 0; n < nUsed; ++n, --pIter ) \ + for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter ) \ if ( *pIter == aElem ) \ { \ Remove(nUsed-n-1, 1); \ - return TRUE; \ + return sal_True; \ } \ - return FALSE; \ + return sal_False; \ } \ \ -BOOL ARR::Contains( const T& rItem ) const \ +sal_Bool ARR::Contains( const T& rItem ) const \ { \ if ( !nUsed ) \ - return FALSE; \ - for ( USHORT n = 0; n < nUsed; ++n ) \ + return sal_False; \ + for ( sal_uInt16 n = 0; n < nUsed; ++n ) \ { \ const T& r2ndItem = GetObject(n); \ if ( r2ndItem == rItem ) \ - return TRUE; \ + return sal_True; \ } \ - return FALSE; \ + return sal_False; \ } \ \ -void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ +void ARR::Insert( sal_uInt16 nPos, const T& rElems, sal_uInt16 nLen ) \ { \ DBG_ASSERT( nPos <= nUsed, "" ); \ \ @@ -283,7 +283,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ { \ \ /* auf die naechste Grow-Grenze aufgerundet vergroeszern */ \ - USHORT nNewSize; \ + sal_uInt16 nNewSize; \ for ( nNewSize = nUsed+nGrow; nNewSize < (nUsed + nLen); ++nNewSize ) \ /* empty loop */; \ size_t nBytes = nNewSize * sizeof(T); \ @@ -296,7 +296,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ memcpy( pNewData, pData, nUsed * sizeof(T) ); \ delete (char*) pData;\ } \ - nUnused = (BYTE)(nNewSize-nUsed); \ + nUnused = (sal_uInt8)(nNewSize-nUsed); \ pData = pNewData; \ } \ \ @@ -308,7 +308,7 @@ void ARR::Insert( USHORT nPos, const T& rElems, USHORT nLen ) \ \ memmove(pData+nPos, &rElems, sizeof(T) * nLen); \ nUsed = nUsed + nLen; \ - nUnused = sal::static_int_cast< BYTE >(nUnused - nLen); \ + nUnused = sal::static_int_cast< sal_uInt8 >(nUnused - nLen); \ } // _lint @@ -318,26 +318,26 @@ class SFX2_DLLPUBLIC SfxPtrArr { private: void** pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - SfxPtrArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + SfxPtrArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); SfxPtrArr( const SfxPtrArr& rOrig ); ~SfxPtrArr(); SfxPtrArr& operator= ( const SfxPtrArr& rOrig ); - void* GetObject( USHORT nPos ) const { return operator[](nPos); } - void*& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, void* rElem ); + void* GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, void* rElem ); void Append( void* rElem ); - BOOL Replace( void* pOldElem, void* pNewElem ); - BOOL Remove( void* rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Replace( void* pOldElem, void* pNewElem ); + sal_Bool Remove( void* rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } inline void** operator*(); - inline void* operator[]( USHORT nPos ) const; - inline void*& operator[]( USHORT nPos ); - BOOL Contains( const void* rItem ) const; + inline void* operator[]( sal_uInt16 nPos ) const; + inline void*& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const void* rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -346,13 +346,13 @@ inline void** SfxPtrArr::operator*() return ( nUsed==0 ? 0 : pData ); } -inline void* SfxPtrArr::operator[]( USHORT nPos ) const +inline void* SfxPtrArr::operator[]( sal_uInt16 nPos ) const { DBG_ASSERT( nPos < nUsed, "" ); return *(pData+nPos); } -inline void*& SfxPtrArr::operator [] (USHORT nPos) +inline void*& SfxPtrArr::operator [] (sal_uInt16 nPos) { DBG_ASSERT( nPos < nUsed, "" ); return *(pData+nPos); @@ -363,35 +363,35 @@ inline void*& SfxPtrArr::operator [] (USHORT nPos) class ARR: public SfxPtrArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\ SfxPtrArr(nIni,nGrowValue) \ {}\ ARR( const ARR& rOrig ):\ SfxPtrArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ SfxPtrArr::Insert(nPos,(void *)aElement);\ }\ void Append( T aElement ) {\ SfxPtrArr::Append((void *)aElement);\ }\ - BOOL Replace( T aOldElem, T aNewElem ) {\ + sal_Bool Replace( T aOldElem, T aNewElem ) {\ return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\ }\ void Remove( T aElement ) {\ SfxPtrArr::Remove((void*)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ SfxPtrArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) SfxPtrArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) SfxPtrArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) SfxPtrArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; @@ -400,25 +400,25 @@ class ByteArr { private: char* pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - ByteArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + ByteArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); ByteArr( const ByteArr& rOrig ); ~ByteArr(); ByteArr& operator= ( const ByteArr& rOrig ); - char GetObject( USHORT nPos ) const { return operator[](nPos); } - char& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, char rElem ); + char GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + char& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, char rElem ); void Append( char rElem ); - BOOL Remove( char rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Remove( char rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } char* operator*(); - char operator[]( USHORT nPos ) const; - char& operator[]( USHORT nPos ); - BOOL Contains( const char rItem ) const; + char operator[]( sal_uInt16 nPos ) const; + char& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const char rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -431,15 +431,15 @@ inline char* ByteArr::operator*() class ARR: public ByteArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrow=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrow=nG ):\ ByteArr(nIni,nGrow) \ {}\ ARR( const ARR& rOrig ):\ ByteArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ ByteArr::Insert(nPos,(char)aElement);\ }\ void Append( T aElement ) {\ @@ -448,15 +448,15 @@ public:\ void Remove( T aElement ) {\ ByteArr::Remove((char)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ ByteArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) ByteArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) ByteArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) ByteArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; @@ -465,25 +465,25 @@ class WordArr { private: short* pData; - USHORT nUsed; - BYTE nGrow; - BYTE nUnused; + sal_uInt16 nUsed; + sal_uInt8 nGrow; + sal_uInt8 nUnused; public: - WordArr( BYTE nInitSize = 0, BYTE nGrowSize = 8 ); + WordArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 ); WordArr( const WordArr& rOrig ); ~WordArr(); WordArr& operator= ( const WordArr& rOrig ); - short GetObject( USHORT nPos ) const { return operator[](nPos); } - short& GetObject( USHORT nPos ) { return operator[](nPos); } - void Insert( USHORT nPos, short rElem ); + short GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } + short& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } + void Insert( sal_uInt16 nPos, short rElem ); void Append( short rElem ); - BOOL Remove( short rElem ); - USHORT Remove( USHORT nPos, USHORT nLen ); - USHORT Count() const { return nUsed; } + sal_Bool Remove( short rElem ); + sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen ); + sal_uInt16 Count() const { return nUsed; } short* operator*(); - short operator[]( USHORT nPos ) const; - short& operator[]( USHORT nPos ); - BOOL Contains( const short rItem ) const; + short operator[]( sal_uInt16 nPos ) const; + short& operator[]( sal_uInt16 nPos ); + sal_Bool Contains( const short rItem ) const; void Clear() { Remove( 0, Count() ); } }; @@ -496,15 +496,15 @@ inline short* WordArr::operator*() class ARR: public WordArr\ {\ public:\ - ARR( BYTE nIni=nI, BYTE nGrowValue=nG ):\ + ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\ WordArr(nIni,nGrowValue) \ {}\ ARR( const ARR& rOrig ):\ WordArr(rOrig) \ {}\ - T GetObject( USHORT nPos ) const { return operator[](nPos); } \ - T& GetObject( USHORT nPos ) { return operator[](nPos); } \ - void Insert( USHORT nPos, T aElement ) {\ + T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \ + T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \ + void Insert( sal_uInt16 nPos, T aElement ) {\ WordArr::Insert(nPos,(short)aElement);\ }\ void Append( T aElement ) {\ @@ -513,15 +513,15 @@ public:\ void Remove( T aElement ) {\ WordArr::Remove((short)aElement);\ }\ - void Remove( USHORT nPos, USHORT nLen = 1 ) {\ + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\ WordArr::Remove( nPos, nLen ); \ }\ T* operator *() {\ return (T*) WordArr::operator*();\ }\ - T operator[]( USHORT nPos ) const { \ + T operator[]( sal_uInt16 nPos ) const { \ return (T) WordArr::operator[](nPos); } \ - T& operator[]( USHORT nPos ) { \ + T& operator[]( sal_uInt16 nPos ) { \ return (T&) WordArr::operator[](nPos); } \ void Clear() { Remove( 0, Count() ); }\ }; diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx index c5f2f84da1d5..6b92205a7694 100644 --- a/sfx2/inc/sfx2/minstack.hxx +++ b/sfx2/inc/sfx2/minstack.hxx @@ -35,7 +35,7 @@ DECL_OBJARRAY( ARR##arr_, T, nI, nG ); \ class ARR: private ARR##arr_ \ { \ public: \ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \ ARR##arr_( nInitSize, nGrowSize ) \ {} \ \ @@ -43,14 +43,14 @@ public: \ ARR##arr_( rOrig ) \ {} \ \ - USHORT Count() const { return ARR##arr_::Count(); } \ + sal_uInt16 Count() const { return ARR##arr_::Count(); } \ void Push( const T& rElem ) { Append( rElem ); } \ - const T& Top( USHORT nLevel = 0 ) const \ + const T& Top( sal_uInt16 nLevel = 0 ) const \ { return (*this)[Count()-nLevel-1]; } \ const T& Bottom() const { return (*this)[0]; } \ T Pop(); \ void Clear() { ARR##arr_::Clear(); } \ - BOOL Contains( const T& rItem ) const \ + sal_Bool Contains( const T& rItem ) const \ { return ARR##arr_::Contains( rItem ); } \ } @@ -68,7 +68,7 @@ DECL_PTRARRAY( ARR##arr_, T, nI, nG ) \ class ARR: private ARR##arr_ \ { \ public: \ - ARR( BYTE nInitSize = nI, BYTE nGrowSize = nG ): \ + ARR( sal_uInt8 nInitSize = nI, sal_uInt8 nGrowSize = nG ): \ ARR##arr_( nInitSize, nGrowSize ) \ {} \ \ @@ -76,11 +76,11 @@ public: \ ARR##arr_( rOrig ) \ {} \ \ - USHORT Count() const { return ARR##arr_::Count(); } \ + sal_uInt16 Count() const { return ARR##arr_::Count(); } \ void Push( T rElem ) { Append( rElem ); } \ - BOOL Replace( T rOldElem, T rNewElem ) \ + sal_Bool Replace( T rOldElem, T rNewElem ) \ { return ARR##arr_::Replace( rOldElem, rNewElem ); } \ - T Top( USHORT nLevel = 0 ) const \ + T Top( sal_uInt16 nLevel = 0 ) const \ { return (*this)[Count()-nLevel-1]; } \ T Bottom() const { return (*this)[0]; } \ T Pop() \ @@ -91,7 +91,7 @@ public: \ T* operator*() \ { return &(*this)[Count()-1]; } \ void Clear() { ARR##arr_::Clear(); } \ - BOOL Contains( const T pItem ) const \ + sal_Bool Contains( const T pItem ) const \ { return ARR##arr_::Contains( pItem ); } \ } diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index fe7d8bb36b1e..669f579a254c 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -50,24 +50,24 @@ class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem String aHelpText; SfxVirtualMenu* pOwnMenu; SfxVirtualMenu* pSubMenu; - BOOL b_ShowStrings; - BOOL b_UnusedDummy; + sal_Bool b_ShowStrings; + sal_Bool b_UnusedDummy; public: SfxMenuControl(); - SfxMenuControl( BOOL bShowStrings ); - SfxMenuControl( USHORT, SfxBindings&); + SfxMenuControl( sal_Bool bShowStrings ); + SfxMenuControl( sal_uInt16, SfxBindings&); - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); - static void RegisterControl( USHORT nSlotId = 0, SfxModule *pMod=NULL ); + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); + static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); ~SfxMenuControl(); using SfxControllerItem::Bind; - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, const String& rTitle, const String &rHelpText, SfxBindings & ); - void Bind( SfxVirtualMenu* pOwnMenu, USHORT nId, + void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, SfxVirtualMenu& rSubMenu, const String& rTitle, const String &rHelpText, SfxBindings & ); @@ -84,13 +84,13 @@ public: const String& GetHelpText() const { return aHelpText; } void SetHelpText(const String &rStr) { aHelpText = rStr; } - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - static SfxMenuControl* CreateControl( USHORT nId, Menu &, SfxBindings & ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, SfxBindings&, SfxVirtualMenu* ); - static SfxUnoMenuControl* CreateControl( const String&, USHORT, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* ); - static BOOL IsSpecialControl( USHORT nId, SfxModule* ); + static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* ); + static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, const String& sHelpText, SfxBindings&, SfxVirtualMenu* ); + static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* ); static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*); }; @@ -99,9 +99,9 @@ class SfxUnoMenuControl : public SfxMenuControl { SfxUnoControllerItem* pUnoCtrl; public: - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, SfxBindings&, SfxVirtualMenu* ); - SfxUnoMenuControl( const String&, USHORT nId, Menu&, + SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&, const String&, const String&, SfxBindings&, SfxVirtualMenu* ); ~SfxUnoMenuControl(); @@ -110,16 +110,16 @@ public: //-------------------------------------------------------------------- -typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & ); +typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & ); struct SfxMenuCtrlFactory { SfxMenuControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxMenuCtrlFactory( SfxMenuControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -143,13 +143,13 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const //-------------------------------------------------------------------- #define SFX_DECL_MENU_CONTROL() \ - static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) #define SFX_IMPL_MENU_CONTROL(Class, nItemClass) \ - SfxMenuControl* __EXPORT Class::CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ) \ + SfxMenuControl* __EXPORT Class::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) \ { return new Class(nId, rMenu, rBindings); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } @@ -158,16 +158,16 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const class SfxAppMenuControl_Impl : public SfxMenuControl { PopupMenu* pMenu; - ULONG m_nSymbolsStyle; - BOOL m_bWasHiContrastMode; - BOOL m_bShowMenuImages; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bWasHiContrastMode; + sal_Bool m_bShowMenuImages; protected: DECL_LINK( Activate, Menu * ); // Needed to support high contrast images public: SFX_DECL_MENU_CONTROL(); - SfxAppMenuControl_Impl( USHORT nPos, Menu& rMenu, SfxBindings& rBindings ); + SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); ~SfxAppMenuControl_Impl(); }; diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index f1df0f0aa547..092a53825a2e 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -60,11 +60,11 @@ friend class SfxPopupMenuManager; SfxVirtualMenu* pMenu; // das eigentliche Menu SfxVirtualMenu* pOldMenu; // only while reconfiguring - BOOL bMenuBar; // Popup oder MenuBar + sal_Bool bMenuBar; // Popup oder MenuBar SfxBindings* pBindings; ResMgr* pResMgr; sal_uInt32 nType; - BOOL bAddClipboardFuncs : 1; + sal_Bool bAddClipboardFuncs : 1; void Construct( SfxVirtualMenu& rMenu ); @@ -72,7 +72,7 @@ protected: SfxMenuManager( Menu*, SfxBindings& ); SfxMenuManager( const ResId&, SfxBindings& ); ~SfxMenuManager(); - USHORT GetItemPos( USHORT nId ); + sal_uInt16 GetItemPos( sal_uInt16 nId ); sal_uInt32 GetType() { return nType; } public: @@ -87,10 +87,10 @@ public: const SfxBindings& GetBindings() const { return *pBindings; } void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() const { return pResMgr; } - void SetPopupMenu( USHORT nId, PopupMenu *pMenu ); + void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); //#if 0 // _SOLAR__PRIVATE - void Construct_Impl( Menu* pMenu, BOOL bWithHelp ); + void Construct_Impl( Menu* pMenu, sal_Bool bWithHelp ); //#endif }; @@ -122,9 +122,9 @@ public: // Please contact cd@openoffice.org if you have questions or need help static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); - USHORT Execute( const Point& rPos, Window *pWindow ); - USHORT Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); - USHORT Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... ); + sal_uInt16 Execute( const Point& rPos, Window *pWindow ); + sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); + sal_uInt16 Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... ); // @deprecated (start)!! // Don't use these methods any longer. The whole class will be removed in the future. @@ -132,11 +132,11 @@ public: // Please contact cd@openoffice.org if you have questions or need help void StartInsert(); void EndInsert(); - void CheckItem( USHORT, BOOL ); - void RemoveItem( USHORT ); - void InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId, - USHORT nPos = MENU_APPEND ); - void InsertSeparator( USHORT nPos = MENU_APPEND ); + void CheckItem( sal_uInt16, sal_Bool ); + void RemoveItem( sal_uInt16 ); + void InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId, + sal_uInt16 nPos = MENU_APPEND ); + void InsertSeparator( sal_uInt16 nPos = MENU_APPEND ); // @deprecated (end) void RemoveDisabledEntries(); diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx index ad83bb4a7418..76c8b92ba2a9 100644 --- a/sfx2/inc/sfx2/module.hxx +++ b/sfx2/inc/sfx2/module.hxx @@ -90,10 +90,10 @@ public: virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); - virtual void Invalidate(USHORT nId = 0); - BOOL IsActive() const; + virtual void Invalidate(sal_uInt16 nId = 0); + sal_Bool IsActive() const; - /*virtual*/ bool IsChildWindowAvailable( const USHORT i_nId, const SfxViewFrame* i_pViewFrame ) const; + /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; static SfxModule* GetActiveModule( SfxViewFrame* pFrame=NULL ); static FieldUnit GetCurrentFieldUnit(); @@ -106,8 +106,8 @@ public: SAL_DLLPRIVATE SfxStbCtrlFactArr_Impl* GetStbCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxMenuCtrlFactArr_Impl* GetMenuCtrlFactories_Impl() const; SAL_DLLPRIVATE SfxChildWinFactArr_Impl* GetChildWinFactories_Impl() const; - SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig ); - SAL_DLLPRIVATE ImageList* GetImageList_Impl( BOOL bBig, BOOL bHiContrast ); + SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig ); + SAL_DLLPRIVATE ImageList* GetImageList_Impl( sal_Bool bBig, sal_Bool bHiContrast ); //#endif }; diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index 10fbd222a2ed..fe694ef5b42b 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -111,14 +111,14 @@ enum SfxSlotKind struct SfxTypeAttrib { - USHORT nAID; + sal_uInt16 nAID; const char __FAR_DATA* pName; }; struct SfxType { TypeId aTypeId; - USHORT nAttribs; + sal_uInt16 nAttribs; SfxTypeAttrib aAttrib[16]; const TypeId& Type() const @@ -130,7 +130,7 @@ struct SfxType struct SfxType0 { TypeId aTypeId; - USHORT nAttribs; + sal_uInt16 nAttribs; const TypeId& Type() const { return aTypeId; } @@ -141,7 +141,7 @@ struct SfxType0 #define SFX_DECL_TYPE(n) struct SfxType##n \ { \ TypeId aTypeId; \ - USHORT nAttribs; \ + sal_uInt16 nAttribs; \ SfxTypeAttrib aAttrib[n]; \ } @@ -240,7 +240,7 @@ struct SfxFormalArgument { const SfxType* pType; // Typ des Parameters (SfxPoolItem Subklasse) const char __FAR_DATA* pName; // Name des Parameters - USHORT nSlotId;// Slot-Id zur Identifikation des Parameters + sal_uInt16 nSlotId;// Slot-Id zur Identifikation des Parameters const TypeId& Type() const { return pType->aTypeId; } @@ -253,13 +253,13 @@ struct SfxFormalArgument class SfxSlot { public: - USHORT nSlotId; // in Shell eindeutige Slot-Id + sal_uInt16 nSlotId; // in Shell eindeutige Slot-Id USHORT nGroupId; // f"ur Konfigurations-Bereich - ULONG nHelpId; // i.d.R. == nSlotId - ULONG nFlags; // artihm. veroderte Flags + sal_uIntPtr nHelpId; // i.d.R. == nSlotId + sal_uIntPtr nFlags; // artihm. veroderte Flags - USHORT nMasterSlotId; // Enum-Slot bzw. Which-Id - USHORT nValue; // Wert, falls Enum-Slot + sal_uInt16 nMasterSlotId; // Enum-Slot bzw. Which-Id + sal_uInt16 nValue; // Wert, falls Enum-Slot SfxExecFunc fnExec; // Funktion zum Ausf"uhren SfxStateFunc fnState; // Funktion f"ur Status @@ -272,7 +272,7 @@ public: const SfxSlot* pNextSlot; // mit derselben Status-Methode const SfxFormalArgument* pFirstArgDef; // erste formale Argument-Definition - USHORT nArgDefCount; // Anzahl der formalen Argumente + sal_uInt16 nArgDefCount; // Anzahl der formalen Argumente long nDisableFlags; // DisableFlags, die vorhanden sein // m"ussen, damit der Slot enabled ist const char __FAR_DATA* pUnoName; // UnoName des Slots @@ -280,21 +280,21 @@ public: public: SfxSlotKind GetKind() const; - USHORT GetSlotId() const; - ULONG GetHelpId() const; - ULONG GetMode() const; - BOOL IsMode( ULONG nMode ) const; - USHORT GetGroupId() const; - USHORT GetMasterSlotId() const { return nMasterSlotId; } - USHORT GetWhich( const SfxItemPool &rPool ) const; - USHORT GetValue() const { return nValue; } + sal_uInt16 GetSlotId() const; + sal_uIntPtr GetHelpId() const; + sal_uIntPtr GetMode() const; + sal_Bool IsMode( sal_uIntPtr nMode ) const; + sal_uInt16 GetGroupId() const; + sal_uInt16 GetMasterSlotId() const { return nMasterSlotId; } + sal_uInt16 GetWhich( const SfxItemPool &rPool ) const; + sal_uInt16 GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } SFX2_DLLPUBLIC rtl::OString GetCommand() const; SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; - USHORT GetFormalArgumentCount() const { return nArgDefCount; } - const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const + sal_uInt16 GetFormalArgumentCount() const { return nArgDefCount; } + const SfxFormalArgument& GetFormalArgument( sal_uInt16 nNo ) const { return pFirstArgDef[nNo]; } SfxExecFunc GetExecFnc() const { return fnExec; } @@ -308,14 +308,14 @@ public: // returns the id of the function -inline USHORT SfxSlot::GetSlotId() const +inline sal_uInt16 SfxSlot::GetSlotId() const { return nSlotId; } //-------------------------------------------------------------------- // returns the help-id of the slot -inline ULONG SfxSlot::GetHelpId() const +inline sal_uIntPtr SfxSlot::GetHelpId() const { return nHelpId; } @@ -324,7 +324,7 @@ inline ULONG SfxSlot::GetHelpId() const // returns a bitfield with flags -inline ULONG SfxSlot::GetMode() const +inline sal_uIntPtr SfxSlot::GetMode() const { return nFlags; } @@ -332,7 +332,7 @@ inline ULONG SfxSlot::GetMode() const // determines if the specified mode is assigned -inline BOOL SfxSlot::IsMode( ULONG nMode ) const +inline sal_Bool SfxSlot::IsMode( sal_uIntPtr nMode ) const { return (nFlags & nMode) != 0; } @@ -340,7 +340,7 @@ inline BOOL SfxSlot::IsMode( ULONG nMode ) const // returns the id of the associated group -inline USHORT SfxSlot::GetGroupId() const +inline sal_uInt16 SfxSlot::GetGroupId() const { return nGroupId; diff --git a/sfx2/inc/sfx2/navigat.hxx b/sfx2/inc/sfx2/navigat.hxx index a3f525ccd754..2958f92ca0d3 100644 --- a/sfx2/inc/sfx2/navigat.hxx +++ b/sfx2/inc/sfx2/navigat.hxx @@ -38,7 +38,7 @@ class SfxNavigatorWrapper : public SfxChildWindow public: SfxNavigatorWrapper( Window* pParent , - USHORT nId , + sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -57,7 +57,7 @@ public: virtual void Resize(); virtual void Resizing( Size& rSize ); - virtual BOOL Close(); + virtual sal_Bool Close(); }; #endif diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx index 1647f880500d..e6bfe590431e 100644 --- a/sfx2/inc/sfx2/new.hxx +++ b/sfx2/inc/sfx2/new.hxx @@ -93,20 +93,20 @@ private: public: - SfxNewFileDialog(Window *pParent, USHORT nFlags = 0); + SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); ~SfxNewFileDialog(); - // Liefert FALSE, wenn '- Keine -' als Vorlage eingestellt ist - // Nur wenn IsTemplate() TRUE liefert, koennen Vorlagennamen + // Liefert sal_False, wenn '- Keine -' als Vorlage eingestellt ist + // Nur wenn IsTemplate() sal_True liefert, koennen Vorlagennamen // erfragt werden - BOOL IsTemplate() const; + sal_Bool IsTemplate() const; String GetTemplateRegion() const; String GetTemplateName() const; String GetTemplateFileName() const; // load template methods - USHORT GetTemplateFlags()const; - void SetTemplateFlags(USHORT nSet); + sal_uInt16 GetTemplateFlags()const; + void SetTemplateFlags(sal_uInt16 nSet); }; #endif diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index c7710f533935..4294a93a454c 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -55,27 +55,27 @@ friend class SfxSlotPool; const char* pName; // Sfx-internal name of interface const SfxInterface* pGenoType; // base interface SfxSlot* pSlots; // SlotMap - USHORT nCount; // number of slots in SlotMap + sal_uInt16 nCount; // number of slots in SlotMap SfxInterfaceId nClassId; // Id of interface ResId aNameResId; // ResId of external interface name SfxInterface_Impl* pImpData; - SfxSlot* operator[]( USHORT nPos ) const; + SfxSlot* operator[]( sal_uInt16 nPos ) const; public: SfxInterface( const char *pClass, const ResId& rResId, SfxInterfaceId nClassId, const SfxInterface* pGeno, - SfxSlot &rMessages, USHORT nMsgCount ); + SfxSlot &rMessages, sal_uInt16 nMsgCount ); virtual ~SfxInterface(); - void SetSlotMap( SfxSlot& rMessages, USHORT nMsgCount ); - inline USHORT Count() const; + void SetSlotMap( SfxSlot& rMessages, sal_uInt16 nMsgCount ); + inline sal_uInt16 Count() const; const SfxSlot* GetRealSlot( const SfxSlot * ) const; - const SfxSlot* GetRealSlot( USHORT nSlotId ) const; - virtual const SfxSlot* GetSlot( USHORT nSlotId ) const; + const SfxSlot* GetRealSlot( sal_uInt16 nSlotId ) const; + virtual const SfxSlot* GetSlot( sal_uInt16 nSlotId ) const; const SfxSlot* GetSlot( const String& rCommand ) const; const char* GetClassName() const { return pName; } @@ -88,21 +88,21 @@ public: const SfxInterface* GetGenoType() const { return pGenoType; } const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const; - void RegisterObjectBar( USHORT, const ResId&, const String* pST=0 ); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 ); - void RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, const String* pST=0 ); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, const String* pST=0 ); + void RegisterChildWindow( sal_uInt16, sal_Bool bContext, sal_uInt32 nFeature, const String* pST=0 ); void RegisterStatusBar( const ResId& ); - const ResId& GetObjectBarResId( USHORT nNo ) const; - USHORT GetObjectBarPos( USHORT nNo ) const; - sal_uInt32 GetObjectBarFeature( USHORT nNo ) const; - USHORT GetObjectBarCount() const; - void SetObjectBarPos( USHORT nPos, USHORT nId ); - const String* GetObjectBarName( USHORT nNo ) const; - BOOL IsObjectBarVisible( USHORT nNo) const; - sal_uInt32 GetChildWindowFeature( USHORT nNo ) const; - sal_uInt32 GetChildWindowId( USHORT nNo ) const; - USHORT GetChildWindowCount() const; + const ResId& GetObjectBarResId( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const; + sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const; + sal_uInt16 GetObjectBarCount() const; + void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId ); + const String* GetObjectBarName( sal_uInt16 nNo ) const; + sal_Bool IsObjectBarVisible( sal_uInt16 nNo) const; + sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const; + sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const; + sal_uInt16 GetChildWindowCount() const; void RegisterPopupMenu( const ResId& ); const ResId& GetPopupMenuResId() const; const ResId& GetStatusBarResId() const; @@ -121,7 +121,7 @@ public: // returns the number of functions in this cluster -inline USHORT SfxInterface::Count() const +inline sal_uInt16 SfxInterface::Count() const { return nCount; } @@ -130,7 +130,7 @@ inline USHORT SfxInterface::Count() const // returns a function by position in the array -inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const +inline SfxSlot* SfxInterface::operator[]( sal_uInt16 nPos ) const { return nPos < nCount? pSlots+nPos: 0; } @@ -139,15 +139,15 @@ inline SfxSlot* SfxInterface::operator[]( USHORT nPos ) const class SfxIFConfig_Impl { friend class SfxInterface; - USHORT nCount; + sal_uInt16 nCount; SfxObjectUIArr_Impl* pObjectBars; public: SfxIFConfig_Impl(); ~SfxIFConfig_Impl(); - BOOL Store(SvStream&); - void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); - USHORT GetType(); + sal_Bool Store(SvStream&); + void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const String* pST=0 ); + sal_uInt16 GetType(); }; //#endif diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 9473ac126bd7..724f5b7a2722 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -269,7 +269,7 @@ public: GetCurrentComponent(); static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - virtual void Invalidate(USHORT nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0); void SetFlags( SfxObjectShellFlags eFlags ); SfxObjectShellFlags GetFlags( ) const ; @@ -328,7 +328,7 @@ public: sal_Bool DoLoad( SfxMedium* pMedium ); sal_Bool DoSave(); sal_Bool DoSaveAs( SfxMedium &rNewStor ); - sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, BOOL bCommit ); + sal_Bool DoSaveObjectAs( SfxMedium &rNewStor, sal_Bool bCommit ); // TODO/LATER: currently only overloaded in Calc, should be made non-virtual virtual sal_Bool DoSaveCompleted( SfxMedium* pNewStor=0 ); @@ -348,9 +348,9 @@ public: virtual void UpdateLinks(); // called for a few slots like SID_SAVE[AS]DOC, SID_PRINTDOC[DIRECT], derived classes may abort the action - virtual sal_Bool QuerySlotExecutable( USHORT nSlotId ); + virtual sal_Bool QuerySlotExecutable( sal_uInt16 nSlotId ); - sal_Bool SaveChildren(BOOL bObjectsOnly=FALSE); + sal_Bool SaveChildren(sal_Bool bObjectsOnly=sal_False); sal_Bool SaveAsChildren( SfxMedium &rMedium ); sal_Bool SwitchChildrenPersistance( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, @@ -499,7 +499,7 @@ public: SfxObjectCreateMode GetCreateMode() const { return eCreateMode; } virtual void MemoryError(); SfxProgress* GetProgress() const; - void SetWaitCursor( BOOL bSet ) const; + void SetWaitCursor( sal_Bool bSet ) const; //(mba) virtual SotObjectRef CreateAggObj( const SotFactory* pFact ); @@ -620,15 +620,15 @@ public: virtual SEQUENCE< OUSTRING > GetEventNames(); Window* GetDialogParent( SfxMedium* pMedium=0 ); - String UpdateTitle( SfxMedium* pMed=NULL, USHORT nDocViewNo=0 ); + String UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 ); static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 ); static String GetServiceNameFromFactory( const String& rFact ); - BOOL IsInPlaceActive(); - BOOL IsUIActive(); - virtual void InPlaceActivate( BOOL ); - virtual void UIActivate( BOOL ); + sal_Bool IsInPlaceActive(); + sal_Bool IsUIActive(); + virtual void InPlaceActivate( sal_Bool ); + virtual void UIActivate( sal_Bool ); static sal_Bool CopyStoragesOfUnknownMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource, @@ -671,11 +671,11 @@ public: virtual Printer * GetDocumentPrinter(); virtual OutputDevice* GetDocumentRefDev(); virtual void OnDocumentPrinterChanged( Printer * pNewPrinter ); - virtual Rectangle GetVisArea( USHORT nAspect ) const; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; virtual void SetVisArea( const Rectangle & rVisArea ); const Rectangle & GetVisArea() const; void SetVisAreaSize( const Size & rVisSize ); - virtual ULONG GetMiscStatus() const; + virtual sal_uIntPtr GetMiscStatus() const; MapUnit GetMapUnit() const; void SetMapUnit( MapUnit nMUnit ); @@ -684,9 +684,9 @@ public: void DoDraw( OutputDevice *, const Point & rObjPos, const Size & rSize, const JobSetup & rSetup, - USHORT nAspect = ASPECT_CONTENT ); + sal_uInt16 nAspect = ASPECT_CONTENT ); virtual void Draw( OutputDevice *, const JobSetup & rSetup, - USHORT nAspect = ASPECT_CONTENT ) = 0; + sal_uInt16 nAspect = ASPECT_CONTENT ) = 0; virtual void FillClass( SvGlobalName * pClassName, @@ -752,7 +752,7 @@ public: const Fraction & rScaleX, const Fraction & rScaleY, const JobSetup & rSetup, - USHORT nAspect ); + sal_uInt16 nAspect ); // Shell Interface SAL_DLLPRIVATE void ExecFile_Impl(SfxRequest &); @@ -793,7 +793,7 @@ public: // configuration items SAL_DLLPRIVATE SfxEventConfigItem_Impl* GetEventConfig_Impl( sal_Bool bForce=sal_False ); SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl(); - SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE ); + SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = sal_False ); SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplAnalyzeSignature( @@ -801,7 +801,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() ); - SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE ); + SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = sal_False ); SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ); //#endif }; @@ -840,7 +840,7 @@ SV_DECL_LOCK(SfxObjectShell) SV_IMPL_LOCK(SfxObjectShell) SV_IMPL_REF(SfxObjectShell) -SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, BOOL bWriting ); +SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& rName, sal_Bool bWriting ); //#if 0 // _SOLAR__PRIVATE //-------------------------------------------------------------------- @@ -882,8 +882,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual String GetValueText() const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SfxObjectShell* GetObjectShell() const { return pObjSh; } diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx index a96033835a84..14d418fcb98e 100644 --- a/sfx2/inc/sfx2/printer.hxx +++ b/sfx2/inc/sfx2/printer.hxx @@ -40,27 +40,27 @@ class SfxItemSet; struct SfxPrinter_Impl; -#define SFX_RANGE_NOTSET ((USHORT)0xFFFF) +#define SFX_RANGE_NOTSET ((sal_uInt16)0xFFFF) // class SfxFontSizeInfo ------------------------------------------------- class SfxFontSizeInfo { private: - static USHORT pStaticSizes[]; + static sal_uInt16 pStaticSizes[]; Size* pSizes; - USHORT nSizes; - BOOL bScalable; + sal_uInt16 nSizes; + sal_Bool bScalable; public: SfxFontSizeInfo( const SfxFont& rFont, const OutputDevice& rDevice ); ~SfxFontSizeInfo(); - BOOL HasSize(const Size &rSize) const; - BOOL IsScalable() const { return bScalable; } + sal_Bool HasSize(const Size &rSize) const; + sal_Bool IsScalable() const { return bScalable; } - USHORT SizeCount() const { return nSizes; } - const Size& GetSize( USHORT nNo ) const + sal_uInt16 SizeCount() const { return nSizes; } + const Size& GetSize( sal_uInt16 nNo ) const { return pSizes[nNo]; } }; @@ -96,7 +96,7 @@ private: JobSetup aOrigJobSetup; SfxItemSet* pOptions; SfxPrinter_Impl* pImpl; - BOOL bKnown; + sal_Bool bKnown; SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined @@ -125,19 +125,19 @@ public: const SfxItemSet& GetOptions() const { return *pOptions; } void SetOptions( const SfxItemSet &rNewOptions ); - void EnableRange( USHORT nRange ); - void DisableRange( USHORT nRange ); - BOOL IsRangeEnabled( USHORT nRange ) const; + void EnableRange( sal_uInt16 nRange ); + void DisableRange( sal_uInt16 nRange ); + sal_Bool IsRangeEnabled( sal_uInt16 nRange ) const; - BOOL IsKnown() const { return bKnown; } - BOOL IsOriginal() const { return bKnown; } + sal_Bool IsKnown() const { return bKnown; } + sal_Bool IsOriginal() const { return bKnown; } using OutputDevice::GetFont; - USHORT GetFontCount(); - const SfxFont* GetFont( USHORT nNo ) const; + sal_uInt16 GetFontCount(); + const SfxFont* GetFont( sal_uInt16 nNo ) const; const SfxFont* GetFontByName( const String &rFontName ); - BOOL InitJob( Window* pUIParent, BOOL bAskAboutTransparentObjects ); + sal_Bool InitJob( Window* pUIParent, sal_Bool bAskAboutTransparentObjects ); }; #endif diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx index 622d69738a59..723fbcc02f9e 100644 --- a/sfx2/inc/sfx2/printopt.hxx +++ b/sfx2/inc/sfx2/printopt.hxx @@ -118,7 +118,7 @@ public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SfxCommonPrintOptionsTabPage(); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual Window* GetParentLabeledBy( const Window* pLabel ) const; virtual Window* GetParentLabelFor( const Window* pLabel ) const; @@ -148,7 +148,7 @@ public: TransparencyPrintWarningBox( Window* pParent ); ~TransparencyPrintWarningBox(); - BOOL IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); } + sal_Bool IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); } }; #endif // #ifndef _SFX_PRINTOPT_HXX diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index f35064418ec3..a4a48cf095d9 100644 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -57,19 +57,19 @@ private: //#endif public: SfxPrintProgress( SfxViewShell* pViewSh, - FASTBOOL bShow = TRUE ); + int bShow = sal_True ); virtual ~SfxPrintProgress(); virtual void SetText( const String &rText ); - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ); - virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ); + sal_Bool SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 ); + virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 ); void RestoreOnEndPrint( SfxPrinter *pOldPrinter ); void RestoreOnEndPrint( SfxPrinter *pOldPrinter, - BOOL bOldEnablePrintFile ); + sal_Bool bOldEnablePrintFile ); void DeleteOnEndPrint(); void SetCancelHdl( const Link& aCancelHdl ); - BOOL IsAborted() const; + sal_Bool IsAborted() const; }; */ // ------------------------------------------------------------------------ @@ -92,7 +92,7 @@ public: const SfxItemSet *rOptions ); virtual ~SfxPrintOptionsDialog(); - BOOL Construct(); + sal_Bool Construct(); virtual short Execute(); virtual long Notify( NotifyEvent& rNEvt ); diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index 7019ebf7785e..e5c95625e587 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -47,24 +47,24 @@ struct SvProgressArg; class SFX2_DLLPUBLIC SfxProgress { SfxProgress_Impl* pImp; - ULONG nVal; - BOOL bSuspended; + sal_uIntPtr nVal; + sal_Bool bSuspended; public: SfxProgress( SfxObjectShell* pObjSh, const String& rText, - ULONG nRange, BOOL bAllDocs = FALSE, - BOOL bWait = TRUE ); + sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False, + sal_Bool bWait = sal_True ); virtual ~SfxProgress(); virtual void SetText( const String& rText ); - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ); - virtual BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ); - ULONG GetState() const { return nVal; } + sal_Bool SetStateText( sal_uIntPtr nVal, const String &rVal, sal_uIntPtr nNewRange = 0 ); + virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 ); + sal_uIntPtr GetState() const { return nVal; } void Resume(); void Suspend(); - BOOL IsSuspended() const { return bSuspended; } + sal_Bool IsSuspended() const { return bSuspended; } void Lock(); void UnLock(); @@ -72,8 +72,8 @@ public: void Stop(); - void SetWaitMode( BOOL bWait ); - BOOL GetWaitMode() const; + void SetWaitMode( sal_Bool bWait ); + sal_Bool GetWaitMode() const; static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = 0 ); static void EnterLock(); @@ -82,7 +82,7 @@ public: //#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* ); DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* ); - SAL_DLLPRIVATE FASTBOOL StatusBarManagerGone_Impl(SfxStatusBarManager*pStb); + SAL_DLLPRIVATE int StatusBarManagerGone_Impl(SfxStatusBarManager*pStb); SAL_DLLPRIVATE const String& GetStateText_Impl() const; //#endif }; diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index 9d7f4a6dc92d..d74e565807ed 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -56,7 +56,7 @@ class SFX2_DLLPUBLIC SfxRequest: public SfxHint { friend struct SfxRequest_Impl; - USHORT nSlot; + sal_uInt16 nSlot; SfxAllItemSet* pArgs; SfxRequest_Impl* pImp; @@ -73,53 +73,53 @@ private: //--------------------------------------------------------------------- public: - SfxRequest( SfxViewFrame*, USHORT nSlotId ); - SfxRequest( USHORT nSlot, USHORT nCallMode, SfxItemPool &rPool ); + SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId ); + SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, SfxItemPool &rPool ); SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs, - USHORT nCallMode, SfxItemPool &rPool ); - SfxRequest( USHORT nSlot, USHORT nCallMode, const SfxAllItemSet& rSfxArgs ); + sal_uInt16 nCallMode, SfxItemPool &rPool ); + SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs ); SfxRequest( const SfxRequest& rOrig ); ~SfxRequest(); - USHORT GetSlot() const { return nSlot; } - void SetSlot(USHORT nNewSlot) { nSlot = nNewSlot; } + sal_uInt16 GetSlot() const { return nSlot; } + void SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; } - USHORT GetModifier() const; - void SetModifier( USHORT nModi ); + sal_uInt16 GetModifier() const; + void SetModifier( sal_uInt16 nModi ); SAL_DLLPRIVATE void SetInternalArgs_Impl( const SfxAllItemSet& rArgs ); SAL_DLLPRIVATE const SfxItemSet* GetInternalArgs_Impl() const; const SfxItemSet* GetArgs() const { return pArgs; } void SetArgs( const SfxAllItemSet& rArgs ); void AppendItem(const SfxPoolItem &); - void RemoveItem( USHORT nSlotId ); + void RemoveItem( sal_uInt16 nSlotId ); - static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId, + static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ); - const SfxPoolItem* GetArg( USHORT nSlotId, FASTBOOL bDeep = FALSE, TypeId aType = 0 ) const; + const SfxPoolItem* GetArg( sal_uInt16 nSlotId, int bDeep = sal_False, TypeId aType = 0 ) const; void ReleaseArgs(); void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; static SfxMacro* GetRecordingMacro(); static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); - static BOOL HasMacroRecorder( SfxViewFrame* pFrame=NULL ); - USHORT GetCallMode() const; - FASTBOOL IsRecording() const; - void AllowRecording( BOOL ); - BOOL AllowsRecording() const; - BOOL IsAPI() const; - BOOL IsSynchronCall() const; - void SetSynchronCall( BOOL bSynchron ); + static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); + sal_uInt16 GetCallMode() const; + int IsRecording() const; + void AllowRecording( sal_Bool ); + sal_Bool AllowsRecording() const; + sal_Bool IsAPI() const; + sal_Bool IsSynchronCall() const; + void SetSynchronCall( sal_Bool bSynchron ); void SetTarget( const String &rTarget ); - BOOL IsDone() const; - void Done( BOOL bRemove = FALSE ); + sal_Bool IsDone() const; + void Done( sal_Bool bRemove = sal_False ); void Ignore(); void Cancel(); - BOOL IsCancelled() const; - void Done(const SfxItemSet &, FASTBOOL bKeep = TRUE ); + sal_Bool IsCancelled() const; + void Done(const SfxItemSet &, int bKeep = sal_True ); void ForgetAllArgs(); diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx index d25f0ee0b967..4c47533f4e4a 100644 --- a/sfx2/inc/sfx2/securitypage.hxx +++ b/sfx2/inc/sfx2/securitypage.hxx @@ -45,7 +45,7 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: diff --git a/sfx2/inc/sfx2/sfxbasecontroller.hxx b/sfx2/inc/sfx2/sfxbasecontroller.hxx index ca30d243bbac..a48b638d15a4 100644 --- a/sfx2/inc/sfx2/sfxbasecontroller.hxx +++ b/sfx2/inc/sfx2/sfxbasecontroller.hxx @@ -389,9 +389,9 @@ public: // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API SfxViewShell* GetViewShell_Impl() const; - SAL_DLLPRIVATE BOOL HandleEvent_Impl( NotifyEvent& rEvent ); - SAL_DLLPRIVATE BOOL HasKeyListeners_Impl(); - SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent ); + SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl(); SAL_DLLPRIVATE void SetCreationArguments_Impl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rCreationArgs ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > impl_getTitleHelper (); //#endif diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index f3d773f98afc..eefa614d9630 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -54,7 +54,7 @@ struct TransferableObjectDescriptor; #include <sfx2/tabdlg.hxx> //typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -//typedef USHORT* (*GetTabPageRanges)(); +//typedef sal_uInt16* (*GetTabPageRanges)(); namespace sfx2 { @@ -76,8 +76,8 @@ public: class SfxAbstractTabDialog : public SfxAbstractDialog { public: - virtual void SetCurPageId( USHORT nId ) = 0; - virtual const USHORT* GetInputRanges( const SfxItemPool& ) = 0; + virtual void SetCurPageId( sal_uInt16 nId ) = 0; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0; virtual void SetInputSet( const SfxItemSet* pInSet ) = 0; }; @@ -86,7 +86,7 @@ class SfxAbstractInsertObjectDialog : public VclAbstractDialog public: virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )=0; - virtual BOOL IsCreateNew()=0; + virtual sal_Bool IsCreateNew()=0; }; class SfxAbstractPasteDialog : public VclAbstractDialog @@ -94,7 +94,7 @@ class SfxAbstractPasteDialog : public VclAbstractDialog public: virtual void Insert( SotFormatStringId nFormat, const String & rFormatName ) = 0; virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName ) = 0; - virtual ULONG GetFormat( const TransferableDataHelper& aHelper, + virtual sal_uIntPtr GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, const TransferableObjectDescriptor* pDesc=0 ) = 0; }; @@ -131,21 +131,21 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const String *pUserButtonText=0 ) = 0; - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0; virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - BOOL bShowSlots, + sal_Bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; diff --git a/sfx2/inc/sfx2/sfxhelp.hxx b/sfx2/inc/sfx2/sfxhelp.hxx index 17589c7cd399..98b31872ce68 100644 --- a/sfx2/inc/sfx2/sfxhelp.hxx +++ b/sfx2/inc/sfx2/sfxhelp.hxx @@ -45,9 +45,9 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); - SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord ); - SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); + SAL_DLLPRIVATE sal_Bool Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); + SAL_DLLPRIVATE virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); + SAL_DLLPRIVATE virtual sal_Bool Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 9b1fcf60efbb..a2d0e4162ba6 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -49,32 +49,32 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser SfxMedium* pMedium; SfxMedium *pDLMedium; // Medium fuer Download von Files - USHORT nMetaTags; // Anzahl der bisher gelesenen Meta-Tags + sal_uInt16 nMetaTags; // Anzahl der bisher gelesenen Meta-Tags ScriptType eScriptType; SAL_DLLPRIVATE void GetScriptType_Impl( SvKeyValueIterator* ); protected: - SfxHTMLParser( SvStream& rStream, BOOL bNewDoc=TRUE, SfxMedium *pMedium=0 ); + SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 ); virtual ~SfxHTMLParser(); public: // Lesen der Optionen einer Image-Map - // <MAP>: TRUE = Image-Map hat einen Namen - // <AREA>: TRUE = Image-Map hat jetzt einen Bereich mehr - static BOOL ParseMapOptions(ImageMap * pImageMap, + // <MAP>: sal_True = Image-Map hat einen Namen + // <AREA>: sal_True = Image-Map hat jetzt einen Bereich mehr + static sal_Bool ParseMapOptions(ImageMap * pImageMap, const HTMLOptions * pOptions ); - BOOL ParseMapOptions(ImageMap * pImageMap) + sal_Bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } - static BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, const HTMLOptions * pOptions, - USHORT nEventMouseOver = 0, - USHORT nEventMouseOut = 0 ); - inline BOOL ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - USHORT nEventMouseOver = 0, - USHORT nEventMouseOut = 0); + sal_uInt16 nEventMouseOver = 0, + sal_uInt16 nEventMouseOut = 0 ); + inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + sal_uInt16 nEventMouseOver = 0, + sal_uInt16 nEventMouseOut = 0); // <TD SDVAL="..." SDNUM="..."> static double GetTableDataOptionsValNum( sal_uInt32& nNumForm, @@ -102,16 +102,16 @@ protected: // unmittelbar vor FinishFileDownload aufgerufen werden, nie aber // danach. - BOOL GetFileDownloadMIME( String& rMime ); + sal_Bool GetFileDownloadMIME( String& rMime ); - // Beenden eines asynchronen File-Downloads. Gibt TRUE zurueck, wenn + // Beenden eines asynchronen File-Downloads. Gibt sal_True zurueck, wenn // der Download geklappt hat. Das gelesene File befindet sich dann in // dem uebergeben String. - BOOL FinishFileDownload( String& rStr ); + sal_Bool FinishFileDownload( String& rStr ); - // Gibt TRUE zurueck, wenn ein File downloaded wurde und + // Gibt sal_True zurueck, wenn ein File downloaded wurde und // FileDownloadFinished noch nicht gerufen wurde. - BOOL ShouldFinishFileDownload() const { return pDLMedium != 0; } + sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; } SfxMedium *GetMedium() { return pMedium; } const SfxMedium *GetMedium() const { return pMedium; } @@ -121,9 +121,9 @@ protected: const String& GetScriptTypeString( SvKeyValueIterator* ) const; }; -inline BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, - USHORT nEventMouseOver, - USHORT nEventMouseOut) +inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL, + sal_uInt16 nEventMouseOver, + sal_uInt16 nEventMouseOut) { return ParseAreaOptions( pImageMap, rBaseURL, GetOptions(), nEventMouseOver, nEventMouseOut ); diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 314c16fdbf1f..8eb2ed59077a 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -174,7 +174,7 @@ protected: #ifndef _SFXSH_HXX SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell* pView ); - SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, USHORT nId ); + SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ); SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const; SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj ); #endif @@ -204,10 +204,10 @@ public: static void EmptyExecStub(SfxShell *pShell, SfxRequest &); static void EmptyStateStub(SfxShell *pShell, SfxItemSet &); - const SfxPoolItem* GetSlotState( USHORT nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); + const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 ); const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 ); - const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, BOOL bAsync ); - ULONG ExecuteSlot( USHORT nSlot, USHORT nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 ); + const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync ); + sal_uIntPtr ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 ); inline SfxItemPool& GetPool() const; inline void SetPool( SfxItemPool *pNewPool ) ; @@ -218,11 +218,11 @@ public: SfxRepeatTarget* GetRepeatTarget() const; void SetRepeatTarget( SfxRepeatTarget *pTarget ); - virtual void Invalidate(USHORT nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0); - BOOL IsActive() const; - virtual void Activate(BOOL bMDI); - virtual void Deactivate(BOOL bMDI); + sal_Bool IsActive() const; + virtual void Activate(sal_Bool bMDI); + virtual void Deactivate(sal_Bool bMDI); virtual void ParentActivate(); virtual void ParentDeactivate(); @@ -233,30 +233,30 @@ public: void UIFeatureChanged(); // Items - const SfxPoolItem* GetItem( USHORT nSlotId ) const; + const SfxPoolItem* GetItem( sal_uInt16 nSlotId ) const; void PutItem( const SfxPoolItem& rItem ); - void RemoveItem( USHORT nSlotId ); + void RemoveItem( sal_uInt16 nSlotId ); // TODO/CLEANUP: still needed?! void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs); const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const; void VerbExec (SfxRequest&); void VerbState (SfxItemSet&); - SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(USHORT nId) const; + SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const; - void SetHelpId(ULONG nId); - ULONG GetHelpId() const; + void SetHelpId(sal_uIntPtr nId); + sal_uIntPtr GetHelpId() const; virtual SfxObjectShell* GetObjectShell(); - void SetDisableFlags( ULONG nFlags ); - ULONG GetDisableFlags() const; + void SetDisableFlags( sal_uIntPtr nFlags ); + sal_uIntPtr GetDisableFlags() const; - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ); + virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); #ifndef _SFXSH_HXX - SAL_DLLPRIVATE FASTBOOL CanExecuteSlot_Impl( const SfxSlot &rSlot ); - SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI); - SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI); + SAL_DLLPRIVATE int CanExecuteSlot_Impl( const SfxSlot &rSlot ); + SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); + SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); #endif }; @@ -331,7 +331,7 @@ inline void SfxShell::SetPool #Class, NameResId, GetInterfaceId(), \ SuperClass::GetStaticInterface(), \ a##Class##Slots_Impl[0], \ - (USHORT) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) ); \ + (sal_uInt16) (sizeof(a##Class##Slots_Impl) / sizeof(SfxSlot) ) ); \ InitInterface_Impl(); \ } \ return pInterface; \ @@ -372,13 +372,13 @@ inline void SfxShell::SetPool GetStaticInterface()->RegisterObjectBar( nPos, rResId, nFeature ) #define SFX_CHILDWINDOW_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False ) #define SFX_FEATURED_CHILDWINDOW_REGISTRATION(nId,nFeature) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) FALSE, nFeature ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_False, nFeature ) #define SFX_CHILDWINDOW_CONTEXT_REGISTRATION(nId) \ - GetStaticInterface()->RegisterChildWindow( nId, (BOOL) TRUE ) + GetStaticInterface()->RegisterChildWindow( nId, (sal_Bool) sal_True ) #define SFX_POPUPMENU_REGISTRATION(rResId) \ GetStaticInterface()->RegisterPopupMenu( rResId ) diff --git a/sfx2/inc/sfx2/stbitem.hxx b/sfx2/inc/sfx2/stbitem.hxx index 977ba869750d..f3bb30eaea5f 100644 --- a/sfx2/inc/sfx2/stbitem.hxx +++ b/sfx2/inc/sfx2/stbitem.hxx @@ -44,16 +44,16 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL ); -typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( USHORT nSlotId, USHORT nId, StatusBar &rStb ); +typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); struct SfxStbCtrlFactory { SfxStatusBarControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -68,8 +68,8 @@ class UserDrawEvent; class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController { - USHORT nSlotId; - USHORT nId; + sal_uInt16 nSlotId; + sal_uInt16 nId; StatusBar* pBar; protected: @@ -104,29 +104,29 @@ protected: virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); // Old sfx2 interface - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void DoubleClick(); virtual void Command( const CommandEvent& rCEvt ); - virtual BOOL MouseButtonDown( const MouseEvent & ); - virtual BOOL MouseMove( const MouseEvent & ); - virtual BOOL MouseButtonUp( const MouseEvent & ); + virtual sal_Bool MouseButtonDown( const MouseEvent & ); + virtual sal_Bool MouseMove( const MouseEvent & ); + virtual sal_Bool MouseButtonUp( const MouseEvent & ); virtual void Paint( const UserDrawEvent &rUDEvt ); - static USHORT convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); + static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons ); public: - SfxStatusBarControl( USHORT nSlotID, USHORT nId, StatusBar& rBar ); + SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar ); virtual ~SfxStatusBarControl(); - USHORT GetSlotId() const { return nSlotId; } - USHORT GetId() const { return nId; } + sal_uInt16 GetSlotId() const { return nSlotId; } + sal_uInt16 GetId() const { return nId; } StatusBar& GetStatusBar() const { return *pBar; } void CaptureMouse(); void ReleaseMouse(); - static SfxStatusBarControl* CreateControl( USHORT nSlotID, USHORT nId, StatusBar *pBar, SfxModule* ); + static SfxStatusBarControl* CreateControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar *pBar, SfxModule* ); static void RegisterStatusBarControl(SfxModule*, SfxStbCtrlFactory*); }; @@ -134,13 +134,13 @@ public: //------------------------------------------------------------------ #define SFX_DECL_STATUSBAR_CONTROL() \ - static SfxStatusBarControl* CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxStatusBarControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) #define SFX_IMPL_STATUSBAR_CONTROL(Class, nItemClass) \ - SfxStatusBarControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, StatusBar &rStb ) \ + SfxStatusBarControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar &rStb ) \ { return new Class( nSlotId, nId, rStb ); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxStatusBarControl::RegisterStatusBarControl( pMod, new SfxStbCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } diff --git a/sfx2/inc/sfx2/styledlg.hxx b/sfx2/inc/sfx2/styledlg.hxx index 9e2ffdadac4d..10c4b28381a6 100644 --- a/sfx2/inc/sfx2/styledlg.hxx +++ b/sfx2/inc/sfx2/styledlg.hxx @@ -47,7 +47,7 @@ protected: public: #define ID_TABPAGE_MANAGESTYLES 1 SfxStyleDialog( Window* pParent, const ResId& rResId, SfxStyleSheetBase&, - BOOL bFreeRes = TRUE, const String* pUserBtnTxt = 0 ); + sal_Bool bFreeRes = sal_True, const String* pUserBtnTxt = 0 ); ~SfxStyleDialog(); diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index cedc8f256010..6ea55ed96067 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -57,7 +57,7 @@ class SfxBindings; #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG*/ typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Wert +typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Wert struct TabPageImpl; class SfxUs_Impl; @@ -79,10 +79,10 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem { public: TYPEINFO(); - SfxTabDialogItem( USHORT nId, const SfxItemSet& rItemSet ); + SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const; - virtual SfxPoolItem* Create(SvStream& rStream, USHORT nVersion) const; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog @@ -104,11 +104,11 @@ friend class SfxTabDialogController; const SfxItemSet* pSet; SfxItemSet* pOutSet; TabDlg_Impl* pImpl; - USHORT* pRanges; + sal_uInt16* pRanges; sal_uInt32 nResId; - USHORT nAppPageId; - BOOL bItemsReset; - BOOL bFmt; + sal_uInt16 nAppPageId; + sal_Bool bItemsReset; + sal_Bool bFmt; //#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); @@ -118,81 +118,81 @@ friend class SfxTabDialogController; DECL_DLLPRIVATE_LINK( BaseFmtHdl, Button * ); DECL_DLLPRIVATE_LINK( UserHdl, Button * ); DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); - SAL_DLLPRIVATE void Init_Impl(BOOL, const String *); + SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *); //#endif protected: virtual short Ok(); // wird im Sfx gel"oscht! - virtual SfxItemSet* CreateInputItemSet( USHORT nId ); + virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); // wird *nicht* im Sfx gel"oscht! virtual const SfxItemSet* GetRefreshedSet(); - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual long Notify( NotifyEvent& rNEvt ); SfxItemSet* pExampleSet; SfxItemSet* GetInputSetImpl(); - SfxTabPage* GetTabPage( USHORT nPageId ) const; + SfxTabPage* GetTabPage( sal_uInt16 nPageId ) const; - BOOL IsInOK() const; + sal_Bool IsInOK() const; /** prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary), handles the item sets to copy. - @return TRUE if it is allowed to leave the current page, FALSE otherwise + @return sal_True if it is allowed to leave the current page, sal_False otherwise */ bool PrepareLeaveCurrentPage(); public: - SfxTabDialog( Window* pParent, const ResId &rResId, USHORT nSetId, SfxBindings& rBindings, - BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 ); + SfxTabDialog( Window* pParent, const ResId &rResId, sal_uInt16 nSetId, SfxBindings& rBindings, + sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0, - BOOL bEditFmt = FALSE, const String *pUserButtonText = 0 ); + sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, - const SfxItemSet * = 0, BOOL bEditFmt = FALSE, + const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); ~SfxTabDialog(); - void AddTabPage( USHORT nId, + void AddTabPage( sal_uInt16 nId, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False); + void AddTabPage( sal_uInt16 nId, const String &rRiderText, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); + void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // darf 0 sein - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); - void AddTabPage( USHORT nId, - BOOL bItemsOnDemand = FALSE); - void AddTabPage( USHORT nId, + void AddTabPage( sal_uInt16 nId, + sal_Bool bItemsOnDemand = sal_False); + void AddTabPage( sal_uInt16 nId, const String &rRiderText, - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); - void AddTabPage( USHORT nId, + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); + void AddTabPage( sal_uInt16 nId, const Bitmap &rRiderBitmap, - BOOL bItemsOnDemand = FALSE, - USHORT nPos = TAB_APPEND); + sal_Bool bItemsOnDemand = sal_False, + sal_uInt16 nPos = TAB_APPEND); - void RemoveTabPage( USHORT nId ); + void RemoveTabPage( sal_uInt16 nId ); - void SetCurPageId( USHORT nId ) { nAppPageId = nId; } - USHORT GetCurPageId() const + void SetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; } + sal_uInt16 GetCurPageId() const { return aTabCtrl.GetCurPageId(); } - void ShowPage( USHORT nId ); + void ShowPage( sal_uInt16 nId ); // liefert ggf. per Map konvertierte lokale Slots - const USHORT* GetInputRanges( const SfxItemPool& ); + const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - const SfxItemSet* GetOutputItemSet( USHORT nId ) const; + const SfxItemSet* GetOutputItemSet( sal_uInt16 nId ) const; int FillOutputItemSet(); - BOOL IsFormat() const { return bFmt; } + sal_Bool IsFormat() const { return bFmt; } const OKButton& GetOKButton() const { return aOKBtn; } OKButton& GetOKButton() { return aOKBtn; } @@ -212,7 +212,7 @@ public: short Execute(); void StartExecuteModal( const Link& rEndDialogHdl ); - void Start( BOOL bShow = TRUE ); + void Start( sal_Bool bShow = sal_True ); #if !ENABLE_LAYOUT_SFX_TABDIALOG const SfxItemSet* GetExampleSet() const { return pExampleSet; } @@ -221,14 +221,14 @@ public: #endif /* ENABLE_LAYOUT_SFX_TABDIALOG */ SfxViewFrame* GetViewFrame() const { return pFrame; } - void EnableApplyButton(BOOL bEnable = TRUE); - BOOL IsApplyButtonEnabled() const; + void EnableApplyButton(sal_Bool bEnable = sal_True); + sal_Bool IsApplyButtonEnabled() const; void SetApplyHandler(const Link& _rHdl); Link GetApplyHandler() const; //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void Start_Impl(); - SAL_DLLPRIVATE BOOL OK_Impl() { return PrepareLeaveCurrentPage(); } + SAL_DLLPRIVATE sal_Bool OK_Impl() { return PrepareLeaveCurrentPage(); } //#endif }; @@ -252,7 +252,7 @@ friend class SfxTabDialog; private: const SfxItemSet* pSet; String aUserString; - BOOL bHasExchangeSupport; + sal_Bool bHasExchangeSupport; SfxTabDialog* pTabDlg; TabPageImpl* pImpl; @@ -263,12 +263,12 @@ protected: SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet ); SfxTabPage( Window *pParent, WinBits nStyle, const SfxItemSet &rAttrSet ); - USHORT GetSlot( USHORT nWhich ) const + sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } - USHORT GetWhich( USHORT nSlot, sal_Bool bDeep = sal_True ) const + sal_uInt16 GetWhich( sal_uInt16 nSlot, sal_Bool bDeep = sal_True ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } - const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True ); - const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, USHORT nSlot ); + const SfxPoolItem* GetOldItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); + const SfxPoolItem* GetExchangeItem( const SfxItemSet& rSet, sal_uInt16 nSlot ); SfxTabDialog* GetTabDialog() const { return pTabDlg; } void AddItemConnection( sfx::ItemConnectionBase* pConnection ); @@ -278,12 +278,12 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); - BOOL HasExchangeSupport() const + sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( BOOL bNew = TRUE ) + void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; } enum sfxpg { @@ -304,9 +304,9 @@ public: { aUserString = rString; } String GetUserData() { return aUserString; } virtual void FillUserData(); - virtual BOOL IsReadOnly() const; + virtual sal_Bool IsReadOnly() const; virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 - static const SfxPoolItem* GetItem( const SfxItemSet& rSet, USHORT nSlot, sal_Bool bDeep = sal_True ); + static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame(); diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 30d82c854642..f8bfa0f00b37 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -61,17 +61,17 @@ class SfxUnoControllerItem; svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ); -//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nId, ToolBox &rTbx, SfxBindings & ); -typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( USHORT nSlotId, USHORT nId, ToolBox& rBox ); +//typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nId, ToolBox &rTbx, SfxBindings & ); +typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); struct SfxTbxCtrlFactory { SfxToolBoxControlCtor pCtor; TypeId nTypeId; - USHORT nSlotId; + sal_uInt16 nSlotId; SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor, - TypeId nTheTypeId, USHORT nTheSlotId ): + TypeId nTheTypeId, sal_uInt16 nTheSlotId ): pCtor(pTheCtor), nTypeId(nTheTypeId), nSlotId(nTheSlotId) @@ -118,11 +118,11 @@ class SfxFrameStatusListener : public svt::FrameStatusListener class SFX2_DLLPUBLIC SfxPopupWindow: public FloatingWindow, public SfxStatusListenerInterface { friend class SfxToolBox_Impl; - BOOL m_bFloating; - ULONG m_nEventId; - BOOL m_bCascading; + sal_Bool m_bFloating; + sal_uIntPtr m_nEventId; + sal_Bool m_bCascading; Link m_aDeleteLink; - USHORT m_nId; + sal_uInt16 m_nId; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; SfxFrameStatusListener* m_pStatusListener; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xStatusListener; @@ -140,10 +140,10 @@ private: protected: virtual void PopupModeEnd(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void DeleteFloatingWindow(); - USHORT GetId() const { return m_nId; } + sal_uInt16 GetId() const { return m_nId; } const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& GetServiceManager() const { return m_xServiceManager; } @@ -155,21 +155,21 @@ protected: // SfxStatusListenerInterface using FloatingWindow::StateChanged; - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ResId &rId ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const ResId &rId ); - SfxPopupWindow( USHORT nId, + SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, WinBits nBits ); @@ -190,8 +190,8 @@ public: //------------------------------------------------------------------ #define SFX_DECL_TOOLBOX_CONTROL() \ - static SfxToolBoxControl* CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ); \ - static void RegisterControl(USHORT nSlotId = 0, SfxModule *pMod=NULL) + static SfxToolBoxControl* CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ); \ + static void RegisterControl(sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL) /* F"ur spezielle ToolBox-Controls, z.B. eine Font-Auswahl-Box oder aus ToolBoxen abrei"sbare FloatingWindows mu"s passend zur Item-Subclass @@ -223,9 +223,9 @@ protected: DECL_LINK( ClosePopupWindow, SfxPopupWindow * ); // old SfxToolBoxControl methods - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Select( BOOL bMod1 = FALSE ); - virtual void Select( USHORT nModifier ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void Select( sal_uInt16 nModifier ); virtual void DoubleClick(); virtual void Click(); @@ -288,7 +288,7 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SfxToolBoxControl( USHORT nSlotID, USHORT nId, ToolBox& rBox, BOOL bShowStrings = FALSE ); + SfxToolBoxControl( sal_uInt16 nSlotID, sal_uInt16 nId, ToolBox& rBox, sal_Bool bShowStrings = sal_False ); virtual ~SfxToolBoxControl(); ToolBox& GetToolBox() const; @@ -302,21 +302,21 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); static SfxItemState GetItemState( const SfxPoolItem* pState ); - static SfxToolBoxControl* CreateControl( USHORT nSlotId, USHORT nTbxId, ToolBox *pBox, SfxModule *pMod ); + static SfxToolBoxControl* CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod ); static void RegisterToolBoxControl( SfxModule*, SfxTbxCtrlFactory*); }; #define SFX_IMPL_TOOLBOX_CONTROL(Class, nItemClass) \ - SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \ + SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx ); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } #define SFX_IMPL_TOOLBOX_CONTROL_ARG(Class, nItemClass, Arg) \ - SfxToolBoxControl* __EXPORT Class::CreateImpl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) \ + SfxToolBoxControl* __EXPORT Class::CreateImpl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) \ { return new Class( nSlotId, nId, rTbx, Arg); } \ - void Class::RegisterControl(USHORT nSlotId, SfxModule *pMod) \ + void Class::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) \ { SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( \ Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); } @@ -342,10 +342,10 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SfxDragToolBoxControl_Impl( USHORT nId, ToolBox& rBox ); + SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); virtual Window* CreateItemWindow( Window *pParent ); using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); }; //------------------------------------------------------------------------ @@ -361,7 +361,7 @@ class SfxAppToolBoxControl_Impl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxAppToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); ~SfxAppToolBoxControl_Impl(); void SetImage( const String& rFacName ); @@ -377,17 +377,17 @@ public: protected: virtual void Click(); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* CreatePopupWindow(); DECL_LINK( Activate, Menu * ); // Needed to support high contrast images private: String aLastURL; - BOOL bBigImages; + sal_Bool bBigImages; PopupMenu* pMenu; - ULONG m_nSymbolsStyle; - BOOL m_bWasHiContrastMode; - BOOL m_bShowMenuImages; + sal_uIntPtr m_nSymbolsStyle; + sal_Bool m_bWasHiContrastMode; + sal_Bool m_bShowMenuImages; }; class SfxHistoryToolBoxControl_Impl : public SfxToolBoxControl @@ -400,22 +400,22 @@ private: protected: virtual void Click( ); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); + virtual void Select( sal_Bool ); public: SFX_DECL_TOOLBOX_CONTROL(); - SfxHistoryToolBoxControl_Impl( USHORT nId, ToolBox& rBox ); + SfxHistoryToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); }; class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: using SfxToolBoxControl::Select; - virtual void Select( USHORT nSelectModifier ); + virtual void Select( sal_uInt16 nSelectModifier ); public: SFX_DECL_TOOLBOX_CONTROL(); - SfxReloadToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxReloadToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); }; class SfxPopupMenuManager; @@ -428,20 +428,20 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl */ { - BOOL bBigImages; + sal_Bool bBigImages; PopupMenu* pMenu; - BOOL m_bWasHiContrastMode; - BOOL m_bShowMenuImages; + sal_Bool m_bWasHiContrastMode; + sal_Bool m_bShowMenuImages; protected: virtual void Click(); using SfxToolBoxControl::Select; - virtual void Select( BOOL ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( sal_Bool ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); DECL_LINK( Activate, Menu * ); // Needed to support high contrast images public: SFX_DECL_TOOLBOX_CONTROL(); - SfxAddonsToolBoxControl_Impl( USHORT nSlotId, USHORT nId, ToolBox& rBox ); + SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); ~SfxAddonsToolBoxControl_Impl(); void RefreshMenuImages( Menu* pMenu ); diff --git a/sfx2/inc/sfx2/titledockwin.hxx b/sfx2/inc/sfx2/titledockwin.hxx index b6925ad332ad..cee9709841a5 100644 --- a/sfx2/inc/sfx2/titledockwin.hxx +++ b/sfx2/inc/sfx2/titledockwin.hxx @@ -76,7 +76,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - USHORT AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -114,7 +114,7 @@ namespace sfx2 virtual void SetText( const String& i_rText ); // DockingWindow overridables - void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); // own overridables virtual void onLayoutDone(); @@ -126,7 +126,7 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - USHORT impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ); /** returns the current title. diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index affa836486e6..ef5d4a358e22 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -80,7 +80,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener SfxObjectShellRef xObjSh; SfxDispatcher* pDispatcher; SfxBindings* pBindings; - USHORT nAdjustPosPixelLock; + sal_uInt16 nAdjustPosPixelLock; private: #ifndef _SFX_HXX @@ -104,21 +104,21 @@ public: static void SetViewFrame( SfxViewFrame* ); - static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId ); - static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const USHORT i_nViewId ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const USHORT i_nViewId = 0 ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const USHORT i_nViewId = 0 ); - static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const USHORT i_nViewId = 0 ); + static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); + static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 ); + static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 ); static SfxViewFrame* Current(); - static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE ); - static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, BOOL bOnlyVisible = TRUE ); - static USHORT Count(); + static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True ); + static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, sal_Bool bOnlyVisible = sal_True ); + static sal_uInt16 Count(); static SfxViewFrame* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL ); - void DoActivate(BOOL bMDI, SfxViewFrame *pOld=NULL); - void DoDeactivate(BOOL bMDI, SfxViewFrame *pOld=NULL); + void DoActivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL); + void DoDeactivate(sal_Bool bMDI, SfxViewFrame *pOld=NULL); SfxViewFrame* GetParentViewFrame() const; @@ -147,12 +147,12 @@ public: const Point &rPos, const Size &rSize ); void Hide(); void Show(); - BOOL IsVisible() const; + sal_Bool IsVisible() const; void ToTop(); - void Enable( BOOL bEnable ); - virtual BOOL Close(); - virtual void Activate( BOOL bUI ); - virtual void Deactivate( BOOL bUI ); + void Enable( sal_Bool bEnable ); + virtual sal_Bool Close(); + virtual void Activate( sal_Bool bUI ); + virtual void Deactivate( sal_Bool bUI ); // DDE-Interface virtual long DdeExecute( const String& rCmd ); @@ -172,17 +172,17 @@ public: static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ); // interne Handler - SAL_DLLPRIVATE virtual BOOL SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); + SAL_DLLPRIVATE virtual sal_Bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder ); SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const; SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); virtual SfxObjectShell* GetObjectShell(); - USHORT GetCurViewId() const; + sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; - BOOL DoClose(); - ULONG GetFrameType() const + sal_Bool DoClose(); + sal_uIntPtr GetFrameType() const { return GetFrame().GetFrameType(); } SfxFrame& GetTopFrame() const { return GetFrame().GetTopFrame(); } @@ -191,47 +191,47 @@ public: void CancelTransfers() { GetFrame().CancelTransfers(); } - void SetModalMode( BOOL ); - BOOL IsInModalMode() const; - void Resize(BOOL bForce=FALSE); - - //void SetChildWindow(USHORT nId, BOOL bVisible ); - void SetChildWindow(USHORT nId, BOOL bVisible, BOOL bSetFocus=TRUE); - void ToggleChildWindow(USHORT); - BOOL HasChildWindow(USHORT); - BOOL KnowsChildWindow(USHORT); - void ShowChildWindow(USHORT,BOOL bVisible=TRUE); - SfxChildWindow* GetChildWindow(USHORT); + void SetModalMode( sal_Bool ); + sal_Bool IsInModalMode() const; + void Resize(sal_Bool bForce=sal_False); + + //void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible ); + void SetChildWindow(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus=sal_True); + void ToggleChildWindow(sal_uInt16); + sal_Bool HasChildWindow(sal_uInt16); + sal_Bool KnowsChildWindow(sal_uInt16); + void ShowChildWindow(sal_uInt16,sal_Bool bVisible=sal_True); + SfxChildWindow* GetChildWindow(sal_uInt16); void ChildWindowExecute(SfxRequest&); void ChildWindowState(SfxItemSet&); //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE void SetDowning_Impl(); SAL_DLLPRIVATE void GetDocNumber_Impl(); - SAL_DLLPRIVATE BOOL IsDowning_Impl() const; + SAL_DLLPRIVATE sal_Bool IsDowning_Impl() const; SAL_DLLPRIVATE void SetViewShell_Impl( SfxViewShell *pVSh ); SAL_DLLPRIVATE void ReleaseObjectShell_Impl(); SAL_DLLPRIVATE void GetState_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq ); - SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, BOOL bAsync ); + SAL_DLLPRIVATE void ExecReload_Impl( SfxRequest &rReq, sal_Bool bAsync ); SAL_DLLPRIVATE void StateReload_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecView_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const; - SAL_DLLPRIVATE void ForceOuterResize_Impl(BOOL bOn=TRUE); - SAL_DLLPRIVATE BOOL IsResizeInToOut_Impl() const; - SAL_DLLPRIVATE BOOL IsAdjustPosSizePixelLocked_Impl() const + SAL_DLLPRIVATE void ForceOuterResize_Impl(sal_Bool bOn=sal_True); + SAL_DLLPRIVATE sal_Bool IsResizeInToOut_Impl() const; + SAL_DLLPRIVATE sal_Bool IsAdjustPosSizePixelLocked_Impl() const { return nAdjustPosPixelLock != 0; } - SAL_DLLPRIVATE void ForceInnerResize_Impl( BOOL bOn ); + SAL_DLLPRIVATE void ForceInnerResize_Impl( sal_Bool bOn ); SAL_DLLPRIVATE void UpdateDocument_Impl(); - SAL_DLLPRIVATE void LockObjectShell_Impl(BOOL bLock=TRUE); + SAL_DLLPRIVATE void LockObjectShell_Impl(sal_Bool bLock=sal_True); - SAL_DLLPRIVATE void MakeActive_Impl( BOOL bActivate ); - SAL_DLLPRIVATE void SetQuietMode_Impl( BOOL ); + SAL_DLLPRIVATE void MakeActive_Impl( sal_Bool bActivate ); + SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool ); SAL_DLLPRIVATE const Size& GetMargin_Impl() const; SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* ); SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const; @@ -239,21 +239,21 @@ public: SAL_DLLPRIVATE static void CloseHiddenFrames_Impl(); SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &); SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &); - SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( USHORT nId ); + SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId ); SAL_DLLPRIVATE void AddDispatchMacroToBasic_Impl(const ::rtl::OUString& sMacro); SAL_DLLPRIVATE void Exec_Impl(SfxRequest &); SAL_DLLPRIVATE void INetExecute_Impl(SfxRequest &); SAL_DLLPRIVATE void INetState_Impl(SfxItemSet &); - SAL_DLLPRIVATE void SetCurViewId_Impl( const USHORT i_nID ); + SAL_DLLPRIVATE void SetCurViewId_Impl( const sal_uInt16 i_nID ); SAL_DLLPRIVATE void ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ); //#endif private: - SAL_DLLPRIVATE BOOL SwitchToViewShell_Impl( USHORT nNo, BOOL bIsIndex = FALSE ); + SAL_DLLPRIVATE sal_Bool SwitchToViewShell_Impl( sal_uInt16 nNo, sal_Bool bIsIndex = sal_False ); SAL_DLLPRIVATE void PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell ); - SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const USHORT i_nNewViewId ); + SAL_DLLPRIVATE void SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ); /** loads the given existing document into the given frame @@ -276,7 +276,7 @@ private: const SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rLoadArgs, - const USHORT i_nViewId, + const sal_uInt16 i_nViewId, const bool i_bHidden ); @@ -298,7 +298,7 @@ private: SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, - const USHORT i_nViewId, + const sal_uInt16 i_nViewId, const bool i_bHidden ); }; @@ -315,7 +315,7 @@ public: SfxPoolItem( 0 ), pFrame( pViewFrame) {} - SfxViewFrameItem( USHORT nWhichId, SfxViewFrame *pViewFrame ): + SfxViewFrameItem( sal_uInt16 nWhichId, SfxViewFrame *pViewFrame ): SfxPoolItem( nWhichId ), pFrame( pViewFrame) {} @@ -334,16 +334,16 @@ class SfxVerbListItem : public SfxPoolItem public: TYPEINFO(); - SfxVerbListItem( USHORT nWhichId = SID_OBJECT ) : + SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) : SfxPoolItem( nWhichId ) {} - SfxVerbListItem( USHORT nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); + SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; } }; diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index b58a9e7bdf73..7a155af570d6 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -120,7 +120,7 @@ private: \ static SfxViewFactory *pFactory; \ public: \ static SfxViewShell *CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView); \ - static void RegisterFactory( USHORT nPrio = USHRT_MAX ); \ + static void RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \ static SfxViewFactory&Factory() { return *pFactory; } \ static void InitFactory() @@ -128,7 +128,7 @@ public: \ SfxViewFactory* Class::pFactory; \ SfxViewShell* __EXPORT Class::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView) \ { return new Class(pFrame, pOldView); } \ - void Class::RegisterFactory( USHORT nPrio ) \ + void Class::RegisterFactory( sal_uInt16 nPrio ) \ { \ pFactory = new SfxViewFactory(&CreateInstance,&InitFactory,nPrio,AsciiViewName);\ InitFactory(); \ @@ -159,11 +159,11 @@ friend class SfxPrinterController; SfxViewFrame* pFrame; SfxShell* pSubShell; Window* pWindow; - BOOL bNoNewWindow; + sal_Bool bNoNewWindow; protected: - virtual void Activate(BOOL IsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool IsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual Size GetOptimalSizePixel() const; @@ -177,9 +177,9 @@ protected: public: // Iteration - static SfxViewShell* GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE ); + static SfxViewShell* GetFirst( const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True ); static SfxViewShell* GetNext( const SfxViewShell& rPrev, - const TypeId* pType = 0, BOOL bOnlyVisible = TRUE ); + const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True ); static SfxViewShell* Current(); static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController ); @@ -188,7 +188,7 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH) - SfxViewShell( SfxViewFrame *pFrame, USHORT nFlags = 0 ); + SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 ); virtual ~SfxViewShell(); SfxInPlaceClient* GetIPClient() const; @@ -211,22 +211,22 @@ public: void SetScrollingMode( SfxScrollingMode eMode ); // Misc - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; virtual SdrView* GetDrawView() const; void SetSubShell( SfxShell *pShell ); SfxShell* GetSubShell() const { return pSubShell; } void AddSubShell( SfxShell& rShell ); void RemoveSubShell( SfxShell *pShell=NULL ); - SfxShell* GetSubShell( USHORT ); + SfxShell* GetSubShell( sal_uInt16 ); // Focus, KeyInput, Cursor void GotFocus() const; inline void LostFocus() const; - virtual void ShowCursor( FASTBOOL bOn = TRUE ); - virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent ); - BOOL Escape(); + virtual void ShowCursor( int bOn = sal_True ); + virtual int KeyInput( const KeyEvent &rKeyEvent ); + sal_Bool Escape(); // Viewing Interface Window* GetWindow() const { return pWindow; } @@ -240,20 +240,20 @@ public: // Printing Interface virtual void PreparePrint( PrintDialog *pPrintDialog = 0 ); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); - virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0 ); - virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); - virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE ); + virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, sal_Bool bSilent, sal_Bool bIsAPI ); + virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 ); + virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); virtual PrintDialog* CreatePrintDialog( Window *pParent ); - void LockPrinter( BOOL bLock = TRUE ); - BOOL IsPrinterLocked() const; + void LockPrinter( sal_Bool bLock = sal_True ); + sal_Bool IsPrinterLocked() const; virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; // Workingset - virtual void WriteUserData( String&, BOOL bBrowse = FALSE ); - virtual void ReadUserData( const String&, BOOL bBrowse = FALSE ); + virtual void WriteUserData( String&, sal_Bool bBrowse = sal_False ); + virtual void ReadUserData( const String&, sal_Bool bBrowse = sal_False ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void QueryObjAreaPixel( Rectangle& rRect ) const; @@ -280,43 +280,43 @@ public: void SetMargin( const Size& ); void DisconnectAllClients(); virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); - BOOL NewWindowAllowed() const { return !bNoNewWindow; } - void SetNewWindowAllowed( BOOL bSet ) { bNoNewWindow = !bSet; } + sal_Bool NewWindowAllowed() const { return !bNoNewWindow; } + void SetNewWindowAllowed( sal_Bool bSet ) { bNoNewWindow = !bSet; } void SetController( SfxBaseController* pController ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > GetController(); ::cppu::OInterfaceContainerHelper& GetContextMenuInterceptors() const; - BOOL TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); + sal_Bool TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent ); void SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool ); - void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL ); + void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, sal_Bool ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier(); #if _SOLAR__PRIVATE SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const; SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor ); SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor ); - SAL_DLLPRIVATE FASTBOOL GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); + SAL_DLLPRIVATE int GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) - { GetIPClientList_Impl(TRUE)->Insert(pIPClient); } + { GetIPClientList_Impl(sal_True)->Insert(pIPClient); } SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient ) - { GetIPClientList_Impl(TRUE)->Remove(pIPClient); } - SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const; + { GetIPClientList_Impl(sal_True)->Remove(pIPClient); } + SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const; SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP ); SAL_DLLPRIVATE void DiscardClients_Impl(); - SAL_DLLPRIVATE BOOL PlugInsActive() const; + SAL_DLLPRIVATE sal_Bool PlugInsActive() const; SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter ); - SAL_DLLPRIVATE BOOL IsShowView_Impl() const; + SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const; SAL_DLLPRIVATE long HandleNotifyEvent_Impl( NotifyEvent& rEvent ); - SAL_DLLPRIVATE BOOL HasKeyListeners_Impl(); - SAL_DLLPRIVATE BOOL HasMouseClickListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl(); + SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl(); SAL_DLLPRIVATE SfxBaseController* GetBaseController_Impl() const; @@ -327,12 +327,12 @@ public: SAL_DLLPRIVATE SfxFrameSetDescriptor* GetFrameSet_Impl() const; SAL_DLLPRIVATE void SetFrameSet_Impl(SfxFrameSetDescriptor*); SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& ); - SAL_DLLPRIVATE void PushSubShells_Impl( BOOL bPush=TRUE ); - SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( FALSE ); } + SAL_DLLPRIVATE void PushSubShells_Impl( sal_Bool bPush=sal_True ); + SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( sal_False ); } SAL_DLLPRIVATE void TakeOwnerShip_Impl(); SAL_DLLPRIVATE void CheckOwnerShip_Impl(); SAL_DLLPRIVATE void TakeFrameOwnerShip_Impl(); - SAL_DLLPRIVATE BOOL ExecKey_Impl(const KeyEvent& aKey); + SAL_DLLPRIVATE sal_Bool ExecKey_Impl(const KeyEvent& aKey); #endif }; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index e45d8f591342..4816bfc58f8e 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -83,14 +83,14 @@ public: inline String GetSearchText() const { return m_aSearchEdit.GetText(); } inline void SetSearchText( const String& _rText ) { m_aSearchEdit.SetText( _rText ); } - inline bool IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != FALSE ); } - inline bool IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != FALSE ); } - inline bool IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != FALSE ); } - inline bool IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != FALSE ); } + inline bool IsOnlyWholeWords() const { return ( m_aWholeWordsBox.IsChecked() != sal_False ); } + inline bool IsMarchCase() const { return ( m_aMatchCaseBox.IsChecked() != sal_False ); } + inline bool IsWrapAround() const { return ( m_aWrapAroundBox.IsChecked() != sal_False ); } + inline bool IsSearchBackwards() const { return ( m_aBackwardsBox.IsChecked() != sal_False ); } void SetFocusOnEdit(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); }; |