diff options
Diffstat (limited to 'svtools/inc')
134 files changed, 2992 insertions, 3315 deletions
diff --git a/svtools/inc/borderhelper.hxx b/svtools/inc/borderhelper.hxx deleted file mode 100644 index 62b8d153b02d..000000000000 --- a/svtools/inc/borderhelper.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BORDERHELPER_HXX -#define _BORDERHELPER_HXX - -#include "svtools/svtdllapi.h" - -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <vcl/outdev.hxx> - -namespace svtools -{ - SVT_DLLPUBLIC basegfx::B2DPolyPolygon ApplyLineDashing( const basegfx::B2DPolygon& rPolygon, - USHORT nDashing, MapUnit eUnit ); - - SVT_DLLPUBLIC void DrawLine( OutputDevice& rDev, const Point& rBeg, - const Point& rEnd, sal_uInt32 nWidth, USHORT nDashing ); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/makefile.mk b/svtools/inc/makefile.mk deleted file mode 100644 index cde85ffe82ca..000000000000 --- a/svtools/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=svtools -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx index e19756675637..6ce70e0c5d0b 100644 --- a/svtools/inc/pch/precompiled_svtools.hxx +++ b/svtools/inc/pch/precompiled_svtools.hxx @@ -421,8 +421,8 @@ #include <unotools/processfactory.hxx> #include <vcl/dndhelp.hxx> -#include <vcl/fldunit.hxx> -#include <vcl/mapunit.hxx> +#include <tools/fldunit.hxx> +#include <tools/mapunit.hxx> #include <vcl/unohelp.hxx> #include <osl/mutex.hxx> diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx index b42cbfcf9756..0e4e9bf86230 100644 --- a/svtools/inc/DocumentInfoPreview.hxx +++ b/svtools/inc/svtools/DocumentInfoPreview.hxx @@ -54,7 +54,7 @@ namespace svtools ::com::sun::star::document::XDocumentProperties>& i_xDocProps ,const String& i_rURL); void InsertEntry( const String& rTitle, const String& rValue ); - void SetAutoScroll(BOOL _bAutoScroll); + void SetAutoScroll(sal_Bool _bAutoScroll); }; } diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx index b9762717d3cd..b9762717d3cd 100644 --- a/svtools/inc/QueryFolderName.hxx +++ b/svtools/inc/svtools/QueryFolderName.hxx diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx index 6bea581e5d78..ec2a69e1edfd 100644 --- a/svtools/inc/acceleratorexecute.hxx +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -211,7 +211,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit specify the accelerator for execute. @return [sal_Bool] - TRUE if this key is configured and match to a command. + sal_True if this key is configured and match to a command. Attention: This state does not mean the success state of the corresponding execute. Because its done asynchronous! */ diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx index d95a99560549..6fefb18a17a1 100644 --- a/svtools/inc/svtools/accessiblefactory.hxx +++ b/svtools/inc/svtools/accessiblefactory.hxx @@ -29,12 +29,12 @@ #ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX #define SVTOOLS_ACCESSIBLE_FACTORY_HXX +#include "AccessibleBrowseBoxObjType.hxx" +#include "accessibletableprovider.hxx" + #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> -#include "AccessibleBrowseBoxObjType.hxx" -#include "accessibletableprovider.hxx" -#include "accessibletable.hxx" namespace com { namespace sun { namespace star { namespace accessibility { @@ -61,6 +61,11 @@ namespace svt class ToolPanelDeck; class IToolPanelDeck; class PanelTabBar; + namespace table + { + class IAccessibleTable; + class IAccessibleTableControl; + } /** a function which is able to create a factory for the standard Accessible/Context components needed for standard toolkit controls diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx index f29e83365b95..5afd1ff2d68e 100644 --- a/svtools/inc/svtools/accessibletable.hxx +++ b/svtools/inc/svtools/accessibletable.hxx @@ -102,7 +102,7 @@ public: // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; - virtual XACC GetAccessible( BOOL bCreate = TRUE )= 0; + virtual XACC GetAccessible( sal_Bool bCreate = sal_True )= 0; virtual Window* GetAccessibleParentWindow() const= 0; virtual Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; @@ -110,11 +110,9 @@ public: virtual long GetRowCount() const= 0; virtual long GetColumnCount() const= 0; virtual sal_Bool HasRowHeader() const= 0; - virtual sal_Int32 GetSelectedRowCount() const= 0; - virtual bool IsRowSelected( long _nRow ) const= 0; virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )= 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ) = 0; + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)= 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)= 0; virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const= 0; @@ -123,9 +121,13 @@ public: virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const = 0; virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const = 0; virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; - virtual std::vector<sal_Int32>& GetSelectedRows() = 0; - virtual void RemoveSelectedRow(sal_Int32 _nRowPos) = 0; virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0; + + virtual sal_Int32 GetSelectedRowCount() const = 0; + virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const = 0; + virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const = 0; + virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ) = 0; + virtual void SelectAllRows( bool const i_select ) = 0; }; // ---------------------------------------------------------------------------- diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx index 1e06a36a5f86..91ef71a16d4d 100644 --- a/svtools/inc/svtools/accessibletableprovider.hxx +++ b/svtools/inc/svtools/accessibletableprovider.hxx @@ -92,7 +92,7 @@ public: virtual void SetNoSelection() = 0; virtual void SelectAll() = 0; - virtual void SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ) = 0; + virtual void SelectRow( long _nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ) = 0; virtual void SelectColumn( sal_uInt16 _nColumnPos, sal_Bool _bSelect = sal_True ) = 0; virtual sal_Int32 GetSelectedRowCount() const = 0; virtual sal_Int32 GetSelectedColumnCount() const = 0; @@ -104,11 +104,11 @@ public: /** @return <TRUE/>, if the cell is visible. */ virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual String GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const = 0; + virtual String GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const = 0; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ) = 0; - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, BOOL _bIsHeader, BOOL _bOnScreen = TRUE ) = 0; + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ) = 0; + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumnPos, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ) = 0; virtual XACC CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0; virtual XACC CreateAccessibleRowHeader( sal_Int32 _nRow ) = 0; @@ -130,12 +130,12 @@ public: virtual void GrabTableFocus() = 0; // OutputDevice - virtual BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; + virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; - virtual XACC GetAccessible( BOOL bCreate = TRUE ) = 0; + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ) = 0; virtual Window* GetAccessibleParentWindow() const = 0; virtual Window* GetWindowInstance() = 0; diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index 5fe7aaa57681..d69a7652affd 100644 --- a/svtools/inc/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -34,7 +34,7 @@ #include <vcl/group.hxx> #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/lstbox.hxx> #include <vcl/scrbar.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx index ca8e71dfc6bb..c423f24c6c79 100644 --- a/svtools/inc/apearcfg.hxx +++ b/svtools/inc/svtools/apearcfg.hxx @@ -35,14 +35,6 @@ class Application; typedef enum { - LookStardivision = 0, - LookMotif, - LookWindows, - LookOSTwo, - LookMacintosh -} SystemLook; - -typedef enum { SnapToButton = 0, SnapToMiddle, NoSnap @@ -57,7 +49,6 @@ typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem { - short nLookNFeel ; short nDragMode ; short nScaleFactor ; short nSnapMode ; @@ -66,11 +57,9 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem short nAAMinPixelHeight ; #endif - BOOL bMenuMouseFollow ; - BOOL bSingleLineTabCtrl ; - BOOL bColoredTabCtrl ; + sal_Bool bMenuMouseFollow ; #if defined( UNX ) - BOOL bFontAntialiasing ; + sal_Bool bFontAntialiasing ; #endif static sal_Bool bInitialized ; @@ -84,40 +73,31 @@ public: virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - USHORT GetLookNFeel () const { return nLookNFeel; } - void SetLookNFeel ( USHORT nSet ); - - USHORT GetDragMode () const { return nDragMode; } - void SetDragMode ( USHORT nSet ); + sal_uInt16 GetDragMode () const { return nDragMode; } + void SetDragMode ( sal_uInt16 nSet ); - USHORT GetScaleFactor () const { return nScaleFactor; } - void SetScaleFactor ( USHORT nSet ); + sal_uInt16 GetScaleFactor () const { return nScaleFactor; } + void SetScaleFactor ( sal_uInt16 nSet ); - USHORT GetSnapMode () const { return nSnapMode; } - void SetSnapMode ( USHORT nSet ); + sal_uInt16 GetSnapMode () const { return nSnapMode; } + void SetSnapMode ( sal_uInt16 nSet ); - USHORT GetMiddleMouseButton () const { return nMiddleMouse; } - void SetMiddleMouseButton ( USHORT nSet ); + sal_uInt16 GetMiddleMouseButton () const { return nMiddleMouse; } + void SetMiddleMouseButton ( sal_uInt16 nSet ); void SetApplicationDefaults ( Application* pApp ); - void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} - BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} - - void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} - BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} + void SetMenuMouseFollow(sal_Bool bSet) {bMenuMouseFollow = bSet; SetModified();} + sal_Bool IsMenuMouseFollow() const{return bMenuMouseFollow;} #if defined( UNX ) - void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } - BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } + void SetFontAntiAliasing( sal_Bool bSet ) { bFontAntialiasing = bSet; SetModified(); } + sal_Bool IsFontAntiAliasing() const { return bFontAntialiasing; } - USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } - void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } + sal_uInt16 GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } + void SetFontAntialiasingMinPixelHeight( sal_uInt16 _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } #endif - void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; - BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} - static sal_Bool IsInitialized() { return bInitialized; } static void SetInitialized() { bInitialized = sal_True; } }; diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx index 6758222fe552..6a2b07b9c9b6 100644 --- a/svtools/inc/asynclink.hxx +++ b/svtools/inc/svtools/asynclink.hxx @@ -41,10 +41,10 @@ namespace svtools { class SVT_DLLPUBLIC AsynchronLink { Link _aLink; - ULONG _nEventId; + sal_uLong _nEventId; Timer* _pTimer; - BOOL _bInCall; - BOOL* _pDeleted; + sal_Bool _bInCall; + sal_Bool* _pDeleted; void* _pArg; ::osl::Mutex* _pMutex; @@ -53,19 +53,19 @@ class SVT_DLLPUBLIC AsynchronLink public: AsynchronLink( const Link& rLink ) : - _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ), _pDeleted( 0 ), _pMutex( 0 ){} - AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( sal_False ), _pDeleted( 0 ), _pMutex( 0 ){} ~AsynchronLink(); void CreateMutex(); void operator=( const Link& rLink ) { _aLink = rLink; } - void Call( void* pObj, BOOL bAllowDoubles = FALSE, - BOOL bUseTimer = FALSE ); + void Call( void* pObj, sal_Bool bAllowDoubles = sal_False, + sal_Bool bUseTimer = sal_False ); void ForcePendingCall( ); void ClearPendingCall( ); - BOOL IsSet() const { return _aLink.IsSet(); } + sal_Bool IsSet() const { return _aLink.IsSet(); } Link GetLink() const { return _aLink; } }; diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 3bddaa765ed1..edfacfa77e00 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -70,7 +70,7 @@ namespace utl { #define BROWSER_INVALIDID USHRT_MAX #define BROWSER_ENDOFSELECTION (long)(SFX_ENDOFSELECTION) -typedef ULONG BrowserMode; +typedef sal_uLong BrowserMode; #define BROWSER_COLUMNSELECTION 0x0001 #define BROWSER_MULTISELECTION 0x0002 @@ -156,20 +156,20 @@ class BrowseEvent Window* pWin; long nRow; Rectangle aRect; - USHORT nCol; - USHORT nColId; + sal_uInt16 nCol; + sal_uInt16 nColId; public: BrowseEvent(); BrowseEvent( Window* pWindow, long nAbsRow, - USHORT nColumn, USHORT nColumnId, + sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); Window* GetWindow() const { return pWin; } long GetRow() const { return nRow; } - USHORT GetColumn() const { return nCol; } - USHORT GetColumnId() const { return nColId; } + sal_uInt16 GetColumn() const { return nCol; } + sal_uInt16 GetColumnId() const { return nColId; } const Rectangle& GetRect() const { return aRect; } }; @@ -183,7 +183,7 @@ public: BrowserMouseEvent(); BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt ); BrowserMouseEvent( Window* pWin, const MouseEvent& rEvt, - long nAbsRow, USHORT nColumn, USHORT nColumnId, + long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); }; @@ -251,45 +251,45 @@ class SVT_DLLPUBLIC BrowseBox ScrollBar aHScroll; // horizontal scrollbar long nDataRowHeight; // height of a single data-row - USHORT nTitleLines; // number of lines in title row - ULONG nControlAreaWidth; // width of fixed area beneeth hscroll - BOOL bThumbDragging; // handle thumb dragging - BOOL bColumnCursor; // single columns and fields selectable - BOOL bMultiSelection;// allow multiple selected rows - BOOL bKeepHighlight; // don't hide selection on LoseFocus - - BOOL bHLines; // draw lines between rows - BOOL bVLines; // draw lines between columns - BOOL bHDots; // draw lines between rows dotted - BOOL bVDots; // draw lines between columns dotted + sal_uInt16 nTitleLines; // number of lines in title row + sal_uLong nControlAreaWidth; // width of fixed area beneeth hscroll + sal_Bool bThumbDragging; // handle thumb dragging + sal_Bool bColumnCursor; // single columns and fields selectable + sal_Bool bMultiSelection;// allow multiple selected rows + sal_Bool bKeepHighlight; // don't hide selection on LoseFocus + + sal_Bool bHLines; // draw lines between rows + sal_Bool bVLines; // draw lines between columns + sal_Bool bHDots; // draw lines between rows dotted + sal_Bool bVDots; // draw lines between columns dotted Color aGridLineColor; // color for lines, default dark grey - BOOL bBootstrapped; // child windows resized etc. + sal_Bool bBootstrapped; // child windows resized etc. long nTopRow; // no. of first visible row (0...) long nCurRow; // no. of row with cursor long nRowCount; // total number of rows in model - USHORT nFirstCol; // no. of first visible scrollable column - USHORT nCurColId; // column id of cursor + sal_uInt16 nFirstCol; // no. of first visible scrollable column + sal_uInt16 nCurColId; // column id of cursor - BOOL bSelecting; - BOOL bRowDividerDrag; - BOOL bHit; - BOOL mbInteractiveRowHeight; + sal_Bool bSelecting; + sal_Bool bRowDividerDrag; + sal_Bool bHit; + sal_Bool mbInteractiveRowHeight; Point a1stPoint; Point a2ndPoint; long nResizeX; // mouse position at start of resizing long nMinResizeX; // never drag more left long nDragX; // last dragged column (MouseMove) - USHORT nResizeCol; // resize this column in MouseMove - BOOL bResizing; // mouse captured for column resizing - - BOOL bSelect; // select or deselect - BOOL bSelectionIsVisible; // depending on focus - BOOL bScrolling; // hidden cursor while scrolling - BOOL bNotToggleSel; // set while in ToggleSelection() etc. - BOOL bHasFocus; // set/unset in Get/LoseFocus - BOOL bHideSelect; // hide selection (highlight) - BOOL bHideCursor; // hide cursor (frame) + sal_uInt16 nResizeCol; // resize this column in MouseMove + sal_Bool bResizing; // mouse captured for column resizing + + sal_Bool bSelect; // select or deselect + sal_Bool bSelectionIsVisible; // depending on focus + sal_Bool bScrolling; // hidden cursor while scrolling + sal_Bool bNotToggleSel; // set while in ToggleSelection() etc. + sal_Bool bHasFocus; // set/unset in Get/LoseFocus + sal_Bool bHideSelect; // hide selection (highlight) + sal_Bool bHideCursor; // hide cursor (frame) Range aSelRange; // for selection expansion BrowserColumns* pCols; // array of column-descriptions @@ -302,23 +302,23 @@ class SVT_DLLPUBLIC BrowseBox ::std::auto_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object - BOOL m_bFocusOnlyCursor; // hide cursor if we don't have the focus + sal_Bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus Color m_aCursorColor; // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too) private: SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode); SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt ); - SVT_DLLPRIVATE void ToggleSelection( BOOL bForce = FALSE ); + SVT_DLLPRIVATE void ToggleSelection( sal_Bool bForce = sal_False ); SVT_DLLPRIVATE void UpdateScrollbars(); SVT_DLLPRIVATE void AutoSizeLastColumn(); SVT_DLLPRIVATE long ImpGetDataRowHeight() const; - SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, USHORT nColId ) const; - SVT_DLLPRIVATE USHORT FrozenColCount() const; + SVT_DLLPRIVATE Rectangle ImplFieldRectPixel( long nRow, sal_uInt16 nColId ) const; + SVT_DLLPRIVATE sal_uInt16 FrozenColCount() const; - SVT_DLLPRIVATE void ColumnInserted( USHORT nPos ); + SVT_DLLPRIVATE void ColumnInserted( sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); @@ -327,26 +327,26 @@ private: SVT_DLLPRIVATE long GetFrozenWidth() const; //#endif - BOOL GoToRow(long nRow, BOOL bRowColMove, BOOL bDoNotModifySelection = FALSE ); + sal_Bool GoToRow(long nRow, sal_Bool bRowColMove, sal_Bool bDoNotModifySelection = sal_False ); - BOOL GoToColumnId( USHORT nColId, BOOL bMakeVisible, BOOL bRowColMove = FALSE); - void SelectColumnPos( USHORT nCol, BOOL _bSelect, BOOL bMakeVisible); - void SelectColumnId( USHORT nColId, BOOL _bSelect, BOOL bMakeVisible) + sal_Bool GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove = sal_False); + void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect, sal_Bool bMakeVisible); + void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect, sal_Bool bMakeVisible) { SelectColumnPos( GetColumnPos(nColId), _bSelect, bMakeVisible); } - void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL _bForeignDevice, BOOL _bDrawSelections); + void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections); - BOOL PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } + sal_Bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } - USHORT ToggleSelectedColumn(); - void SetToggledSelectedColumn(USHORT _nSelectedColumnId); + sal_uInt16 ToggleSelectedColumn(); + void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); protected: /// retrieves the XAccessible implementation associated with the BrowseBox instance ::svt::IAccessibleFactory& getAccessibleFactory(); protected: - USHORT ColCount() const; + sal_uInt16 ColCount() const; // software plug for database access // Der RowCount wird jetzt intern automatisch gezaehlt @@ -359,7 +359,7 @@ protected: // fuer Anzeige im VScrollBar z.B. auf "?" oder setzen void SetRealRowCount( const String &rRealRowCount ); - // Return Value muss immer TRUE sein - SeekRow *muss* klappen! + // Return Value muss immer sal_True sein - SeekRow *muss* klappen! // (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein! /** seeks for the given row position @@ -371,7 +371,7 @@ protected: virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); virtual void PaintData( Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, - USHORT nColumnId ) const = 0; + sal_uInt16 nColumnId ) const = 0; // Benachrichtigung an die abgeleitete Klasse, dass sich der sichtbare // Bereich von Rows geaendert hat. Aus dieser Methode heraus darf // die abgeleitete Klasse Aenderungen des Model mit Hilfe der Methoden @@ -389,13 +389,13 @@ protected: // dadurch aendert sich nur die Numerierung der sichtbaren Rows // - Scrollen (und daraus resultierend eine andere erste sichtbare Row) // - Resize des Fensters - virtual void VisibleRowsChanged( long nNewTopRow, USHORT nNumRows); + virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); // Anzahl sichtbarer Rows in dem Fenster (inkl. "angeschnittener" Rows) - USHORT GetVisibleRows() - { return (USHORT)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } + sal_uInt16 GetVisibleRows() + { return (sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() + 1); } long GetTopRow() { return nTopRow; } - USHORT GetFirstVisibleColNumber() const { return nFirstCol; } + sal_uInt16 GetFirstVisibleColNumber() const { return nFirstCol; } // Focus-Rect ein-/ausschalten void DoShowCursor( const char *pWhoLog ); @@ -449,7 +449,7 @@ public: virtual void GetFocus(); virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Command( const CommandEvent& rEvt ); virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); @@ -467,18 +467,18 @@ public: virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); - virtual sal_Bool IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const; + virtual sal_Bool IsCursorMoveAllowed( long nNewRow, sal_uInt16 nNewColId ) const; virtual void CursorMoved(); - virtual void ColumnMoved( USHORT nColId ); - virtual void ColumnResized( USHORT nColId ); - virtual long QueryColumnResize( USHORT nColId, long nWidth ); + virtual void ColumnMoved( sal_uInt16 nColId ); + virtual void ColumnResized( sal_uInt16 nColId ); + virtual long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); // Window-Control (pass to DataWindow) - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const; + void SetUpdateMode( sal_Bool bUpdate ); + sal_Bool GetUpdateMode() const; // map-mode and font control void SetFont( const Font& rNewFont ); @@ -492,73 +492,73 @@ public: const Color& GetGridLineColor() const {return aGridLineColor;} // inserting, changing, removing and freezing of columns - void InsertHandleColumn( ULONG nWidth ); - void InsertDataColumn( USHORT nItemId, const Image& rImage, + void InsertHandleColumn( sal_uLong nWidth ); + void InsertDataColumn( sal_uInt16 nItemId, const Image& rImage, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertDataColumn( USHORT nItemId, const XubString& rText, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertDataColumn( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertDataColumn( USHORT nItemId, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertDataColumn( sal_uInt16 nItemId, const Image& rImage, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND, + sal_uInt16 nPos = HEADERBAR_APPEND, // Hilfstext bei leerem rText const String* pHelpText = 0 ); - void SetColumnTitle( USHORT nColumnId, const String &rTitle ); - void SetColumnMode( USHORT nColumnId, BrowserColumnMode nFlags ); - void SetColumnWidth( USHORT nColumnId, ULONG nWidth ); - void SetColumnPos( USHORT nColumnId, USHORT nPos ); - void FreezeColumn( USHORT nColumnId, BOOL bFreeze = TRUE ); + void SetColumnTitle( sal_uInt16 nColumnId, const String &rTitle ); + void SetColumnMode( sal_uInt16 nColumnId, BrowserColumnMode nFlags ); + void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth ); + void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ); + void FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True ); void UnfreezeColumns(); - void RemoveColumn( USHORT nColumnId ); + void RemoveColumn( sal_uInt16 nColumnId ); void RemoveColumns(); // control of title and data row height void SetDataRowHeight( long nPixel ); long GetDataRowHeight() const; - void SetTitleLines( USHORT nLines ); - USHORT GetTitleLines() const { return nTitleLines; } + void SetTitleLines( sal_uInt16 nLines ); + sal_uInt16 GetTitleLines() const { return nTitleLines; } virtual long GetTitleHeight() const; // access to dynamic values of cursor row - String GetColumnTitle( USHORT nColumnId ) const; - BrowserColumnMode GetColumnMode( USHORT nColumnId ) const; - Rectangle GetFieldRect( USHORT nColumnId ) const; - ULONG GetColumnWidth( USHORT nColumnId ) const; - USHORT GetColumnId( USHORT nPos ) const; - USHORT GetColumnPos( USHORT nColumnId ) const; - BOOL IsFrozen( USHORT nColumnId ) const; + String GetColumnTitle( sal_uInt16 nColumnId ) const; + BrowserColumnMode GetColumnMode( sal_uInt16 nColumnId ) const; + Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; + sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const; + sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; + sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; + sal_Bool IsFrozen( sal_uInt16 nColumnId ) const; // movement of visible area void ResetScroll(); long ScrollColumns( long nColumns ); long ScrollRows( long nRows ); long ScrollPages( long nPagesY ); - BOOL MakeFieldVisible( long nRow, USHORT nColId, BOOL bComplete = FALSE ); + sal_Bool MakeFieldVisible( long nRow, sal_uInt16 nColId, sal_Bool bComplete = sal_False ); // access and movement of cursor long GetCurRow() const { return nCurRow; } - USHORT GetCurColumnId() const { return nCurColId; } - BOOL GoToRow( long nRow ); - BOOL GoToRowAndDoNotModifySelection( long nRow ); - BOOL GoToColumnId( USHORT nColId ); - BOOL GoToRowColumnId( long nRow, USHORT nColId ); + sal_uInt16 GetCurColumnId() const { return nCurColId; } + sal_Bool GoToRow( long nRow ); + sal_Bool GoToRowAndDoNotModifySelection( long nRow ); + sal_Bool GoToColumnId( sal_uInt16 nColId ); + sal_Bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections virtual void SetNoSelection(); virtual void SelectAll(); - virtual void SelectRow( long nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ); - void SelectColumnPos( USHORT nCol, BOOL _bSelect = TRUE ) - { SelectColumnPos( nCol, _bSelect, TRUE); } - void SelectColumnId( USHORT nColId, BOOL _bSelect = TRUE ) - { SelectColumnPos( GetColumnPos(nColId), _bSelect, TRUE); } + virtual void SelectRow( long nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ); + void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect = sal_True ) + { SelectColumnPos( nCol, _bSelect, sal_True); } + void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect = sal_True ) + { SelectColumnPos( GetColumnPos(nColId), _bSelect, sal_True); } long GetSelectRowCount() const; - USHORT GetSelectColumnCount() const; + sal_uInt16 GetSelectColumnCount() const; virtual bool IsRowSelected( long nRow ) const; - bool IsColumnSelected( USHORT nColumnId ) const; + bool IsColumnSelected( sal_uInt16 nColumnId ) const; sal_Bool IsAllSelected() const; - long FirstSelectedRow( BOOL bInverse = FALSE ); + long FirstSelectedRow( sal_Bool bInverse = sal_False ); long LastSelectedRow(); long PrevSelectedRow(); long NextSelectedRow(); @@ -570,40 +570,40 @@ public: long FirstSelectedColumn( ) const; long NextSelectedColumn( ) const; - BOOL IsResizing() const { return bResizing; } + sal_Bool IsResizing() const { return bResizing; } // access to positions of fields, column and rows Window& GetEventWindow() const; Window& GetDataWindow() const { return *pDataWin; } Rectangle GetRowRectPixel( long nRow, - BOOL bRelToBrowser = TRUE ) const; - Rectangle GetFieldRectPixel( long nRow, USHORT nColId, - BOOL bRelToBrowser = TRUE) const; - BOOL IsFieldVisible( long nRow, USHORT nColId, - BOOL bComplete = FALSE ) const; + sal_Bool bRelToBrowser = sal_True ) const; + Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, + sal_Bool bRelToBrowser = sal_True) const; + sal_Bool IsFieldVisible( long nRow, sal_uInt16 nColId, + sal_Bool bComplete = sal_False ) const; long GetRowAtYPosPixel( long nY, - BOOL bRelToBrowser = TRUE ) const; - USHORT GetColumnAtXPosPixel( long nX, - BOOL bRelToBrowser = TRUE ) const; + sal_Bool bRelToBrowser = sal_True ) const; + sal_uInt16 GetColumnAtXPosPixel( long nX, + sal_Bool bRelToBrowser = sal_True ) const; // invalidations void Clear(); - void RowRemoved( long nRow, long nNumRows = 1, BOOL bDoPaint = TRUE ); - void RowModified( long nRow, USHORT nColId = USHRT_MAX ); - void RowInserted( long nRow, long nNumRows = 1, BOOL bDoPaint = TRUE, BOOL bKeepSelection = FALSE ); + void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True ); + void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX ); + void RowInserted( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True, sal_Bool bKeepSelection = sal_False ); // miscellanous - void ReserveControlArea( USHORT nWidth = USHRT_MAX ); + void ReserveControlArea( sal_uInt16 nWidth = USHRT_MAX ); Rectangle GetControlArea() const; - BOOL ProcessKey( const KeyEvent& rEvt ); - void Dispatch( USHORT nId ); + sal_Bool ProcessKey( const KeyEvent& rEvt ); + void Dispatch( sal_uInt16 nId ); void SetMode( BrowserMode nMode = 0 ); BrowserMode GetMode( ) const { return m_nCurrentMode; } bool IsInCommandEvent() const; void SetCursorColor(const Color& _rCol); Color GetCursorColor() const { return m_aCursorColor; } - void ResetSelecting() { bSelecting = FALSE; } + void ResetSelecting() { bSelecting = sal_False; } /** specifies that the user is allowed to interactively change the height of a row, by simply dragging an arbitrary row separator. @@ -611,21 +611,21 @@ public: Note that this works only if there's a handle column, since only in this case, there *is* something for the user to click onto */ - void EnableInteractiveRowHeight( BOOL _bEnable = TRUE ) { mbInteractiveRowHeight = _bEnable; } - BOOL IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } + void EnableInteractiveRowHeight( sal_Bool _bEnable = sal_True ) { mbInteractiveRowHeight = _bEnable; } + sal_Bool IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } /// access to selected methods, to be granted to the BrowserColumn struct BrowserColumnAccess { friend class BrowserColumn; private: BrowserColumnAccess() { } }; /** public version of PaintField, with selected access rights for the BrowserColumn */ - void DoPaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId, BrowserColumnAccess ) const + void DoPaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId, BrowserColumnAccess ) const { PaintField( rDev, rRect, nColumnId ); } /** suggests a default width for a column containing a given text The width is calculated so that the text fits completely, plus som margin. */ - ULONG GetDefaultColumnWidth( const String& _rText ) const; + sal_uLong GetDefaultColumnWidth( const String& _rText ) const; /** GetCellText returns the text at the given position @param _nRow @@ -635,12 +635,12 @@ public: @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; /** @return the current column count */ - USHORT GetColumnCount() const { return ColCount(); } + sal_uInt16 GetColumnCount() const { return ColCount(); } /** commitBrowseBoxEvent commit the event at all listeners of the browsebox @param nEventId @@ -689,7 +689,7 @@ public: @return the Rectangle */ - virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen = TRUE); + virtual Rectangle calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen = sal_True); /** calculates the Rectangle of the table @param _bOnScreen @@ -697,7 +697,7 @@ public: @return the Rectangle */ - virtual Rectangle calcTableRect(BOOL _bOnScreen = TRUE); + virtual Rectangle calcTableRect(sal_Bool _bOnScreen = sal_True); /** @param _nRowId @@ -709,7 +709,7 @@ public: @return the Rectangle */ - virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,sal_uInt16 _nColId, BOOL _bIsHeader, BOOL _bOnScreen = TRUE); + virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True); /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive sal_Bool isAccessibleAlive( ) const; @@ -833,7 +833,7 @@ public: virtual sal_uInt16 GetCurrColumn() const; virtual sal_Bool HasRowHeader() const; virtual sal_Bool IsCellFocusable() const; - virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); + virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual void SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True ); virtual sal_Bool IsColumnSelected( long _nColumn ) const; virtual sal_Int32 GetSelectedRowCount() const; @@ -841,11 +841,11 @@ public: virtual void GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const; virtual void GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const; virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual String GetAccessibleCellText(long _nRow, USHORT _nColPos) const; - virtual BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual String GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const; + virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual XACC GetAccessible( BOOL bCreate = TRUE ); + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ); virtual Window* GetAccessibleParentWindow() const; virtual Window* GetWindowInstance(); diff --git a/svtools/inc/calendar.hxx b/svtools/inc/svtools/calendar.hxx index feb4a3df58b1..f07b100e5c03 100644 --- a/svtools/inc/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -133,16 +133,16 @@ wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() -abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, -FALSE eine Selektion nach rechts oder unten. +abgefragt werden. sal_True bedeutet eine Selektion nach links oder oben, +sal_False eine Selektion nach rechts oder unten. -------------------------------------------------------------------------- Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion uebernehmen will, sollte dies nur gemacht werden, wenn -IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert -TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons -ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen +IsScrollDateRangeChanged() sal_True zurueckliefert. Denn diese Methode liefert +sal_True zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons +ausgeloest wurde. Bei sal_False wurde dies durch Resize(), Methoden-Aufrufen oder durch Beendigung einer Selektion ausgeloest. *************************************************************************/ @@ -164,7 +164,7 @@ oder durch Beendigung einer Selektion ausgeloest. #define WB_MULTISELECT ((WinBits)0x00400000) #endif -#define DIB_BOLD ((USHORT)0x0001) +#define DIB_BOLD ((sal_uInt16)0x0001) // ------------ // - Calendar - @@ -198,7 +198,7 @@ private: Color* mpStandardColor; Color* mpSaturdayColor; Color* mpSundayColor; - ULONG mnDayCount; + sal_uLong mnDayCount; long mnDaysOffX; long mnWeekDayOffY; long mnDaysOffY; @@ -213,10 +213,10 @@ private: long mnDummy3; long mnDummy4; WinBits mnWinStyle; - USHORT mnFirstYear; - USHORT mnLastYear; - USHORT mnRequestYear; - BOOL mbCalc:1, + sal_uInt16 mnFirstYear; + sal_uInt16 mnLastYear; + sal_uInt16 mnRequestYear; + sal_Bool mbCalc:1, mbFormat:1, mbDrag:1, mbSelection:1, @@ -240,7 +240,7 @@ private: Link maDoubleClickHdl; Link maSelectHdl; Timer maDragScrollTimer; - USHORT mnDragScrollHitTest; + sal_uInt16 mnDragScrollHitTest; #ifdef _SV_CALENDAR_CXX using Control::ImplInitSettings; @@ -250,30 +250,30 @@ private: SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; SVT_DLLPRIVATE void ImplFormat(); using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const; + SVT_DLLPRIVATE void ImplDrawSpin( sal_Bool bDrawPrev = sal_True, sal_Bool bDrawNext = sal_True ); SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, - USHORT nDay, USHORT nMonth, USHORT nYear, + sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, - BOOL bBack = TRUE, BOOL bOther = FALSE, - ULONG nToday = 0 ); - SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); + sal_Bool bBack = sal_True, sal_Bool bOther = sal_False, + sal_uLong nToday = 0 ); + SVT_DLLPRIVATE void ImplDraw( sal_Bool bPaint = sal_False ); SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); - SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, - BOOL bMove, BOOL bExpand, BOOL bExtended ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); + SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest, + sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended ); + SVT_DLLPRIVATE void ImplUpdate( sal_Bool bCalcNew = sal_False ); using Window::ImplScroll; - SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); + SVT_DLLPRIVATE void ImplScroll( sal_Bool bPrev ); SVT_DLLPRIVATE void ImplInvertDropPos(); SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( sal_Bool bCancel ); SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; #endif protected: - BOOL ShowDropPos( const Point& rPos, Date& rDate ); + sal_Bool ShowDropPos( const Point& rPos, Date& rDate ); void HideDropPos(); DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); @@ -311,29 +311,29 @@ public: /// Set how many days of a week must reside in the first week of a year. void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); - void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); + void SelectDate( const Date& rDate, sal_Bool bSelect = sal_True ); void SelectDateRange( const Date& rStartDate, const Date& rEndDate, - BOOL bSelect = TRUE ); + sal_Bool bSelect = sal_True ); void SetNoSelection(); - BOOL IsDateSelected( const Date& rDate ) const; - ULONG GetSelectDateCount() const; - Date GetSelectDate( ULONG nIndex = 0 ) const; - void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } - BOOL IsCallEverySelectEnabled() const { return mbAllSel; } + sal_Bool IsDateSelected( const Date& rDate ) const; + sal_uLong GetSelectDateCount() const; + Date GetSelectDate( sal_uLong nIndex = 0 ) const; + void EnableCallEverySelect( sal_Bool bEvery = sal_True ) { mbAllSel = bEvery; } + sal_Bool IsCallEverySelectEnabled() const { return mbAllSel; } - USHORT GetRequestYear() const { return mnRequestYear; } + sal_uInt16 GetRequestYear() const { return mnRequestYear; } void SetCurDate( const Date& rNewDate ); Date GetCurDate() const { return maCurDate; } void SetFirstDate( const Date& rNewFirstDate ); Date GetFirstDate() const { return maFirstDate; } Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - ULONG GetDayCount() const { return mnDayCount; } + sal_uLong GetDayCount() const { return mnDayCount; } Date GetFirstMonth() const; Date GetLastMonth() const; - USHORT GetMonthCount() const; - BOOL GetDate( const Point& rPos, Date& rDate ) const; + sal_uInt16 GetMonthCount() const; + sal_Bool GetDate( const Point& rPos, Date& rDate ) const; Rectangle GetDateRect( const Date& rDate ) const; - BOOL GetDropDate( Date& rDate ) const; + sal_Bool GetDropDate( Date& rDate ) const; long GetCurMonthPerLine() const { return mnMonthPerLine; } long GetCurLines() const { return mnLines; } @@ -348,7 +348,7 @@ public: void AddDateInfo( const Date& rDate, const XubString& rText, const Color* pTextColor = NULL, const Color* pFrameColor = NULL, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); void RemoveDateInfo( const Date& rDate ); void ClearDateInfo(); XubString GetDateInfoText( const Date& rDate ); @@ -356,9 +356,9 @@ public: void StartSelection(); void EndSelection(); - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } - BOOL IsSelectLeft() const { return mbSelLeft; } + sal_Bool IsTravelSelect() const { return mbTravelSelect; } + sal_Bool IsScrollDateRangeChanged() const { return mbScrollDateRange; } + sal_Bool IsSelectLeft() const { return mbSelLeft; } Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, long nCalcLines = 1 ) const; @@ -454,8 +454,8 @@ private: PushButton* mpTodayBtn; PushButton* mpNoneBtn; Date maDefaultDate; - BOOL mbToday; - BOOL mbNone; + sal_Bool mbToday; + sal_Bool mbNone; Link maSelectHdl; #ifdef _SV_CALENDAR_CXX @@ -471,17 +471,17 @@ public: virtual void Select(); - virtual BOOL ShowDropDown( BOOL bShow ); + virtual sal_Bool ShowDropDown( sal_Bool bShow ); virtual Calendar* CreateCalendar( Window* pParent ); Calendar* GetCalendar(); void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } Date GetDefaultDate() const { return maDefaultDate; } - void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } - BOOL IsTodayEnabled() const { return mbToday; } - void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } - BOOL IsNoneEnabled() const { return mbNone; } + void EnableToday( sal_Bool bToday = sal_True ) { mbToday = bToday; } + sal_Bool IsTodayEnabled() const { return mbToday; } + void EnableNone( sal_Bool bNone = sal_True ) { mbNone = bNone; } + sal_Bool IsNoneEnabled() const { return mbNone; } void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } WinBits GetCalendarStyle() const { return mnCalendarStyle; } diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx index 40d44a4cdcab..6f9aee42c268 100644 --- a/svtools/inc/cliplistener.hxx +++ b/svtools/inc/svtools/cliplistener.hxx @@ -47,7 +47,7 @@ public: TransferableClipboardListener( const Link& rCallback ); ~TransferableClipboardListener(); - void AddRemoveListener( Window* pWin, BOOL bAdd ); + void AddRemoveListener( Window* pWin, sal_Bool bAdd ); void ClearCallbackLink(); // XEventListener diff --git a/svtools/inc/svtools/colctrl.hxx b/svtools/inc/svtools/colctrl.hxx index 69a372e07bb3..5ad4681b26bb 100644 --- a/svtools/inc/svtools/colctrl.hxx +++ b/svtools/inc/svtools/colctrl.hxx @@ -73,7 +73,7 @@ public: Color GetColor() const { return maColor; }; void SetColor( const Color& rCol ); - void SetColor( const ColorHSB& rCol, BOOL bSetColor = TRUE ); + void SetColor( const ColorHSB& rCol, sal_Bool bSetColor = sal_True ); short GetLuminance() const { return mnLuminance; }; void SetLuminance( short nLum ); @@ -112,27 +112,27 @@ enum CMCPosition { CMC_TOPLEFT, CMC_TOPRIGHT, CMC_BOTTOMLEFT, CMC_BOTTOMRIGHT, C class ColorMixingControl : public ValueSet { private: - USHORT mnRows; - USHORT mnColumns; + sal_uInt16 mnRows; + sal_uInt16 mnColumns; Color maColor[4]; void Initialize(); - Color CalcDifferenceColor( USHORT nCol1, USHORT nCol2, USHORT nSteps ); - void FillRow( USHORT nRow ); - void FillColumn( USHORT nColumn ); + Color CalcDifferenceColor( sal_uInt16 nCol1, sal_uInt16 nCol2, sal_uInt16 nSteps ); + void FillRow( sal_uInt16 nRow ); + void FillColumn( sal_uInt16 nColumn ); public: ColorMixingControl( Window* pParent, WinBits nStyle = 0, - USHORT nRows = 4, USHORT nColumns = 4 ); + sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 ); ColorMixingControl( Window* pParent, const ResId& rResId, - USHORT nRows = 4, USHORT nColumns = 4 ); + sal_uInt16 nRows = 4, sal_uInt16 nColumns = 4 ); ~ColorMixingControl(); - USHORT GetRows() const { return mnRows; }; - void SetRows( USHORT nRows ); - USHORT GetColumns() const { return mnColumns; }; - void SetColumns( USHORT nColumns ); + sal_uInt16 GetRows() const { return mnRows; }; + void SetRows( sal_uInt16 nRows ); + sal_uInt16 GetColumns() const { return mnColumns; }; + void SetColumns( sal_uInt16 nColumns ); using ValueSet::GetColor; Color GetColor( CMCPosition ePos ) const { return maColor[ ePos ]; }; @@ -150,23 +150,23 @@ public: class ColorHSB { private: - USHORT mnHue; // Farbwinkel, 360 Grad - USHORT mnSat; // Saturation, 100 % - USHORT mnBri; // Brightness, 100 % + sal_uInt16 mnHue; // Farbwinkel, 360 Grad + sal_uInt16 mnSat; // Saturation, 100 % + sal_uInt16 mnBri; // Brightness, 100 % public: ColorHSB() { mnHue=0; mnSat=0; mnBri=0; } - ColorHSB( USHORT nH, USHORT nS, USHORT nB ) + ColorHSB( sal_uInt16 nH, sal_uInt16 nS, sal_uInt16 nB ) { mnHue=nH; mnSat=nS; mnBri=nB; } ColorHSB( const Color& rColor ); - void SetHue( USHORT nH ) { mnHue=nH; } - void SetSat( USHORT nS ) { mnSat=nS; } - void SetBri( USHORT nB ) { mnBri=nB; } - USHORT GetHue() const { return mnHue; } - USHORT GetSat() const { return mnSat; } - USHORT GetBri() const { return mnBri; } + void SetHue( sal_uInt16 nH ) { mnHue=nH; } + void SetSat( sal_uInt16 nS ) { mnSat=nS; } + void SetBri( sal_uInt16 nB ) { mnBri=nB; } + sal_uInt16 GetHue() const { return mnHue; } + sal_uInt16 GetSat() const { return mnSat; } + sal_uInt16 GetBri() const { return mnBri; } Color GetRGB() const; }; @@ -177,26 +177,26 @@ public: class ColorCMYK { private: - USHORT mnCyan; - USHORT mnMagenta; - USHORT mnYellow; - USHORT mnKey; + sal_uInt16 mnCyan; + sal_uInt16 mnMagenta; + sal_uInt16 mnYellow; + sal_uInt16 mnKey; public: ColorCMYK() { mnCyan=0; mnMagenta=0; mnYellow=0; mnKey=100; } - ColorCMYK( USHORT nC, USHORT nM, USHORT nY, USHORT nK ) + ColorCMYK( sal_uInt16 nC, sal_uInt16 nM, sal_uInt16 nY, sal_uInt16 nK ) { mnCyan=nC; mnMagenta=nM; mnYellow=nY; mnKey=nK; } ColorCMYK( const Color& rColor ); - void SetCyan( USHORT nC ) { mnCyan=nC; } - void SetMagenta( USHORT nM ) { mnMagenta=nM; } - void SetYellow( USHORT nY ) { mnYellow=nY; } - void SetKey( USHORT nK ) { mnKey=nK; } - USHORT GetCyan() const { return mnCyan; } - USHORT GetMagenta() const { return mnMagenta; } - USHORT GetYellow() const { return mnYellow; } - USHORT GetKey() const { return mnKey; } + void SetCyan( sal_uInt16 nC ) { mnCyan=nC; } + void SetMagenta( sal_uInt16 nM ) { mnMagenta=nM; } + void SetYellow( sal_uInt16 nY ) { mnYellow=nY; } + void SetKey( sal_uInt16 nK ) { mnKey=nK; } + sal_uInt16 GetCyan() const { return mnCyan; } + sal_uInt16 GetMagenta() const { return mnMagenta; } + sal_uInt16 GetYellow() const { return mnYellow; } + sal_uInt16 GetKey() const { return mnKey; } Color GetRGB() const; }; diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx index 467e8b7103f1..467e8b7103f1 100644 --- a/svtools/inc/collatorres.hxx +++ b/svtools/inc/svtools/collatorres.hxx diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx index c6f30e2a3d4b..c6f30e2a3d4b 100644 --- a/svtools/inc/contextmenuhelper.hxx +++ b/svtools/inc/svtools/contextmenuhelper.hxx diff --git a/svtools/inc/controldims.hrc b/svtools/inc/svtools/controldims.hrc index 5e26f132897d..5e26f132897d 100644 --- a/svtools/inc/controldims.hrc +++ b/svtools/inc/svtools/controldims.hrc diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx index 6804b7192503..50a83f8a2218 100644 --- a/svtools/inc/ctrlbox.hxx +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -178,60 +178,60 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ); using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, + sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const Color& rColor, const XubString& rStr, + sal_uInt16 nPos = LISTBOX_APPEND ); void InsertAutomaticEntry(); using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); + virtual void RemoveEntry( sal_uInt16 nPos ); virtual void Clear(); void CopyEntries( const ColorListBox& rBox ); using ListBox::GetEntryPos; - virtual USHORT GetEntryPos( const Color& rColor ) const; - virtual Color GetEntryColor( USHORT nPos ) const; + virtual sal_uInt16 GetEntryPos( const Color& rColor ) const; + virtual Color GetEntryColor( sal_uInt16 nPos ) const; Size GetImageSize() const { return aImageSize; } - void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) + void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); - XubString GetSelectEntry( USHORT nSelIndex = 0 ) const + void SelectEntry( const Color& rColor, sal_Bool bSelect = sal_True ); + XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const { return ListBox::GetSelectEntry( nSelIndex ); } - Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; - BOOL IsEntrySelected( const XubString& rStr ) const + Color GetSelectEntryColor( sal_uInt16 nSelIndex = 0 ) const; + sal_Bool IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( const Color& rColor ) const; + sal_Bool IsEntrySelected( const Color& rColor ) const; private: // declared as private because some compilers would generate the default functions ColorListBox( const ColorListBox& ); ColorListBox& operator =( const ColorListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; }; -inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) +inline void ColorListBox::SelectEntry( const Color& rColor, sal_Bool bSelect ) { - USHORT nPos = GetEntryPos( rColor ); + sal_uInt16 nPos = GetEntryPos( rColor ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) ListBox::SelectEntryPos( nPos, bSelect ); } -inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const +inline sal_Bool ColorListBox::IsEntrySelected( const Color& rColor ) const { - USHORT nPos = GetEntryPos( rColor ); + sal_uInt16 nPos = GetEntryPos( rColor ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nPos ); else - return FALSE; + return sal_False; } -inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const +inline Color ColorListBox::GetSelectEntryColor( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); Color aColor; if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aColor = GetEntryColor( nPos ); @@ -257,7 +257,7 @@ class SVT_DLLPUBLIC LineListBox : public ListBox using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); void UpdateLineColors( void ); - BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed + sal_Bool UpdatePaintLineColor( void ); // returns sal_True if maPaintCol has changed inline const Color& GetPaintColor( void ) const; virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -267,31 +267,30 @@ public: virtual ~LineListBox(); using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, - USHORT nStyle = STYLE_SOLID, USHORT nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, + sal_uInt16 nStyle = STYLE_SOLID, sal_uInt16 nPos = LISTBOX_APPEND ); using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); + virtual void RemoveEntry( sal_uInt16 nPos ); virtual void Clear(); using ListBox::GetEntryPos; - USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0, - USHORT nStyle = STYLE_SOLID ) const; - long GetEntryLine1( USHORT nPos ) const; - long GetEntryLine2( USHORT nPos ) const; - long GetEntryDistance( USHORT nPos ) const; + sal_uInt16 GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0, + sal_uInt16 nStyle = STYLE_SOLID ) const; + long GetEntryLine2( sal_uInt16 nPos ) const; + long GetEntryDistance( sal_uInt16 nPos ) const; USHORT GetEntryStyle( USHORT nPos ) const; - inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } + inline void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ) { ListBox::SelectEntry( rStr, bSelect ); } void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, - USHORT nStyle = STYLE_SOLID, BOOL bSelect = TRUE ); - long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; - long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; - long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; - USHORT GetSelectEntryStyle( USHORT nSelIndex = 0 ) const; - inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0, - USHORT nStyle1 = STYLE_SOLID ) const; + sal_uInt16 nStyle = STYLE_SOLID, sal_Bool bSelect = sal_True ); + long GetSelectEntryLine1( sal_uInt16 nSelIndex = 0 ) const; + long GetSelectEntryLine2( sal_uInt16 nSelIndex = 0 ) const; + long GetSelectEntryDistance( sal_uInt16 nSelIndex = 0 ) const; + sal_uInt16 GetSelectEntryStyle( sal_uInt16 nSelIndex = 0 ) const; + inline sal_Bool IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } + sal_Bool IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0, + sal_uInt16 nStyle1 = STYLE_SOLID ) const; inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } inline FieldUnit GetUnit() const { return eUnit; } @@ -305,61 +304,61 @@ private: // declared as private because some compilers would generate the default methods LineListBox( const LineListBox& ); LineListBox& operator =( const LineListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; }; -inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, USHORT nStyle, BOOL bSelect ) +inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, sal_uInt16 nStyle, sal_Bool bSelect ) { - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance, nStyle ); + sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance, nStyle ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) ListBox::SelectEntryPos( nPos, bSelect ); } -inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryLine1( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryLine1( nPos ); else return 0; } -inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryLine2( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryLine2( nPos ); else return 0; } -inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const +inline long LineListBox::GetSelectEntryDistance( sal_uInt16 nSelIndex ) const { - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return GetEntryDistance( nPos ); else return 0; } -inline USHORT LineListBox::GetSelectEntryStyle( USHORT nSelIndex ) const +inline sal_uInt16 LineListBox::GetSelectEntryStyle( sal_uInt16 nSelIndex ) const { - USHORT nStyle = STYLE_SOLID; - USHORT nPos = GetSelectEntryPos( nSelIndex ); + sal_uInt16 nStyle = STYLE_SOLID; + sal_uInt16 nPos = GetSelectEntryPos( nSelIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) nStyle = GetEntryStyle( nPos ); return nStyle; } -inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance, USHORT nStyle ) const +inline sal_Bool LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance, sal_uInt16 nStyle ) const { - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance, nStyle ); + sal_uInt16 nPos = GetEntryPos( nLine1, nLine2, nDistance, nStyle ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nPos ); else - return FALSE; + return sal_False; } inline void LineListBox::SetColor( const Color& rColor ) @@ -386,8 +385,8 @@ private: Image maImagePrinterFont; Image maImageBitmapFont; Image maImageScalableFont; - BOOL mbWYSIWYG; - BOOL mbSymbols; + sal_Bool mbWYSIWYG; + sal_Bool mbSymbols; #ifdef _CTRLBOX_CXX SVT_DLLPRIVATE void ImplCalcUserItemSize(); @@ -407,11 +406,11 @@ public: void Fill( const FontList* pList ); - void EnableWYSIWYG( BOOL bEnable = TRUE ); - BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } + void EnableWYSIWYG( sal_Bool bEnable = sal_True ); + sal_Bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } - void EnableSymbols( BOOL bEnable = TRUE ); - BOOL IsSymbolsEnabled() const { return mbSymbols; } + void EnableSymbols( sal_Bool bEnable = sal_True ); + sal_Bool IsSymbolsEnabled() const { return mbSymbols; } private: // declared as private because some compilers would generate the default functions @@ -461,13 +460,13 @@ class SVT_DLLPUBLIC FontSizeBox : public MetricBox { FontInfo aFontInfo; const FontList* pFontList; - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; + sal_uInt16 nRelMin; + sal_uInt16 nRelMax; + sal_uInt16 nRelStep; short nPtRelMin; short nPtRelMax; short nPtRelStep; - BOOL bRelativeMode:1, + sal_Bool bRelativeMode:1, bRelative:1, bPtRelative:1, bStdSize:1; @@ -490,22 +489,22 @@ public: void Fill( const FontInfo* pInfo, const FontList* pList ); - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); + void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, + sal_uInt16 nStep = 5 ); void EnablePtRelativeMode( short nMin = -200, short nMax = 200, short nStep = 10 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void SetPtRelative( BOOL bPtRel = TRUE ) - { bPtRelative = bPtRel; SetRelative( TRUE ); } - BOOL IsPtRelative() const { return bPtRelative; } + sal_Bool IsRelativeMode() const { return bRelativeMode; } + void SetRelative( sal_Bool bRelative = sal_False ); + sal_Bool IsRelative() const { return bRelative; } + void SetPtRelative( sal_Bool bPtRel = sal_True ) + { bPtRelative = bPtRel; SetRelative( sal_True ); } + sal_Bool IsPtRelative() const { return bPtRelative; } virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); virtual void SetValue( sal_Int64 nNewValue ); virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; virtual sal_Int64 GetValue() const; - sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; + sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const; void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index dd35d06ec893..e0352c4eb585 100644 --- a/svtools/inc/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.hxx @@ -60,7 +60,7 @@ class FontNameMenu, class FontStyleMenu, class FontSizeMenu -------------------------------------------------------------------------- FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); + sal_Bool bAll = sal_True ); Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, @@ -77,8 +77,8 @@ Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden sind, wird die vom uebergebenen Device "pDevice" bevorzugt. Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften -abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch -Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und +abgefragt werden sollen oder alle. Wenn sal_True uebergeben wird, werden auch +Bitmap-Schriften mit abgefragt. Bei sal_False werden Vector-Schriften und scalierbare Schriften abgefragt. -------------------------------------------------------------------------- @@ -144,11 +144,11 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. // - FontList - // ------------ -#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) +#define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) -#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) -#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) -#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) +#define FONTLIST_FONTNAMETYPE_PRINTER ((sal_uInt16)0x0001) +#define FONTLIST_FONTNAMETYPE_SCREEN ((sal_uInt16)0x0002) +#define FONTLIST_FONTNAMETYPE_SCALABLE ((sal_uInt16)0x0004) class SVT_DLLPUBLIC FontList : private List { @@ -172,16 +172,16 @@ private: OutputDevice* mpDev2; #ifdef CTRLTOOL_CXX - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, - BOOL bInsertData ); + SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll, + sal_Bool bInsertData ); #endif public: FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); + sal_Bool bAll = sal_True ); ~FontList(); FontList* Clone() const; @@ -189,7 +189,7 @@ public: OutputDevice* GetDevice() const { return mpDev; } OutputDevice* GetDevice2() const { return mpDev2; } XubString GetFontMapText( const FontInfo& rInfo ) const; - USHORT GetFontNameType( const XubString& rFontName ) const; + sal_uInt16 GetFontNameType( const XubString& rFontName ) const; const XubString& GetNormalStr() const { return maNormal; } const XubString& GetItalicStr() const { return maNormalItalic; } @@ -204,11 +204,11 @@ public: FontWeight eWeight, FontItalic eItalic ) const; - BOOL IsAvailable( const XubString& rName ) const; - USHORT GetFontNameCount() const - { return (USHORT)List::Count(); } - const FontInfo& GetFontName( USHORT nFont ) const; - USHORT GetFontNameType( USHORT nFont ) const; + sal_Bool IsAvailable( const XubString& rName ) const; + sal_uInt16 GetFontNameCount() const + { return (sal_uInt16)List::Count(); } + const FontInfo& GetFontName( sal_uInt16 nFont ) const; + sal_uInt16 GetFontNameType( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const XubString& rName ) const; sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; @@ -230,19 +230,19 @@ class SVT_DLLPUBLIC FontSizeNames { private: const struct ImplFSNameItem* mpArray; - ULONG mnElem; + sal_uLong mnElem; public: FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - ULONG Count() const { return mnElem; } - BOOL IsEmpty() const { return !mnElem; } + sal_uLong Count() const { return mnElem; } + sal_Bool IsEmpty() const { return !mnElem; } long Name2Size( const String& ) const; String Size2Name( long ) const; - String GetIndexName( ULONG nIndex ) const; - long GetIndexSize( ULONG nIndex ) const; + String GetIndexName( sal_uLong nIndex ) const; + long GetIndexSize( sal_uLong nIndex ) const; }; #endif // _CTRLTOOL_HXX diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx index 7b80ed6b449d..7b80ed6b449d 100644 --- a/svtools/inc/dialogclosedlistener.hxx +++ b/svtools/inc/svtools/dialogclosedlistener.hxx diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx index d0bb6646ba85..d0bb6646ba85 100644 --- a/svtools/inc/dialogcontrolling.hxx +++ b/svtools/inc/svtools/dialogcontrolling.hxx diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index ecb3fe3bda89..d8c389215613 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -37,7 +37,7 @@ #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <svtools/brwbox.hxx> #include <vcl/timer.hxx> #include <svtools/brwhead.hxx> @@ -98,7 +98,7 @@ namespace svt protected: Control* pWindow; - sal_Bool bSuspended; // <TRUE> if the window is hidden and disabled + sal_Bool bSuspended; // <sal_True> if the window is hidden and disabled public: TYPEINFO(); @@ -140,8 +140,8 @@ namespace svt virtual String GetText( LineEnd aSeparator ) const = 0; virtual void SetText( const String& _rStr ) = 0; - virtual BOOL IsReadOnly() const = 0; - virtual void SetReadOnly( BOOL bReadOnly ) = 0; + virtual sal_Bool IsReadOnly() const = 0; + virtual void SetReadOnly( sal_Bool bReadOnly ) = 0; virtual xub_StrLen GetMaxTextLen() const = 0; virtual void SetMaxTextLen( xub_StrLen _nMaxLen ) = 0; @@ -176,8 +176,8 @@ namespace svt virtual String GetText( LineEnd aSeparator ) const; virtual void SetText( const String& _rStr ); - virtual BOOL IsReadOnly() const; - virtual void SetReadOnly( BOOL bReadOnly ); + virtual sal_Bool IsReadOnly() const; + virtual void SetReadOnly( sal_Bool bReadOnly ); virtual xub_StrLen GetMaxTextLen() const; virtual void SetMaxTextLen( xub_StrLen _nMaxLen ); @@ -218,7 +218,7 @@ namespace svt virtual void Modify(); private: - BOOL dispatchKeyEvent( const KeyEvent& _rEvent ); + sal_Bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; //================================================================== @@ -244,7 +244,7 @@ namespace svt class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; - BOOL m_bOwnImplementation; // did we create m_pEditImplementation? + sal_Bool m_bOwnImplementation; // did we create m_pEditImplementation? public: TYPEINFO(); @@ -300,7 +300,7 @@ namespace svt virtual void GetFocus(); virtual long PreNotify(NotifyEvent& rEvt); virtual void Paint(const Rectangle& rClientRect); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& _rEvent ); virtual void Resize(); @@ -485,7 +485,7 @@ namespace svt CellControllerRef aController, aOldController; - ULONG nStartEvent, nEndEvent, nCellModifiedEvent; // event ids + sal_uLong nStartEvent, nEndEvent, nCellModifiedEvent; // event ids Window* m_pFocusWhileRequest; // In ActivateCell, we grab the focus asynchronously, but if between requesting activation // and the asynchornous event the focus has changed, we won't grab it for ourself. @@ -662,7 +662,7 @@ namespace svt virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True); + ::com::sun::star::accessibility::XAccessible > CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState,sal_Bool _bEnabled=sal_True); protected: // creates the accessible which wraps the active cell void implCreateActiveAccessible( ); diff --git a/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx index b2515bb6d067..e93ec6721e68 100644 --- a/svtools/inc/svtools/editimplementation.hxx +++ b/svtools/inc/svtools/editimplementation.hxx @@ -75,14 +75,14 @@ void GenericEditImplementation< EDIT >::SetSelection( const Selection& _rSelecti //---------------------------------------------------------------------- template <class EDIT> -void GenericEditImplementation< EDIT >::SetReadOnly( BOOL bReadOnly ) +void GenericEditImplementation< EDIT >::SetReadOnly( sal_Bool bReadOnly ) { m_rEdit.SetReadOnly( bReadOnly ); } //---------------------------------------------------------------------- template <class EDIT> -BOOL GenericEditImplementation< EDIT >::IsReadOnly() const +sal_Bool GenericEditImplementation< EDIT >::IsReadOnly() const { return m_rEdit.IsReadOnly(); } diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx index 265e0bc4110c..caba30f37e1f 100644 --- a/svtools/inc/svtools/editsyntaxhighlighter.hxx +++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx @@ -42,7 +42,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit svtools::ColorConfig m_aColorConfig; private: - virtual void DoBracketHilight(USHORT aKey); + virtual void DoBracketHilight(sal_uInt16 aKey); protected: virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx index 835854b2f030..3a572aa29d8f 100644 --- a/svtools/inc/svtools/ehdl.hxx +++ b/svtools/inc/svtools/ehdl.hxx @@ -42,16 +42,16 @@ class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - USHORT nCtxIdP, Window *pWin=0, - USHORT nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + sal_uInt16 nCtxIdP, Window *pWin=0, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); SfxErrorContext( - USHORT nCtxIdP, const String &aArg1, Window *pWin=0, - USHORT nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - virtual BOOL GetString(ULONG nErrId, String &rStr); + sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + virtual sal_Bool GetString(sal_uLong nErrId, String &rStr); private: - USHORT nCtxId; - USHORT nResId; + sal_uInt16 nCtxId; + sal_uInt16 nResId; ResMgr *pMgr; String aArg1; }; @@ -59,24 +59,24 @@ private: class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: - SfxErrorHandler(USHORT nId, ULONG lStart, ULONG lEnd, ResMgr *pMgr=0); + SfxErrorHandler(sal_uInt16 nId, sal_uLong lStart, sal_uLong lEnd, ResMgr *pMgr=0); ~SfxErrorHandler(); protected: - virtual BOOL GetErrorString(ULONG lErrId, String &, USHORT&) const; - virtual BOOL GetMessageString(ULONG lErrId, String &, USHORT&) const; + virtual sal_Bool GetErrorString(sal_uLong lErrId, String &, sal_uInt16&) const; + virtual sal_Bool GetMessageString(sal_uLong lErrId, String &, sal_uInt16&) const; private: - ULONG lStart; - ULONG lEnd; - USHORT nId; + sal_uLong lStart; + sal_uLong lEnd; + sal_uInt16 nId; ResMgr *pMgr; ResMgr *pFreeMgr; - SVT_DLLPRIVATE BOOL GetClassString(ULONG lErrId, String &) const; - virtual BOOL CreateString( - const ErrorInfo *, String &, USHORT &) const; + SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, String &) const; + virtual sal_Bool CreateString( + const ErrorInfo *, String &, sal_uInt16 &) const; }; #endif diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx index bbc839d12c8a..abae6318de69 100644 --- a/svtools/inc/svtools/embedhlp.hxx +++ b/svtools/inc/svtools/embedhlp.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <vcl/graph.hxx> -#include <vcl/mapunit.hxx> +#include <tools/mapunit.hxx> #include <rtl/ustring.hxx> #define NS_UNO ::com::sun::star::uno @@ -58,8 +58,8 @@ namespace svt EmbeddedObjectRef_Impl* mpImp; NS_UNO::Reference < NS_EMBED::XEmbeddedObject > mxObj; - SVT_DLLPRIVATE SvStream* GetGraphicStream( BOOL bUpdate ) const; - /* SVT_DLLPRIVATE */ void GetReplacement( BOOL bUpdate ); + SVT_DLLPRIVATE SvStream* GetGraphicStream( sal_Bool bUpdate ) const; + /* SVT_DLLPRIVATE */ void GetReplacement( sal_Bool bUpdate ); SVT_DLLPRIVATE void Construct_Impl(); EmbeddedObjectRef& operator = ( const EmbeddedObjectRef& ); @@ -70,7 +70,7 @@ namespace svt static void DrawPaintReplacement( const Rectangle &rRect, const String &rText, OutputDevice *pOut ); static void DrawShading( const Rectangle &rRect, OutputDevice *pOut ); - static BOOL TryRunningState( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& ); + static sal_Bool TryRunningState( const NS_UNO::Reference < NS_EMBED::XEmbeddedObject >& ); static void SetGraphicToContainer( const Graphic& rGraphic, comphelper::EmbeddedObjectContainer& aContainer, const ::rtl::OUString& aName, @@ -95,7 +95,7 @@ namespace svt ~EmbeddedObjectRef(); EmbeddedObjectRef( const EmbeddedObjectRef& ); - BOOL TryRunningState(); + sal_Bool TryRunningState(); // assigning to a container enables the object to exchange graphical representations with a storage void AssignToContainer( comphelper::EmbeddedObjectContainer* pContainer, const ::rtl::OUString& rPersistName ); @@ -115,15 +115,15 @@ namespace svt const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInGrStream, const ::rtl::OUString& rMediaType ); - void UpdateReplacement() { GetReplacement( TRUE ); } + void UpdateReplacement() { GetReplacement( sal_True ); } void UpdateReplacementOnDemand(); MapUnit GetMapUnit() const; - void Lock( BOOL bLock = TRUE ); - BOOL IsLocked() const; + void Lock( sal_Bool bLock = sal_True ); + sal_Bool IsLocked() const; void Clear(); - BOOL is() const { return mxObj.is(); } + sal_Bool is() const { return mxObj.is(); } - BOOL IsChart() const; + sal_Bool IsChart() const; // #i104867# // Provides a graphic version number for the fetchable Graphic during this object's lifetime. Internally, diff --git a/svtools/inc/expander.hxx b/svtools/inc/svtools/expander.hxx index 55b339ba9dfc..da998d50d332 100644 --- a/svtools/inc/expander.hxx +++ b/svtools/inc/svtools/expander.hxx @@ -53,9 +53,9 @@ private: Image aActiveImage; Rectangle maFocusRect; ImageList maExpanderImages; - BOOL mbIsExpanded; - BOOL mbHasFocusRect; - BOOL mbIsInMouseDown; + sal_Bool mbIsExpanded; + sal_Bool mbHasFocusRect; + sal_Bool mbIsInMouseDown; Link maToggleHdl; SvExpanderStateType eType; @@ -76,9 +76,9 @@ public: SvExpander( Window* pParent, WinBits nStyle = 0 ); SvExpander( Window* pParent, const ResId& rResId ); - BOOL IsExpanded() {return mbIsExpanded;} + sal_Bool IsExpanded() {return mbIsExpanded;} - void SetToExpanded(BOOL bFlag=TRUE); + void SetToExpanded(sal_Bool bFlag=sal_True); void SetExpanderImage( SvExpanderStateType eType); Image GetExpanderImage(SvExpanderStateType eType); diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx index 11d551cd88e6..11d551cd88e6 100644 --- a/svtools/inc/extcolorcfg.hxx +++ b/svtools/inc/svtools/extcolorcfg.hxx diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx index 87d05eb20bb2..40eace698501 100644 --- a/svtools/inc/filectrl.hxx +++ b/svtools/inc/svtools/filectrl.hxx @@ -38,14 +38,14 @@ #define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! // Flags for FileControl -typedef USHORT FileControlMode; -#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely +typedef sal_uInt16 FileControlMode; +#define FILECTRL_RESIZEBUTTONBYPATHLEN ((sal_uInt16)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely // Flags for internal use of FileControl -typedef USHORT FileControlMode_Internal; -#define FILECTRL_INRESIZE ((USHORT)0x0001) -#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) +typedef sal_uInt16 FileControlMode_Internal; +#define FILECTRL_INRESIZE ((sal_uInt16)0x0001) +#define FILECTRL_ORIGINALBUTTONTEXT ((sal_uInt16)0x0002) class SVT_DLLPUBLIC FileControl : public Window @@ -55,7 +55,7 @@ private: PushButton maButton; String maButtonText; - BOOL mbOpenDlg; + sal_Bool mbOpenDlg; Link maDialogCreatedHdl; @@ -79,10 +79,10 @@ public: Edit& GetEdit() { return maEdit; } PushButton& GetButton() { return maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } - BOOL IsOpenDialog() const { return mbOpenDlg; } + void SetOpenDialog( sal_Bool bOpen ) { mbOpenDlg = bOpen; } + sal_Bool IsOpenDialog() const { return mbOpenDlg; } void SetText( const XubString& rStr ); XubString GetText() const; @@ -91,8 +91,8 @@ public: void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } Selection GetSelection() const { return maEdit.GetSelection(); } - void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } - BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } + void SetReadOnly( sal_Bool bReadOnly = sal_True ) { maEdit.SetReadOnly( bReadOnly ); } + sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); } //------ //manipulate the Button-Text: diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx index 7f9452573fe1..1e31ddc7a6a6 100644 --- a/svtools/inc/filedlg.hxx +++ b/svtools/inc/svtools/filedlg.hxx @@ -52,7 +52,7 @@ protected: UniString aDfltExt; // Default - Extension public: - PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); + PathDialog( Window* pParent, WinBits nWinStyle = 0, sal_Bool bCreateDir = sal_True ); ~PathDialog(); virtual long OK(); @@ -91,9 +91,9 @@ public: void RemoveAllFilter(); void SetCurFilter( const UniString& rFilter ); UniString GetCurFilter() const; - USHORT GetFilterCount() const; - UniString GetFilterName( USHORT nPos ) const; - UniString GetFilterType( USHORT nPos ) const; + sal_uInt16 GetFilterCount() const; + UniString GetFilterName( sal_uInt16 nPos ) const; + UniString GetFilterType( sal_uInt16 nPos ) const; void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } const Link& GetFileSelectHdl() const { return aFileHdlLink; } diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc index a87bd6ebcad0..a87bd6ebcad0 100644 --- a/svtools/inc/filedlg2.hrc +++ b/svtools/inc/svtools/filedlg2.hrc diff --git a/svtools/inc/fileview.hxx b/svtools/inc/svtools/fileview.hxx index 31137017389e..3c78e1d48706 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -103,8 +103,8 @@ public: sal_Bool GetParentURL( String& _rParentURL ) const; sal_Bool CreateNewFolder( const String& rNewFolder ); - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; + void SetHelpId( const rtl::OString& rHelpId ); + const rtl::OString& GetHelpId( ) const; void SetSizePixel( const Size& rNewSize ); using Window::SetPosSizePixel; virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); @@ -188,7 +188,7 @@ public: void SetDoubleClickHdl( const Link& rHdl ); void SetOpenDoneHdl( const Link& rHdl ); - ULONG GetSelectionCount() const; + sal_uLong GetSelectionCount() const; SvLBoxEntry* FirstSelected() const; SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; void EnableAutoResize(); @@ -198,7 +198,7 @@ public: void EnableDelete( sal_Bool bEnable ); void EnableNameReplacing( sal_Bool bEnable = sal_True ); // translate folder names or display doc-title instead of file name - // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! + // EnableContextMenu( sal_True )/EnableDelete(sal_True) disable name replacing! // save and load column size and sort order String GetConfigString() const; diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index ceb966ac90ff..105783013bdc 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -45,7 +45,7 @@ struct ImplDirEntryHelper { - static BOOL Exists( const INetURLObject& rObj ); + static sal_Bool Exists( const INetURLObject& rObj ); static void Kill( const String& rStr ); }; @@ -65,8 +65,8 @@ class Graphic; #define GRFILTER_OUTHINT_GREY 1 -#define GRFILTER_FORMAT_NOTFOUND ((USHORT)0xFFFF) -#define GRFILTER_FORMAT_DONTKNOW ((USHORT)0xFFFF) +#define GRFILTER_FORMAT_NOTFOUND ((sal_uInt16)0xFFFF) +#define GRFILTER_FORMAT_DONTKNOW ((sal_uInt16)0xFFFF) #define GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG 00000001 #define GRFILTER_I_FLAGS_DONT_SET_LOGSIZE_FOR_JPEG 00000002 @@ -108,42 +108,32 @@ class Graphic; // unterstuetzten Grafik-Fileformate // ------------------------------------ -#define GFF_NOT ( (USHORT)0x0000 ) -#define GFF_BMP ( (USHORT)0x0001 ) -#define GFF_GIF ( (USHORT)0x0002 ) -#define GFF_JPG ( (USHORT)0x0003 ) -#define GFF_PCD ( (USHORT)0x0004 ) -#define GFF_PCX ( (USHORT)0x0005 ) -#define GFF_PNG ( (USHORT)0x0006 ) -#define GFF_TIF ( (USHORT)0x0007 ) -#define GFF_XBM ( (USHORT)0x0008 ) -#define GFF_XPM ( (USHORT)0x0009 ) -#define GFF_PBM ( (USHORT)0x000a ) -#define GFF_PGM ( (USHORT)0x000b ) -#define GFF_PPM ( (USHORT)0x000c ) -#define GFF_RAS ( (USHORT)0x000d ) -#define GFF_TGA ( (USHORT)0x000e ) -#define GFF_PSD ( (USHORT)0x000f ) -#define GFF_EPS ( (USHORT)0x0010 ) -#define GFF_DXF ( (USHORT)0x00f1 ) -#define GFF_MET ( (USHORT)0x00f2 ) -#define GFF_PCT ( (USHORT)0x00f3 ) -#define GFF_SGF ( (USHORT)0x00f4 ) -#define GFF_SVM ( (USHORT)0x00f5 ) -#define GFF_WMF ( (USHORT)0x00f6 ) -#define GFF_SGV ( (USHORT)0x00f7 ) -#define GFF_EMF ( (USHORT)0x00f8 ) -#define GFF_XXX ( (USHORT)0xffff ) - -// --------------- -// - RequestInfo - -// --------------- - -struct RequestInfo -{ - BYTE* pBuffer; - ULONG nRealBufferSize; -}; +#define GFF_NOT ( (sal_uInt16)0x0000 ) +#define GFF_BMP ( (sal_uInt16)0x0001 ) +#define GFF_GIF ( (sal_uInt16)0x0002 ) +#define GFF_JPG ( (sal_uInt16)0x0003 ) +#define GFF_PCD ( (sal_uInt16)0x0004 ) +#define GFF_PCX ( (sal_uInt16)0x0005 ) +#define GFF_PNG ( (sal_uInt16)0x0006 ) +#define GFF_TIF ( (sal_uInt16)0x0007 ) +#define GFF_XBM ( (sal_uInt16)0x0008 ) +#define GFF_XPM ( (sal_uInt16)0x0009 ) +#define GFF_PBM ( (sal_uInt16)0x000a ) +#define GFF_PGM ( (sal_uInt16)0x000b ) +#define GFF_PPM ( (sal_uInt16)0x000c ) +#define GFF_RAS ( (sal_uInt16)0x000d ) +#define GFF_TGA ( (sal_uInt16)0x000e ) +#define GFF_PSD ( (sal_uInt16)0x000f ) +#define GFF_EPS ( (sal_uInt16)0x0010 ) +#define GFF_DXF ( (sal_uInt16)0x00f1 ) +#define GFF_MET ( (sal_uInt16)0x00f2 ) +#define GFF_PCT ( (sal_uInt16)0x00f3 ) +#define GFF_SGF ( (sal_uInt16)0x00f4 ) +#define GFF_SVM ( (sal_uInt16)0x00f5 ) +#define GFF_WMF ( (sal_uInt16)0x00f6 ) +#define GFF_SGV ( (sal_uInt16)0x00f7 ) +#define GFF_EMF ( (sal_uInt16)0x00f8 ) +#define GFF_XXX ( (sal_uInt16)0xffff ) // --------------------- // - GraphicDescriptor - @@ -152,71 +142,47 @@ struct RequestInfo class SVT_DLLPUBLIC GraphicDescriptor { SvStream* pFileStm; - Link aReqLink; + String aPathExt; Size aPixSize; Size aLogSize; - SvStream* pMemStm; - SvStream* pBaseStm; - ULONG nStmPos; - USHORT nBitsPerPixel; - USHORT nPlanes; - USHORT nFormat; - BOOL bCompressed; - BOOL bDataReady; - BOOL bLinked; - BOOL bLinkChanged; - BOOL bWideSearch; - BOOL bBaseStm; - long nExtra1; - long nExtra2; + sal_uInt16 nBitsPerPixel; + sal_uInt16 nPlanes; + sal_uInt16 nFormat; + sal_Bool bCompressed; + sal_Bool bOwnStream; void ImpConstruct(); - BOOL ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCD( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectXBM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectXPM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPBM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPGM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPPM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectRAS( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectTGA( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectEPS( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectDXF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectMET( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectPCT( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSGF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectWMF( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo ); - BOOL ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo ); - + sal_Bool ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo ); + sal_Bool ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo ); GraphicDescriptor( const GraphicDescriptor& ); GraphicDescriptor& operator=( const GraphicDescriptor& ); -protected: - - BOOL IsDataReady() const; - BOOL IsWideSearch() const; - SvStream& GetSearchStream() const; - const String& GetPathExtension() const; - public: - // Default-Ctor, um anschliessend einen Link zu setzen, mit dem - // die Daten vom Aufrufer im ::Detect() angefordert werden. - // da einige Formate ( Mtf's ) keinen eindeutigen Header besitzen, - // ist es sinnvoll den vollen Filenamen (inkl. Ext. ) mitanzugeben, - // da so das Format ueber die Extension ermittelt werden kann - GraphicDescriptor( const String* pPath = NULL ); - // Ctor, um einen Filenamen zu setzen. Es muss ::Detect() gerufen werden, // um das File zu identifizieren; // wenn das File keinen eindeutigen Header besitzt ( Mtf's ) wird das @@ -234,14 +200,14 @@ public: virtual ~GraphicDescriptor(); // Startet die Detektion; - // bei bExtendedInfo == TRUE werden soweit wie moeglich + // bei bExtendedInfo == sal_True werden soweit wie moeglich // Daten aus dem jeweiligen FileHeader ermittelt // ( Groesse, Farbtiefe usw. ) - virtual BOOL Detect( BOOL bExtendedInfo = FALSE ); + virtual sal_Bool Detect( sal_Bool bExtendedInfo = sal_False ); // liefert das Fileformat nach erfolgreicher Detektion zurueck; // wenn kein Format erkannt wurde, ist das Formart GFF_NOT - USHORT GetFileFormat() const { return nFormat; } + sal_uInt16 GetFileFormat() const { return nFormat; } // liefert die Pixel-Bildgroesse oder 0-Size zurueck const Size& GetSizePixel() const { return (Size&) aPixSize; } @@ -250,28 +216,13 @@ public: const Size& GetSize_100TH_MM() const { return (Size&) aLogSize; } // liefert die Bits/Pixel oder 0 zurueck - USHORT GetBitsPerPixel() const { return nBitsPerPixel; } + sal_uInt16 GetBitsPerPixel() const { return nBitsPerPixel; } // liefert die Anzahl der Planes oder 0 zurueck - USHORT GetPlanes() const { return nPlanes; } + sal_uInt16 GetPlanes() const { return nPlanes; } // zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist - BOOL IsCompressed() const { return bCompressed; } - - // setzt den LinkHdl zum Setzen der Bytes; - // der Handler muss einen Pointer auf die RequestInfo-Struktur - // zurueckgeben; die Anzahl der minimal zur Verfuegung zu stellenden - // Daten muss im Handler ueber ::GetRequestedByteCount() erfragt werden; - // die tatsaechlich zur Verfuegung gestellte BYTE-Anzahl - // wird in der RequestInfo-Struktur gesetzt - void SetRequestHdl( const Link& rRequestHdl ); - - // gibt den LinkHdl zum Setzen der Bytes zurueck - const Link& GetRequestHdl() const { return aReqLink; } - - // muss im ReqHdl gerufen werden, um zu erfahren, wieviele - // Bytes _mindestens_ bereitgestellt werden muessen - ULONG GetRequestedByteCount() const; + sal_Bool IsCompressed() const { return bCompressed; } // gibt die Filternummer des Filters zurueck, // der im GraphicFilter zum Lesen dieses Formats @@ -285,8 +236,8 @@ public: struct FilterErrorEx { - ULONG nFilterError; - ULONG nStreamError; + sal_uLong nFilterError; + sal_uLong nStreamError; long nDummy1; long nDummy2; long nDummy3; @@ -306,7 +257,7 @@ class SVT_DLLPUBLIC GraphicFilter private: void ImplInit(); - ULONG ImplSetError( ULONG nError, const SvStream* pStm = NULL ); + sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = NULL ); sal_uInt16 ImpTestOrFindFormat( const String& rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_LINK( FilterCallback, ConvertData* pData ); @@ -334,73 +285,73 @@ public: void SetFilterPath( const String& rFilterPath ) { aFilterPath = rFilterPath; }; - USHORT GetImportFormatCount(); - USHORT GetImportFormatNumber( const String& rFormatName ); - USHORT GetImportFormatNumberForMediaType( const String& rMediaType ); - USHORT GetImportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetImportFormatCount(); + sal_uInt16 GetImportFormatNumber( const String& rFormatName ); + sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); - String GetImportFormatName( USHORT nFormat ); - String GetImportFormatTypeName( USHORT nFormat ); - String GetImportFormatMediaType( USHORT nFormat ); - String GetImportFormatShortName( USHORT nFormat ); - String GetImportOSFileType( USHORT nFormat ); - String GetImportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 ); - BOOL IsImportPixelFormat( USHORT nFormat ); - - USHORT GetExportFormatCount(); - USHORT GetExportFormatNumber( const String& rFormatName ); - USHORT GetExportFormatNumberForMediaType( const String& rShortName ); - USHORT GetExportFormatNumberForShortName( const String& rShortName ); + String GetImportFormatName( sal_uInt16 nFormat ); + String GetImportFormatTypeName( sal_uInt16 nFormat ); + String GetImportFormatMediaType( sal_uInt16 nFormat ); + String GetImportFormatShortName( sal_uInt16 nFormat ); + String GetImportOSFileType( sal_uInt16 nFormat ); + String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + + sal_uInt16 GetExportFormatCount(); + sal_uInt16 GetExportFormatNumber( const String& rFormatName ); + sal_uInt16 GetExportFormatNumberForMediaType( const String& rShortName ); + sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); - String GetExportFormatName( USHORT nFormat ); - String GetExportFormatTypeName( USHORT nFormat ); - String GetExportFormatMediaType( USHORT nFormat ); - String GetExportFormatShortName( USHORT nFormat ); - String GetExportOSFileType( USHORT nFormat ); - String GetExportWildcard( USHORT nFormat, sal_Int32 nEntry = 0 ); - BOOL IsExportPixelFormat( USHORT nFormat ); - - BOOL HasImportDialog( USHORT nFormat ); - BOOL DoImportDialog( Window* pWindow, USHORT nFormat ); - - BOOL HasExportDialog( USHORT nFormat ); - BOOL DoExportDialog( Window* pWindow, USHORT nFormat ); - BOOL DoExportDialog( Window* pWindow, USHORT nFormat, FieldUnit eFieldUnit ); - - USHORT ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, + String GetExportFormatName( sal_uInt16 nFormat ); + String GetExportFormatTypeName( sal_uInt16 nFormat ); + String GetExportFormatMediaType( sal_uInt16 nFormat ); + String GetExportFormatShortName( sal_uInt16 nFormat ); + String GetExportOSFileType( sal_uInt16 nFormat ); + String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + + sal_Bool HasImportDialog( sal_uInt16 nFormat ); + sal_Bool DoImportDialog( Window* pWindow, sal_uInt16 nFormat ); + + sal_Bool HasExportDialog( sal_uInt16 nFormat ); + sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat ); + sal_Bool DoExportDialog( Window* pWindow, sal_uInt16 nFormat, FieldUnit eFieldUnit ); + + sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); - USHORT ExportGraphic( const Graphic& rGraphic, const String& rPath, - SvStream& rOStm, USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 ExportGraphic( const Graphic& rGraphic, const String& rPath, + SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); long GetExportGraphicHint() const { return nExpGraphHint; } - USHORT CanImportGraphic( const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL); + sal_uInt16 CanImportGraphic( const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL); - USHORT ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + sal_uInt16 ImportGraphic( Graphic& rGraphic, const INetURLObject& rPath, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); - USHORT CanImportGraphic( const String& rPath, SvStream& rStream, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL); + sal_uInt16 CanImportGraphic( const String& rPath, SvStream& rStream, + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL); - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rStream, - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW, - USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, + sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 ); - USHORT ImportGraphic( Graphic& rGraphic, const String& rPath, + sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rStream, - USHORT nFormat, - USHORT * pDeterminedFormat, sal_uInt32 nImportFlags, + sal_uInt16 nFormat, + sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ); - BOOL Setup( USHORT nFormat ); + sal_Bool Setup( sal_uInt16 nFormat ); - void Abort() { bAbort = TRUE; } + void Abort() { bAbort = sal_True; } const FilterErrorEx& GetLastError() const; void ResetLastError(); @@ -410,16 +361,16 @@ public: static int LoadGraphic( const String& rPath, const String& rFilter, Graphic& rGraphic, GraphicFilter* pFilter = NULL, - USHORT* pDeterminedFormat = NULL ); + sal_uInt16* pDeterminedFormat = NULL ); }; // ------------------------------------ // - Windows Metafile Lesen/Schreiben - // ------------------------------------ -SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); -SVT_DLLPUBLIC BOOL WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); -SVT_DLLPUBLIC BOOL WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); #endif //_FILTER_HXX diff --git a/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx index aa973d629e79..a3bc298cc106 100644 --- a/svtools/inc/svtools/fltcall.hxx +++ b/svtools/inc/svtools/fltcall.hxx @@ -56,19 +56,19 @@ struct FltCallDialogParameter eFieldUnit ( eFiUni ) {}; }; -typedef BOOL (*PFilterCall)(SvStream & rStream, Graphic & rGraphic, +typedef sal_Bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool bPrefDialog); // Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. // rFileName ist der komplette Pfadname der zu importierenden bzw. zu exportierenden Datei. // pCallBack darf auch NULL sein. pCallerData wird der Callback-Funktion uebergeben. // pOptionsConfig darf NULL sein. Anderenfalls ist die Gruppe des Config schon gesetzt // und darf von dem Filter nicht geaendert werden! - // Wenn bPrefDialog==TRUE gilt, wird ggf. ein Preferences-Dialog durchgefuehrt. + // Wenn bPrefDialog==sal_True gilt, wird ggf. ein Preferences-Dialog durchgefuehrt. -typedef BOOL ( *PFilterDlgCall )( FltCallDialogParameter& ); +typedef sal_Bool ( *PFilterDlgCall )( FltCallDialogParameter& ); // Von diesem Typ sind sowohl Export-Filter-Funktionen als auch Import-Filter-Funktionen. // Uebergeben wird ein Pointer auf ein Parent-Fenster und auf die Options-Config. - // pOptions und pWindow duerfen NULL sein, in diesem Fall wird FALSE zurueckgeliefert. + // pOptions und pWindow duerfen NULL sein, in diesem Fall wird sal_False zurueckgeliefert. // Anderenfalls ist die Gruppe der Config schon gesetzt // und darf von dem Filter nicht geaendert werden! diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx index 665945d6d3b2..fbdfb573edae 100644 --- a/svtools/inc/fltdefs.hxx +++ b/svtools/inc/svtools/fltdefs.hxx @@ -35,18 +35,18 @@ #define _FLTDEFS_HXX -#if defined ( WIN ) || defined ( WNT ) +#if defined ( WNT ) #define RGBQUAD RGBQUADWIN typedef struct RGBQUAD { - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; + sal_uInt8 rgbBlue; + sal_uInt8 rgbGreen; + sal_uInt8 rgbRed; + sal_uInt8 rgbReserved; - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) : rgbBlue ( cBlue ), rgbGreen ( cGreen ), rgbRed ( cRed ), @@ -54,43 +54,27 @@ typedef struct RGBQUAD } RGBQUAD; -#ifdef WIN -typedef BYTE huge* PDIBBYTE; -#define MEMCPY hmemcpy -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) -#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) -#define MEMSET( pDst, cByte, nCount ) \ -{ \ - PDIBBYTE pTmp = (PDIBBYTE) pDst; \ - for ( ULONG i = 0; i < nCount; i++ )\ - *pTmp++ = cByte; \ -} - -#else - -typedef BYTE* PDIBBYTE; +typedef sal_uInt8* PDIBBYTE; #define MEMCPY memcpy #define MEMSET memset #define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) #define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) #define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) -#endif #else -typedef BYTE* PDIBBYTE; +typedef sal_uInt8* PDIBBYTE; #define MEMCPY memcpy #define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) +#define GLOBALALLOC(nSize) ((PDIBBYTE)new sal_uInt8[(nSize)]) #define GLOBALFREE(pPointer) (delete[] (pPointer)) #endif #if defined ( OS2 ) || defined ( UNX ) -void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); -void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); +void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 ); +void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer ); #ifdef OS2 #define RGBQUAD RGBQUADOS2 @@ -104,12 +88,12 @@ void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); typedef struct RGBQUAD { - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; + sal_uInt8 rgbBlue; + sal_uInt8 rgbGreen; + sal_uInt8 rgbRed; + sal_uInt8 rgbReserved; - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + RGBQUAD( const sal_uInt8 cRed = 0, const sal_uInt8 cGreen = 0, const sal_uInt8 cBlue = 0 ) : rgbBlue ( cBlue ), rgbGreen ( cGreen ), rgbRed ( cRed ), @@ -118,27 +102,27 @@ typedef struct RGBQUAD typedef struct BITMAPFILEHEADER { - UINT16 bfType; - UINT32 bfSize; - UINT16 bfReserved1; - UINT16 bfReserved2; - UINT32 bfOffBits; + sal_uInt16 bfType; + sal_uInt32 bfSize; + sal_uInt16 bfReserved1; + sal_uInt16 bfReserved2; + sal_uInt32 bfOffBits; } BITMAPFILEHEADER; typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; typedef struct BITMAPINFOHEADER { - UINT32 biSize; - UINT32 biWidth; - UINT32 biHeight; - UINT16 biPlanes; - UINT16 biBitCount; - UINT32 biCompression; - UINT32 biSizeImage; - UINT32 biXPelsPerMeter; - UINT32 biYPelsPerMeter; - UINT32 biClrUsed; - UINT32 biClrImportant; + sal_uInt32 biSize; + sal_uInt32 biWidth; + sal_uInt32 biHeight; + sal_uInt16 biPlanes; + sal_uInt16 biBitCount; + sal_uInt32 biCompression; + sal_uInt32 biSizeImage; + sal_uInt32 biXPelsPerMeter; + sal_uInt32 biYPelsPerMeter; + sal_uInt32 biClrUsed; + sal_uInt32 biClrImportant; } BITMAPINFOHEADER; typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx index 406c827a7636..c7192392811d 100644 --- a/svtools/inc/svtools/fmtfield.hxx +++ b/svtools/inc/svtools/fmtfield.hxx @@ -45,7 +45,7 @@ namespace validation { class NumberValidator; } #endif -typedef USHORT FORMAT_CHANGE_TYPE; +typedef sal_uInt16 FORMAT_CHANGE_TYPE; #define FCT_KEYONLY 0x00 // only a new key was set #define FCT_FORMATTER 0x01 // a new formatter weas set, usually implies a change of the key, too #define FCT_PRECISION 0x02 // a new precision was set @@ -61,7 +61,7 @@ private: class StaticFormatter { static SvNumberFormatter* s_cFormatter; - static ULONG s_nReferences; + static sal_uLong s_nReferences; public: StaticFormatter(); ~StaticFormatter(); @@ -78,19 +78,19 @@ protected: double m_dMinValue; double m_dMaxValue; - BOOL m_bHasMin : 1; - BOOL m_bHasMax : 1; + sal_Bool m_bHasMin : 1; + sal_Bool m_bHasMax : 1; - BOOL m_bStrictFormat : 1; + sal_Bool m_bStrictFormat : 1; - BOOL m_bValueDirty : 1; - BOOL m_bEnableEmptyField : 1; - BOOL m_bAutoColor : 1; - BOOL m_bEnableNaN : 1; + sal_Bool m_bValueDirty : 1; + sal_Bool m_bEnableEmptyField : 1; + sal_Bool m_bAutoColor : 1; + sal_Bool m_bEnableNaN : 1; double m_dCurrentValue; double m_dDefaultValue; - ULONG m_nFormatKey; + sal_uLong m_nFormatKey; SvNumberFormatter* m_pFormatter; StaticFormatter m_aStaticFormatter; @@ -101,7 +101,7 @@ protected: // es macht einen Unterschied, ob man bei eingestellter Textformatierung beim LostFocus den aktuellen String durch // den Formatter jagt und das Ergebnis anzeigt oder erst aus dem String ein double macht, das formatiert und dann // ausgibt - BOOL m_bTreatAsNumber; + sal_Bool m_bTreatAsNumber; // und mit den folgenden Members koennen wir das Ganze hier auch zur formatierten Text-Ausgabe benutzen ... String m_sCurrentTextValue; String m_sDefaultText; @@ -113,18 +113,18 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, INT32 nFormatKey = 0); - FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter = NULL, INT32 nFormatKey = 0); + FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); + FormattedField(Window* pParent, const ResId& rResId, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); virtual ~FormattedField(); // Min-/Max-Verwaltung - BOOL HasMinValue() const { return m_bHasMin; } - void ClearMinValue() { m_bHasMin = FALSE; } + sal_Bool HasMinValue() const { return m_bHasMin; } + void ClearMinValue() { m_bHasMin = sal_False; } void SetMinValue(double dMin); double GetMinValue() const { return m_dMinValue; } - BOOL HasMaxValue() const { return m_bHasMax; } - void ClearMaxValue() { m_bHasMax = FALSE; } + sal_Bool HasMaxValue() const { return m_bHasMax; } + void ClearMaxValue() { m_bHasMax = sal_False; } void SetMaxValue(double dMax); double GetMaxValue() const { return m_dMaxValue; } @@ -138,30 +138,30 @@ public: void SetTextValue(const XubString& rText); // der String wird in ein double umgewandelt (durch den Formatter) und anschliessen in SetValue gesteckt - BOOL IsEmptyFieldEnabled() const { return m_bEnableEmptyField; } - void EnableEmptyField(BOOL bEnable); + sal_Bool IsEmptyFieldEnabled() const { return m_bEnableEmptyField; } + void EnableEmptyField(sal_Bool bEnable); // wenn nicht enabled, wird beim Verlassen des Feldes der Text auf den letzten gueltigen zurueckgesetzt - void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = TRUE; } + void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = sal_True; } // wenn der aktuelle String ungueltig ist, liefert GetValue() diesen Default-Wert double GetDefaultValue() const { return m_dDefaultValue; } // Einstellungen fuer das Format - ULONG GetFormatKey() const { return m_nFormatKey; } - void SetFormatKey(ULONG nFormatKey); + sal_uLong GetFormatKey() const { return m_nFormatKey; } + void SetFormatKey(sal_uLong nFormatKey); SvNumberFormatter* GetFormatter() const { return m_pFormatter; } - void SetFormatter(SvNumberFormatter* pFormatter, BOOL bResetFormat = TRUE); - // wenn bResetFormat FALSE ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht + void SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat = sal_True); + // wenn bResetFormat sal_False ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht // um eines der Standard-Formate handelt, die in allen Formattern gleich sind) - // wenn TRUE, wird als neuer FormatKey 0 gesetzt + // wenn sal_True, wird als neuer FormatKey 0 gesetzt - BOOL GetThousandsSep() const; - void SetThousandsSep(BOOL _bUseSeparator); + sal_Bool GetThousandsSep() const; + void SetThousandsSep(sal_Bool _bUseSeparator); // the is no check if the current format is numeric, so be cautious when calling these functions - USHORT GetDecimalDigits() const; - void SetDecimalDigits(USHORT _nPrecision); + sal_uInt16 GetDecimalDigits() const; + void SetDecimalDigits(sal_uInt16 _nPrecision); // the is no check if the current format is numeric, so be cautious when calling these functions SvNumberFormatter* StandardFormatter() { return m_aStaticFormatter; } @@ -170,11 +170,11 @@ public: // also ist etwas Vorsicht angebracht ... void GetFormat(XubString& rFormatString, LanguageType& eLang) const; - BOOL SetFormat(const XubString& rFormatString, LanguageType eLang); - // FALSE, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist) + sal_Bool SetFormat(const XubString& rFormatString, LanguageType eLang); + // sal_False, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist) - BOOL IsStrictFormat() const { return m_bStrictFormat; } - void SetStrictFormat(BOOL bEnable) { m_bStrictFormat = bEnable; } + sal_Bool IsStrictFormat() const { return m_bStrictFormat; } + void SetStrictFormat(sal_Bool bEnable) { m_bStrictFormat = bEnable; } // Formatueberpruefung waehrend der Eingabe ? // Spin-Handling @@ -194,15 +194,15 @@ public: void SetSpinLast(double dLast) { m_dSpinLast = dLast; } double GetSpinLast() const { return m_dSpinLast; } - BOOL TreatingAsNumber() const { return m_bTreatAsNumber; } - void TreatAsNumber(BOOL bDoSo) { m_bTreatAsNumber = bDoSo; } + sal_Bool TreatingAsNumber() const { return m_bTreatAsNumber; } + void TreatAsNumber(sal_Bool bDoSo) { m_bTreatAsNumber = bDoSo; } public: virtual void SetText( const XubString& rStr ); virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); void SetValidateText(const XubString& rText, const String* pErrorText = NULL); - // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf FALSE sitzt + // die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf sal_False sitzt /** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling gar nicht haben, sondern einfach den Text formatiert ausgeben ... (der Text wird einfach nur durch den Formatter gejagt und dann gesetzt) @@ -223,12 +223,12 @@ public: */ void Commit(); - // enable automatic coloring. if set to TRUE, and the format the field is working with for any current value + // enable automatic coloring. if set to sal_True, and the format the field is working with for any current value // says that it has to be painted in a special color (e.g. a format where negative numbers should be printed // red), the text is painted with that color automatically. // The color used is the same as returned by GetLastOutputColor() - void SetAutoColor(BOOL _bAutomatic); - BOOL GetAutoColor() const { return m_bAutoColor; } + void SetAutoColor(sal_Bool _bAutomatic); + sal_Bool GetAutoColor() const { return m_bAutoColor; } /** enables handling of not-a-number value. @@ -244,8 +244,8 @@ public: control, and then tabs out of it, the text "foo" will persist, and GetValue will return NaN in subsequent calls. */ - void EnableNotANumber( BOOL _bEnable ); - BOOL IsNotANumberEnabled( ) const { return m_bEnableNaN; } + void EnableNotANumber( sal_Bool _bEnable ); + sal_Bool IsNotANumberEnabled( ) const { return m_bEnableNaN; } /** When being set to true, the strings in the field are formatted using the InputLine format. That's also what you get in Calc when you edit a cell @@ -259,16 +259,16 @@ protected: virtual void Modify(); // CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit - virtual BOOL CheckText(const XubString&) const { return TRUE; } + virtual sal_Bool CheckText(const XubString&) const { return sal_True; } // any aspect of the current format has changed virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); void ImplSetTextImpl(const XubString& rNew, Selection* pNewSel); - void ImplSetValue(double dValue, BOOL bForce); - BOOL ImplGetValue(double& dNewVal); + void ImplSetValue(double dValue, sal_Bool bForce); + sal_Bool ImplGetValue(double& dNewVal); - void ImplSetFormatKey(ULONG nFormatKey); + void ImplSetFormatKey(sal_uLong nFormatKey); // SetFormatKey without FormatChanged notification virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } @@ -314,7 +314,7 @@ public: virtual ~DoubleNumericField(); protected: - virtual BOOL CheckText(const XubString& sText) const; + virtual sal_Bool CheckText(const XubString& sText) const; virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); void ResetConformanceTester(); @@ -328,8 +328,8 @@ protected: class DoubleCurrencyField : public FormattedField { XubString m_sCurrencySymbol; - BOOL m_bPrependCurrSym; - BOOL m_bChangingFormat; + sal_Bool m_bPrependCurrSym; + sal_Bool m_bChangingFormat; public: DoubleCurrencyField(Window* pParent, WinBits nStyle = 0); @@ -338,8 +338,8 @@ public: XubString getCurrencySymbol() const { return m_sCurrencySymbol; } void setCurrencySymbol(const XubString& _sSymbol); - BOOL getPrependCurrSym() const { return m_bPrependCurrSym; } - void setPrependCurrSym(BOOL _bPrepend); + sal_Bool getPrependCurrSym() const { return m_bPrependCurrSym; } + void setPrependCurrSym(sal_Bool _bPrepend); protected: virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat); diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx index f7bce249e2a3..f7bce249e2a3 100644 --- a/svtools/inc/fontsubstconfig.hxx +++ b/svtools/inc/svtools/fontsubstconfig.hxx diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx index 4a41d93d5334..4a41d93d5334 100644 --- a/svtools/inc/framestatuslistener.hxx +++ b/svtools/inc/svtools/framestatuslistener.hxx diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx index 2e1aaa1a0cf1..ffe229c58fa9 100644 --- a/svtools/inc/svtools/generictoolboxcontroller.hxx +++ b/svtools/inc/svtools/generictoolboxcontroller.hxx @@ -47,7 +47,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBox, - USHORT nID, + sal_uInt16 nID, const rtl::OUString& aCommand ); virtual ~GenericToolboxController(); diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index 3eee508e5d70..d3fcc9800c88 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -105,14 +105,14 @@ private: long mnTopCrop; long mnRightCrop; long mnBottomCrop; - USHORT mnRotate10; + sal_uInt16 mnRotate10; short mnContPercent; short mnLumPercent; short mnRPercent; short mnGPercent; short mnBPercent; - BOOL mbInvert; - BYTE mcTransparency; + sal_Bool mbInvert; + sal_uInt8 mcTransparency; GraphicDrawMode meDrawMode; void* mpDummy; @@ -122,14 +122,14 @@ public: GraphicAttr(); ~GraphicAttr(); - BOOL operator==( const GraphicAttr& rAttr ) const; - BOOL operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } + sal_Bool operator==( const GraphicAttr& rAttr ) const; + sal_Bool operator!=( const GraphicAttr& rAttr ) const { return !( *this == rAttr ); } void SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; } GraphicDrawMode GetDrawMode() const { return meDrawMode; } - void SetMirrorFlags( ULONG nMirrFlags ) { mnMirrFlags = nMirrFlags; } - ULONG GetMirrorFlags() const { return mnMirrFlags; } + void SetMirrorFlags( sal_uLong nMirrFlags ) { mnMirrFlags = nMirrFlags; } + sal_uLong GetMirrorFlags() const { return mnMirrFlags; } void SetCrop( long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, long nBottom_100TH_MM ) { @@ -141,8 +141,8 @@ public: long GetRightCrop() const { return mnRightCrop; } long GetBottomCrop() const { return mnBottomCrop; } - void SetRotation( USHORT nRotate10 ) { mnRotate10 = nRotate10; } - USHORT GetRotation() const { return mnRotate10; } + void SetRotation( sal_uInt16 nRotate10 ) { mnRotate10 = nRotate10; } + sal_uInt16 GetRotation() const { return mnRotate10; } void SetLuminance( short nLuminancePercent ) { mnLumPercent = nLuminancePercent; } short GetLuminance() const { return mnLumPercent; } @@ -162,22 +162,22 @@ public: void SetGamma( double fGamma ) { mfGamma = fGamma; } double GetGamma() const { return mfGamma; } - void SetInvert( BOOL bInvert ) { mbInvert = bInvert; } - BOOL IsInvert() const { return mbInvert; } + void SetInvert( sal_Bool bInvert ) { mbInvert = bInvert; } + sal_Bool IsInvert() const { return mbInvert; } - void SetTransparency( BYTE cTransparency ) { mcTransparency = cTransparency; } - BYTE GetTransparency() const { return mcTransparency; } + void SetTransparency( sal_uInt8 cTransparency ) { mcTransparency = cTransparency; } + sal_uInt8 GetTransparency() const { return mcTransparency; } - BOOL IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } - BOOL IsMirrored() const { return( mnMirrFlags != 0UL ); } - BOOL IsCropped() const + sal_Bool IsSpecialDrawMode() const { return( meDrawMode != GRAPHICDRAWMODE_STANDARD ); } + sal_Bool IsMirrored() const { return( mnMirrFlags != 0UL ); } + sal_Bool IsCropped() const { return( mnLeftCrop != 0 || mnTopCrop != 0 || mnRightCrop != 0 || mnBottomCrop != 0 ); } - BOOL IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } - BOOL IsTransparent() const { return( mcTransparency > 0 ); } - BOOL IsAdjusted() const + sal_Bool IsRotated() const { return( ( mnRotate10 % 3600 ) != 0 ); } + sal_Bool IsTransparent() const { return( mcTransparency > 0 ); } + sal_Bool IsAdjusted() const { return( mnLumPercent != 0 || mnContPercent != 0 || mnRPercent != 0 || mnGPercent != 0 || mnBPercent != 0 || mfGamma != 1.0 || mbInvert ); @@ -203,7 +203,7 @@ private: GraphicAttr maAttr; Size maPrefSize; MapMode maPrefMapMode; - ULONG mnSizeBytes; + sal_uLong mnSizeBytes; GraphicType meType; GraphicManager* mpMgr; String* mpLink; @@ -211,17 +211,17 @@ private: String* mpUserData; Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; - ULONG mnAnimationLoopCount; + sal_uLong mnAnimationLoopCount; void* mpDummy1; void* mpDummy2; - BOOL mbAutoSwapped : 1; - BOOL mbTransparent : 1; - BOOL mbAnimated : 1; - BOOL mbEPS : 1; - BOOL mbIsInSwapIn : 1; - BOOL mbIsInSwapOut : 1; - BOOL mbAlpha : 1; - BOOL mbDummyFlag8 : 1; + sal_Bool mbAutoSwapped : 1; + sal_Bool mbTransparent : 1; + sal_Bool mbAnimated : 1; + sal_Bool mbEPS : 1; + sal_Bool mbIsInSwapIn : 1; + sal_Bool mbIsInSwapOut : 1; + sal_Bool mbAlpha : 1; + sal_Bool mbDummyFlag8 : 1; void SVT_DLLPRIVATE ImplConstruct(); void SVT_DLLPRIVATE ImplAssignGraphicData(); @@ -229,9 +229,9 @@ private: const ByteString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplAutoSwapIn(); - BOOL SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } - BOOL SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, - PolyPolygon& rClipPolyPoly, BOOL& bRectClipRegion ) const; + sal_Bool SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; } + sal_Bool SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr, + PolyPolygon& rClipPolyPoly, sal_Bool& bRectClipRegion ) const; /** Render a given number of tiles in an optimized way @@ -277,22 +277,22 @@ private: bool SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, - const GraphicAttr* pAttr, ULONG nFlags ); + const GraphicAttr* pAttr, sal_uLong nFlags ); /// internally called by ImplRenderTempTile() bool SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor, int nNumOrigTilesX, int nNumOrigTilesY, int nRemainderTilesX, int nRemainderTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, - ULONG nFlags, ImplTileInfo& rTileInfo ); + sal_uLong nFlags, ImplTileInfo& rTileInfo ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, - const Size& rOffset, const GraphicAttr* pAttr, ULONG nFlags, int nTileCacheSize1D ); + const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos, int nNumTilesX, int nNumTilesY, const Size& rTileSize, - const GraphicAttr* pAttr, ULONG nFlags ); + const GraphicAttr* pAttr, sal_uLong nFlags ); void SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx& rBmpEx, const GraphicAttr& rAttr, @@ -300,7 +300,7 @@ private: const Size& rCropRightBottom, const Rectangle& rCropRect, const Size& rDstSize, - BOOL bEnlarge ) const; + sal_Bool bEnlarge ) const; DECL_LINK( ImplAutoSwapOutHdl, void* ); @@ -310,7 +310,7 @@ protected: virtual SvStream* GetSwapStream() const; // !!! to be removed - virtual ULONG GetReleaseFromCache() const; + virtual sal_uLong GetReleaseFromCache() const; virtual void Load( SvStream& ); virtual void Save( SvStream& ); @@ -328,14 +328,14 @@ public: ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); - BOOL operator==( const GraphicObject& rCacheObj ) const; - BOOL operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } + sal_Bool operator==( const GraphicObject& rCacheObj ) const; + sal_Bool operator!=( const GraphicObject& rCacheObj ) const { return !( *this == rCacheObj ); } - BOOL HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } + sal_Bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); - void SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout = 0UL ); + void SetSwapStreamHdl( const Link& rHdl, const sal_uLong nSwapOutTimeout = 0UL ); Link GetSwapStreamHdl() const; - ULONG GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } + sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } void FireSwapInRequest(); void FireSwapOutRequest(); @@ -343,8 +343,8 @@ public: void SetGraphicManager( const GraphicManager& rMgr ); GraphicManager& GetGraphicManager() const { return *mpMgr; } - BOOL IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD) const; + sal_Bool IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD) const; void ReleaseFromCache(); const Graphic& GetGraphic() const; @@ -382,12 +382,12 @@ public: void SetAttr( const GraphicAttr& rAttr ); const GraphicAttr& GetAttr() const { return maAttr; } - BOOL HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); } + sal_Bool HasLink() const { return( mpLink != NULL && mpLink->Len() > 0 ); } void SetLink(); void SetLink( const String& rLink ); String GetLink() const; - BOOL HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); } + sal_Bool HasUserData() const { return( mpUserData != NULL && mpUserData->Len() > 0 ); } void SetUserData(); void SetUserData( const String& rUserData ); String GetUserData() const; @@ -397,36 +397,36 @@ public: GraphicType GetType() const { return meType; } const Size& GetPrefSize() const { return maPrefSize; } const MapMode& GetPrefMapMode() const { return maPrefMapMode; } - ULONG GetSizeBytes() const { return mnSizeBytes; } - ULONG GetChecksum() const; - BOOL IsTransparent() const { return mbTransparent; } - BOOL IsAlpha() const { return mbAlpha; } - BOOL IsAnimated() const { return mbAnimated; } - BOOL IsEPS() const { return mbEPS; } + sal_uLong GetSizeBytes() const { return mnSizeBytes; } + sal_uLong GetChecksum() const; + sal_Bool IsTransparent() const { return mbTransparent; } + sal_Bool IsAlpha() const { return mbAlpha; } + sal_Bool IsAnimated() const { return mbAnimated; } + sal_Bool IsEPS() const { return mbEPS; } void ResetAnimationLoopCount(); List* GetAnimationInfoList() const; Link GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); } void SetAnimationNotifyHdl( const Link& rLink ); - BOOL SwapOut(); - BOOL SwapOut( SvStream* pOStm ); - BOOL SwapIn(); - BOOL SwapIn( SvStream* pIStm ); + sal_Bool SwapOut(); + sal_Bool SwapOut( SvStream* pOStm ); + sal_Bool SwapIn(); + sal_Bool SwapIn( SvStream* pIStm ); - BOOL IsInSwapIn() const { return mbIsInSwapIn; } - BOOL IsInSwapOut() const { return mbIsInSwapOut; } - BOOL IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } - BOOL IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } + sal_Bool IsInSwapIn() const { return mbIsInSwapIn; } + sal_Bool IsInSwapOut() const { return mbIsInSwapOut; } + sal_Bool IsInSwap() const { return( mbIsInSwapOut || mbIsInSwapOut ); } + sal_Bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } void SetSwapState(); - BOOL Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD ); + sal_Bool Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD ); - BOOL DrawWithPDFHandling( OutputDevice& rOutDev, + sal_Bool DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr = NULL, - const ULONG nFlags = GRFMGR_DRAW_STANDARD ); + const sal_uLong nFlags = GRFMGR_DRAW_STANDARD ); /** Draw the graphic repeatedly into the given output rectangle @@ -459,14 +459,14 @@ public: is. This is useful if e.g. you want only a few, very large bitmap drawings appear on the outdev. - @return TRUE, if drawing completed successfully + @return sal_True, if drawing completed successfully */ - BOOL DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, + sal_Bool DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, const Size& rOffset, const GraphicAttr* pAttr = NULL, - ULONG nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); + sal_uLong nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); - BOOL StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L, - const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD, + sal_Bool StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L, + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL ); void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); @@ -494,33 +494,33 @@ private: GraphicManager( const GraphicManager& ) {} GraphicManager& operator=( const GraphicManager& ) { return *this; } - BOOL SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, + sal_Bool SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const ULONG nFlags, BOOL& rCached ); + const sal_uLong nFlags, sal_Bool& rCached ); - BOOL SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const ULONG nFlags, BitmapEx* pBmpEx = NULL ); - BOOL SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, + const sal_uLong nFlags, BitmapEx* pBmpEx = NULL ); + sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const ULONG nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); + const sal_uLong nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); - BOOL SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx, + sal_Bool SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ); - BOOL SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx, - USHORT nRot10, const Size& rOutSzPix, const Size& rUntSzPix, + sal_Bool SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx, + sal_uInt16 nRot10, const Size& rOutSzPix, const Size& rUntSzPix, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ); - static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr ); @@ -530,42 +530,42 @@ private: const ByteString* pID = NULL, const GraphicObject* pCopyObj = NULL ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); - inline BOOL SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); } + inline sal_Bool SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); } // Only used in swap case by GraphicObject void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj ); - BOOL SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); + sal_Bool SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); void SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ); ByteString SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const; public: - GraphicManager( ULONG nCacheSize = 10000000UL, ULONG nMaxObjCacheSize = 2400000UL ); + GraphicManager( sal_uLong nCacheSize = 10000000UL, sal_uLong nMaxObjCacheSize = 2400000UL ); ~GraphicManager(); - void SetMaxCacheSize( ULONG nNewCacheSize ); - ULONG GetMaxCacheSize() const; + void SetMaxCacheSize( sal_uLong nNewCacheSize ); + sal_uLong GetMaxCacheSize() const; - void SetMaxObjCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE ); - ULONG GetMaxObjCacheSize() const; + void SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); + sal_uLong GetMaxObjCacheSize() const; - ULONG GetUsedCacheSize() const; - ULONG GetFreeCacheSize() const; + sal_uLong GetUsedCacheSize() const; + sal_uLong GetFreeCacheSize() const; - void SetCacheTimeout( ULONG nTimeoutSeconds ); - ULONG GetCacheTimeout() const; + void SetCacheTimeout( sal_uLong nTimeoutSeconds ); + sal_uLong GetCacheTimeout() const; void ClearCache(); void ReleaseFromCache( const GraphicObject& rObj ); - BOOL IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool IsInCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const; - BOOL DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, + sal_Bool DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const ULONG nFlags, BOOL& rCached ); + const sal_uLong nFlags, sal_Bool& rCached ); }; #endif // _GRFMGR_HXX diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index eb3bd66e7a30..1cba24f2e212 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -106,7 +106,7 @@ StartDrag() Dieser Handler wird gerufen, wenn Draggen gestartet wird, bzw. wenn ein Item angeklickt wurde. In diesem Handler sollte spaetestens mit SetDragSize() die Groesse der Size-Linie gesetzt werden, wenn - IsItemMode() FALSE zurueckliefert. + IsItemMode() sal_False zurueckliefert. Drag() Dieser Handler wird gerufen, wenn gedraggt wird. Wenn mit SetDragSize() keine Groesse gesetzt wird, kann dieser Handler dafuer benutzt werden, um die @@ -117,12 +117,12 @@ Drag() Dieser Handler wird gerufen, wenn gedraggt wird. Wenn EndDrag() Dieser Handler wird gerufen, wenn ein Drag-Vorgang beendet wurde. Wenn im EndDrag-Handler GetCurItemId() 0 zurueckliefert, wurde der Drag-Vorgang abgebrochen. - Wenn dies nicht der Fall ist und IsItemMode() FALSE + Wenn dies nicht der Fall ist und IsItemMode() sal_False zurueckliefert, sollte von dem gedraggten Item die neue Groesse mit GetItemSize() abgefragt werden und entsprechend im dazugehoerigem Control uebernommen - werden. Wenn IsItemMode() TRUE, GetCurItemId() eine Id - und IsItemDrag() TRUE zurueckliefert, wurde dieses + werden. Wenn IsItemMode() sal_True, GetCurItemId() eine Id + und IsItemDrag() sal_True zurueckliefert, wurde dieses Item verschoben. Es sollte dann mit GetItemPos() die neue Position abgefragt werden und auch die Daten im dazugehoerigem Control angepasst werden. Ansonsten @@ -144,12 +144,12 @@ GetItemDragPos() Liefert die Position zurueck, an der ein Item verschoben oder wenn kein ItemDrag aktiv ist. IsItemMode() Mit dieser Methode kann abgefragt werden, ob fuer ein Item oder einen Trenner der Handler gerufen wurde. - TRUE - Handler wurde fuer das Item gerufen - FALSE - Handler wurde fuer den Trenner gerufen + sal_True - Handler wurde fuer das Item gerufen + sal_False - Handler wurde fuer den Trenner gerufen IsItemDrag() Mit dieser Methode kann abgefragt werden, ob ein Item gedragt oder selektiert wurde. - TRUE - Item wird verschoben - FALSE - Item wird selektiert + sal_True - Item wird verschoben + sal_False - Item wird selektiert SetDragSize() Mit dieser Methode wird gesetzt, wir gross der Trennstrich sein soll, der vom Control gemalt wird. Dies sollte so gross sein, wie das angrenzende Fenster @@ -203,7 +203,7 @@ typedef ::std::vector< ImplHeadItem* > ImplHeadItemList; // - HeaderBarItemBits - // --------------------- -typedef USHORT HeaderBarItemBits; +typedef sal_uInt16 HeaderBarItemBits; // ---------------------------- // - Bits fuer HeaderBarItems - @@ -230,8 +230,8 @@ typedef USHORT HeaderBarItemBits; // - HeaderBar-Types - // ------------------- -#define HEADERBAR_APPEND ((USHORT)0xFFFF) -#define HEADERBAR_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define HEADERBAR_APPEND ((sal_uInt16)0xFFFF) +#define HEADERBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define HEADERBAR_FULLSIZE ((long)1000000000) #define HEADERBAR_TEXTOFF 2 @@ -253,14 +253,14 @@ private: long mnStartPos; long mnDragPos; long mnMouseOff; - USHORT mnCurItemId; - USHORT mnItemDragPos; - BOOL mbDragable; - BOOL mbDrag; - BOOL mbItemDrag; - BOOL mbOutDrag; - BOOL mbButtonStyle; - BOOL mbItemMode; + sal_uInt16 mnCurItemId; + sal_uInt16 mnItemDragPos; + sal_Bool mbDragable; + sal_Bool mbDrag; + sal_Bool mbItemDrag; + sal_Bool mbOutDrag; + sal_Bool mbButtonStyle; + sal_Bool mbItemMode; Link maStartDragHdl; Link maDragHdl; Link maEndDragHdl; @@ -275,25 +275,25 @@ private: #ifdef _SV_HEADBAR_CXX using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE long ImplGetItemPos( USHORT nPos ) const; - SVT_DLLPRIVATE Rectangle ImplGetItemRect( USHORT nPos ) const; + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const; + SVT_DLLPRIVATE Rectangle ImplGetItemRect( sal_uInt16 nPos ) const; using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, long& nMouseOff, USHORT& nPos ) const; - SVT_DLLPRIVATE void ImplInvertDrag( USHORT nStartPos, USHORT nEndPos ); + SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const; + SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos ); SVT_DLLPRIVATE void ImplDrawItem( OutputDevice* pDev, - USHORT nPos, BOOL bHigh, BOOL bDrag, + sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, const Rectangle& rItemRect, const Rectangle* pRect, - ULONG nFlags ); - SVT_DLLPRIVATE void ImplDrawItem( USHORT nPos, BOOL bHigh = FALSE, - BOOL bDrag = FALSE, + sal_uLong nFlags ); + SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh = sal_False, + sal_Bool bDrag = sal_False, const Rectangle* pRect = NULL ); - SVT_DLLPRIVATE void ImplUpdate( USHORT nPos, - BOOL bEnd = FALSE, BOOL bDirect = FALSE ); - SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, BOOL bCommand ); + SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos, + sal_Bool bEnd = sal_False, sal_Bool bDirect = sal_False ); + SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, sal_Bool bCommand ); SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); - SVT_DLLPRIVATE void ImplEndDrag( BOOL bCancel ); + SVT_DLLPRIVATE void ImplEndDrag( sal_Bool bCancel ); #endif public: @@ -305,7 +305,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -319,18 +319,18 @@ public: virtual void Select(); virtual void DoubleClick(); - void InsertItem( USHORT nItemId, const Image& rImage, + void InsertItem( sal_uInt16 nItemId, const Image& rImage, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertItem( USHORT nItemId, const XubString& rText, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertItem( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void InsertItem( USHORT nItemId, + sal_uInt16 nPos = HEADERBAR_APPEND ); + void InsertItem( sal_uInt16 nItemId, const Image& rImage, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - USHORT nPos = HEADERBAR_APPEND ); - void RemoveItem( USHORT nItemId ); - void MoveItem( USHORT nItemId, USHORT nNewPos ); + sal_uInt16 nPos = HEADERBAR_APPEND ); + void RemoveItem( sal_uInt16 nItemId ); + void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ); void Clear(); void SetOffset( long nNewOffset = 0 ); @@ -338,40 +338,40 @@ public: inline void SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; } long GetDragSize() const { return mnDragSize; } - USHORT GetItemCount() const; - USHORT GetItemPos( USHORT nItemId ) const; - USHORT GetItemId( USHORT nPos ) const; - USHORT GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( USHORT nItemId ) const; - USHORT GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + Rectangle GetItemRect( sal_uInt16 nItemId ) const; + sal_uInt16 GetCurItemId() const { return mnCurItemId; } long GetDragPos() const { return mnDragPos; } - USHORT GetItemDragPos() const { return mnItemDragPos; } - BOOL IsItemMode() const { return mbItemMode; } - BOOL IsItemDrag() const { return mbItemDrag; } - - void SetItemSize( USHORT nItemId, long nNewSize ); - long GetItemSize( USHORT nItemId ) const; - void SetItemBits( USHORT nItemId, HeaderBarItemBits nNewBits ); - HeaderBarItemBits GetItemBits( USHORT nItemId ) const; - void SetItemData( USHORT nItemId, void* pNewData ); - void* GetItemData( USHORT nItemId ) const; - - void SetItemImage( USHORT nItemId, const Image& rImage ); - Image GetItemImage( USHORT nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rText ); - XubString GetItemText( USHORT nItemId ) const; - - void SetHelpText( USHORT nItemId, const XubString& rText ); - XubString GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + sal_uInt16 GetItemDragPos() const { return mnItemDragPos; } + sal_Bool IsItemMode() const { return mbItemMode; } + sal_Bool IsItemDrag() const { return mbItemDrag; } + + void SetItemSize( sal_uInt16 nItemId, long nNewSize ); + long GetItemSize( sal_uInt16 nItemId ) const; + void SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits ); + HeaderBarItemBits GetItemBits( sal_uInt16 nItemId ) const; + void SetItemData( sal_uInt16 nItemId, void* pNewData ); + void* GetItemData( sal_uInt16 nItemId ) const; + + void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemImage( sal_uInt16 nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rText ); + XubString GetItemText( sal_uInt16 nItemId ) const; + + void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); + XubString GetHelpText( sal_uInt16 nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( sal_uInt16 nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - inline ULONG GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const rtl::OString& rId ) { Window::SetHelpId( rId ); } + inline const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } @@ -386,7 +386,7 @@ public: inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; } inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; } - inline BOOL IsDragable() const { return mbDragable; } + inline sal_Bool IsDragable() const { return mbDragable; } /** Creates and returns the accessible object of the header bar. */ virtual ::com::sun::star::uno::Reference< diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx index 7d2987eb6f96..7d2987eb6f96 100644 --- a/svtools/inc/helpagentwindow.hxx +++ b/svtools/inc/svtools/helpagentwindow.hxx diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 1ffb7a99fb32..ecf8ba4b1bf7 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -28,90 +28,103 @@ #ifndef _SVT_HELPID_HRC #define _SVT_HELPID_HRC -// include --------------------------------------------------------------- - -#include <svl/solar.hrc> - -// Help-Ids -------------------------------------------------------------- - -#define HID_FILEDLG_OPENDLG (HID_SVTOOLS_START + 0) -#define HID_FILEDLG_PATHDLG (HID_SVTOOLS_START + 1) -#define HID_FILEDLG_DIR (HID_SVTOOLS_START + 2) -#define HID_FILEDLG_EDIT (HID_SVTOOLS_START + 3) -#define HID_FILEDLG_DIRS (HID_SVTOOLS_START + 4) -#define HID_FILEDLG_DRIVE (HID_SVTOOLS_START + 5) -#define HID_FILEDLG_DRIVES (HID_SVTOOLS_START + 6) -#define HID_FILEDLG_NEWDIR (HID_SVTOOLS_START + 7) -#define HID_FILEDLG_HOME (HID_SVTOOLS_START + 8) -#define HID_FILEDLG_FILE (HID_SVTOOLS_START + 9) -#define HID_FILEDLG_FILES (HID_SVTOOLS_START + 10) -#define HID_FILEDLG_PATH (HID_SVTOOLS_START + 11) -#define HID_FILEDLG_TYPE (HID_SVTOOLS_START + 12) -#define HID_FILEDLG_TYPES (HID_SVTOOLS_START + 13) +#define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" +#define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" +#define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" +#define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT" +#define HID_FILEDLG_DIRS "SVT_HID_FILEDLG_DIRS" +#define HID_FILEDLG_DRIVE "SVT_HID_FILEDLG_DRIVE" +#define HID_FILEDLG_DRIVES "SVT_HID_FILEDLG_DRIVES" +#define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR" +#define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME" +#define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE" +#define HID_FILEDLG_FILES "SVT_HID_FILEDLG_FILES" +#define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" +#define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" +#define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" +#define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SVT_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SVT_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "SVT_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SVT_HID_FILEDLG_READ_ONLY" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SVT_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SVT_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SVT_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SVT_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SVT_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SVT_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SVT_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_FILEDLG_EDIT_FAVORITES "SVT_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SVT_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_FILEDLG_EXPORTASPDF "SVT_HID_FILEDLG_EXPORTASPDF" // HelpID's fuer die Textkomponente -#define HID_TEXTCPNT_OPEN_LINK (HID_SVTOOLS_START + 14) -#define HID_TEXTCPNT_OPEN_LINK_NEW (HID_SVTOOLS_START + 15) -#define HID_TEXTCPNT_DOWNLOAD (HID_SVTOOLS_START + 16) -#define HID_TEXTCPNT_ADD_BOOKMARK (HID_SVTOOLS_START + 17) -#define HID_TEXTCPNT_COPY_LINK (HID_SVTOOLS_START + 18) +#define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" +#define HID_TEXTCPNT_OPEN_LINK_NEW "SVT_HID_TEXTCPNT_OPEN_LINK_NEW" +#define HID_TEXTCPNT_DOWNLOAD "SVT_HID_TEXTCPNT_DOWNLOAD" +#define HID_TEXTCPNT_ADD_BOOKMARK "SVT_HID_TEXTCPNT_ADD_BOOKMARK" +#define HID_TEXTCPNT_COPY_LINK "SVT_HID_TEXTCPNT_COPY_LINK" // HelpID's fuer RegisterDialog -#define HID_LIMITED_DIALOG (HID_SVTOOLS_START + 20) +#define HID_LIMITED_DIALOG "SVT_HID_LIMITED_DIALOG" // Help ids of template dialog -#define HID_TEMPLATEDLG_DIALOG (HID_SVTOOLS_START + 21) -#define HID_TEMPLATEDLG_ICONCTRL (HID_SVTOOLS_START + 22) -#define HID_TEMPLATEDLG_FILEVIEW (HID_SVTOOLS_START + 23) -#define HID_TEMPLATEDLG_TB_BACK (HID_SVTOOLS_START + 24) -#define HID_TEMPLATEDLG_TB_PREV (HID_SVTOOLS_START + 25) -#define HID_TEMPLATEDLG_TB_PRINT (HID_SVTOOLS_START + 26) -#define HID_TEMPLATEDLG_TB_DOCINFO (HID_SVTOOLS_START + 27) -#define HID_TEMPLATEDLG_TB_PREVIEW (HID_SVTOOLS_START + 28) +#define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG" +#define HID_TEMPLATEDLG_ICONCTRL "SVT_HID_TEMPLATEDLG_ICONCTRL" +#define HID_TEMPLATEDLG_FILEVIEW "SVT_HID_TEMPLATEDLG_FILEVIEW" +#define HID_TEMPLATEDLG_TB_BACK "SVT_HID_TEMPLATEDLG_TB_BACK" +#define HID_TEMPLATEDLG_TB_PREV "SVT_HID_TEMPLATEDLG_TB_PREV" +#define HID_TEMPLATEDLG_TB_PRINT "SVT_HID_TEMPLATEDLG_TB_PRINT" +#define HID_TEMPLATEDLG_TB_DOCINFO "SVT_HID_TEMPLATEDLG_TB_DOCINFO" +#define HID_TEMPLATEDLG_TB_PREVIEW "SVT_HID_TEMPLATEDLG_TB_PREVIEW" -#define HID_ADDRTEMPL_FIELD_ASSIGNMENT (HID_SVTOOLS_START + 29) +#define HID_ADDRTEMPL_FIELD_ASSIGNMENT "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT" // Help ids for the filepicker dialogs -#define HID_EXPLORERDLG_FILE (HID_SVTOOLS_START + 30) +#define HID_EXPLORERDLG_FILE "SVT_HID_EXPLORERDLG_FILE" // help ids for fileview contextmenu -#define HID_FILEVIEW_MENU_DELETE (HID_SVTOOLS_START + 31) -#define HID_FILEVIEW_MENU_RENAME (HID_SVTOOLS_START + 32) +#define HID_FILEVIEW_MENU_DELETE "SVT_HID_FILEVIEW_MENU_DELETE" +#define HID_FILEVIEW_MENU_RENAME "SVT_HID_FILEVIEW_MENU_RENAME" // help ids for the different modi of the file picker dialog // FREE -#define HID_FILESAVE_LEVELUP (HID_SVTOOLS_START + 34) -#define HID_FILESAVE_CREATEDIRECTORY (HID_SVTOOLS_START + 35) -#define HID_FILESAVE_DEFAULTDIRECTORY (HID_SVTOOLS_START + 36) -#define HID_FILESAVE_FILEVIEW (HID_SVTOOLS_START + 37) -#define HID_FILESAVE_TEMPLATE (HID_SVTOOLS_START + 38) -#define HID_FILESAVE_FILEURL (HID_SVTOOLS_START + 39) -#define HID_FILESAVE_FILETYPE (HID_SVTOOLS_START + 40) -#define HID_FILESAVE_DOSAVE (HID_SVTOOLS_START + 41) -#define HID_FILESAVE_AUTOEXTENSION (HID_SVTOOLS_START + 42) -#define HID_FILESAVE_SAVEWITHPASSWORD (HID_SVTOOLS_START + 43) -#define HID_FILESAVE_CUSTOMIZEFILTER (HID_SVTOOLS_START + 44) -#define HID_FILESAVE_SELECTION (HID_SVTOOLS_START + 45) -#define HID_FILESAVE_DIALOG (HID_SVTOOLS_START + 46) -#define HID_FILESAVE_DOPLAY (HID_SVTOOLS_START + 47) - -#define HID_FILEOPEN_READONLY (HID_SVTOOLS_START + 48) -#define HID_FILEOPEN_VERSION (HID_SVTOOLS_START + 49) -#define HID_FILEOPEN_IMAGE_TEMPLATE (HID_SVTOOLS_START + 50) - -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) +#define HID_FILESAVE_LEVELUP "SVT_HID_FILESAVE_LEVELUP" +#define HID_FILESAVE_CREATEDIRECTORY "SVT_HID_FILESAVE_CREATEDIRECTORY" +#define HID_FILESAVE_DEFAULTDIRECTORY "SVT_HID_FILESAVE_DEFAULTDIRECTORY" +#define HID_FILESAVE_FILEVIEW "SVT_HID_FILESAVE_FILEVIEW" +#define HID_FILESAVE_TEMPLATE "SVT_HID_FILESAVE_TEMPLATE" +#define HID_FILESAVE_FILEURL "SVT_HID_FILESAVE_FILEURL" +#define HID_FILESAVE_FILETYPE "SVT_HID_FILESAVE_FILETYPE" +#define HID_FILESAVE_DOSAVE "SVT_HID_FILESAVE_DOSAVE" +#define HID_FILESAVE_AUTOEXTENSION "SVT_HID_FILESAVE_AUTOEXTENSION" +#define HID_FILESAVE_SAVEWITHPASSWORD "SVT_HID_FILESAVE_SAVEWITHPASSWORD" +#define HID_FILESAVE_CUSTOMIZEFILTER "SVT_HID_FILESAVE_CUSTOMIZEFILTER" +#define HID_FILESAVE_SELECTION "SVT_HID_FILESAVE_SELECTION" +#define HID_FILESAVE_DIALOG "SVT_HID_FILESAVE_DIALOG" +#define HID_FILESAVE_DOPLAY "SVT_HID_FILESAVE_DOPLAY" + +#define HID_FILEOPEN_READONLY "SVT_HID_FILEOPEN_READONLY" +#define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" +#define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" // uniqueid for the helpagent window (testtool) -#define HID_HELPAGENT_WINDOW (HID_SVTOOLS_START + 51) +#define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" // registration dialog -#define HID_REGISTRATION_DIALOG (HID_SVTOOLS_START + 52) +#define HID_REGISTRATION_DIALOG "SVT_HID_REGISTRATION_DIALOG" -#define HID_PRINTDIALOG_TOFILE (HID_SVTOOLS_START + 53) +#define HID_PRINTDIALOG_TOFILE "SVT_HID_PRINTDIALOG_TOFILE" -#define HID_WIZARD_NEXT (HID_SVTOOLS_START + 54) -#define HID_WIZARD_PREVIOUS (HID_SVTOOLS_START + 55) +#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT" +#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS" #endif diff --git a/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx index 3f57d275a705..33c87839db8a 100644 --- a/svtools/inc/svtools/htmlcfg.hxx +++ b/svtools/inc/svtools/htmlcfg.hxx @@ -65,37 +65,37 @@ public: virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - USHORT GetFontSize(USHORT nPos) const; - void SetFontSize(USHORT nPos, USHORT nSize); + sal_uInt16 GetFontSize(sal_uInt16 nPos) const; + void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize); - BOOL IsImportUnknown() const; - void SetImportUnknown(BOOL bSet); + sal_Bool IsImportUnknown() const; + void SetImportUnknown(sal_Bool bSet); - USHORT GetExportMode() const; - void SetExportMode(USHORT nSet); + sal_uInt16 GetExportMode() const; + void SetExportMode(sal_uInt16 nSet); - BOOL IsStarBasic() const; - void SetStarBasic(BOOL bSet); + sal_Bool IsStarBasic() const; + void SetStarBasic(sal_Bool bSet); - BOOL IsStarBasicWarning() const; - void SetStarBasicWarning(BOOL bSet); + sal_Bool IsStarBasicWarning() const; + void SetStarBasicWarning(sal_Bool bSet); - BOOL IsSaveGraphicsLocal() const; - void SetSaveGraphicsLocal(BOOL bSet); + sal_Bool IsSaveGraphicsLocal() const; + void SetSaveGraphicsLocal(sal_Bool bSet); - BOOL IsPrintLayoutExtension() const; - void SetPrintLayoutExtension(BOOL bSet); + sal_Bool IsPrintLayoutExtension() const; + void SetPrintLayoutExtension(sal_Bool bSet); - BOOL IsIgnoreFontFamily() const; - void SetIgnoreFontFamily(BOOL bSet); + sal_Bool IsIgnoreFontFamily() const; + void SetIgnoreFontFamily(sal_Bool bSet); sal_Bool IsDefaultTextEncoding() const; rtl_TextEncoding GetTextEncoding() const; void SetTextEncoding( rtl_TextEncoding ); static SvxHtmlOptions* Get(); - BOOL IsNumbersEnglishUS() const; - void SetNumbersEnglishUS(BOOL bSet); + sal_Bool IsNumbersEnglishUS() const; + void SetNumbersEnglishUS(sal_Bool bSet); void AddListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink ); diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx index 999ee21d236c..999ee21d236c 100644 --- a/svtools/inc/htmlkywd.hxx +++ b/svtools/inc/svtools/htmlkywd.hxx diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index 665b0dfd1cd2..06caae765b6a 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -46,7 +46,7 @@ struct HTMLOutEvent { const sal_Char *pBasicName; const sal_Char *pJavaName; - USHORT nEvent; + sal_uInt16 nEvent; }; struct SVT_DLLPUBLIC HTMLOutContext @@ -61,7 +61,7 @@ struct SVT_DLLPUBLIC HTMLOutContext struct HTMLOutFuncs { -#if defined(MAC) || defined(UNX) +#if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else static const sal_Char sNewLine[]; // \015\012 @@ -72,7 +72,7 @@ struct HTMLOutFuncs String *pNonConvertableChars = 0); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, - BOOL bOn = TRUE, + sal_Bool bOn = sal_True, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, HTMLOutContext& rContext, @@ -80,13 +80,13 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen, + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const String&, const ImageMap&, const String&, const HTMLOutEvent *pEventTable, - BOOL bOutStarBasic, + sal_Bool bOutStarBasic, const sal_Char *pDelim = 0, const sal_Char *pIndentArea = 0, const sal_Char *pIndentMap = 0, @@ -108,18 +108,18 @@ struct HTMLOutFuncs // der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem // nur aus 0 bestehen Eintrag terminiert ist. SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&, - const HTMLOutEvent*, BOOL bOutStarBasic, + const HTMLOutEvent*, sal_Bool bOutStarBasic, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static ByteString& CreateTableDataOptionsValNum( ByteString& aStrTD, - BOOL bValue, double fVal, ULONG nFormat, + sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static BOOL PrivateURLToInternalImg( String& rURL ); + SVT_DLLPUBLIC static sal_Bool PrivateURLToInternalImg( String& rURL ); }; #endif diff --git a/svtools/inc/htmltokn.h b/svtools/inc/svtools/htmltokn.h index 29169d6959fe..bd4fe7ba6c25 100644 --- a/svtools/inc/htmltokn.h +++ b/svtools/inc/svtools/htmltokn.h @@ -47,7 +47,7 @@ SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); int GetHTMLOption( const String& rName ); // suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) -SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); +SVT_DLLPUBLIC sal_uIntPtr GetHTMLColor( const String& rName ); // beginnen immer ab 256, groesser als ein char const int HTML_TOKEN_START = 0x100; diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc index 021cbe4c9ac8..021cbe4c9ac8 100644 --- a/svtools/inc/imagemgr.hrc +++ b/svtools/inc/svtools/imagemgr.hrc diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx index eca8b658e5cb..eca8b658e5cb 100644 --- a/svtools/inc/imagemgr.hxx +++ b/svtools/inc/svtools/imagemgr.hxx diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx index 3999ce908be5..3999ce908be5 100644 --- a/svtools/inc/imageresourceaccess.hxx +++ b/svtools/inc/svtools/imageresourceaccess.hxx diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx index 043900e4c377..7e0124f70d0c 100644 --- a/svtools/inc/svtools/imap.hxx +++ b/svtools/inc/svtools/imap.hxx @@ -54,13 +54,13 @@ protected: // Binaer laden/speichern void ImpWriteImageMap( SvStream& rOStm, const String& ) const ; - void ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& ); + void ImpReadImageMap( SvStream& rIStm, sal_uInt16 nCount, const String& ); // Im-/Export void ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const; void ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const; - ULONG ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); - ULONG ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); + sal_uLong ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); + sal_uLong ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); void ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL ); Point ImpReadCERNCoords( const char** ppStr ); @@ -71,7 +71,7 @@ protected: String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ); Point ImpReadNCSACoords( const char** ppStr ); - ULONG ImpDetectFormat( SvStream& rIStm ); + sal_uLong ImpDetectFormat( SvStream& rIStm ); public: @@ -90,8 +90,8 @@ public: ImageMap& operator=( const ImageMap& rImageMap ); // Vergleichsoperator (es wird alles auf Gleichheit geprueft) - BOOL operator==( const ImageMap& rImageMap ); - BOOL operator!=( const ImageMap& rImageMap ); + sal_Bool operator==( const ImageMap& rImageMap ); + sal_Bool operator!=( const ImageMap& rImageMap ); // In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt void InsertIMapObject( const IMapObject& rIMapObject ); @@ -102,7 +102,7 @@ public: IMapObject* GetNextIMapObject() { return (IMapObject*) maList.Next(); } IMapObject* GetLastIMapObject() { return (IMapObject*) maList.Last(); } IMapObject* GetPrevIMapObject() { return (IMapObject*) maList.Prev(); } - IMapObject* GetIMapObject( USHORT nPos ) const { return (IMapObject*) maList.GetObject( nPos ); } + IMapObject* GetIMapObject( sal_uInt16 nPos ) const { return (IMapObject*) maList.GetObject( nPos ); } // Gibt das Objekt zurueck, das zuerst getroffen wurde oder NULL; // Groessen- und Positionsangaben sind in 1/100mm; @@ -113,16 +113,16 @@ public: IMapObject* GetHitIMapObject( const Size& rOriginalSize, const Size& rDisplaySize, const Point& rRelHitPoint, - ULONG nFlags = 0 ); + sal_uLong nFlags = 0 ); // Gibt die Gesamtanzahl der IMap-Objekte zurueck - UINT16 GetIMapObjectCount() const { return (UINT16) maList.Count(); } + sal_uInt16 GetIMapObjectCount() const { return (sal_uInt16) maList.Count(); } // Loescht alle internen Objekte void ClearImageMap(); // liefert die aktuelle Versionsnummer - UINT16 GetVersion() const; + sal_uInt16 GetVersion() const; // liefert / setzt den Namen der ImageMap const String& GetName() const { return aName; } @@ -138,8 +138,8 @@ public: void Write ( SvStream& rOStm, const String& rBaseURL ) const; void Read( SvStream& rIStm, const String& rBaseURL ); - void Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) const; - ULONG Read( SvStream& rIStm, ULONG nFormat, const String& rBaseURL ); + void Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const; + sal_uLong Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL ); }; /****************************************************************************** @@ -151,18 +151,18 @@ public: class IMapCompat { SvStream* pRWStm; - ULONG nCompatPos; - ULONG nTotalSize; - USHORT nStmMode; + sal_uLong nCompatPos; + sal_uLong nTotalSize; + sal_uInt16 nStmMode; IMapCompat() {} IMapCompat( const IMapCompat& ) {} IMapCompat& operator=( const IMapCompat& ) { return *this; } - BOOL operator==( const IMapCompat& ) { return FALSE; } + sal_Bool operator==( const IMapCompat& ) { return sal_False; } public: - IMapCompat( SvStream& rStm, const USHORT nStreamMode ); + IMapCompat( SvStream& rStm, const sal_uInt16 nStreamMode ); ~IMapCompat(); }; diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx index 4181d8a4f7c5..1ae929374b4f 100644 --- a/svtools/inc/svtools/imapcirc.hxx +++ b/svtools/inc/svtools/imapcirc.hxx @@ -43,9 +43,9 @@ class Fraction; class SVT_DLLPUBLIC IMapCircleObject : public IMapObject { Point aCenter; - ULONG nRadius; + sal_uLong nRadius; - void ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPixel ); + void ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel ); protected: @@ -56,21 +56,21 @@ protected: public: IMapCircleObject() {}; - IMapCircleObject( const Point& rCenter, ULONG nRad, + IMapCircleObject( const Point& rCenter, sal_uLong nRad, const String& rURL, const String& rAltText, const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapCircleObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Point GetCenter( BOOL bPixelCoords = TRUE ) const; - ULONG GetRadius( BOOL bPixelCoords = TRUE ) const; + Point GetCenter( sal_Bool bPixelCoords = sal_True ) const; + sal_uLong GetRadius( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Kreis-Objektes in 1/100mm virtual Rectangle GetBoundRect() const; @@ -78,7 +78,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapCircleObject& rEqObj ); + sal_Bool IsEqual( const IMapCircleObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index 6929e4d21291..fc907135fdaa 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -37,13 +37,13 @@ class Point; class Rectangle; class SvStream; -#define IMAP_OBJ_NONE ((UINT16)0x0000) -#define IMAP_OBJ_RECTANGLE ((UINT16)0x0001) -#define IMAP_OBJ_CIRCLE ((UINT16)0x0002) -#define IMAP_OBJ_POLYGON ((UINT16)0x0003) -#define IMAP_OBJ_VERSION ((UINT16)0x0005) +#define IMAP_OBJ_NONE ((sal_uInt16)0x0000) +#define IMAP_OBJ_RECTANGLE ((sal_uInt16)0x0001) +#define IMAP_OBJ_CIRCLE ((sal_uInt16)0x0002) +#define IMAP_OBJ_POLYGON ((sal_uInt16)0x0003) +#define IMAP_OBJ_VERSION ((sal_uInt16)0x0005) -#define IMAGE_MAP_VERSION ((UINT16)0x0001) +#define IMAGE_MAP_VERSION ((sal_uInt16)0x0001) #define IMAPMAGIC "SDIMAP" @@ -74,11 +74,11 @@ class SVT_DLLPUBLIC IMapObject String aTarget; String aName; SvxMacroTableDtor aEventList; - BOOL bActive; + sal_Bool bActive; protected: - UINT16 nReadVersion; + sal_uInt16 nReadVersion; // Binaer-Im-/Export virtual void WriteIMapObject( SvStream& rOStm ) const = 0; @@ -100,12 +100,12 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive ); + sal_Bool bActive ); virtual ~IMapObject() {}; - virtual UINT16 GetVersion() const; - virtual UINT16 GetType() const = 0; - virtual BOOL IsHit( const Point& rPoint ) const = 0; + virtual sal_uInt16 GetVersion() const; + virtual sal_uInt16 GetType() const = 0; + virtual sal_Bool IsHit( const Point& rPoint ) const = 0; void Write ( SvStream& rOStm, const String& rBaseURL ) const; void Read( SvStream& rIStm, const String& rBaseURL ); @@ -127,33 +127,33 @@ public: const String& GetName() const { return aName; } void SetName( const String& rName ) { aName = rName; } - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bSetActive = TRUE ) { bActive = bSetActive; } + sal_Bool IsActive() const { return bActive; } + void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; } static Point GetPixelPoint( const Point& rLogPoint ); static Point GetLogPoint( const Point& rPixelPoint ); - BOOL IsEqual( const IMapObject& rEqObj ); + sal_Bool IsEqual( const IMapObject& rEqObj ); // IMap-Events inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; } - inline const SvxMacro& GetEvent( USHORT nEvent ) const; - inline BOOL HasEvent( USHORT nEvent ) const; - void SetEvent( USHORT nEvent, const SvxMacro& ); - inline BOOL DelEvent( USHORT nEvent ); + inline const SvxMacro& GetEvent( sal_uInt16 nEvent ) const; + inline sal_Bool HasEvent( sal_uInt16 nEvent ) const; + void SetEvent( sal_uInt16 nEvent, const SvxMacro& ); + inline sal_Bool DelEvent( sal_uInt16 nEvent ); }; -inline BOOL IMapObject::HasEvent( USHORT nEvent ) const +inline sal_Bool IMapObject::HasEvent( sal_uInt16 nEvent ) const { return aEventList.IsKeyValid( nEvent ); } -inline const SvxMacro& IMapObject::GetEvent( USHORT nEvent ) const +inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const { return *(aEventList.Get( nEvent )); } -inline BOOL IMapObject::DelEvent( USHORT nEvent ) +inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent ) { SvxMacro *pMacro = aEventList.Remove( nEvent ); delete pMacro; diff --git a/svtools/inc/svtools/imappoly.hxx b/svtools/inc/svtools/imappoly.hxx index 655d180f6613..605a43c36c44 100644 --- a/svtools/inc/svtools/imappoly.hxx +++ b/svtools/inc/svtools/imappoly.hxx @@ -45,9 +45,9 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject { Polygon aPoly; Rectangle aEllipse; - BOOL bEllipse; + sal_Bool bEllipse; - SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, BOOL bPixel ); + SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, sal_Bool bPixel ); protected: @@ -55,7 +55,7 @@ protected: virtual void WriteIMapObject( SvStream& rOStm ) const; virtual void ReadIMapObject( SvStream& rIStm ); - BOOL ReadPreProLine( SvStream& rIStm, String& rStr ); + sal_Bool ReadPreProLine( SvStream& rIStm, String& rStr ); public: IMapPolygonObject() {}; @@ -65,26 +65,26 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapPolygonObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Polygon GetPolygon( BOOL bPixelCoords = TRUE ) const; + Polygon GetPolygon( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Polygon-Objektes in 1/100mm virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); } - BOOL HasExtraEllipse() const { return bEllipse; } + sal_Bool HasExtraEllipse() const { return bEllipse; } const Rectangle& GetExtraEllipse() const { return aEllipse; } void SetExtraEllipse( const Rectangle& rEllipse ); void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapPolygonObject& rEqObj ); + sal_Bool IsEqual( const IMapPolygonObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/svtools/imaprect.hxx b/svtools/inc/svtools/imaprect.hxx index f10000de3e92..e5dc8ebaf18b 100644 --- a/svtools/inc/svtools/imaprect.hxx +++ b/svtools/inc/svtools/imaprect.hxx @@ -44,7 +44,7 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject { Rectangle aRect; - SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, BOOL bPixel ); + SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, sal_Bool bPixel ); protected: @@ -61,14 +61,14 @@ public: const String& rDesc, const String& rTarget, const String& rName, - BOOL bActive = TRUE, - BOOL bPixelCoords = TRUE ); + sal_Bool bActive = sal_True, + sal_Bool bPixelCoords = sal_True ); virtual ~IMapRectangleObject() {}; - virtual UINT16 GetType() const; - virtual BOOL IsHit( const Point& rPoint ) const; + virtual sal_uInt16 GetType() const; + virtual sal_Bool IsHit( const Point& rPoint ) const; - Rectangle GetRectangle( BOOL bPixelCoords = TRUE ) const; + Rectangle GetRectangle( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Rechteck-Objektes in 1/100mm virtual Rectangle GetBoundRect() const { return aRect; } @@ -76,7 +76,7 @@ public: void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; - BOOL IsEqual( const IMapRectangleObject& rEqObj ); + sal_Bool IsEqual( const IMapRectangleObject& rEqObj ); // Im-/Export void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const; diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx index d10585a73caa..d10585a73caa 100644 --- a/svtools/inc/imgdef.hxx +++ b/svtools/inc/svtools/imgdef.hxx diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx index 56424cc00c7e..56424cc00c7e 100644 --- a/svtools/inc/indexentryres.hxx +++ b/svtools/inc/svtools/indexentryres.hxx diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx index 22a4af175ca9..12f3df2a4289 100644 --- a/svtools/inc/inetimg.hxx +++ b/svtools/inc/svtools/inetimg.hxx @@ -78,8 +78,8 @@ public: const Size& GetSizePixel() const { return aSizePixel; } // Im-/Export - sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; - sal_Bool Read( SvStream& rIStm, ULONG nFormat ); + sal_Bool Write( SvStream& rOStm, sal_uLong nFormat ) const; + sal_Bool Read( SvStream& rIStm, sal_uLong nFormat ); }; #endif // #ifndef _INETIMG_HXX diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx index ccf1848a0094..f352dd2fae83 100644 --- a/svtools/inc/svtools/inettbc.hxx +++ b/svtools/inc/svtools/inettbc.hxx @@ -50,17 +50,17 @@ friend class SvtURLBox_Impl; SvtMatchContext_Impl* pCtx; SvtURLBox_Impl* pImp; INetProtocol eSmartProtocol; - BOOL bAutoCompleteMode : 1; - BOOL bOnlyDirectories : 1; - BOOL bModified : 1; - BOOL bTryAutoComplete : 1; - BOOL bCtrlClick : 1; - BOOL bHistoryDisabled : 1; - BOOL bNoSelection : 1; - BOOL bIsAutoCompleteEnabled : 1; + sal_Bool bAutoCompleteMode : 1; + sal_Bool bOnlyDirectories : 1; + sal_Bool bModified : 1; + sal_Bool bTryAutoComplete : 1; + sal_Bool bCtrlClick : 1; + sal_Bool bHistoryDisabled : 1; + sal_Bool bNoSelection : 1; + sal_Bool bIsAutoCompleteEnabled : 1; - SVT_DLLPRIVATE BOOL ProcessKey( const KeyCode& rCode ); - SVT_DLLPRIVATE void TryAutoComplete( BOOL bForce ); + SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode& rCode ); + SVT_DLLPRIVATE void TryAutoComplete( sal_Bool bForce ); SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl(); DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* ); using Window::ImplInit; @@ -82,11 +82,11 @@ public: const String& GetBaseURL() const { return aBaseURL; } void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; } const Link& GetOpenHdl() const { return aOpenHdl; } - void SetOnlyDirectories( BOOL bDir = TRUE ); - void SetNoURLSelection( BOOL bSet = TRUE ); + void SetOnlyDirectories( sal_Bool bDir = sal_True ); + void SetNoURLSelection( sal_Bool bSet = sal_True ); INetProtocol GetSmartProtocol() const { return eSmartProtocol; } void SetSmartProtocol( INetProtocol eProt ); - BOOL IsCtrlOpen() + sal_Bool IsCtrlOpen() { return bCtrlClick; } String GetURL(); void DisableHistory(); @@ -99,7 +99,7 @@ public: void SetUrlFilter( const IUrlFilter* _pFilter ); const IUrlFilter* GetUrlFilter( ) const; - inline void EnableAutocompletion( BOOL _bEnable = TRUE ) + inline void EnableAutocompletion( sal_Bool _bEnable = sal_True ) { bIsAutoCompleteEnabled = _bEnable; } void SetPlaceHolder( const String& sPlaceHolder ) { aPlaceHolder = sPlaceHolder; } String GetPlaceHolder() { return aPlaceHolder; } diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx index 2ceb73a781b9..2ceb73a781b9 100644 --- a/svtools/inc/itemdel.hxx +++ b/svtools/inc/svtools/itemdel.hxx diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index ccba40e43442..13bf8bcdd24a 100644 --- a/svtools/inc/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -85,7 +85,7 @@ class SvxIconChoiceCtrlEntry Rectangle aRect; // Bounding-Rect des Entries Rectangle aGridRect; // nur gesetzt im Grid-Modus - ULONG nPos; + sal_uLong nPos; // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus @@ -95,12 +95,12 @@ class SvxIconChoiceCtrlEntry SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) SvxIconChoiceCtrlTextMode eTextMode; - USHORT nX,nY; // fuer Tastatursteuerung - USHORT nFlags; + sal_uInt16 nX,nY; // fuer Tastatursteuerung + sal_uInt16 nFlags; - void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } - void SetFlags( USHORT nMask ) { nFlags |= nMask; } - void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } + void ClearFlags( sal_uInt16 nMask ) { nFlags &= (~nMask); } + void SetFlags( sal_uInt16 nMask ) { nFlags |= nMask; } + void AssignFlags( sal_uInt16 _nFlags ) { nFlags = _nFlags; } // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) void SetBacklink( SvxIconChoiceCtrlEntry* pA ) @@ -120,8 +120,8 @@ class SvxIconChoiceCtrlEntry } public: - SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( sal_uInt16 nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 nFlags = 0 ); ~SvxIconChoiceCtrlEntry () {} void SetImage ( const Image& rImage ) { aImage = rImage; } @@ -136,21 +136,21 @@ public: const Rectangle & GetBoundRect() const { return aRect; } - void SetFocus ( BOOL bSet ) + void SetFocus ( sal_Bool bSet ) { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } - USHORT GetFlags() const { return nFlags; } - BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } - BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } - BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } - BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } - BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } - BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } - BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } - void SetMoved( BOOL bMoved ); - BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } - void LockPos( BOOL bLock ); + sal_uInt16 GetFlags() const { return nFlags; } + sal_Bool IsSelected() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } + sal_Bool IsFocused() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } + sal_Bool IsInUse() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } + sal_Bool IsCursored() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } + sal_Bool IsDropTarget() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } + sal_Bool IsBlockingEmphasis() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } + sal_Bool WasMoved() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } + void SetMoved( sal_Bool bMoved ); + sal_Bool IsPosLocked() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } + void LockPos( sal_Bool bLock ); // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } @@ -171,10 +171,10 @@ class SvxIconChoiceCtrlColumnInfo Image aColImage; long nWidth; SvxIconChoiceCtrlColumnAlign eAlignment; - USHORT nSubItem; + sal_uInt16 nSubItem; public: - SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, + SvxIconChoiceCtrlColumnInfo( sal_uInt16 nSub, long nWd, SvxIconChoiceCtrlColumnAlign eAlign ) : nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); @@ -183,13 +183,13 @@ public: void SetImage( const Image& rImg ) { aColImage = rImg; } void SetWidth( long nWd ) { nWidth = nWd; } void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } - void SetSubItem( USHORT nSub) { nSubItem = nSub; } + void SetSubItem( sal_uInt16 nSub) { nSubItem = nSub; } const String& GetText() const { return aColText; } const Image& GetImage() const { return aColImage; } long GetWidth() const { return nWidth; } SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } - USHORT GetSubItem() const { return nSubItem; } + sal_uInt16 GetSubItem() const { return nSubItem; } }; //################################################################################################################################### @@ -238,15 +238,15 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control Link _aVisRectChangedHdl; KeyEvent* _pCurKeyEvent; SvxIconChoiceCtrl_Impl* _pImp; - BOOL _bAutoFontColor; + sal_Bool _bAutoFontColor; protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); + virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, sal_Bool bCancelled ); virtual void DocumentRectChanged(); virtual void VisibleRectChanged(); - virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); virtual void Command( const CommandEvent& rCEvt ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -266,11 +266,11 @@ protected: virtual String GetEntryText( SvxIconChoiceCtrlEntry* pEntry, - BOOL bInplaceEdit ); + sal_Bool bInplaceEdit ); virtual void FillLayoutData() const; - void CallImplEventListeners(ULONG nEvent, void* pData); + void CallImplEventListeners(sal_uLong nEvent, void* pData); public: @@ -281,9 +281,9 @@ public: void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const; - BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); + sal_Bool SetChoiceWithCursor ( sal_Bool bDo = sal_True ); - void SetUpdateMode( BOOL bUpdateMode ); + void SetUpdateMode( sal_Bool bUpdateMode ); void SetFont( const Font& rFont ); void SetPointFont( const Font& rFont ); @@ -296,14 +296,14 @@ public: void ArrangeIcons(); - SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, + SvxIconChoiceCtrlEntry* InsertEntry( sal_uLong nPos = LIST_APPEND, const Point* pPos = 0, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, - ULONG nPos = LIST_APPEND, + sal_uLong nPos = LIST_APPEND, const Point* pPos = 0, - USHORT nFlags = 0 + sal_uInt16 nFlags = 0 ); /** creates automatic mnemonics for all icon texts in the control @@ -321,14 +321,14 @@ public: void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); - BOOL DoKeyInput( const KeyEvent& rKEvt ); + sal_Bool DoKeyInput( const KeyEvent& rKEvt ); - BOOL IsEntryEditing() const; + sal_Bool IsEntryEditing() const; void Clear(); - ULONG GetEntryCount() const; - SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; - ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + sal_uLong GetEntryCount() const; + SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const; + sal_uLong GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; using Window::SetCursor; void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); SvxIconChoiceCtrlEntry* GetCursor() const; @@ -336,16 +336,16 @@ public: // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); - // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt - // ==TRUE : Bitmap oder Text muss getroffen sein - SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; + // bHit==sal_False: Eintrag gilt als getroffen, wenn Position im BoundRect liegt + // ==sal_True : Bitmap oder Text muss getroffen sein + SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, sal_Bool bHit = sal_False ) const; // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool ) const; // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool ) const; - // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben - SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; + // in dem sal_uLong wird die Position in der Liste des gefunden Eintrags zurueckgegeben + SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uLong& rPos ) const; void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; @@ -355,19 +355,19 @@ public: void Flush(); - virtual BOOL HasBackground() const; - virtual BOOL HasFont() const; - virtual BOOL HasFontTextColor() const; - virtual BOOL HasFontFillColor() const; + virtual sal_Bool HasBackground() const; + virtual sal_Bool HasFont() const; + virtual sal_Bool HasFontTextColor() const; + virtual sal_Bool HasFontFillColor() const; - void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } - BOOL AutoFontColor () { return _bAutoFontColor; } + void SetFontColorToBackground ( sal_Bool bDo = sal_True ) { _bAutoFontColor = bDo; } + sal_Bool AutoFontColor () { return _bAutoFontColor; } Point GetLogicPos( const Point& rPosPixel ) const; Point GetPixelPos( const Point& rPosLogic ) const; void SetSelectionMode( SelectionMode eMode ); - BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); + sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx index e3137f7bed2b..608861ad898e 100644 --- a/svtools/inc/svtools/javainteractionhandler.hxx +++ b/svtools/inc/svtools/javainteractionhandler.hxx @@ -75,7 +75,7 @@ private: bool m_bJavaNotFound_Handled; bool m_bVMCreationFailure_Handled; bool m_bRestartRequired_Handled; - USHORT m_nResult_JavaDisabled; + sal_uInt16 m_nResult_JavaDisabled; }; } diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx index 30f986d2e002..c006f034e5fd 100644 --- a/svtools/inc/localresaccess.hxx +++ b/svtools/inc/svtools/localresaccess.hxx @@ -69,7 +69,7 @@ namespace svt FreeResource(); } - inline BOOL IsAvailableRes( const ResId& _rId ) const + inline sal_Bool IsAvailableRes( const ResId& _rId ) const { return Resource::IsAvailableRes( _rId ); } diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index ddf0352c558a..20e15990e538 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -121,7 +121,7 @@ public: // ... als Enum pOptEnums ist ein HTMLOptionEnum-Array sal_uInt16 GetEnum( const HTMLOptionEnum *pOptEnums, sal_uInt16 nDflt=0 ) const; - BOOL GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const; + sal_Bool GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const; // ... und als ein par spezielle Enums HTMLInputType GetInputType() const; // <INPUT TYPE=...> @@ -135,20 +135,20 @@ SV_DECL_PTRARR(HTMLOptions,HTMLOptionPtr,16,16) class SVT_DLLPUBLIC HTMLParser : public SvParser { - BOOL bNewDoc : 1; // neues Doc lesen ? - BOOL bIsInHeader : 1; // scanne Header-Bereich - BOOL bIsInBody : 1; // scanne Body-Bereich - BOOL bReadListing : 1; // Lese Listings - BOOL bReadXMP : 1; // Lese XMP - BOOL bReadPRE : 1; // Lese preformatted Text - BOOL bReadTextArea : 1; // Lese TEXTAREA - BOOL bReadScript : 1; // Lesen von <SCRIPT> - BOOL bReadStyle : 1; // Lesen von <STYLE> - BOOL bEndTokenFound : 1; // </SCRIPT> oder </STYLE> gefunden - - BOOL bPre_IgnoreNewPara : 1; // Flags fuers lesen von PRE-Absaetzen - BOOL bReadNextChar : 1; // TRUE: NextChar nochmals lesen (JavaScript!) - BOOL bReadComment : 1; // TRUE: NextChar nochmals lesen (JavaScript!) + sal_Bool bNewDoc : 1; // neues Doc lesen ? + sal_Bool bIsInHeader : 1; // scanne Header-Bereich + sal_Bool bIsInBody : 1; // scanne Body-Bereich + sal_Bool bReadListing : 1; // Lese Listings + sal_Bool bReadXMP : 1; // Lese XMP + sal_Bool bReadPRE : 1; // Lese preformatted Text + sal_Bool bReadTextArea : 1; // Lese TEXTAREA + sal_Bool bReadScript : 1; // Lesen von <SCRIPT> + sal_Bool bReadStyle : 1; // Lesen von <STYLE> + sal_Bool bEndTokenFound : 1; // </SCRIPT> oder </STYLE> gefunden + + sal_Bool bPre_IgnoreNewPara : 1; // Flags fuers lesen von PRE-Absaetzen + sal_Bool bReadNextChar : 1; // sal_True: NextChar nochmals lesen (JavaScript!) + sal_Bool bReadComment : 1; // sal_True: NextChar nochmals lesen (JavaScript!) sal_uInt32 nPre_LinePos; // Pos in der Line im PRE-Tag @@ -167,43 +167,43 @@ protected: virtual ~HTMLParser(); - void FinishHeader( BOOL bBody ) { bIsInHeader = FALSE; bIsInBody = bBody; } + void FinishHeader( sal_Bool bBody ) { bIsInHeader = sal_False; bIsInBody = bBody; } public: - HTMLParser( SvStream& rIn, int bReadNewDoc = TRUE ); + HTMLParser( SvStream& rIn, int bReadNewDoc = sal_True ); virtual SvParserState CallParser(); // Aufruf des Parsers - BOOL IsNewDoc() const { return bNewDoc; } - BOOL IsInHeader() const { return bIsInHeader; } - BOOL IsInBody() const { return bIsInBody; } - BOOL IsValidSyntax() const { return TRUE; } - BOOL IsReadListing() const { return bReadListing; } - BOOL IsReadXMP() const { return bReadXMP; } - BOOL IsReadPRE() const { return bReadPRE; } - BOOL IsReadScript() const { return bReadScript; } - BOOL IsReadStyle() const { return bReadStyle; } + sal_Bool IsNewDoc() const { return bNewDoc; } + sal_Bool IsInHeader() const { return bIsInHeader; } + sal_Bool IsInBody() const { return bIsInBody; } + sal_Bool IsValidSyntax() const { return sal_True; } + sal_Bool IsReadListing() const { return bReadListing; } + sal_Bool IsReadXMP() const { return bReadXMP; } + sal_Bool IsReadPRE() const { return bReadPRE; } + sal_Bool IsReadScript() const { return bReadScript; } + sal_Bool IsReadStyle() const { return bReadStyle; } - void SetReadNextChar() { bReadNextChar = TRUE; } + void SetReadNextChar() { bReadNextChar = sal_True; } // PRE-/LISTING oder XMP-Modus starten/beenden oder Tags entsprechend // filtern - inline void StartPRE( BOOL bRestart=FALSE ); - void FinishPRE() { bReadPRE = FALSE; } + inline void StartPRE( sal_Bool bRestart=sal_False ); + void FinishPRE() { bReadPRE = sal_False; } int FilterPRE( int nToken ); - inline void StartListing( BOOL bRestart=FALSE ); - void FinishListing() { bReadListing = FALSE; } + inline void StartListing( sal_Bool bRestart=sal_False ); + void FinishListing() { bReadListing = sal_False; } int FilterListing( int nToken ); - inline void StartXMP( BOOL bRestart=FALSE ); - void FinishXMP() { bReadXMP = FALSE; } + inline void StartXMP( sal_Bool bRestart=sal_False ); + void FinishXMP() { bReadXMP = sal_False; } int FilterXMP( int nToken ); - void FinishTextArea() { bReadTextArea = FALSE; } + void FinishTextArea() { bReadTextArea = sal_False; } // PRE-/LSITING- und XMP-Modus beenden - void FinishPREListingXMP() { bReadPRE = bReadListing = bReadXMP = FALSE; } + void FinishPREListingXMP() { bReadPRE = bReadListing = bReadXMP = sal_False; } // Das aktuelle Token dem aktuellen Modus (PRE, XMP, ...) entsprechend // Filtern und die Flags setzen. Wird von Continue aufgerufen, bevor @@ -213,7 +213,7 @@ public: // Scannen eines Scripts beenden (sollte nur unmittelbar nach dem // Lesen eines <SCRIPT> aufgerufen werden - void EndScanScript() { bReadScript = FALSE; } + void EndScanScript() { bReadScript = sal_False; } void ReadRawData( const sal_Char *pEndToken ) { aEndToken.AssignAscii(pEndToken); } @@ -254,43 +254,43 @@ public: // Ist der uebergebene 0-terminierte String (vermutlich) der Anfang // eines HTML-Files? Er sollte mind. 80 Zeichen lang sein. - // Mit Ausnahme des Falls, dass SwitchToUCS2==FALSE und + // Mit Ausnahme des Falls, dass SwitchToUCS2==sal_False und // SVPAR_CS_DONTKNOW uebergeben wird muss der String mit zwei(!) // 0-Bytes an einer geraden(!) Position terminiert sein. static bool IsHTMLFormat( const sal_Char* pHeader, - BOOL bSwitchToUCS2 = FALSE, + sal_Bool bSwitchToUCS2 = sal_False, rtl_TextEncoding eEnc=RTL_TEXTENCODING_DONTKNOW ); - BOOL ParseScriptOptions( String& rLangString, const String&, HTMLScriptLanguage& rLang, + sal_Bool ParseScriptOptions( String& rLangString, const String&, HTMLScriptLanguage& rLang, String& rSrc, String& rLibrary, String& rModule ); // Einen Kommentar um den Inhalt von <SCRIPT> oder <STYLE> entfernen // Bei 'bFull' wird ggf. die gesammte Zeile hinter einem "<!--" // entfernt (fuer JavaSript) - static void RemoveSGMLComment( String &rString, BOOL bFull ); + static void RemoveSGMLComment( String &rString, sal_Bool bFull ); - static BOOL InternalImgToPrivateURL( String& rURL ); + static sal_Bool InternalImgToPrivateURL( String& rURL ); static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader ); - BOOL SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader ); + sal_Bool SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader ); }; -inline void HTMLParser::StartPRE( BOOL bRestart ) +inline void HTMLParser::StartPRE( sal_Bool bRestart ) { - bReadPRE = TRUE; + bReadPRE = sal_True; bPre_IgnoreNewPara = !bRestart; nPre_LinePos = 0UL; } -inline void HTMLParser::StartListing( BOOL bRestart ) +inline void HTMLParser::StartListing( sal_Bool bRestart ) { - bReadListing = TRUE; + bReadListing = sal_True; bPre_IgnoreNewPara = !bRestart; nPre_LinePos = 0UL; } -inline void HTMLParser::StartXMP( BOOL bRestart ) +inline void HTMLParser::StartXMP( sal_Bool bRestart ) { - bReadXMP = TRUE; + bReadXMP = sal_True; bPre_IgnoreNewPara = !bRestart; nPre_LinePos = 0UL; } diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx index 7bab3233f454..e47428ba3ac9 100644 --- a/svtools/inc/svtools/parrtf.hxx +++ b/svtools/inc/svtools/parrtf.hxx @@ -31,19 +31,19 @@ #include "svtools/svtdllapi.h" #include <svtools/svparser.hxx> -#include <svl/svarray.hxx> +#include <stack> struct RtfParserState_Impl { rtl_TextEncoding eCodeSet; - BYTE nUCharOverread; + sal_uInt8 nUCharOverread; - RtfParserState_Impl( BYTE nUOverread, rtl_TextEncoding eCdSt ) + RtfParserState_Impl( sal_uInt8 nUOverread, rtl_TextEncoding eCdSt ) : eCodeSet( eCdSt ), nUCharOverread( nUOverread ) {} }; -SV_DECL_VARARR( RtfParserStates_Impl, RtfParserState_Impl, 16, 16 ) +typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl; class SVT_DLLPUBLIC SvRTFParser : public SvParser { @@ -51,7 +51,7 @@ class SVT_DLLPUBLIC SvRTFParser : public SvParser int nOpenBrakets; rtl_TextEncoding eCodeSet, eUNICodeSet; - BYTE nUCharOverread; + sal_uInt8 nUCharOverread; private: static short _inSkipGroup; @@ -77,7 +77,7 @@ protected: void SetUNICodeSet( rtl_TextEncoding eSet ) { eUNICodeSet = eSet; } public: - SvRTFParser( SvStream& rIn, BYTE nStackSize = 3 ); + SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); virtual SvParserState CallParser(); // Aufruf des Parsers diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx index 88ce944174b7..b55955cf0462 100644 --- a/svtools/inc/prgsbar.hxx +++ b/svtools/inc/svtools/prgsbar.hxx @@ -73,15 +73,15 @@ private: Point maPos; long mnPrgsWidth; long mnPrgsHeight; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbCalcNew; + sal_uInt16 mnPercent; + sal_uInt16 mnPercentCount; + sal_Bool mbCalcNew; #ifdef _SV_PRGSBAR_CXX using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SVT_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); #endif public: @@ -94,8 +94,8 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetValue( USHORT nNewPercent ); - USHORT GetValue() const { return mnPercent; } + void SetValue( sal_uInt16 nNewPercent ); + sal_uInt16 GetValue() const { return mnPercent; } }; #endif // _PRGSBAR_HXX diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx deleted file mode 100644 index 575dc2830134..000000000000 --- a/svtools/inc/svtools/printdlg.hxx +++ /dev/null @@ -1,285 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_PRINTDLG_HXX_ -#define _SV_PRINTDLG_HXX_ - -#include "svtools/svtdllapi.h" - -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/group.hxx> -#include <vcl/field.hxx> -#include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> -#include <svtools/stdctrl.hxx> - -class Printer; -class QueueInfo; -struct SvtPrinterImpl; - -// --------------------- -// - PrintDialog-Types - -// --------------------- - -enum PrintDialogRange{ - PRINTDIALOG_ALL, PRINTDIALOG_SELECTION, PRINTDIALOG_FROMTO, PRINTDIALOG_RANGE }; - -enum PrintSheetRange -{ - PRINTSHEETS_ALL, - PRINTSHEETS_SELECTED_SHEETS, - PRINTSHEETS_SELECTED_CELLS -}; - - -// --------------- -// - PrintDialog - -// --------------- - -class SVT_DLLPUBLIC PrintDialog : public ModalDialog -{ -private: - FixedLine maFlPrinter; - FixedText maFtName; - ListBox maLbName; - PushButton maBtnProperties; - FixedText maFtStatus; - FixedInfo maFiStatus; - FixedText maFtType; - FixedInfo maFiType; - FixedText maFtLocation; - FixedInfo maFiLocation; - FixedText maFtComment; - FixedInfo maFiComment; - - // "Print to file" or "Fax number" - CheckBox maCbxFilePrint; - FixedInfo maFiPrintFile; - FixedText maFiFaxNo; - Edit maEdtFaxNo; - //PushButton maBtnBrowse_nomore; - - // "Print" - FixedLine maFlPrint; - RadioButton maRbtAllSheets; - RadioButton maRbtSelectedSheets; - RadioButton maRbtSelectedCells; - - // "Print range" - FixedLine maFlPrintRange; - RadioButton maRbtAll; - RadioButton maRbtPages; - RadioButton maRbtSelection; - Edit maEdtPages; - - FixedLine maFlSepCopiesRange; - - // "Copies" - FixedLine maFlCopies; - FixedText maFtCopies; - NumericField maNumCopies; - FixedImage maImgCollate; - FixedImage maImgNotCollate; - CheckBox maCbxCollate; - - FixedLine maFlSepButtonLine; - PushButton maBtnOptions; - OKButton maBtnOK; - CancelButton maBtnCancel; - HelpButton maBtnHelp; - - AutoTimer maStatusTimer; - Printer* mpPrinter; - SvtPrinterImpl* mpPrinterImpl; - - XubString maRangeText; - USHORT mnCopyCount; - USHORT mnFirstPage; - USHORT mnLastPage; - USHORT mnMinPage; - USHORT mnMaxPage; - PrintDialogRange meCheckRange; - BOOL mbAll; - BOOL mbSelection; - BOOL mbFromTo; - BOOL mbRange; - BOOL mbCollate; - BOOL mbCollateCheck; - BOOL mbOptions; - bool mbWithSheetsAndCells; - Link maOptionsHdlLink; // Link zum Options-Handler - Link maOKHdlLink; // Link zum OK-Handler - - String maAllFilterStr; - - SVT_DLLPRIVATE void ImplCheckOK(); - SVT_DLLPRIVATE void ImplInitControls(); - SVT_DLLPRIVATE void ImplFillDialogData(); - SVT_DLLPRIVATE void ImplSetInfo(); - SVT_DLLPRIVATE void ImplSetImages(); - SVT_DLLPRIVATE bool ImplGetFilename(); - - DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplModifyControlHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplStatusHdl, Timer* ); - -public: - PrintDialog( Window* pWindow, bool bWithSheetsAndCells ); - ~PrintDialog(); - - virtual long OK(); - virtual long ClickOptionsHdl(); - - void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } - Printer* GetPrinter() const { return mpPrinter; } - - inline bool IsSheetRangeAvailable() const { return mbWithSheetsAndCells; } - void EnableSheetRange( bool bEnable, PrintSheetRange eRange ); - bool IsSheetRangeEnabled( PrintSheetRange eRange ) const; - void CheckSheetRange( PrintSheetRange eRange ); - PrintSheetRange GetCheckedSheetRange() const; - bool IsSheetRangeChecked( PrintSheetRange eRange ) const; - - void EnableRange( PrintDialogRange eRange ); - void DisableRange( PrintDialogRange eRange ); - BOOL IsRangeEnabled( PrintDialogRange eRange ) const; - - void CheckRange( PrintDialogRange eRange = PRINTDIALOG_ALL ) - { meCheckRange = eRange; } - PrintDialogRange GetCheckedRange() const { return meCheckRange; } - BOOL IsRangeChecked( PrintDialogRange eRange ) const; - - void SetRangeText( const XubString& rRange ) { maRangeText = rRange; } - const XubString& GetRangeText() const { return maRangeText; } - - void SetFirstPage( USHORT nPage = 0 ); - USHORT GetFirstPage() const { return mnFirstPage; } - void SetLastPage( USHORT nPage = 0 ); - USHORT GetLastPage() const { return mnLastPage; } - - void SetMinPage( USHORT nPage = 1 ) { mnMinPage = nPage; } - USHORT GetMinPage() const { return mnMinPage; } - void SetMaxPage( USHORT nPage = 65535 ) { mnMaxPage = nPage; } - USHORT GetMaxPage() const { return mnMaxPage; } - - void SetCopyCount( USHORT nCopies = 1 ) { mnCopyCount = nCopies; } - USHORT GetCopyCount() const { return mnCopyCount; } - - void EnableCollate( BOOL bEnable = TRUE ) - { mbCollate = bEnable; } - BOOL IsCollateEnabled() const { return mbCollate; } - void CheckCollate( BOOL bCheck = TRUE ) - { mbCollateCheck = bCheck; } - BOOL IsCollateChecked() const { return mbCollateCheck; } - - void ShowOptionsButton( BOOL bShow = TRUE ) - { mbOptions = bShow; } - BOOL IsOptionsButtonVisible() const { return mbOptions; } - - void SetOptionsHdl( const Link& rLink ) { maOptionsHdlLink = rLink; } - const Link& GetOptionsHdl() const { return maOptionsHdlLink; } - - void SetOKHdl( const Link& rLink ) { maOKHdlLink = rLink; } - const Link& GetOKHdl() const { return maOKHdlLink; } - - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long Notify( NotifyEvent& rNEvt ); - - virtual short Execute(); - - void DisableHelp(); -}; - -inline void PrintDialog::EnableRange( PrintDialogRange eRange ) -{ - if ( eRange == PRINTDIALOG_ALL ) - mbAll = TRUE; - else if ( eRange == PRINTDIALOG_SELECTION ) - mbSelection = TRUE; - else if ( eRange == PRINTDIALOG_FROMTO ) - mbFromTo = TRUE; - else - mbRange = TRUE; -} - -inline void PrintDialog::DisableRange( PrintDialogRange eRange ) -{ - if ( eRange == PRINTDIALOG_ALL ) - mbAll = FALSE; - else if ( eRange == PRINTDIALOG_SELECTION ) - mbSelection = FALSE; - else if ( eRange == PRINTDIALOG_FROMTO ) - mbFromTo = FALSE; - else - mbRange = FALSE; -} - -inline BOOL PrintDialog::IsRangeEnabled( PrintDialogRange eRange ) const -{ - BOOL bRet; - - if ( eRange == PRINTDIALOG_ALL ) - bRet = mbAll; - else if ( eRange == PRINTDIALOG_SELECTION ) - bRet = mbSelection; - else if ( eRange == PRINTDIALOG_FROMTO ) - bRet = mbFromTo; - else - bRet = mbRange; - - return bRet; -} - -inline BOOL PrintDialog::IsRangeChecked( PrintDialogRange eRange ) const -{ - if ( eRange == meCheckRange ) - return TRUE; - else - return FALSE; -} - -inline void PrintDialog::SetFirstPage( USHORT nPage ) -{ - mnFirstPage = nPage; - if ( nPage && (nPage < mnMinPage) ) - mnMinPage = nPage; -} - -inline void PrintDialog::SetLastPage( USHORT nPage ) -{ - mnLastPage = nPage; - if ( nPage && (nPage > mnMaxPage) ) - mnMaxPage = nPage; -} - -#endif // _SV_PRINTDLG_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx index 46542b9081e9..a7155032a238 100644 --- a/svtools/inc/svtools/prnsetup.hxx +++ b/svtools/inc/svtools/prnsetup.hxx @@ -101,7 +101,7 @@ public: void ImplFillPrnDlgListBox( const Printer* pPrinter, ListBox* pBox, PushButton* pPropBtn ); -void ImplFreePrnDlgListBox( ListBox* pBox, BOOL bClear = TRUE ); +void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear = sal_True ); Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, Printer* pPrinter, Printer* pTempPrinter ); Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter ); diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx index 988af84294c0..988af84294c0 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/svtools/roadmap.hxx diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 6dd2b5302987..76a8587beedd 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -91,8 +91,8 @@ namespace svt void SetRoadmapBitmap( const BitmapEx& _rBitmap ); const BitmapEx& GetRoadmapBitmap( ) const; - void SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART ); - SmartId GetRoadmapSmartHelpId() const; + void SetRoadmapHelpId( const rtl::OString& _rId ); + const rtl::OString& GetRoadmapHelpId() const; void SetRoadmapInteractive( sal_Bool _bInteractive ); sal_Bool IsRoadmapInteractive(); diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx index b9ad75ae8e32..b9ad75ae8e32 100644 --- a/svtools/inc/rtfkeywd.hxx +++ b/svtools/inc/svtools/rtfkeywd.hxx diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx index 71a0475a91b1..b8b3c400103a 100644 --- a/svtools/inc/rtfout.hxx +++ b/svtools/inc/svtools/rtfout.hxx @@ -40,7 +40,7 @@ class SvStream; class SVT_DLLPUBLIC RTFOutFuncs { public: -#if defined(MAC) || defined(UNX) +#if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else static const sal_Char sNewLine[]; // \015\012 @@ -49,15 +49,15 @@ public: static SvStream& Out_Char( SvStream&, sal_Unicode cChar, int *pUCMode, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); static SvStream& Out_Fontname( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); + sal_Bool bWriteHelpFile = sal_False ); - static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); + static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen ); }; diff --git a/svtools/inc/rtftoken.h b/svtools/inc/svtools/rtftoken.h index d7dda804a8d7..d7dda804a8d7 100644 --- a/svtools/inc/rtftoken.h +++ b/svtools/inc/svtools/rtftoken.h diff --git a/svtools/inc/ruler.hxx b/svtools/inc/svtools/ruler.hxx index 2e8a4f6a53b6..ba04f9342525 100644 --- a/svtools/inc/ruler.hxx +++ b/svtools/inc/svtools/ruler.hxx @@ -129,7 +129,7 @@ bottom/right margin. If these methods are called whithout arguments, no margins are displayed. Otherwise, the following arguments can be passed: long nPos - offset in pixels relative to the origin - USHORT nStyle - bit style: + sal_uInt16 nStyle - bit style: RULER_MARGIN_SIZEABLE margin size can be changed @@ -144,7 +144,7 @@ has to be passed. In the array, the following values have to be initialized: long nPos - offset in pixels relative to the origin long nWidth - column spacing in pixels (can also be 0, for example, for table columns) - USHORT nStyle - bit style: + sal_uInt16 nStyle - bit style: RULER_BORDER_SIZEABLE Column spacing can be changed. This flag should only be set if the size of the spacing is changed, @@ -176,7 +176,7 @@ rulers. A Ruler Indent must be passed as an argument, with the following values initialized: long nPos - offset relative to the origin in pixels - USHORT nStyle - bit style: + sal_uInt16 nStyle - bit style: RULER_INDENT_TOP (indent of the first line) RULER_INDENT_BOTTOM (left/right indent) RULER_INDENT_BORDER (Vertical line that shows the border distance) @@ -191,7 +191,7 @@ An array of type RulerTab must be passed as an argument, with the following valu initialized: long nPos - offset relative to the origin in pixels - USHORT nStyle - bit style: + sal_uInt16 nStyle - bit style: RULER_TAB_DEFAULT (can't be selected) RULER_TAB_LEFT RULER_TAB_CENTER @@ -207,7 +207,7 @@ SetLines() displays position lines in the ruler. An array of type RulerLine must the following values initialized: long nPos - offset relative to the origin in pixels - USHORT nStyle - bit style (has to be 0 currently) + sal_uInt16 nStyle - bit style (has to be 0 currently) SetArrows() displays dimension arrows in the ruler. With dimension arrows set no subdivisions will be shown any more in the ruler. Therefore, dimension @@ -217,7 +217,7 @@ must be passed with the following values initialized: long nPos - offset relative to the origin in pixels long nWidth - the arrow's width long nLogWidth - the arrow's width in logical unit - USHORT nStyle - bit style (has to be 0 currently) + sal_uInt16 nStyle - bit style (has to be 0 currently) SetSourceUnit() sets the unit in which the logical values are given that are passed to SetArrows(). The only units accepted are MAP_TWIP and MAP_100TH_MM. @@ -303,7 +303,7 @@ it has been dragged. There are the following query methods: gezogen, werden automatisch die alten Werte dargestellt, ohne das der Drag-Handler gerufen wird. Falls der Benutzer jedoch den Wert auf die alte Position - zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls + zurueckgeschoben hat, liefert die Methode trotzdem sal_False. Falls dies vermieden werden soll, muss sich die Applikation im StartDrag- Handler den alten Wert merken und im EndDrag-Handler den Wert vergleichen. @@ -350,7 +350,7 @@ it has been dragged. There are the following query methods: gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als Paramter ueber gibt man die Fensterposition und gegebenenfalls - einen Pointer auf einen USHORT, um die Array-Position eines + einen Pointer auf einen sal_uInt16, um die Array-Position eines Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende Werte zurueckgegeben: RULER_TYPE_DONTKNOW (kein Element im Linealbereich) @@ -366,7 +366,7 @@ mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die Drag-Steuerung: - IsDrag() - Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. + Liefert sal_True zurueck, wenn sich das Lineal im Drag-Vorgang befindet. - CancelDrag() Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei @@ -421,7 +421,7 @@ womit man bestimmte Aktionen abfangen kann. RULER_EXTRA_DONTKNOW (Nichts) RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) RULER_EXTRA_TAB (Tab) - - USHORT nStyle Bitfeld als Style: + - sal_uInt16 nStyle Bitfeld als Style: RULER_STYLE_HIGHLIGHT (selektiert) RULER_TAB_... (ein Tab-Style) @@ -531,9 +531,9 @@ enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, enum RulerExtra { RULER_EXTRA_DONTKNOW, RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; -#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) -#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) -#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) +#define RULER_STYLE_HIGHLIGHT ((sal_uInt16)0x8000) +#define RULER_STYLE_DONTKNOW ((sal_uInt16)0x4000) +#define RULER_STYLE_INVISIBLE ((sal_uInt16)0x2000) #define RULER_DRAGSIZE_MOVE 0 #define RULER_DRAGSIZE_1 1 @@ -552,24 +552,24 @@ enum RulerExtra { RULER_EXTRA_DONTKNOW, // - RulerMargin - // --------------- -#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) +#define RULER_MARGIN_SIZEABLE ((sal_uInt16)0x0001) // --------------- // - RulerBorder - // --------------- -#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) -#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) -#define RULER_BORDER_VARIABLE ((USHORT)0x0004) -#define RULER_BORDER_TABLE ((USHORT)0x0008) -#define RULER_BORDER_SNAP ((USHORT)0x0010) -#define RULER_BORDER_MARGIN ((USHORT)0x0020) +#define RULER_BORDER_SIZEABLE ((sal_uInt16)0x0001) +#define RULER_BORDER_MOVEABLE ((sal_uInt16)0x0002) +#define RULER_BORDER_VARIABLE ((sal_uInt16)0x0004) +#define RULER_BORDER_TABLE ((sal_uInt16)0x0008) +#define RULER_BORDER_SNAP ((sal_uInt16)0x0010) +#define RULER_BORDER_MARGIN ((sal_uInt16)0x0020) struct RulerBorder { long nPos; long nWidth; - USHORT nStyle; + sal_uInt16 nStyle; //minimum/maximum position, supported for table borders/rows long nMinPos; long nMaxPos; @@ -579,33 +579,33 @@ struct RulerBorder // - RulerIndent - // --------------- -#define RULER_INDENT_TOP ((USHORT)0x0000) -#define RULER_INDENT_BOTTOM ((USHORT)0x0001) -#define RULER_INDENT_BORDER ((USHORT)0x0002) -#define RULER_INDENT_STYLE ((USHORT)0x000F) +#define RULER_INDENT_TOP ((sal_uInt16)0x0000) +#define RULER_INDENT_BOTTOM ((sal_uInt16)0x0001) +#define RULER_INDENT_BORDER ((sal_uInt16)0x0002) +#define RULER_INDENT_STYLE ((sal_uInt16)0x000F) struct RulerIndent { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; // ------------ // - RulerTab - // ------------ -#define RULER_TAB_LEFT ((USHORT)0x0000) -#define RULER_TAB_RIGHT ((USHORT)0x0001) -#define RULER_TAB_DECIMAL ((USHORT)0x0002) -#define RULER_TAB_CENTER ((USHORT)0x0003) -#define RULER_TAB_DEFAULT ((USHORT)0x0004) -#define RULER_TAB_STYLE ((USHORT)0x000F) -#define RULER_TAB_RTL ((USHORT)0x0010) +#define RULER_TAB_LEFT ((sal_uInt16)0x0000) +#define RULER_TAB_RIGHT ((sal_uInt16)0x0001) +#define RULER_TAB_DECIMAL ((sal_uInt16)0x0002) +#define RULER_TAB_CENTER ((sal_uInt16)0x0003) +#define RULER_TAB_DEFAULT ((sal_uInt16)0x0004) +#define RULER_TAB_STYLE ((sal_uInt16)0x000F) +#define RULER_TAB_RTL ((sal_uInt16)0x0010) struct RulerTab { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; #define RULER_TAB_WIDTH 7 @@ -618,7 +618,7 @@ struct RulerTab struct RulerLine { long nPos; - USHORT nStyle; + sal_uInt16 nStyle; }; // -------------- @@ -630,7 +630,7 @@ struct RulerArrow long nPos; long nWidth; long nLogWidth; - USHORT nStyle; + sal_uInt16 nStyle; }; class ImplRulerData; @@ -654,20 +654,20 @@ private: long mnBorderWidth; long mnStartDragPos; long mnDragPos; - ULONG mnUpdateEvtId; + sal_uLong mnUpdateEvtId; ImplRulerData* mpSaveData; ImplRulerData* mpData; ImplRulerData* mpDragData; Rectangle maExtraRect; WinBits mnWinStyle; - USHORT mnUnitIndex; - USHORT mnDragAryPos; - USHORT mnDragSize; - USHORT mnDragScroll; - USHORT mnDragModifier; - USHORT mnExtraStyle; - USHORT mnExtraClicks; - USHORT mnExtraModifier; + sal_uInt16 mnUnitIndex; + sal_uInt16 mnDragAryPos; + sal_uInt16 mnDragSize; + sal_uInt16 mnDragScroll; + sal_uInt16 mnDragModifier; + sal_uInt16 mnExtraStyle; + sal_uInt16 mnExtraClicks; + sal_uInt16 mnExtraModifier; // Amelia long mnCharWidth; long mnLineHeight; @@ -677,14 +677,14 @@ private: MapUnit meSourceUnit; FieldUnit meUnit; Fraction maZoom; - BOOL mbCalc; - BOOL mbFormat; - BOOL mbDrag; - BOOL mbDragDelete; - BOOL mbDragCanceled; - BOOL mbAutoWinWidth; - BOOL mbActive; - BYTE mnUpdateFlags; + sal_Bool mbCalc; + sal_Bool mbFormat; + sal_Bool mbDrag; + sal_Bool mbDragDelete; + sal_Bool mbDragCanceled; + sal_Bool mbAutoWinWidth; + sal_Bool mbActive; + sal_uInt8 mnUpdateFlags; Link maStartDragHdl; Link maDragHdl; Link maEndDragHdl; @@ -700,27 +700,27 @@ private: SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, sal_uInt16 nStyle ); SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, sal_uInt16 nStyle ); SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SVT_DLLPRIVATE void ImplCalc(); SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); - SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); + SVT_DLLPRIVATE void ImplInitExtraField( sal_Bool bUpdate ); + SVT_DLLPRIVATE void ImplInvertLines( sal_Bool bErase = sal_False ); SVT_DLLPRIVATE void ImplDraw(); - SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); + SVT_DLLPRIVATE void ImplDrawExtra( sal_Bool bPaint = sal_False ); + SVT_DLLPRIVATE void ImplUpdate( sal_Bool bMustCalc = sal_False ); using Window::ImplHitTest; - SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, + SVT_DLLPRIVATE sal_Bool ImplHitTest( const Point& rPos, ImplRulerHitTest* pHitTest, - BOOL bRequiredStyle = FALSE, - USHORT nRequiredStyle = 0 ) const; - SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; - SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); + sal_Bool bRequiredStyle = sal_False, + sal_uInt16 nRequiredStyle = 0 ) const; + SVT_DLLPRIVATE sal_Bool ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; + SVT_DLLPRIVATE sal_Bool ImplStartDrag( ImplRulerHitTest* pHitTest, sal_uInt16 nModifier ); SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); SVT_DLLPRIVATE void ImplEndDrag(); DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); @@ -751,7 +751,7 @@ public: void Activate(); void Deactivate(); - BOOL IsActive() const { return mbActive; } + sal_Bool IsActive() const { return mbActive; } void SetWinPos( long nOff = 0, long nWidth = 0 ); long GetWinOffset() const { return mnWinOff; } @@ -771,67 +771,67 @@ public: void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } MapUnit GetSourceUnit() const { return meSourceUnit; } - void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); + void SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle = 0 ); RulerExtra GetExtraType() const { return meExtraType; } - USHORT GetExtraStyle() const { return mnExtraStyle; } - USHORT GetExtraClicks() const { return mnExtraClicks; } - USHORT GetExtraModifier() const { return mnExtraModifier; } + sal_uInt16 GetExtraStyle() const { return mnExtraStyle; } + sal_uInt16 GetExtraClicks() const { return mnExtraClicks; } + sal_uInt16 GetExtraModifier() const { return mnExtraModifier; } - BOOL StartDocDrag( const MouseEvent& rMEvt, + sal_Bool StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType = RULER_TYPE_DONTKNOW ); RulerType GetDocType( const Point& rPos, RulerType eDragType = RULER_TYPE_DONTKNOW, - USHORT* pAryPos = NULL ) const; + sal_uInt16* pAryPos = NULL ) const; RulerType GetDragType() const { return meDragType; } long GetDragPos() const { return mnDragPos; } - USHORT GetDragAryPos() const { return mnDragAryPos; } - USHORT GetDragSize() const { return mnDragSize; } - BOOL IsDragDelete() const { return mbDragDelete; } - BOOL IsDragCanceled() const { return mbDragCanceled; } - USHORT GetDragScroll() const { return mnDragScroll; } - USHORT GetDragModifier() const { return mnDragModifier; } - BOOL IsDrag() const { return mbDrag; } + sal_uInt16 GetDragAryPos() const { return mnDragAryPos; } + sal_uInt16 GetDragSize() const { return mnDragSize; } + sal_Bool IsDragDelete() const { return mbDragDelete; } + sal_Bool IsDragCanceled() const { return mbDragCanceled; } + sal_uInt16 GetDragScroll() const { return mnDragScroll; } + sal_uInt16 GetDragModifier() const { return mnDragModifier; } + sal_Bool IsDrag() const { return mbDrag; } void CancelDrag(); long GetClickPos() const { return mnDragPos; } RulerType GetClickType() const { return meDragType; } - USHORT GetClickAryPos() const { return mnDragAryPos; } + sal_uInt16 GetClickAryPos() const { return mnDragAryPos; } using Window::GetType; RulerType GetType( const Point& rPos, - USHORT* pAryPos = NULL ) const; + sal_uInt16* pAryPos = NULL ) const; void SetNullOffset( long nPos ); long GetNullOffset() const; void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + void SetMargin1( long nPos, sal_uInt16 nMarginStyle = RULER_MARGIN_SIZEABLE ); long GetMargin1() const; - USHORT GetMargin1Style() const; + sal_uInt16 GetMargin1Style() const; void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + void SetMargin2( long nPos, sal_uInt16 nMarginStyle = RULER_MARGIN_SIZEABLE ); long GetMargin2() const; - USHORT GetMargin2Style() const; + sal_uInt16 GetMargin2Style() const; - void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); - USHORT GetLineCount() const; + void SetLines( sal_uInt16 n = 0, const RulerLine* pLineAry = NULL ); + sal_uInt16 GetLineCount() const; const RulerLine* GetLines() const; - void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); - USHORT GetArrowCount() const; + void SetArrows( sal_uInt16 n = 0, const RulerArrow* pArrowAry = NULL ); + sal_uInt16 GetArrowCount() const; const RulerArrow* GetArrows() const; - void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); - USHORT GetBorderCount() const; + void SetBorders( sal_uInt16 n = 0, const RulerBorder* pBrdAry = NULL ); + sal_uInt16 GetBorderCount() const; const RulerBorder* GetBorders() const; - void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); - USHORT GetIndentCount() const; + void SetIndents( sal_uInt16 n = 0, const RulerIndent* pIndentAry = NULL ); + sal_uInt16 GetIndentCount() const; const RulerIndent* GetIndents() const; - void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); - USHORT GetTabCount() const; + void SetTabs( sal_uInt16 n = 0, const RulerTab* pTabAry = NULL ); + sal_uInt16 GetTabCount() const; const RulerTab* GetTabs() const; static void DrawTab( OutputDevice* pDevice, - const Point& rPos, USHORT nStyle ); + const Point& rPos, sal_uInt16 nStyle ); void SetStyle( WinBits nStyle ); WinBits GetStyle() const { return mnWinStyle; } @@ -850,7 +850,7 @@ public: const Link& GetExtraDownHdl() const { return maExtraDownHdl; } //set text direction right-to-left - void SetTextRTL(BOOL bRTL); + void SetTextRTL(sal_Bool bRTL); void SetCharWidth( long nWidth ) { mnCharWidth = nWidth ; } void SetLineHeight( long nHeight ) { mnLineHeight = nHeight ; } diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx index bbca120ef017..bbca120ef017 100644 --- a/svtools/inc/scriptedtext.hxx +++ b/svtools/inc/svtools/scriptedtext.hxx diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx index ba5291c7f8c7..f81b60d446de 100644 --- a/svtools/inc/scrwin.hxx +++ b/svtools/inc/svtools/scrwin.hxx @@ -39,7 +39,7 @@ class DataChangedEvent; // - ScrollableWindow-Type - // ------------------------- -typedef USHORT ScrollableWindowFlags; +typedef sal_uInt16 ScrollableWindowFlags; #define SCRWIN_THUMBDRAGGING 1 #define SCRWIN_VCENTER 2 @@ -61,7 +61,7 @@ private: ScrollBar aVScroll; // the scrollbars ScrollBar aHScroll; ScrollBarBox aCornerWin; // window in the bottom right corner - BOOL bScrolling:1, // user controlled scrolling + sal_Bool bScrolling:1, // user controlled scrolling bHandleDragging:1, // scroll window while dragging bHCenter:1, bVCenter:1; @@ -93,15 +93,15 @@ public: Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } void SetVisibleSize( const Size& rNewSize ); - BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); + sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False ); Rectangle GetVisibleArea() const; - void SetLineSize( ULONG nHorz, ULONG nVert ); + void SetLineSize( sal_uLong nHorz, sal_uLong nVert ); using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); + virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); void ScrollLines( long nLinesX, long nLinesY ); - void ScrollPages( long nPagesX, ULONG nOverlapX, - long nPagesY, ULONG nOverlapY ); + void ScrollPages( long nPagesX, sal_uLong nOverlapX, + long nPagesY, sal_uLong nOverlapY ); private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx index 1ac67e909b69..1ac67e909b69 100644 --- a/svtools/inc/sfxecode.hxx +++ b/svtools/inc/svtools/sfxecode.hxx diff --git a/svtools/inc/soerr.hxx b/svtools/inc/svtools/soerr.hxx index 05d3100f8f4e..05d3100f8f4e 100644 --- a/svtools/inc/soerr.hxx +++ b/svtools/inc/svtools/soerr.hxx diff --git a/svtools/inc/sores.hxx b/svtools/inc/svtools/sores.hxx index 1b19a2c8144c..1b19a2c8144c 100644 --- a/svtools/inc/sores.hxx +++ b/svtools/inc/svtools/sores.hxx diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx index 0703a87f4d06..0703a87f4d06 100644 --- a/svtools/inc/statusbarcontroller.hxx +++ b/svtools/inc/svtools/statusbarcontroller.hxx diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx index 2ccb6cd59605..d14a42e6a7b5 100644 --- a/svtools/inc/stdmenu.hxx +++ b/svtools/inc/svtools/stdmenu.hxx @@ -188,7 +188,7 @@ private: Link maSelectHdl; Link maHighlightHdl; - SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); + SVT_DLLPRIVATE sal_Bool ImplIsAlreadyInserted( const XubString& rStyleName, sal_uInt16 nCount ); public: FontStyleMenu(); diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx index 1153b125c9e9..30773b101547 100644 --- a/svtools/inc/svtools/svicnvw.hxx +++ b/svtools/inc/svtools/svicnvw.hxx @@ -61,20 +61,20 @@ enum SvIconViewTextMode class SvIcnVwDataEntry : public SvViewDataEntry { friend class SvImpIconView; - USHORT nIcnVwFlags; + sal_uInt16 nIcnVwFlags; SvIconViewTextMode eTextMode; public: Rectangle aRect; // Bounding-Rect of the Entry Rectangle aGridRect; // set in grid mode Size aTextSize; // set in grid mode only - USHORT nX,nY; // for keyboard control + sal_uInt16 nX,nY; // for keyboard control SvIcnVwDataEntry(); virtual ~SvIcnVwDataEntry(); - BOOL IsEntryPosLocked() const { return (BOOL)((nIcnVwFlags & ICNVW_FLAG_POS_LOCKED) !=0); } - void ClearVwFlags( USHORT nMask ) { nIcnVwFlags &= (~nMask); } - void SetVwFlags( USHORT nMask ) { nIcnVwFlags |= nMask; } - USHORT GetVwFlags() const { return nIcnVwFlags; } + sal_Bool IsEntryPosLocked() const { return (sal_Bool)((nIcnVwFlags & ICNVW_FLAG_POS_LOCKED) !=0); } + void ClearVwFlags( sal_uInt16 nMask ) { nIcnVwFlags &= (~nMask); } + void SetVwFlags( sal_uInt16 nMask ) { nIcnVwFlags |= nMask; } + sal_uInt16 GetVwFlags() const { return nIcnVwFlags; } SvIconViewTextMode GetTextMode() const { return eTextMode; } }; @@ -87,8 +87,7 @@ class SvIconView : public SvLBox SvImpIconView* pImp; Image aCollapsedEntryBmp; Image aExpandedEntryBmp; - WinBits nWinBits; - USHORT nIcnVwFlags; + sal_uInt16 nIcnVwFlags; void SetModel( SvLBoxTreeList* ); protected: @@ -109,6 +108,7 @@ protected: virtual void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); virtual void Command( const CommandEvent& rCEvt ); virtual void PreparePaint( SvLBoxEntry* ); + virtual void StateChanged( StateChangedType nStateChange ); public: @@ -119,15 +119,15 @@ public: void DisconnectFromModel(); SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos=LIST_APPEND ); + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos=LIST_APPEND ); SvLBoxEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos = LIST_APPEND ); + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos = LIST_APPEND ); const Image& GetDefaultExpandedEntryBmp() const { return aExpandedEntryBmp;} const Image& GetDefaultCollapsedEntryBmp() const { return aCollapsedEntryBmp;} @@ -144,7 +144,7 @@ public: virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); virtual void RequestingChilds( SvLBoxEntry* pParent ); @@ -156,7 +156,7 @@ public: virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); - void SetUpdateMode( BOOL ); + void SetUpdateMode( sal_Bool ); using SvListView::SetModel; virtual void SetModel( SvLBoxTreeList*, SvLBoxEntry* pParent ); @@ -164,44 +164,43 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving(SvListEntry* pSource, - SvListEntry* pTargetParent, ULONG nChildPos ); + SvListEntry* pTargetParent, sal_uLong nChildPos ); virtual void ModelHasMoved(SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); - virtual void ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow ); + virtual void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow ); using Window::GetDropTarget; virtual SvLBoxEntry* GetDropTarget( const Point& ); virtual Region GetDragRegion() const; // NotifyMoving/Copying is overloaded, since GetDropTarget // returns a "magic pointer" if the drop happens in/on an empty // area(?) of the IconView - virtual BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos); - virtual BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos); + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos); + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos); // returns TopLeft of the BoundingRect. Add MapMode.Origin to get the // position relative to the window Point GetEntryPosition( SvLBoxEntry* ) const; void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos); void SetEntryPosition( SvLBoxEntry*, const Point& rDocPos, - BOOL bAdjustAtGrid ); + sal_Bool bAdjustAtGrid ); void SetFont( const Font& rFont ); void SetDefaultFont(); using SvLBox::GetEntry; - SvLBoxEntry* GetEntry( const Point& rPixPos, BOOL ) const; + SvLBoxEntry* GetEntry( const Point& rPixPos, sal_Bool ) const; // returns the entry just above pCurEntry (z-wise) - SvLBoxEntry* GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL ) const; + SvLBoxEntry* GetNextEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const; // returns the entry just below pCurEntry (z-wise) - SvLBoxEntry* GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, BOOL ) const; + SvLBoxEntry* GetPrevEntry( const Point& rPixPos, SvLBoxEntry* pCurEntry, sal_Bool ) const; SvLBoxEntry* GetEntryFromLogicPos( const Point& rDocPos ) const; - void SetWindowBits( WinBits nWinStyle ); virtual void PaintEntry( SvLBoxEntry* ); virtual void PaintEntry( SvLBoxEntry*, const Point& rDocPos ); Rectangle GetFocusRect( SvLBoxEntry* ); @@ -212,8 +211,8 @@ public: void SetSelectionMode( SelectionMode ); using SvListView::Select; - BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); - void SelectAll( BOOL bSelect, BOOL bPaint=TRUE ); + sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True ); virtual void SetCurEntry( SvLBoxEntry* _pEntry ); virtual SvLBoxEntry* GetCurEntry() const; @@ -221,28 +220,28 @@ public: // locigal coordinates void SelectRect( const Rectangle& rRect, - BOOL bAdd = FALSE, + sal_Bool bAdd = sal_False, // inverts the intersection with rRect - // (ignored if bAdd == FALSE) + // (ignored if bAdd == sal_False) SvPtrarr* pOtherRects = 0, short nBorderOffs = -5 ); - ULONG GetSelectionCount() const; + sal_uLong GetSelectionCount() const; virtual void Arrange(); void SetSpaceBetweenEntries( long nHor, long Ver ); long GetHorSpaceBetweenEntries(); long GetVerSpaceBetweenEntries(); - void EnableInplaceEditing( BOOL bEnable ); + void EnableInplaceEditing( sal_Bool bEnable ); void EditEntry( SvLBoxEntry* pEntry = 0 ); - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual BOOL EditedEntry( SvLBoxEntry*, const XubString& rNewText ); + virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvLBoxEntry*, const XubString& rNewText ); void SetCurParent( SvLBoxEntry* pNewParent ); SvLBoxEntry* GetCurParent() const; - virtual void ModelNotification( USHORT nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, ULONG nPos ); + virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, + SvListEntry* pEntry2, sal_uLong nPos ); // pass (0, 0) to switch off grid mode void SetGrid( long nDX, long nDY ); @@ -252,7 +251,7 @@ public: // nDeltaX < 0 : View moves left relative to Doc // nDeltaX > 0 : View moves right relative to Doc using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); + virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); virtual void PrepareCommandEvent( const CommandEvent& ); virtual void StartDrag( sal_Int8 nAction, const Point& ); @@ -270,14 +269,14 @@ public: const Point& rRefPosPixel, long& rScrollX, long& rScrollY, - BOOL bInDragDrop = FALSE, - USHORT nBorderWidth = 10 ); + sal_Bool bInDragDrop = sal_False, + sal_uInt16 nBorderWidth = 10 ); using Window::EndTracking; void EndTracking(); void AdjustAtGrid( SvLBoxEntry* pEntry = 0 ); - void LockEntryPos( SvLBoxEntry* pEntry, BOOL bLock = TRUE ); - BOOL IsEntryPosLocked( const SvLBoxEntry* pEntry ) const; + void LockEntryPos( SvLBoxEntry* pEntry, sal_Bool bLock = sal_True ); + sal_Bool IsEntryPosLocked( const SvLBoxEntry* pEntry ) const; void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 ); SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0 ) const; diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index 1f23481ff783..6ef90e9e7b97 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -63,11 +63,11 @@ private: long nWidth; long nHeight; SvLBoxButtonData_Impl* pImpl; - BOOL bDataOk; + sal_Bool bDataOk; SvButtonState eState; SVT_DLLPRIVATE void SetWidthAndHeight(); - SVT_DLLPRIVATE void InitData( BOOL bImagesFromDefault, + SVT_DLLPRIVATE void InitData( sal_Bool bImagesFromDefault, bool _bRadioBtn, const Control* pControlForSettings = NULL ); public: // include creating default images (CheckBox or RadioButton) @@ -77,17 +77,17 @@ public: SvLBoxButtonData(); ~SvLBoxButtonData(); - USHORT GetIndex( USHORT nItemState ); + sal_uInt16 GetIndex( sal_uInt16 nItemState ); inline long Width(); inline long Height(); void SetLink( const Link& rLink) { aLink=rLink; } const Link& GetLink() const { return aLink; } - BOOL IsRadio(); + sal_Bool IsRadio(); // weil Buttons nicht von LinkHdl abgeleitet sind void CallLink(); - void StoreButtonState( SvLBoxEntry* pEntry, USHORT nItemFlags ); - SvButtonState ConvertToButtonState( USHORT nItemFlags ) const; + void StoreButtonState( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags ); + SvButtonState ConvertToButtonState( sal_uInt16 nItemFlags ) const; inline SvButtonState GetActButtonState() const; SvLBoxEntry* GetActEntry() const; @@ -97,7 +97,7 @@ public: void SetDefaultImages( const Control* pControlForSettings = NULL ); // set images acording to the color scheeme of the Control // pControlForSettings == NULL: settings are taken from Application - BOOL HasDefaultImages( void ) const; + sal_Bool HasDefaultImages( void ) const; }; inline long SvLBoxButtonData::Width() @@ -125,14 +125,14 @@ class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem { XubString aStr; public: - SvLBoxString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr); + SvLBoxString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr); SvLBoxString(); virtual ~SvLBoxString(); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); XubString GetText() const { return aStr; } void SetText( SvLBoxEntry*, const XubString& rStr ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); }; @@ -141,13 +141,13 @@ class SvLBoxBmp : public SvLBoxItem { Image aBmp; public: - SvLBoxBmp( SvLBoxEntry*, USHORT nFlags, Image ); + SvLBoxBmp( SvLBoxEntry*, sal_uInt16 nFlags, Image ); SvLBoxBmp(); virtual ~SvLBoxBmp(); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); void SetBitmap( SvLBoxEntry*, Image ); - void Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); }; @@ -170,9 +170,11 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem { SvLBoxButtonData* pData; SvLBoxButtonKind eKind; - USHORT nItemFlags; - USHORT nImgArrOffs; - USHORT nBaseOffs; + sal_uInt16 nItemFlags; + sal_uInt16 nImgArrOffs; + sal_uInt16 nBaseOffs; + + void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox @@ -180,31 +182,31 @@ public: // (see SV_BMP_STATICIMAGE; nFlags are effectively ignored // for that kind). SvLBoxButton( SvLBoxEntry* pEntry, - SvLBoxButtonKind eTheKind, USHORT nFlags, + SvLBoxButtonKind eTheKind, sal_uInt16 nFlags, SvLBoxButtonData* pBData ); SvLBoxButton(); virtual ~SvLBoxButton(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - virtual USHORT IsA(); - void Check( SvLBox* pView, SvLBoxEntry*, BOOL bCheck ); - virtual BOOL ClickHdl(SvLBox* pView, SvLBoxEntry* ); - void Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* ); + virtual sal_uInt16 IsA(); + void Check( SvLBox* pView, SvLBoxEntry*, sal_Bool bCheck ); + virtual sal_Bool ClickHdl(SvLBox* pView, SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); - USHORT GetButtonFlags() const { return nItemFlags; } - BOOL IsStateChecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_CHECKED)!=0; } - BOOL IsStateUnchecked() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; } - BOOL IsStateTristate() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; } - BOOL IsStateHilighted() const { return (BOOL)(nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; } + sal_uInt16 GetButtonFlags() const { return nItemFlags; } + sal_Bool IsStateChecked() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_CHECKED)!=0; } + sal_Bool IsStateUnchecked() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_UNCHECKED)!=0; } + sal_Bool IsStateTristate() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_TRISTATE)!=0; } + sal_Bool IsStateHilighted() const { return (sal_Bool)(nItemFlags & SV_ITEMSTATE_HILIGHTED)!=0; } void SetStateChecked(); void SetStateUnchecked(); void SetStateTristate(); - void SetStateHilighted( BOOL bHilight ); + void SetStateHilighted( sal_Bool bHilight ); SvLBoxButtonKind GetKind() const { return eKind; } - void SetBaseOffs( USHORT nOffs ) { nBaseOffs = nOffs; } - USHORT GetBaseOffs() const { return nBaseOffs; } + void SetBaseOffs( sal_uInt16 nOffs ) { nBaseOffs = nOffs; } + sal_uInt16 GetBaseOffs() const { return nBaseOffs; } // Check whether this button can be modified via UI, sounding a beep if it // cannot be modified: @@ -226,7 +228,7 @@ inline void SvLBoxButton::SetStateTristate() nItemFlags &= SV_STATE_MASK; nItemFlags |= SV_ITEMSTATE_TRISTATE; } -inline void SvLBoxButton::SetStateHilighted( BOOL bHilight ) +inline void SvLBoxButton::SetStateHilighted( sal_Bool bHilight ) { if ( bHilight ) nItemFlags |= SV_ITEMSTATE_HILIGHTED; @@ -240,18 +242,18 @@ class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem { SvLBoxContextBmp_Impl* m_pImpl; public: - SvLBoxContextBmp( SvLBoxEntry*,USHORT nFlags,Image,Image, - USHORT nEntryFlagsBmp1); + SvLBoxContextBmp( SvLBoxEntry*,sal_uInt16 nFlags,Image,Image, + sal_uInt16 nEntryFlagsBmp1); SvLBoxContextBmp(); virtual ~SvLBoxContextBmp(); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rView, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rView, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); - BOOL SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ); + sal_Bool SetModeImages( const Image& _rBitmap1, const Image& _rBitmap2 ); void GetModeImages( Image& _rBitmap1, Image& _rBitmap2 ) const; inline void SetBitmap1( const Image& _rImage ); diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index bd58c3e0735d..7b801d2288fd 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -42,6 +42,7 @@ #include <vcl/timer.hxx> #include <vcl/accel.hxx> #include <vcl/mnemonicengine.hxx> +#include <vcl/quickselectionengine.hxx> #include <tools/gen.hxx> #include <svtools/treelist.hxx> #include <svl/svarray.hxx> @@ -96,21 +97,21 @@ class SvLBoxTab void* pUserData; public: SvLBoxTab(); - SvLBoxTab( long nPos, USHORT nFlags=SV_LBOXTAB_ADJUST_LEFT ); + SvLBoxTab( long nPos, sal_uInt16 nFlags=SV_LBOXTAB_ADJUST_LEFT ); SvLBoxTab( const SvLBoxTab& ); ~SvLBoxTab(); - USHORT nFlags; + sal_uInt16 nFlags; void SetUserData( void* pPtr ) { pUserData = pPtr; } void* GetUserData() const { return pUserData; } - BOOL IsDynamic() const { return (BOOL)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); } + sal_Bool IsDynamic() const { return (sal_Bool)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); } void SetPos( long nNewPos) { nPos = nNewPos; } long GetPos() const { return nPos; } long CalcOffset( long nItemLength, long nTabWidth ); // long CalcOffset( const String&, const OutputDevice& ); - BOOL IsEditable() const { return (BOOL)((nFlags & SV_LBOXTAB_EDITABLE)!=0); } - BOOL IsPushable() const { return (BOOL)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); } + sal_Bool IsEditable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_EDITABLE)!=0); } + sal_Bool IsPushable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); } }; // ********************************************************************* @@ -132,7 +133,7 @@ class SvViewDataEntry : public SvViewData { public: SvViewDataItem* pItemData; // ein Array von SvViewDataItems - USHORT nItmCnt; // Anzahl Items fuer delete-operator + sal_uInt16 nItmCnt; // Anzahl Items fuer delete-operator SvViewDataEntry(); virtual ~SvViewDataEntry(); @@ -145,20 +146,20 @@ public: class SVT_DLLPUBLIC SvLBoxItem { public: - SvLBoxItem( SvLBoxEntry*, USHORT nFlags ); + SvLBoxItem( SvLBoxEntry*, sal_uInt16 nFlags ); SvLBoxItem(); virtual ~SvLBoxItem(); - virtual USHORT IsA() = 0; + virtual sal_uInt16 IsA() = 0; const Size& GetSize( SvLBox* pView, SvLBoxEntry* pEntry ); const Size& GetSize( SvLBoxEntry*, SvViewDataEntry* ); - const Size& GetSize( SvViewDataEntry* pData, USHORT nItemPos ) + const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos ) { SvViewDataItem* pIData=pData->pItemData+nItemPos; return pIData->aSize; } virtual void Paint( const Point& rPos, SvLBox& rOutDev, - USHORT nViewDataEntryFlags, + sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry ) = 0; virtual void InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, @@ -188,31 +189,31 @@ class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry SvPtrarr aItems; void* pUserData; - USHORT nEntryFlags; + sal_uInt16 nEntryFlags; SVT_DLLPRIVATE void DeleteItems_Impl(); public: SvLBoxEntry(); virtual ~SvLBoxEntry(); - USHORT ItemCount() const { return (USHORT)aItems.Count(); } + sal_uInt16 ItemCount() const { return (sal_uInt16)aItems.Count(); } // DARF NUR GERUFEN WERDEN, WENN DER EINTRAG NOCH NICHT IM MODEL // EINGEFUEGT IST, DA SONST FUER DAS ITEM KEINE VIEW-ABHAENGIGEN // DATEN ALLOZIERT WERDEN! void AddItem( SvLBoxItem* pItem ); - void ReplaceItem( SvLBoxItem* pNewItem, USHORT nPos ); - SvLBoxItem* GetItem( USHORT nPos ) const { return (SvLBoxItem*)aItems.GetObject(nPos ); } - SvLBoxItem* GetFirstItem( USHORT nId ); - USHORT GetPos( SvLBoxItem* pItem ) const { return aItems.GetPos( pItem ); } + void ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ); + SvLBoxItem* GetItem( sal_uInt16 nPos ) const { return (SvLBoxItem*)aItems.GetObject(nPos ); } + SvLBoxItem* GetFirstItem( sal_uInt16 nId ); + sal_uInt16 GetPos( SvLBoxItem* pItem ) const { return aItems.GetPos( pItem ); } void* GetUserData() const { return pUserData; } void SetUserData( void* pPtr ) { pUserData = pPtr; } virtual void Clone( SvListEntry* pSource ); - void EnableChildsOnDemand( BOOL bEnable=TRUE ); - BOOL HasChildsOnDemand() const { return (BOOL)((nEntryFlags & SV_ENTRYFLAG_CHILDS_ON_DEMAND)!=0); } - BOOL HasInUseEmphasis() const { return (BOOL)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); } + void EnableChildsOnDemand( sal_Bool bEnable=sal_True ); + sal_Bool HasChildsOnDemand() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_CHILDS_ON_DEMAND)!=0); } + sal_Bool HasInUseEmphasis() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); } - USHORT GetFlags() const { return nEntryFlags; } - void SetFlags( USHORT nFlags ) { nEntryFlags = nFlags; } + sal_uInt16 GetFlags() const { return nEntryFlags; } + void SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; } }; // ********************************************************************* @@ -221,7 +222,7 @@ public: #define WB_FORCE_SELECTION ((WinBits)0x8000) -#define DragDropMode USHORT +#define DragDropMode sal_uInt16 #define SV_DRAGDROP_NONE (DragDropMode)0x0000 #define SV_DRAGDROP_CTRL_MOVE (DragDropMode)0x0001 #define SV_DRAGDROP_CTRL_COPY (DragDropMode)0x0002 @@ -246,10 +247,12 @@ DECLARE_SVTREELIST(SvLBoxTreeList, SvLBoxEntry*) class SvLBox; struct SvLBox_Impl { - bool m_bIsEmptyTextAllowed; - bool m_bEntryMnemonicsEnabled; - Link* m_pLink; - ::vcl::MnemonicEngine m_aMnemonicEngine; + bool m_bIsEmptyTextAllowed; + bool m_bEntryMnemonicsEnabled; + bool m_bDoingQuickSelection; + Link* m_pLink; + ::vcl::MnemonicEngine m_aMnemonicEngine; + ::vcl::QuickSelectionEngine m_aQuickSelectionEngine; SvLBox_Impl( SvLBox& _rBox ); }; @@ -260,6 +263,7 @@ class SVT_DLLPUBLIC SvLBox ,public DropTargetHelper ,public DragSourceHelper ,public ::vcl::IMnemonicEntryList + ,public ::vcl::ISearchableStringList { friend class SvLBoxEntry; @@ -281,7 +285,6 @@ class SVT_DLLPUBLIC SvLBox protected: - WinBits nWindowStyle; Link aExpandedHdl; Link aExpandingHdl; Link aSelectHdl; @@ -293,18 +296,18 @@ protected: SvLBox_Impl* pLBoxImpl; - USHORT nImpFlags; + sal_uInt16 nImpFlags; // Move/CopySelection: Position des aktuellen Eintrags in Selektionsliste - USHORT nCurEntrySelPos; + sal_uInt16 nCurEntrySelPos; DragDropMode nDragDropMode; SelectionMode eSelMode; sal_Int8 nDragOptions; - BOOL CheckDragAndDropMode( SvLBox* pSource, sal_Int8 ); - void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow); - void EnableSelectionAsDropTarget( BOOL bEnable = TRUE, - BOOL bWithChilds = TRUE ); + sal_Bool CheckDragAndDropMode( SvLBox* pSource, sal_Int8 ); + void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow); + void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True, + sal_Bool bWithChilds = sal_True ); // standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die // D&D unterstuetzen, ueberladen werden using Window::GetDropTarget; @@ -319,23 +322,23 @@ protected: // invalidate children on enable/disable virtual void StateChanged( StateChangedType ); - virtual ULONG Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,ULONG nPos=LIST_APPEND); - virtual ULONG Insert( SvLBoxEntry* pEntry,ULONG nRootPos = LIST_APPEND ); + virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ); void InsertTree( SvLBoxEntry* pTree, SvLBoxEntry* pTarget) {pModel->InsertTree( pTree, pTarget ); } // Inplace-Editing SvInplaceEdit2* pEdCtrl; - void EnableInplaceEditing( BOOL bEnable){if(bEnable)nImpFlags|=SVLBOX_EDT_ENABLED; else nImpFlags&=~SVLBOX_EDT_ENABLED;} - BOOL IsInplaceEditingEnabled() const { return (BOOL)((nImpFlags&SVLBOX_EDT_ENABLED)!=0); } + void EnableInplaceEditing( sal_Bool bEnable){if(bEnable)nImpFlags|=SVLBOX_EDT_ENABLED; else nImpFlags&=~SVLBOX_EDT_ENABLED;} + sal_Bool IsInplaceEditingEnabled() const { return (sal_Bool)((nImpFlags&SVLBOX_EDT_ENABLED)!=0); } virtual void EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem, const Point& rMousePos ); void EditText( const String&, const Rectangle&,const Selection&); - void EditText( const String&, const Rectangle&,const Selection&, BOOL bMulti); + void EditText( const String&, const Rectangle&,const Selection&, sal_Bool bMulti); void EditTextMultiLine( const String&, const Rectangle&,const Selection&); void CancelTextEditing(); - BOOL IsEditingActive() const { return (BOOL)((nImpFlags & SVLBOX_IN_EDT)!=0); } - BOOL EditingCanceled() const; - void EndEditing( BOOL bCancel = FALSE ); + sal_Bool IsEditingActive() const { return (sal_Bool)((nImpFlags & SVLBOX_IN_EDT)!=0); } + sal_Bool EditingCanceled() const; + void EndEditing( sal_Bool bCancel = sal_False ); bool IsEmptyTextAllowed() const; void ForbidEmptyText(); // Callback EditText @@ -353,7 +356,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual SvLBoxEntry* GetEntry( const Point& rPos, BOOL bHit=FALSE ) const; + virtual SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit=sal_False ) const; virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); // handler and methods for Drag - finished handler. This link can be set @@ -367,11 +370,18 @@ protected: // for asynchronous D&D sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView ); - // IMnemonicEntryList - virtual const void* FirstSearchEntry( String& _rEntryText ); - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ); - virtual void SelectSearchEntry( const void* _pEntry ); - virtual void ExecuteSearchEntry( const void* _pEntry ); + void OnCurrentEntryChanged(); + + // IMnemonicEntryList + virtual const void* FirstSearchEntry( String& _rEntryText ) const; + virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const; + virtual void SelectSearchEntry( const void* _pEntry ); + virtual void ExecuteSearchEntry( const void* _pEntry ) const; + + // ISearchableStringList + virtual ::vcl::StringEntryIdentifier CurrentEntry( String& _out_entryText ) const; + virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const; + virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); public: @@ -384,12 +394,12 @@ public: void SetModel( SvLBoxTreeList* ); void DisconnectFromModel(); - virtual USHORT IsA(); - ULONG GetEntryCount() const {return pModel->GetEntryCount();} + virtual sal_uInt16 IsA(); + sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); } - SvLBoxEntry* Next( SvLBoxEntry* pEntry, USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));} - SvLBoxEntry* Prev( SvLBoxEntry* pEntry, USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));} - SvLBoxEntry* Last( USHORT* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Last(pDepth));} + SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));} + SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));} + SvLBoxEntry* Last( sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Last(pDepth));} SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); } SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); } @@ -402,9 +412,9 @@ public: SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); } SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); } - BOOL CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget ); - BOOL MoveSelection( SvLBox* pSource, SvLBoxEntry* pTarget ); - BOOL MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback ); + sal_Bool CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget ); + sal_Bool MoveSelection( SvLBox* pSource, SvLBoxEntry* pTarget ); + sal_Bool MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback ); void RemoveSelection(); DragDropMode GetDragDropMode() const { return nDragDropMode; } @@ -413,8 +423,8 @@ public: virtual void SetSelectionMode( SelectionMode ); // pParent==0 -> Root-Ebene - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } - SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } + SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } SvLBoxEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const; void FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const; @@ -425,8 +435,8 @@ public: SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));} using Window::GetChildCount; - ULONG GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); } - ULONG GetLevelChildCount( SvLBoxEntry* pParent ) const; + sal_uLong GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); } + sal_uLong GetLevelChildCount( SvLBoxEntry* pParent ) const; SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); } SvViewDataItem* GetViewDataItem( SvListEntry*, SvLBoxItem* ) const; @@ -469,21 +479,21 @@ public: */ bool HandleKeyInput( const KeyEvent& rKEvt ); - virtual BOOL Expand( SvLBoxEntry* pParent ); - virtual BOOL Collapse( SvLBoxEntry* pParent ); - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); - virtual ULONG SelectChilds( SvLBoxEntry* pParent, BOOL bSelect ); - virtual void SelectAll( BOOL bSelect, BOOL bPaint=TRUE ); + virtual sal_Bool Expand( SvLBoxEntry* pParent ); + virtual sal_Bool Collapse( SvLBoxEntry* pParent ); + virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); + virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True ); virtual void SetCurEntry( SvLBoxEntry* _pEntry ) = 0; virtual SvLBoxEntry* GetCurEntry() const = 0; // Model - void SetInUseEmphasis( SvLBoxEntry* pEntry, BOOL bInUse=TRUE); + void SetInUseEmphasis( SvLBoxEntry* pEntry, sal_Bool bInUse=sal_True); // View - void SetCursorEmphasis( SvLBoxEntry* pEntry, BOOL bCursored=TRUE); - BOOL HasCursorEmphasis( SvLBoxEntry* pEntry ) const; + void SetCursorEmphasis( SvLBoxEntry* pEntry, sal_Bool bCursored=sal_True); + sal_Bool HasCursorEmphasis( SvLBoxEntry* pEntry ) const; void SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; } void SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; } @@ -499,8 +509,8 @@ public: virtual long ExpandingHdl(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual BOOL DoubleClickHdl(); - BOOL IsTravelSelect() const { return (BOOL)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);} + virtual sal_Bool DoubleClickHdl(); + sal_Bool IsTravelSelect() const { return (sal_Bool)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);} SvLBoxEntry* GetHdlEntry() const { return pHdlEntry; } SvLBoxItem* GetHdlItem() const; @@ -517,7 +527,7 @@ public: virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); - virtual BOOL NotifyAcceptDrop( SvLBoxEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } sal_Int8 GetDragOptions() const { return nDragOptions; } @@ -526,25 +536,25 @@ public: SvLBox* GetTargetView() const; virtual void NotifyRemoving( SvLBoxEntry* ); - virtual void ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow ); + virtual void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow ); virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); virtual SvLBoxEntry* CreateEntry() const; // zum 'new'en von Entries - // Rueckgabe: TRUE==Ok, FALSE==Abbrechen - virtual BOOL NotifyMoving( + // Rueckgabe: sal_True==Ok, sal_False==Abbrechen + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() SvLBoxEntry* pEntry, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - ULONG& rNewChildPos); // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents - // Rueckgabe: TRUE==Ok, FALSE==Abbrechen - virtual BOOL NotifyCopying( + // Rueckgabe: sal_True==Ok, sal_False==Abbrechen + virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() SvLBoxEntry* pEntry, // Zu kopierender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - ULONG& rNewChildPos); // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents // ACCESSIBILITY ========================================================== @@ -577,7 +587,7 @@ struct SvLBoxDDInfo SvLBoxEntry* pDDStartEntry; // relative Position im Eintrag bei Drag-Beginn (IconView) long nMouseRelX,nMouseRelY; - ULONG nRes1,nRes2,nRes3,nRes4; + sal_uLong nRes1,nRes2,nRes3,nRes4; }; class SvInplaceEdit : public Edit @@ -586,8 +596,8 @@ class SvInplaceEdit : public Edit Accelerator aAccReturn; Accelerator aAccEscape; Timer aTimer; - BOOL bCanceled; - BOOL bAlreadyInCallBack; + sal_Bool bCanceled; + sal_Bool bAlreadyInCallBack; void CallCallBackHdl_Impl(); DECL_LINK( Timeout_Impl, Timer * ); @@ -602,9 +612,9 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void LoseFocus(); - BOOL EditingCanceled() const { return bCanceled; } + sal_Bool EditingCanceled() const { return bCanceled; } String GetText() const { return Edit::GetText(); } - void StopEditing( BOOL bCancel = FALSE ); + void StopEditing( sal_Bool bCancel = sal_False ); }; class SvInplaceEdit2 @@ -614,9 +624,9 @@ class SvInplaceEdit2 Accelerator aAccEscape; Timer aTimer; Edit* pEdit; - BOOL bCanceled; - BOOL bAlreadyInCallBack; - BOOL bMultiLine; + sal_Bool bCanceled; + sal_Bool bAlreadyInCallBack; + sal_Bool bMultiLine; void CallCallBackHdl_Impl(); DECL_LINK( Timeout_Impl, Timer * ); @@ -626,14 +636,14 @@ class SvInplaceEdit2 public: SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, const String& rData, const Link& rNotifyEditEnd, - const Selection&, BOOL bMultiLine = FALSE ); + const Selection&, sal_Bool bMultiLine = sal_False ); ~SvInplaceEdit2(); - BOOL KeyInput( const KeyEvent& rKEvt ); + sal_Bool KeyInput( const KeyEvent& rKEvt ); void LoseFocus(); - BOOL EditingCanceled() const { return bCanceled; } + sal_Bool EditingCanceled() const { return bCanceled; } String GetText() const; String GetSavedValue() const; - void StopEditing( BOOL bCancel = FALSE ); + void StopEditing( sal_Bool bCancel = sal_False ); void Hide(); }; @@ -644,7 +654,7 @@ inline SvViewDataItem* SvLBox::GetViewDataItem( SvListEntry* pEntry, (SvViewDataEntry*)SvListView::GetViewData(pEntry); DBG_ASSERT(pEntryData,"Entry not in View"); DBG_ASSERT(pEntryData->pItemData,"No ItemData"); - USHORT nItemPos = ((SvLBoxEntry*)pEntry)->GetPos( pItem ); + sal_uInt16 nItemPos = ((SvLBoxEntry*)pEntry)->GetPos( pItem ); return (pEntryData->pItemData+nItemPos); } diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx index 7deaa8e1a93a..5ff8ab4de8a3 100644 --- a/svtools/inc/svtools/svmedit.hxx +++ b/svtools/inc/svtools/svmedit.hxx @@ -29,7 +29,7 @@ #ifndef _SVEDIT_HXX #define _SVEDIT_HXX -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/edit.hxx> #include <svtools/syntaxhighlight.hxx> @@ -60,7 +60,7 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ); long Notify( NotifyEvent& rNEvt ); using Control::ImplInitSettings; - void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); WinBits ImplInitStyle( WinBits nStyle ); ExtTextEngine* GetTextEngine() const; @@ -79,17 +79,17 @@ public: virtual void SetModifyFlag(); virtual void ClearModifyFlag(); - virtual BOOL IsModified() const; + virtual sal_Bool IsModified() const; - virtual void EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT ); + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); virtual void DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } - virtual ULONG IsUpdateDataEnabled() const; + virtual sal_uLong IsUpdateDataEnabled() const; - virtual void SetReadOnly( BOOL bReadOnly = TRUE ); - virtual BOOL IsReadOnly() const; + virtual void SetReadOnly( sal_Bool bReadOnly = sal_True ); + virtual sal_Bool IsReadOnly() const; - void EnableFocusSelectionHide( BOOL bHide ); - BOOL IsFocusSelectionHideEnabled() const; + void EnableFocusSelectionHide( sal_Bool bHide ); + sal_Bool IsFocusSelectionHideEnabled() const; virtual void SetMaxTextLen( xub_StrLen nMaxLen = 0 ); virtual xub_StrLen GetMaxTextLen() const; @@ -114,8 +114,8 @@ public: String GetTextLines() const; String GetTextLines( LineEnd aSeparator ) const; - void SetRightToLeft( BOOL bRightToLeft ); - BOOL IsRightToLeft() const; + void SetRightToLeft( sal_Bool bRightToLeft ); + sal_Bool IsRightToLeft() const; void SaveValue() { aSaveValue = GetText(); } const XubString& GetSavedValue() const { return aSaveValue; } @@ -132,22 +132,22 @@ public: Size CalcMinimumSize() const; Size CalcAdjustedSize( const Size& rPrefSize ) const; using Edit::CalcSize; - Size CalcSize( USHORT nColumns, USHORT nLines ) const; - void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; + Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; + void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); - void SetLeftMargin( USHORT n ); - USHORT GetLeftMargin() const; + void SetLeftMargin( sal_uInt16 n ); + sal_uInt16 GetLeftMargin() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(BOOL bCreate = TRUE); + GetComponentInterface(sal_Bool bCreate = sal_True); void DisableSelectionOnFocus(); }; -inline ULONG MultiLineEdit::IsUpdateDataEnabled() const +inline sal_uLong MultiLineEdit::IsUpdateDataEnabled() const { return pUpdateDataTimer ? pUpdateDataTimer->GetTimeout() : 0; } diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx index 5df3669c5656..9710f1e5bf6d 100644 --- a/svtools/inc/svtools/svmedit2.hxx +++ b/svtools/inc/svtools/svmedit2.hxx @@ -41,14 +41,14 @@ public: ~ExtMultiLineEdit(); // methods of TextView - void InsertText( const String& rNew, BOOL bSelect = FALSE ); - void SetAutoScroll( BOOL bAutoScroll ); - void EnableCursor( BOOL bEnable ); + void InsertText( const String& rNew, sal_Bool bSelect = sal_False ); + void SetAutoScroll( sal_Bool bAutoScroll ); + void EnableCursor( sal_Bool bEnable ); // methods of TextEngine - void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd ); - void SetLeftMargin( USHORT nLeftMargin ); - ULONG GetParagraphCount() const; + void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); + void SetLeftMargin( sal_uInt16 nLeftMargin ); + sal_uLong GetParagraphCount() const; }; #endif diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx index 182c77878490..b82a5a85e36e 100644 --- a/svtools/inc/svtools/svparser.hxx +++ b/svtools/inc/svtools/svparser.hxx @@ -57,21 +57,21 @@ class SVT_DLLPUBLIC SvParser : public SvRefBase protected: SvStream& rInput; String aToken; // gescanntes Token - ULONG nlLineNr; // akt. Zeilen Nummer - ULONG nlLinePos; // akt. Spalten Nummer + sal_uLong nlLineNr; // akt. Zeilen Nummer + sal_uLong nlLinePos; // akt. Spalten Nummer SvParser_Impl *pImplData; // interne Daten long nTokenValue; // zusaetzlicher Wert (RTF) - BOOL bTokenHasValue; // indicates whether nTokenValue is valid + sal_Bool bTokenHasValue; // indicates whether nTokenValue is valid SvParserState eState; // Status auch in abgl. Klassen rtl_TextEncoding eSrcEnc; // Source encoding - ULONG nNextChPos; + sal_uLong nNextChPos; sal_Unicode nNextCh; // Akt. Zeichen fuer die "lex" - BOOL bDownloadingFile : 1;// TRUE: Es wird gerade ein externes + sal_Bool bDownloadingFile : 1;// sal_True: Es wird gerade ein externes // File geladen. d.h. alle // DataAvailable Links muessen // ignoriert werden. @@ -80,16 +80,16 @@ protected: // Stream als ANSI gelesen, // aber als CharSet DONTKNOW // zurueckgegeben. - BOOL bUCS2BSrcEnc : 1; // oder als big-endian UCS2 - BOOL bSwitchToUCS2 : 1; // Umschalten des ist erlaubt + sal_Bool bUCS2BSrcEnc : 1; // oder als big-endian UCS2 + sal_Bool bSwitchToUCS2 : 1; // Umschalten des ist erlaubt - BOOL bRTF_InTextRead : 1; // only for RTF-Parser!!! + sal_Bool bRTF_InTextRead : 1; // only for RTF-Parser!!! struct TokenStackType { String sToken; long nTokenValue; - BOOL bTokenHasValue; + sal_Bool bTokenHasValue; int nTokenId; inline TokenStackType() { nTokenId = 0; } @@ -99,7 +99,7 @@ protected: // Methoden fuer Token-Stack int SkipToken( short nCnt = -1 ); // n Tokens zurueck "skippen" TokenStackType* GetStackPtr( short nCnt ); - inline BYTE GetStackPos() const; + inline sal_uInt8 GetStackPos() const; // scanne das naechste Token: // Tokenstack abarbeiten und ggfs. _GetNextToken() rufen. Diese @@ -118,22 +118,22 @@ protected: private: TokenStackType* pTokenStack; TokenStackType *pTokenStackPos; - BYTE nTokenStackSize, nTokenStackPos; + sal_uInt8 nTokenStackSize, nTokenStackPos; public: // Konstruktor - SvParser( SvStream& rIn, BYTE nStackSize = 3 ); + SvParser( SvStream& rIn, sal_uInt8 nStackSize = 3 ); virtual SvParserState CallParser() = 0; // Aufruf des Parsers inline SvParserState GetStatus() const { return eState; } // StatusInfo - inline ULONG GetLineNr() const { return nlLineNr; } - inline ULONG GetLinePos() const { return nlLinePos; } - inline ULONG IncLineNr() { return ++nlLineNr; } - inline ULONG IncLinePos() { return ++nlLinePos; } - inline ULONG SetLineNr( ULONG nlNum ); // inline unten - inline ULONG SetLinePos( ULONG nlPos ); // inline unten + inline sal_uLong GetLineNr() const { return nlLineNr; } + inline sal_uLong GetLinePos() const { return nlLinePos; } + inline sal_uLong IncLineNr() { return ++nlLineNr; } + inline sal_uLong IncLinePos() { return ++nlLinePos; } + inline sal_uLong SetLineNr( sal_uLong nlNum ); // inline unten + inline sal_uLong SetLinePos( sal_uLong nlPos ); // inline unten sal_Unicode GetNextChar(); void RereadLookahead(); @@ -150,24 +150,24 @@ public: /*virtual*/ void RestoreState(); virtual void Continue( int nToken ); - inline void SetDownloadingFile( BOOL bSet ) { bDownloadingFile = bSet; } - inline BOOL IsDownloadingFile() const { return bDownloadingFile; } + inline void SetDownloadingFile( sal_Bool bSet ) { bDownloadingFile = bSet; } + inline sal_Bool IsDownloadingFile() const { return bDownloadingFile; } // Set/get source encoding. The UCS2BEncoding flag is valid if source // encoding is UCS2. It specifies a big endian encoding. void SetSrcEncoding( rtl_TextEncoding eSrcEnc ); rtl_TextEncoding GetSrcEncoding() const { return eSrcEnc; } - void SetSrcUCS2BEncoding( BOOL bSet ) { bUCS2BSrcEnc = bSet; } - BOOL IsSrcUCS2BEncoding() const { return bUCS2BSrcEnc; } + void SetSrcUCS2BEncoding( sal_Bool bSet ) { bUCS2BSrcEnc = bSet; } + sal_Bool IsSrcUCS2BEncoding() const { return bUCS2BSrcEnc; } // Darf der Zeichensatz auf UCS/2 umgeschaltet werden, wenn // in den ersten beiden Zeichen im Stream eine BOM steht? - void SetSwitchToUCS2( BOOL bSet ) { bSwitchToUCS2 = bSet; } - BOOL IsSwitchToUCS2() const { return bSwitchToUCS2; } + void SetSwitchToUCS2( sal_Bool bSet ) { bSwitchToUCS2 = bSet; } + sal_Bool IsSwitchToUCS2() const { return bSwitchToUCS2; } // Aus wie vielen Bytes betseht ein Zeichen - inline USHORT GetCharSize() const; + inline sal_uInt16 GetCharSize() const; int GetSaveToken() const; @@ -175,8 +175,8 @@ public: // 'pWhichIds' von Which-Ids. Es hat die Lange 'nWhichIds'. // Die Which-Map wird nicht geloescht. static void BuildWhichTbl( SvUShorts &rWhichMap, - USHORT *pWhichIds, - USHORT nWhichIds ); + sal_uInt16 *pWhichIds, + sal_uInt16 nWhichIds ); }; @@ -188,16 +188,16 @@ SV_IMPL_REF(SvParser) -inline ULONG SvParser::SetLineNr( ULONG nlNum ) -{ ULONG nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } +inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum ) +{ sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } -inline ULONG SvParser::SetLinePos( ULONG nlPos ) -{ ULONG nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } +inline sal_uLong SvParser::SetLinePos( sal_uLong nlPos ) +{ sal_uLong nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } -inline BYTE SvParser::GetStackPos() const +inline sal_uInt8 SvParser::GetStackPos() const { return nTokenStackPos; } -inline USHORT SvParser::GetCharSize() const +inline sal_uInt16 SvParser::GetCharSize() const { return (RTL_TEXTENCODING_UCS2 == eSrcEnc) ? 2 : 1; } @@ -262,7 +262,7 @@ class SVT_DLLPUBLIC SvKeyValueIterator : public SvRefBase, /** Representation. */ SvKeyValueList_Impl* m_pList; - USHORT m_nPos; + sal_uInt16 m_nPos; public: /** Construction/Destruction. @@ -272,8 +272,8 @@ public: /** Operation. */ - virtual BOOL GetFirst (SvKeyValue &rKeyVal); - virtual BOOL GetNext (SvKeyValue &rKeyVal); + virtual sal_Bool GetFirst (SvKeyValue &rKeyVal); + virtual sal_Bool GetNext (SvKeyValue &rKeyVal); virtual void Append (const SvKeyValue &rKeyVal); }; diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index e47d64f8ceed..899a0a719c65 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -48,10 +48,10 @@ enum SvTabJustify struct TabListBoxEventData { SvLBoxEntry* m_pEntry; - USHORT m_nColumn; + sal_uInt16 m_nColumn; String m_sOldText; - TabListBoxEventData( SvLBoxEntry* pEntry, USHORT nColumn, const String& rOldText ) : + TabListBoxEventData( SvLBoxEntry* pEntry, sal_uInt16 nColumn, const String& rOldText ) : m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {} }; @@ -59,71 +59,71 @@ class SVT_DLLPUBLIC SvTabListBox : public SvTreeListBox { private: SvLBoxTab* pTabList; - USHORT nTabCount; + sal_uInt16 nTabCount; XubString aCurEntry; - ULONG nDummy1; - ULONG nDummy2; + sal_uLong nDummy1; + sal_uLong nDummy2; protected: SvLBoxEntry* pViewParent; - static const xub_Unicode* GetToken( const xub_Unicode* pPtr, USHORT& rLen ); + static const xub_Unicode* GetToken( const xub_Unicode* pPtr, sal_uInt16& rLen ); virtual void SetTabs(); virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); - String GetTabEntryText( ULONG nPos, USHORT nCol ) const; - SvLBoxEntry* GetEntryOnPos( ULONG _nEntryPos ) const; - SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, ULONG _nEntryPos, ULONG& _rPos ) const; + String GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; + SvLBoxEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; + SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; public: SvTabListBox( Window* pParent, WinBits = WB_BORDER ); SvTabListBox( Window* pParent, const ResId& ); ~SvTabListBox(); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); - USHORT TabCount() const { return (USHORT)nTabCount; } + sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } using SvTreeListBox::GetTab; - long GetTab( USHORT nTab ) const; - void SetTab( USHORT nTab, long nValue, MapUnit = MAP_APPFONT ); - long GetLogicTab( USHORT nTab ); + long GetTab( sal_uInt16 nTab ) const; + void SetTab( sal_uInt16 nTab, long nValue, MapUnit = MAP_APPFONT ); + long GetLogicTab( sal_uInt16 nTab ); virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos=LIST_APPEND, void* pUserData = 0, + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); virtual SvLBoxEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos = LIST_APPEND, void* pUserData = 0, + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, ULONG nPos = LIST_APPEND, - USHORT nCol = 0xffff, void* pUserData = NULL ); + virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, + sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, - ULONG nPos, USHORT nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, - ULONG nPos = LIST_APPEND, USHORT nCol = 0xffff, void* pUserData = NULL ); + sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual String GetEntryText( SvLBoxEntry* pEntry ) const; - String GetEntryText( SvLBoxEntry*, USHORT nCol ) const; - String GetEntryText( ULONG nPos, USHORT nCol = 0xffff ) const; + String GetEntryText( SvLBoxEntry*, sal_uInt16 nCol ) const; + String GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; - void SetEntryText( const XubString&, ULONG, USHORT nCol=0xffff ); - void SetEntryText(const XubString&,SvLBoxEntry*,USHORT nCol=0xffff); - String GetCellText( ULONG nPos, USHORT nCol ) const; - ULONG GetEntryPos( const XubString&, USHORT nCol = 0xffff ); - ULONG GetEntryPos( const SvLBoxEntry* pEntry ) const; + void SetEntryText( const XubString&, sal_uLong, sal_uInt16 nCol=0xffff ); + void SetEntryText(const XubString&,SvLBoxEntry*,sal_uInt16 nCol=0xffff); + String GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const; + sal_uLong GetEntryPos( const XubString&, sal_uInt16 nCol = 0xffff ); + sal_uLong GetEntryPos( const SvLBoxEntry* pEntry ) const; virtual void Resize(); - void SetTabJustify( USHORT nTab, SvTabJustify ); - SvTabJustify GetTabJustify( USHORT nTab ) const; + void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); + SvTabJustify GetTabJustify( sal_uInt16 nTab ) const; }; -inline long SvTabListBox::GetTab( USHORT nTab ) const +inline long SvTabListBox::GetTab( sal_uInt16 nTab ) const { DBG_ASSERT( nTab < nTabCount, "GetTabPos:Invalid Tab" ); return pTabList[nTab].GetPos(); @@ -161,17 +161,17 @@ public: virtual void Paint( const Rectangle& ); void InitHeaderBar( HeaderBar* pHeaderBar ); - sal_Bool IsItemChecked( SvLBoxEntry* pEntry, USHORT nCol ) const; + sal_Bool IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const; - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, ULONG nPos = LIST_APPEND, - USHORT nCol = 0xffff, void* pUserData = NULL ); + virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, + sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, - ULONG nPos, USHORT nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, - ULONG nPos = LIST_APPEND, USHORT nCol = 0xffff, void* pUserData = NULL ); - virtual ULONG Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,ULONG nPos=LIST_APPEND); - virtual ULONG Insert( SvLBoxEntry* pEntry, ULONG nRootPos = LIST_APPEND ); + sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos = LIST_APPEND ); void RemoveEntry( SvLBoxEntry* _pEntry ); void Clear(); @@ -208,8 +208,8 @@ public: virtual void SetNoSelection(); using SvListView::SelectAll; virtual void SelectAll(); - virtual void SelectAll( BOOL bSelect, BOOL bPaint = TRUE ); - virtual void SelectRow( long _nRow, BOOL _bSelect = TRUE, BOOL bExpand = TRUE ); + virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); + virtual void SelectRow( long _nRow, sal_Bool _bSelect = sal_True, sal_Bool bExpand = sal_True ); virtual void SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect = sal_True ); virtual sal_Int32 GetSelectedRowCount() const; virtual sal_Int32 GetSelectedColumnCount() const; @@ -221,11 +221,11 @@ public: /** @return <TRUE/>, if the cell is visible. */ virtual sal_Bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const; - virtual String GetAccessibleCellText( long _nRow, USHORT _nColumnPos ) const; + virtual String GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const; - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ); - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ); - virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, BOOL _bIsHeader, BOOL _bOnScreen = TRUE ); + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ); + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ); + virtual Rectangle GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen = sal_True ); virtual XACC CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumn ); virtual XACC CreateAccessibleRowHeader( sal_Int32 _nRow ); @@ -249,12 +249,12 @@ public: virtual void GrabTableFocus(); // OutputDevice - virtual BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); + virtual sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); // Window virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; virtual void GrabFocus(); - virtual XACC GetAccessible( BOOL bCreate = TRUE ); + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ); virtual Window* GetAccessibleParentWindow() const; /** Creates and returns the accessible object of the whole BrowseBox. */ diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 5c1900b2493a..f647c6ee32e2 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -29,6 +29,7 @@ #ifndef _SVTOOLS_SVTDATA_HXX #define _SVTOOLS_SVTDATA_HXX +#include "svtools/svtdllapi.h" #include <tools/resid.hxx> #include <com/sun/star/lang/Locale.hpp> @@ -41,11 +42,10 @@ class ImpSvtData public: SfxItemDesruptorList_Impl * pItemDesruptList; ResMgr * pResMgr; - ResMgr * pPatchResMgr; private: ImpSvtData(): - pItemDesruptList(0), pResMgr(0), pPatchResMgr(0) + pItemDesruptList(0), pResMgr(0) {} ~ImpSvtData(); @@ -53,32 +53,16 @@ private: public: ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - ResMgr * GetPatchResMgr(); - ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); static ImpSvtData & GetSvtData(); }; //============================================================================ - -class SvpResId: public ResId +class SVT_DLLPUBLIC SvtResId: public ResId { public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - - -class SvtResId: public ResId -{ -public: - SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): - ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} - - SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} + SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale); + SvtResId(sal_uInt16 nId); // VCL dependant, only available in SVT, not in SVL! }; diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index 5323dad47d6f..a3afc83d162d 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -32,25 +32,18 @@ #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) +#define ABOUT_STR_COPYRIGHT (RID_SVTOOLS_START + 1) +#define ABOUT_STR_DEVELOPER_ARY (RID_SVTOOLS_START + 2) + //............................................................................. // various unsorted stuff -#define DLG_EXPORT_PIX (RID_SVTOOLS_START+1) -#define DLG_EXPORT_VEC (RID_SVTOOLS_START+2) #define DLG_TWAIN_SOURCE (RID_SVTOOLS_START+3) #define DLG_SVT_EXPLORERFILE (RID_SVTOOLS_START+4) #define DLG_SVT_QUERYFOLDERNAME (RID_SVTOOLS_START+5) #define DLG_SVT_QUERYDELETE (RID_SVTOOLS_START+6) -#define EXPORT_DIALOG_TITLE (RID_SVTOOLS_START+4) -#define KEY_MODE (RID_SVTOOLS_START+5) -#define KEY_RES (RID_SVTOOLS_START+6) -#define KEY_SIZE (RID_SVTOOLS_START+7) - -#define KEY_COLORS (RID_SVTOOLS_START+9) -#define KEY_RLE_CODING (RID_SVTOOLS_START+10) - #define STR_SVT_AUTOMATIC_COLOR (RID_SVTOOLS_START+16) #define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20) @@ -97,6 +90,10 @@ #define STR_BASICKEY_FORMAT_TRUE (RID_SVTOOLS_START+107) #define STR_BASICKEY_FORMAT_FALSE (RID_SVTOOLS_START+108) #define CONFIG_BASIC_FORMAT_END (RID_SVTOOLS_START+109) +#define STR_UNDO (RID_SVTOOLS_START+110) +#define STR_REDO (RID_SVTOOLS_START+111) +#define STR_REPEAT (RID_SVTOOLS_START+112) + #define STR_INVALIDTRYBUY (RID_SVTOOLS_START+120) #define STR_OLDTRYBUY (RID_SVTOOLS_START+121) @@ -253,6 +250,10 @@ #define STR_SVT_ACC_DESC_FOLDER (STR_SVT_ACC_BEGIN+4) #define STR_SVT_ACC_DESC_FILE (STR_SVT_ACC_BEGIN+5) #define STR_SVT_ACC_EMPTY_FIELD (STR_SVT_ACC_BEGIN+6) +//IAccessible2 implementation +#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7) +#define STR_SVT_ACC_RULER_VERT_NAME (STR_SVT_ACC_BEGIN+8) +#define STR_SVT_ACC_RULER_HORZ_NAME (STR_SVT_ACC_BEGIN+9) #define STR_SVT_ACC_END (STR_SVT_ACC_EMPTY_FIELD) #define STR_SVT_INDEXENTRY_START (STR_SVT_ACC_END + 1) @@ -287,17 +288,16 @@ //............................................................................. // dialogs - -#define DLG_EXPORT_JPG_START (RID_SVTOOLS_START+110) -#define DLG_EXPORT_JPG (RID_SVTOOLS_START+111) -#define DLG_EXPORT_JPG_END (RID_SVTOOLS_START+112) +#define DLG_EXPORT_START (STR_ARR_SVT_LANGUAGE_TABLE_END + 1) +#define DLG_EXPORT (DLG_EXPORT_START) +#define DLG_EXPORT_TITLE (DLG_EXPORT_START+1) +#define DLG_EXPORT_END (DLG_EXPORT_TITLE) #define DLG_LOGIN (RID_SVTOOLS_START+113) #define DLG_ADDRESSBOOKSOURCE (RID_SVTOOLS_START+114) #define DLG_REGISTRATION_REQUEST (RID_SVTOOLS_START+115) -#define DLG_EXPORT_EPNG (RID_SVTOOLS_START+116) //............................................................................. // bitmaps @@ -364,5 +364,10 @@ #define RID_IMG_PRNDLG_COLLATE (STR_SVT_PRNDLG_START + 29) #define RID_IMG_PRNDLG_NOCOLLATE (STR_SVT_PRNDLG_START + 30) +// IAccessible2 implementation in 2009 +#define STR_PARAGRAPH_START (STR_SVT_PRNDLG_START + 50) +#define STR_PARAGRAPH (STR_PARAGRAPH_START + 0) +#define STR_PARAGRAPH_END (STR_PARAGRAPH) + #endif // #ifndef _SVTOOLS_HRC diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx index 18fdde318eec..6edd32110317 100644 --- a/svtools/inc/svtools/svtreebx.hxx +++ b/svtools/inc/svtools/svtreebx.hxx @@ -41,11 +41,6 @@ class TabBar; #define SV_TAB_BORDER 8 -#define WB_HASBUTTONSATROOT ((WinBits)0x0800) -#define WB_NOINITIALSELECTION WB_DROPDOWN -#define WB_HIDESELECTION WB_NOHIDESELECTION -#define WB_FORCE_MAKEVISIBLE WB_SPIN - #define SV_LISTBOX_ID_TREEBOX 1 // fuer SvLBox::IsA() #define SV_ENTRYHEIGHTOFFS_PIXEL 2 @@ -77,12 +72,12 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox Image aCurInsertedColBmp; short nContextBmpWidthMax; - USHORT nFirstSelTab, nLastSelTab; + sal_uInt16 nFirstSelTab, nLastSelTab; short nEntryHeight; short nEntryHeightOffs; short nIndent; short nFocusWidth; - USHORT aContextBmpMode; + sal_uInt16 aContextBmpMode; #ifdef _SVTREEBX_CXX DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * ); @@ -96,17 +91,19 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox SVT_DLLPRIVATE void ImpEntryInserted( SvLBoxEntry* pEntry ); SVT_DLLPRIVATE long PaintEntry1( SvLBoxEntry*, long nLine, - USHORT nTabFlagMask=0xffff, - BOOL bHasClipRegion=FALSE ); + sal_uInt16 nTabFlagMask=0xffff, + sal_Bool bHasClipRegion=sal_False ); - SVT_DLLPRIVATE void InitTreeView( WinBits nWinStyle ); + SVT_DLLPRIVATE void InitTreeView(); SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab, - USHORT nEmptyWidth ); + sal_uInt16 nEmptyWidth ); + SVT_DLLPRIVATE void ImplInitStyle(); + #endif protected: SvLBoxButtonData* pCheckButtonData; - USHORT nTreeFlags; + sal_uInt16 nTreeFlags; SvLBoxEntry* pEdEntry; SvLBoxItem* pEdItem; @@ -124,13 +121,13 @@ protected: // Bitmaps, beim Wechsel des Models usw. automatisch gerufen virtual void SetTabs(); void SetTabs_Impl(); - void AddTab( long nPos,USHORT nFlags=SV_LBOXTAB_ADJUST_LEFT, + void AddTab( long nPos,sal_uInt16 nFlags=SV_LBOXTAB_ADJUST_LEFT, void* pUserData = 0 ); - USHORT TabCount() const { return aTabs.Count(); } + sal_uInt16 TabCount() const { return aTabs.Count(); } SvLBoxTab* GetFirstDynamicTab() const; - SvLBoxTab* GetFirstDynamicTab( USHORT& rTabPos ) const; - SvLBoxTab* GetFirstTab( USHORT nFlagMask, USHORT& rTabPos ); - SvLBoxTab* GetLastTab( USHORT nFlagMask, USHORT& rTabPos ); + SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; + SvLBoxTab* GetFirstTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos ); + SvLBoxTab* GetLastTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos ); SvLBoxTab* GetTab( SvLBoxEntry*, SvLBoxItem* ) const; void ClearTabList(); @@ -150,8 +147,8 @@ protected: // in das Control hineingezeichnet werden virtual void NotifyInvalidating(); - virtual ULONG GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); - virtual ULONG GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); + virtual sal_uLong GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); + virtual sal_uLong GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -160,11 +157,11 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); - void InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground); - BOOL IsCellFocusEnabled() const; - bool SetCurrentTabPos( USHORT _nNewPos ); - USHORT GetCurrentTabPos() const; - void CallImplEventListeners(ULONG nEvent, void* pData); + void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground); + sal_Bool IsCellFocusEnabled() const; + bool SetCurrentTabPos( sal_uInt16 _nNewPos ); + sal_uInt16 GetCurrentTabPos() const; + void CallImplEventListeners(sal_uLong nEvent, void* pData); void ImplEditEntry( SvLBoxEntry* pEntry ); @@ -206,16 +203,16 @@ public: } virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos=LIST_APPEND, void* pUserData = 0, + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); virtual SvLBoxEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, - BOOL bChildsOnDemand = FALSE, - ULONG nPos = LIST_APPEND, void* pUserData = 0, + sal_Bool bChildsOnDemand = sal_False, + sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); const Image& GetDefaultExpandedEntryBmp( ) const; @@ -227,8 +224,8 @@ public: void SetCheckButtonState( SvLBoxEntry*, SvButtonState ); SvButtonState GetCheckButtonState( SvLBoxEntry* ) const; - void ShowExpandBitmapOnCursor( BOOL ); - BOOL IsExpandBitmapOnCursor() const { return (BOOL)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; } + void ShowExpandBitmapOnCursor( sal_Bool ); + sal_Bool IsExpandBitmapOnCursor() const { return (sal_Bool)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; } void SetEntryText(SvLBoxEntry*, const XubString& ); void SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage ); @@ -245,24 +242,24 @@ public: virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource ); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); - void SetSublistOpenWithReturn( BOOL bMode = TRUE ); // open/close sublist with return/enter - BOOL IsSublistOpenWithReturn() const; - void SetSublistOpenWithLeftRight( BOOL bMode = TRUE ); // open/close sublist with cursor left/right - BOOL IsSublistOpenWithLeftRight() const; + void SetSublistOpenWithReturn( sal_Bool bMode = sal_True ); // open/close sublist with return/enter + sal_Bool IsSublistOpenWithReturn() const; + void SetSublistOpenWithLeftRight( sal_Bool bMode = sal_True ); // open/close sublist with cursor left/right + sal_Bool IsSublistOpenWithLeftRight() const; - void EnableInplaceEditing( BOOL bEnable ); - BOOL IsInplaceEditingEnabled() const { return SvLBox::IsInplaceEditingEnabled(); } + void EnableInplaceEditing( sal_Bool bEnable ); + sal_Bool IsInplaceEditingEnabled() const { return SvLBox::IsInplaceEditingEnabled(); } inline void ForbidEmptyText() { SvLBox::ForbidEmptyText(); } // Editiert das erste StringItem des Entries, 0==Cursor void EditEntry( SvLBoxEntry* pEntry = NULL ); void CancelEditing(); - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); - BOOL IsEditingActive() const { return SvLBox::IsEditingActive(); } - void EndEditing( BOOL bCancel = FALSE ) { SvLBox::EndEditing( bCancel ); } - BOOL EditingCanceled() const { return SvLBox::EditingCanceled(); } + virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + sal_Bool IsEditingActive() const { return SvLBox::IsEditingActive(); } + void EndEditing( sal_Bool bCancel = sal_False ) { SvLBox::EndEditing( bCancel ); } + sal_Bool EditingCanceled() const { return SvLBox::EditingCanceled(); } virtual void RequestingChilds( SvLBoxEntry* pParent ); @@ -274,9 +271,9 @@ public: virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); - void SetUpdateMode( BOOL ); + void SetUpdateMode( sal_Bool ); // aktualisiert nicht die vertikale ScrollBar - void SetUpdateModeFast( BOOL ); + void SetUpdateModeFast( sal_Bool ); using SvListView::SetModel; void SetModel( SvLBoxTreeList* ); @@ -284,19 +281,19 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving(SvListEntry* pSource, - SvListEntry* pTargetParent, ULONG nChildPos ); + SvListEntry* pTargetParent, sal_uLong nChildPos ); virtual void ModelHasMoved(SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); - void ShowTargetEmphasis( SvLBoxEntry*, BOOL bShow ); + void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow ); using Window::GetDropTarget; SvLBoxEntry* GetDropTarget( const Point& ); void ScrollOutputArea( short nDeltaEntries ); short GetEntryHeight() const { return nEntryHeight; } - void SetEntryHeight( short nHeight, BOOL bAlways = FALSE ); + void SetEntryHeight( short nHeight, sal_Bool bAlways = sal_False ); Size GetOutputSizePixel() const; short GetIndent() const { return nIndent; } void SetIndent( short nIndent ); @@ -305,7 +302,7 @@ public: Point GetEntryPosition( SvLBoxEntry* ) const; void ShowEntry( SvLBoxEntry* ); // !!!OBSOLETE, use MakeVisible virtual void MakeVisible( SvLBoxEntry* ); - void MakeVisible( SvLBoxEntry*, BOOL bMoveToTop ); + void MakeVisible( SvLBoxEntry*, sal_Bool bMoveToTop ); void SetCollapsedNodeBmp( const Image& ); void SetExpandedNodeBmp( const Image& ); @@ -315,18 +312,15 @@ public: void SetFont( const Font& rFont ); using Window::SetCursor; - void SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE ); - - SvLBoxEntry* GetEntry( const Point& rPos, BOOL bHit = FALSE ) const; - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); } - SvLBoxEntry* GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);} + void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); - void SetWindowBits( WinBits nWinStyle ); - WinBits GetWindowBits() const { return nWindowStyle; } + SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const; + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return SvLBox::GetEntry(pParent,nPos); } + SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return SvLBox::GetEntry(nRootPos);} void PaintEntry( SvLBoxEntry* ); long PaintEntry( SvLBoxEntry*, long nLine, - USHORT nTabFlagMask=0xffff ); + sal_uInt16 nTabFlagMask=0xffff ); virtual Rectangle GetFocusRect( SvLBoxEntry*, long nLine ); // Beruecksichtigt Einrueckung virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); @@ -337,23 +331,23 @@ public: void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - void SetAddMode( BOOL bAdd ); - BOOL IsAddMode() const; - - virtual BOOL Expand( SvLBoxEntry* pParent ); - virtual BOOL Collapse( SvLBoxEntry* pParent ); - virtual BOOL Select( SvLBoxEntry* pEntry, BOOL bSelect=TRUE ); - virtual ULONG SelectChilds( SvLBoxEntry* pParent, BOOL bSelect ); - virtual void SelectAll( BOOL bSelect, BOOL bPaint = TRUE ); + void SetAddMode( sal_Bool bAdd ); + sal_Bool IsAddMode() const; + + virtual sal_Bool Expand( SvLBoxEntry* pParent ); + virtual sal_Bool Collapse( SvLBoxEntry* pParent ); + virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); + virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); virtual void SetCurEntry( SvLBoxEntry* _pEntry ); virtual SvLBoxEntry* GetCurEntry() const; using Window::Invalidate; - virtual void Invalidate( USHORT nFlags = 0); - virtual void Invalidate( const Rectangle&, USHORT nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0); + virtual void Invalidate( const Rectangle&, sal_uInt16 nFlags = 0 ); - void SetHighlightRange(USHORT nFirstTab=0,USHORT nLastTab=0xffff); + void SetHighlightRange(sal_uInt16 nFirstTab=0,sal_uInt16 nLastTab=0xffff); void RemoveHighlightRange(); virtual Region GetDragRegion() const; @@ -362,16 +356,16 @@ public: void RemoveParentKeepChilds( SvLBoxEntry* pParent ); DECL_LINK( DefaultCompare, SvSortData* ); - virtual void ModelNotification( USHORT nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, ULONG nPos ); + virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, + SvListEntry* pEntry2, sal_uLong nPos ); long GetTextOffset() const; void EndSelection(); - BOOL IsNodeButton( const Point& rPos ) const; + sal_Bool IsNodeButton( const Point& rPos ) const; void RepaintScrollBars() const; ScrollBar* GetVScroll(); ScrollBar* GetHScroll(); - void EnableAsyncDrag( BOOL b ); + void EnableAsyncDrag( sal_Bool b ); SvLBoxEntry* GetFirstEntryInView() const; SvLBoxEntry* GetNextEntryInView(SvLBoxEntry*) const; @@ -384,11 +378,11 @@ public: void CancelPendingEdit(); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); void EnableContextMenuHandling( void ); - void EnableContextMenuHandling( BOOL bEnable ); - BOOL IsContextMenuHandlingEnabled( void ) const; + void EnableContextMenuHandling( sal_Bool bEnable ); + sal_Bool IsContextMenuHandlingEnabled( void ) const; void EnableList( bool _bEnable ); diff --git a/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx index 271213bda9fc..0759e212bb9f 100644 --- a/svtools/inc/svtools/svxbox.hxx +++ b/svtools/inc/svtools/svxbox.hxx @@ -51,16 +51,16 @@ class SVT_DLLPUBLIC SvxBoxEntry friend class SvxComboBox; public: - SvxBoxEntry( const String& aName, USHORT nId=0 ); + SvxBoxEntry( const String& aName, sal_uInt16 nId=0 ); SvxBoxEntry( const SvxBoxEntry& rOrg ); SvxBoxEntry(); String aName; - USHORT nId; + sal_uInt16 nId; private: - BOOL bModified; - BOOL bNew; + sal_Bool bModified; + sal_Bool bNew; }; // class SvxListBox ------------------------------------------------------ @@ -80,30 +80,30 @@ public: void InsertNewEntry( const SvxBoxEntry& rEntry ); void InsertEntry( const SvxBoxEntry& rEntry, - USHORT nId = LISTBOX_ENTRY_NOTFOUND ); + sal_uInt16 nId = LISTBOX_ENTRY_NOTFOUND ); - void RemoveEntry( USHORT nPos ); + void RemoveEntry( sal_uInt16 nPos ); void RemoveEntry( const SvxBoxEntry& rEntry ); void Clear(); - USHORT GetEntryPos( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetSvxBoxEntry( USHORT nIdx ) const; + sal_uInt16 GetEntryPos( const SvxBoxEntry& rEntry ) const; + const SvxBoxEntry& GetSvxBoxEntry( sal_uInt16 nIdx ) const; - inline BOOL IsEntrySelected( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetSelectSvxBoxEntry( USHORT nIdx = 0 ) const; + inline sal_Bool IsEntrySelected( const SvxBoxEntry& rEntry ) const; + const SvxBoxEntry& GetSelectSvxBoxEntry( sal_uInt16 nIdx = 0 ) const; inline void SelectEntry( const SvxBoxEntry& rEntry, - BOOL bSelect = TRUE ); + sal_Bool bSelect = sal_True ); - void ModifyEntry( USHORT nPos, const String& aName ); - USHORT GetModifiedCount() const; - const SvxBoxEntry& GetModifiedEntry( USHORT nPos ) const; + void ModifyEntry( sal_uInt16 nPos, const String& aName ); + sal_uInt16 GetModifiedCount() const; + const SvxBoxEntry& GetModifiedEntry( sal_uInt16 nPos ) const; - USHORT GetRemovedCount() const; - const SvxBoxEntry& GetRemovedEntry( USHORT nPos ) const; + sal_uInt16 GetRemovedCount() const; + const SvxBoxEntry& GetRemovedEntry( sal_uInt16 nPos ) const; - USHORT GetNewCount() const; - const SvxBoxEntry& GetNewEntry( USHORT nPos ) const; + sal_uInt16 GetNewCount() const; + const SvxBoxEntry& GetNewEntry( sal_uInt16 nPos ) const; private: SvxEntryLst aEntryLst; @@ -116,10 +116,10 @@ private: // inlines --------------------------------------------------------------- -inline BOOL SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const +inline sal_Bool SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const { return ListBox::IsEntrySelected( aEntry.aName ); } -inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect ) +inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, sal_Bool bSelect ) { ListBox::SelectEntry( aEntry.aName, bSelect ); } // enum SvxComboBoxStyle ------------------------------------------------- @@ -130,11 +130,7 @@ enum SvxComboBoxStyle SVX_CBS_LOWER = 0x02, SVX_CBS_ALL = 0x04, SVX_CBS_FILENAME = 0x08, -#ifdef WIN - SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER -#else SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME -#endif }; // class SvxComboBox ----------------------------------------------------- @@ -148,33 +144,33 @@ class SVT_DLLPUBLIC SvxComboBox : public ComboBox public: SvxComboBox( Window* pParent, - WinBits nBits = WB_BORDER, USHORT nStyleBits = SVX_CBS_ALL ); - SvxComboBox( Window* pParent, const ResId& rId, USHORT nStyleBits = SVX_CBS_ALL ); + WinBits nBits = WB_BORDER, sal_uInt16 nStyleBits = SVX_CBS_ALL ); + SvxComboBox( Window* pParent, const ResId& rId, sal_uInt16 nStyleBits = SVX_CBS_ALL ); ~SvxComboBox(); void InsertNewEntry( const SvxBoxEntry& ); void InsertEntry( const SvxBoxEntry& ); - void RemoveEntry( USHORT nPos ); + void RemoveEntry( sal_uInt16 nPos ); void RemoveEntry( const SvxBoxEntry& rEntry ); void Clear(); - USHORT GetEntryPos( const SvxBoxEntry& rEntry ) const; - const SvxBoxEntry& GetEntry( USHORT nIdx ) const; + sal_uInt16 GetEntryPos( const SvxBoxEntry& rEntry ) const; + const SvxBoxEntry& GetEntry( sal_uInt16 nIdx ) const; - void ModifyEntry( USHORT nPos, const String& aName ); - USHORT GetModifiedCount() const; - const SvxBoxEntry& GetModifiedEntry( USHORT nPos ) const; + void ModifyEntry( sal_uInt16 nPos, const String& aName ); + sal_uInt16 GetModifiedCount() const; + const SvxBoxEntry& GetModifiedEntry( sal_uInt16 nPos ) const; - USHORT GetRemovedCount() const; - const SvxBoxEntry& GetRemovedEntry( USHORT nPos ) const; + sal_uInt16 GetRemovedCount() const; + const SvxBoxEntry& GetRemovedEntry( sal_uInt16 nPos ) const; - USHORT GetNewCount() const; - const SvxBoxEntry& GetNewEntry( USHORT nPos ) const; + sal_uInt16 GetNewCount() const; + const SvxBoxEntry& GetNewEntry( sal_uInt16 nPos ) const; - USHORT GetStyle() const { return nStyle; } - void SetStyle( const USHORT nSt ) { nStyle = nSt; } + sal_uInt16 GetStyle() const { return nStyle; } + void SetStyle( const sal_uInt16 nSt ) { nStyle = nSt; } String GetText() const; @@ -182,7 +178,7 @@ private: SvxEntryLst aEntryLst; SvxEntryLst aDelEntryLst; SvxBoxEntry aDefault; - USHORT nStyle; + sal_uInt16 nStyle; virtual void KeyInput( const KeyEvent& rKEvt ); diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx index a7fbcf560e7c..73936870157a 100644 --- a/svtools/inc/sychconv.hxx +++ b/svtools/inc/svtools/sychconv.hxx @@ -42,7 +42,7 @@ class SymCharConverter { public: - static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); + static sal_Bool Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); }; #endif // _CHARCONV_HXX diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx index 75af1ccd5bdd..b9e9e11fe608 100644 --- a/svtools/inc/svtools/syntaxhighlight.hxx +++ b/svtools/inc/svtools/syntaxhighlight.hxx @@ -57,8 +57,6 @@ #include <tools/string.hxx> #include <tools/gen.hxx> -#include <svl/svarray.hxx> - // Token-Typen TT_... enum TokenTypes @@ -76,11 +74,10 @@ enum TokenTypes TT_PARAMETER }; -struct HighlightPortion { UINT16 nBegin; UINT16 nEnd; TokenTypes tokenType; }; - +struct HighlightPortion { sal_uInt16 nBegin; sal_uInt16 nEnd; TokenTypes tokenType; }; -SV_DECL_VARARR(HighlightPortions, HighlightPortion, 0, 16) +typedef std::vector<HighlightPortion> HighlightPortions; ///////////////////////////////////////////////////////////////////////// // Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum @@ -113,23 +110,23 @@ class SimpleTokenizer_Impl { HighlighterLanguage aLanguage; // Zeichen-Info-Tabelle - USHORT aCharTypeTab[256]; + sal_uInt16 aCharTypeTab[256]; const sal_Unicode* mpStringBegin; const sal_Unicode* mpActualPos; // Zeile und Spalte - UINT32 nLine; - UINT32 nCol; + sal_uInt32 nLine; + sal_uInt32 nCol; sal_Unicode peekChar( void ) { return *mpActualPos; } sal_Unicode getChar( void ) { nCol++; return *mpActualPos++; } // Hilfsfunktion: Zeichen-Flag Testen - BOOL testCharFlags( sal_Unicode c, USHORT nTestFlags ); + sal_Bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ); // Neues Token holen, Leerstring == nix mehr da - BOOL getNextToken( /*out*/TokenTypes& reType, + sal_Bool getNextToken( /*out*/TokenTypes& reType, /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos ); String getTokStr( /*out*/const sal_Unicode* pStartPos, /*out*/const sal_Unicode* pEndPos ); @@ -141,16 +138,16 @@ class SimpleTokenizer_Impl #endif const char** ppListKeyWords; - UINT16 nKeyWordCount; + sal_uInt16 nKeyWordCount; public: SimpleTokenizer_Impl( HighlighterLanguage aLang = HIGHLIGHT_BASIC ); ~SimpleTokenizer_Impl( void ); - UINT16 parseLine( UINT32 nLine, const String* aSource ); - void getHighlightPortions( UINT32 nParseLine, const String& rLine, + sal_uInt16 parseLine( sal_uInt32 nLine, const String* aSource ); + void getHighlightPortions( sal_uInt32 nParseLine, const String& rLine, /*out*/HighlightPortions& portions ); - void setKeyWords( const char** ppKeyWords, UINT16 nCount ); + void setKeyWords( const char** ppKeyWords, sal_uInt16 nCount ); }; @@ -166,7 +163,7 @@ class SVT_DLLPUBLIC SyntaxHighlighter HighlighterLanguage eLanguage; SimpleTokenizer_Impl* m_pSimpleTokenizer; char* m_pKeyWords; - UINT16 m_nKeyWordCount; + sal_uInt16 m_nKeyWordCount; // void initializeKeyWords( HighlighterLanguage eLanguage ); @@ -180,10 +177,10 @@ public: // nur Zeile 0 angegeben werden. void initialize( HighlighterLanguage eLanguage_ ); - const Range notifyChange( UINT32 nLine, INT32 nLineCountDifference, - const String* pChangedLines, UINT32 nArrayLength); + const Range notifyChange( sal_uInt32 nLine, sal_Int32 nLineCountDifference, + const String* pChangedLines, sal_uInt32 nArrayLength); - void getHighlightPortions( UINT32 nLine, const String& rLine, + void getHighlightPortions( sal_uInt32 nLine, const String& rLine, HighlightPortions& pPortions ); HighlighterLanguage GetLanguage() { return eLanguage;} diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx index 30787b284466..05aecccbb81f 100644 --- a/svtools/inc/tabbar.hxx +++ b/svtools/inc/svtools/tabbar.hxx @@ -90,10 +90,10 @@ DoubleClick - Wird gerufen, wenn ein DoubleClick im TabBar ausgeloest ActivatePage - Wird gerufen, wenn eine andere Seite aktiviert wird. GetCurPageId() gibt die aktivierte Seite zurueck. DeactivatePage - Wird gerufen, wenn eine Seite deaktiviert wird. Wenn - eine andere Seite aktiviert werden darf, muss TRUE + eine andere Seite aktiviert werden darf, muss sal_True zurueckgegeben werden, wenn eine andere Seite von der Aktivierung ausgeschlossen werden soll, muss - FALSE zurueckgegeben werden. GetCurPageId() gibt die + sal_False zurueckgegeben werden. GetCurPageId() gibt die zu deaktivierende Seite zurueck. @@ -108,7 +108,7 @@ werden. Dabei muss in den Handlern folgendes implementiert werden: Command - Wenn in diesem Handler das Dragging gestartet werden soll, muss StartDrag() gerufen werden. Diese Methode selektiert dann den entsprechenden Eintrag oder gibt - FALSE zurueck, wenn das Dragging nicht durchgefuhert + sal_False zurueck, wenn das Dragging nicht durchgefuhert werden kann. QueryDrop - Dieser Handler wird von StarView immer dann gerufen, wenn @@ -166,7 +166,7 @@ SwitchPage - Diese Methode muss vom QueryDrop-Handler gerufen werden, Das umschalten der Seite passiert zeitverzoegert (500 ms) und wird automatisch von dieser Methode verwaltet. In der Methode muss die Position vom Event uebergeben - werden. Diese Methode gibt TRUE zurueck, wenn die Page + werden. Diese Methode gibt sal_True zurueck, wenn die Page umgeschaltet wurde. EndSwitchPage - Diese Methode setzt die Daten fuer das umschalten der @@ -227,7 +227,7 @@ EnableEditMode - Damit kann eingestellt werden, das bei Alt+LeftClick Im StartRenaming()-Handler kann dann das Umbenennen noch abgelehnt werden. StartEditMode - Mit dieser Methode wird der EditModus auf einem - Tab gestartet. FALSE wird zurueckgegeben, wenn + Tab gestartet. sal_False wird zurueckgegeben, wenn der Editmodus schon aktiv ist, mit StartRenaming() der Modus abgelehnt wurde oder kein Platz zum Editieren vorhanden ist. @@ -248,7 +248,7 @@ GetEditPageId - Mit dieser Methode wird in den Renaming-Handlern StartRenaming() - Dieser Handler wird gerufen, wenn ueber StartEditMode() der Editmodus gestartet wurde. Mit GetEditPageId() kann abgefragt werden, welcher Tab umbenannt werden - soll. FALSE sollte zurueckgegeben werden, wenn + soll. sal_False sollte zurueckgegeben werden, wenn der Editmodus nicht gestartet werden soll. AllowRenaming() - Dieser Handler wird gerufen, wenn der Editmodus beendet wird (nicht bei Cancel). In diesem Handler @@ -313,7 +313,7 @@ ueber einem bzw. ueber welchem Item durchgefuehrt wurde. // - TabBarPageBits - // ------------------ -typedef USHORT TabBarPageBits; +typedef sal_uInt16 TabBarPageBits; // ------------------------- // - Bits fuer TabBarPages - @@ -325,8 +325,8 @@ typedef USHORT TabBarPageBits; // - TabBar-Types - // ---------------- -#define TABBAR_RENAMING_YES ((long)TRUE) -#define TABBAR_RENAMING_NO ((long)FALSE) +#define TABBAR_RENAMING_YES ((long)sal_True) +#define TABBAR_RENAMING_NO ((long)sal_False) #define TABBAR_RENAMING_CANCEL ((long)2) // ---------- @@ -358,25 +358,25 @@ private: long mnOffY; long mnLastOffX; long mnSplitSize; - ULONG mnSwitchTime; + sal_uLong mnSwitchTime; WinBits mnWinStyle; - USHORT mnCurPageId; - USHORT mnFirstPos; - USHORT mnDropPos; - USHORT mnSwitchId; - USHORT mnEditId; - BOOL mbFormat; - BOOL mbFirstFormat; - BOOL mbSizeFormat; - BOOL mbAutoMaxWidth; - BOOL mbInSwitching; - BOOL mbAutoEditMode; - BOOL mbEditCanceled; - BOOL mbDropPos; - BOOL mbInSelect; - BOOL mbSelColor; - BOOL mbSelTextColor; - BOOL mbMirrored; + sal_uInt16 mnCurPageId; + sal_uInt16 mnFirstPos; + sal_uInt16 mnDropPos; + sal_uInt16 mnSwitchId; + sal_uInt16 mnEditId; + sal_Bool mbFormat; + sal_Bool mbFirstFormat; + sal_Bool mbSizeFormat; + sal_Bool mbAutoMaxWidth; + sal_Bool mbInSwitching; + sal_Bool mbAutoEditMode; + sal_Bool mbEditCanceled; + sal_Bool mbDropPos; + sal_Bool mbInSelect; + sal_Bool mbSelColor; + sal_Bool mbSelTextColor; + sal_Bool mbMirrored; bool mbHasInsertTab; // if true, the tab bar has an extra tab at the end. Link maSelectHdl; Link maDoubleClickHdl; @@ -390,13 +390,13 @@ private: using Window::ImplInit; SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bBackground ); SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, Color& rSelectColor, Color& rSelectTextColor ); - SVT_DLLPRIVATE void ImplShowPage( USHORT nPos ); - SVT_DLLPRIVATE BOOL ImplCalcWidth(); + SVT_DLLPRIVATE void ImplShowPage( sal_uInt16 nPos ); + SVT_DLLPRIVATE sal_Bool ImplCalcWidth(); SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE USHORT ImplGetLastFirstPos(); + SVT_DLLPRIVATE sal_uInt16 ImplGetLastFirstPos(); SVT_DLLPRIVATE void ImplInitControls(); SVT_DLLPRIVATE void ImplEnableControls(); SVT_DLLPRIVATE void ImplSelect(); @@ -438,102 +438,102 @@ public: virtual void EndRenaming(); virtual void Mirror(); - void InsertPage( USHORT nPageId, const XubString& rText, + void InsertPage( sal_uInt16 nPageId, const XubString& rText, TabBarPageBits nBits = 0, - USHORT nPos = TabBar::APPEND ); - void RemovePage( USHORT nPageId ); - void MovePage( USHORT nPageId, USHORT nNewPos ); + sal_uInt16 nPos = TabBar::APPEND ); + void RemovePage( sal_uInt16 nPageId ); + void MovePage( sal_uInt16 nPageId, sal_uInt16 nNewPos ); - Color GetTabBgColor( USHORT nPageId ) const; - void SetTabBgColor( USHORT nPageId, const Color& aTabBgColor ); - BOOL IsDefaultTabBgColor( USHORT nPageId ); + Color GetTabBgColor( sal_uInt16 nPageId ) const; + void SetTabBgColor( sal_uInt16 nPageId, const Color& aTabBgColor ); + sal_Bool IsDefaultTabBgColor( sal_uInt16 nPageId ); void Clear(); - void EnablePage( USHORT nPageId, BOOL bEnable = TRUE ); - BOOL IsPageEnabled( USHORT nPageId ) const; + void EnablePage( sal_uInt16 nPageId, sal_Bool bEnable = sal_True ); + sal_Bool IsPageEnabled( sal_uInt16 nPageId ) const; - void SetPageBits( USHORT nPageId, TabBarPageBits nBits = 0 ); - TabBarPageBits GetPageBits( USHORT nPageId ) const; + void SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits = 0 ); + TabBarPageBits GetPageBits( sal_uInt16 nPageId ) const; - USHORT GetPageCount() const; - USHORT GetPageId( USHORT nPos ) const; - USHORT GetPagePos( USHORT nPageId ) const; - USHORT GetPageId( const Point& rPos, bool bCheckInsTab = false ) const; - Rectangle GetPageRect( USHORT nPageId ) const; + sal_uInt16 GetPageCount() const; + sal_uInt16 GetPageId( sal_uInt16 nPos ) const; + sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const; + sal_uInt16 GetPageId( const Point& rPos, bool bCheckInsTab = false ) const; + Rectangle GetPageRect( sal_uInt16 nPageId ) const; // returns the rectangle in which page tabs are drawn Rectangle GetPageArea() const; - void SetCurPageId( USHORT nPageId ); - USHORT GetCurPageId() const { return mnCurPageId; } + void SetCurPageId( sal_uInt16 nPageId ); + sal_uInt16 GetCurPageId() const { return mnCurPageId; } - void SetFirstPageId( USHORT nPageId ); - USHORT GetFirstPageId() const { return GetPageId( mnFirstPos ); } - void MakeVisible( USHORT nPageId ); + void SetFirstPageId( sal_uInt16 nPageId ); + sal_uInt16 GetFirstPageId() const { return GetPageId( mnFirstPos ); } + void MakeVisible( sal_uInt16 nPageId ); - void SelectPage( USHORT nPageId, BOOL bSelect = TRUE ); - void SelectPageRange( BOOL bSelect = FALSE, - USHORT nStartPos = 0, - USHORT nEndPos = TabBar::APPEND ); - USHORT GetSelectPage( USHORT nSelIndex = 0 ) const; - USHORT GetSelectPageCount() const; - BOOL IsPageSelected( USHORT nPageId ) const; + void SelectPage( sal_uInt16 nPageId, sal_Bool bSelect = sal_True ); + void SelectPageRange( sal_Bool bSelect = sal_False, + sal_uInt16 nStartPos = 0, + sal_uInt16 nEndPos = TabBar::APPEND ); + sal_uInt16 GetSelectPage( sal_uInt16 nSelIndex = 0 ) const; + sal_uInt16 GetSelectPageCount() const; + sal_Bool IsPageSelected( sal_uInt16 nPageId ) const; - void EnableAutoMaxPageWidth( BOOL bEnable = TRUE ) { mbAutoMaxWidth = bEnable; } - BOOL IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } + void EnableAutoMaxPageWidth( sal_Bool bEnable = sal_True ) { mbAutoMaxWidth = bEnable; } + sal_Bool IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } void SetMaxPageWidth( long nMaxWidth ); long GetMaxPageWidth() const { return mnMaxPageWidth; } void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + sal_Bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } - void EnableEditMode( BOOL bEnable = TRUE ) { mbAutoEditMode = bEnable; } - BOOL IsEditModeEnabled() const { return mbAutoEditMode; } - BOOL StartEditMode( USHORT nPageId ); - void EndEditMode( BOOL bCancel = FALSE ); + void EnableEditMode( sal_Bool bEnable = sal_True ) { mbAutoEditMode = bEnable; } + sal_Bool IsEditModeEnabled() const { return mbAutoEditMode; } + sal_Bool StartEditMode( sal_uInt16 nPageId ); + void EndEditMode( sal_Bool bCancel = sal_False ); void SetEditText( const XubString& rText ) { maEditText = rText; } const XubString& GetEditText() const { return maEditText; } - BOOL IsInEditMode() const { return (mpEdit != NULL); } - BOOL IsEditModeCanceled() const { return mbEditCanceled; } - USHORT GetEditPageId() const { return mnEditId; } + sal_Bool IsInEditMode() const { return (mpEdit != NULL); } + sal_Bool IsEditModeCanceled() const { return mbEditCanceled; } + sal_uInt16 GetEditPageId() const { return mnEditId; } /** Mirrors the entire control including position of buttons and splitter. Mirroring is done relative to the current direction of the GUI. - @param bMirrored TRUE = the control will draw itself RTL in LTR GUI, - and vice versa; FALSE = the control behaves according to the + @param bMirrored sal_True = the control will draw itself RTL in LTR GUI, + and vice versa; sal_False = the control behaves according to the current direction of the GUI. */ - void SetMirrored( BOOL bMirrored = TRUE ); - /** Returns TRUE, if the control is set to mirrored mode (see SetMirrored()). */ - BOOL IsMirrored() const { return mbMirrored; } + void SetMirrored( sal_Bool bMirrored = sal_True ); + /** Returns sal_True, if the control is set to mirrored mode (see SetMirrored()). */ + sal_Bool IsMirrored() const { return mbMirrored; } /** Sets the control to LTR or RTL mode regardless of the GUI direction. - @param bRTL FALSE = the control will draw from left to right; - TRUE = the control will draw from right to left. */ - void SetEffectiveRTL( BOOL bRTL ); - /** Returns TRUE, if the control draws from right to left (see SetEffectiveRTL()). */ - BOOL IsEffectiveRTL() const; - - BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); - USHORT ShowDropPos( const Point& rPos ); + @param bRTL sal_False = the control will draw from left to right; + sal_True = the control will draw from right to left. */ + void SetEffectiveRTL( sal_Bool bRTL ); + /** Returns sal_True, if the control draws from right to left (see SetEffectiveRTL()). */ + sal_Bool IsEffectiveRTL() const; + + sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + sal_uInt16 ShowDropPos( const Point& rPos ); void HideDropPos(); - BOOL SwitchPage( const Point& rPos ); + sal_Bool SwitchPage( const Point& rPos ); void EndSwitchPage(); - BOOL IsInSwitching() { return mbInSwitching; } + sal_Bool IsInSwitching() { return mbInSwitching; } void SetSelectColor(); void SetSelectColor( const Color& rColor ); const Color& GetSelectColor() const { return maSelColor; } - BOOL IsSelectColor() const { return mbSelColor; } + sal_Bool IsSelectColor() const { return mbSelColor; } void SetSelectTextColor(); void SetSelectTextColor( const Color& rColor ); const Color& GetSelectTextColor() const { return maSelTextColor; } - BOOL IsSelectTextColor() const { return mbSelTextColor; } + sal_Bool IsSelectTextColor() const { return mbSelTextColor; } - void SetPageText( USHORT nPageId, const XubString& rText ); - XubString GetPageText( USHORT nPageId ) const; - void SetHelpText( USHORT nPageId, const XubString& rText ); - XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetPageText( sal_uInt16 nPageId, const XubString& rText ); + XubString GetPageText( sal_uInt16 nPageId ) const; + void SetHelpText( sal_uInt16 nPageId, const XubString& rText ); + XubString GetHelpText( sal_uInt16 nPageId ) const; + void SetHelpId( sal_uInt16 nPageId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( sal_uInt16 nPageId ) const; long GetSplitSize() const { return mnSplitSize; } long GetMinSize() const; @@ -542,9 +542,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/svtools/table/abstracttablecontrol.hxx b/svtools/inc/svtools/table/abstracttablecontrol.hxx deleted file mode 100644 index dbe9e0a86346..000000000000 --- a/svtools/inc/svtools/table/abstracttablecontrol.hxx +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX -#define SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX - -#include <sal/types.h> -#include <vcl/event.hxx> -#include <vcl/seleng.hxx> -#include "tabletypes.hxx" -//........................................................................ -namespace svt { namespace table -{ -//........................................................................ - - enum TableControlAction - { - /// moves the cursor in the table control one row up, if possible, by keeping the current column - cursorUp, - /// moves the cursor in the table control one row down, if possible, by keeping the current column - cursorDown, - /// moves the cursor in the table control one column to the left, if possible, by keeping the current row - cursorLeft, - /// moves the cursor in the table control one column to the right, if possible, by keeping the current row - cursorRight, - /// moves the cursor to the beginning of the current line - cursorToLineStart, - /// moves the cursor to the end of the current line - cursorToLineEnd, - /// moves the cursor to the first row, keeping the current column - cursorToFirstLine, - /// moves the cursor to the last row, keeping the current column - cursorToLastLine, - /// moves the cursor one page up, keeping the current column - cursorPageUp, - /// moves the cursor one page down, keeping the current column - cursorPageDown, - /// moves the cursor to the top-most, left-most cell - cursorTopLeft, - /// moves the cursor to the bottom-most, right-most cell - cursorBottomRight, - /// selects the row, where the actual cursor is - cursorSelectRow, - /// selects the rows, above the actual cursor is - cursorSelectRowUp, - /// selects the row, beneath the actual cursor is - cursorSelectRowDown, - /// selects the row, from the actual cursor till top - cursorSelectRowAreaTop, - /// selects the row, from the actual cursor till bottom - cursorSelectRowAreaBottom, - - - /// invalid and final enumeration value, not to be actually used - invalidTableControlAction - }; - - //==================================================================== - //= IAbstractTableControl - //==================================================================== - /** defines a callback interface to be implemented by a concrete table control - */ - class SAL_NO_VTABLE IAbstractTableControl - { - public: - /** hides the cell cursor - - The method cares for successive calls, that is, for every call to - ->hideCursor(), you need one call to ->showCursor. Only if the number - of both calls matches, the cursor is really shown. - - @see showCursor - */ - virtual void hideCursor() = 0; - - /** shows the cell cursor - - @see hideCursor - */ - virtual void showCursor() = 0; - - /** dispatches an action to the table control - - @return - <TRUE/> if the action could be dispatched successfully, <FALSE/> otherwise. Usual - failure conditions include some other instance vetoing the action, or impossibility - to execute the action at all (for instance moving up one row when already positioned - on the very first row). - - @see TableControlAction - */ - virtual bool dispatchAction( TableControlAction _eAction ) = 0; - /** returns selection engine*/ - virtual SelectionEngine* getSelEngine() = 0; - virtual void setCursorAtCurrentCell(const Point& rPoint) = 0; - virtual bool isTooltipActive() = 0; - virtual rtl::OUString& setTooltip(const Point& rPoint ) = 0; - virtual RowPos getCurrentRow(const Point& rPoint ) = 0; - virtual void resizeColumn(const Point& rPoint ) = 0; - virtual bool startResizeColumn(const Point& rPoint) = 0; - virtual bool endResizeColumn(const Point& rPoint) = 0; - virtual bool isRowSelected(RowPos _nRow) = 0; - - virtual ~IAbstractTableControl() {}; - }; - -//........................................................................ -} } // namespace svt::table -//........................................................................ - -#endif // SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/svtools/inc/svtools/table/defaultinputhandler.hxx index 5b035b041a8d..3b05fe15d996 100644 --- a/svtools/inc/svtools/table/defaultinputhandler.hxx +++ b/svtools/inc/svtools/table/defaultinputhandler.hxx @@ -28,44 +28,45 @@ #ifndef SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX #define SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX -#include <svtools/table/tableinputhandler.hxx> +#include "svtools/table/tableinputhandler.hxx" +#include "svtools/table/tabletypes.hxx" -//........................................................................ +#include <boost/scoped_ptr.hpp> + +//...................................................................................................................... namespace svt { namespace table { -//........................................................................ +//...................................................................................................................... struct DefaultInputHandler_Impl; - //==================================================================== + //================================================================================================================== //= DefaultInputHandler - //==================================================================== + //================================================================================================================== class DefaultInputHandler : public ITableInputHandler { - friend class TableDataWindow; private: - DefaultInputHandler_Impl* m_pImpl; - bool m_bResize; + ::boost::scoped_ptr< DefaultInputHandler_Impl > m_pImpl; public: DefaultInputHandler(); ~DefaultInputHandler(); - virtual bool MouseMove ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonDown ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool MouseButtonUp ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ); - virtual bool KeyInput ( IAbstractTableControl& _rControl, const KeyEvent& rKEvt ); - virtual bool GetFocus ( IAbstractTableControl& _rControl ); - virtual bool LoseFocus ( IAbstractTableControl& _rControl ); - virtual bool RequestHelp ( IAbstractTableControl& _rControl, const HelpEvent& rHEvt ); - virtual bool Command ( IAbstractTableControl& _rControl, const CommandEvent& rCEvt ); - virtual bool PreNotify ( IAbstractTableControl& _rControl, NotifyEvent& rNEvt ); - virtual bool Notify ( IAbstractTableControl& _rControl, NotifyEvent& rNEvt ); + virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ); + virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ); + virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ); + virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ); + virtual bool GetFocus ( ITableControl& _rControl ); + virtual bool LoseFocus ( ITableControl& _rControl ); + virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ); + virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ); + virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ); + virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ); }; -//........................................................................ +//...................................................................................................................... } } // namespace svt::table -//........................................................................ +//...................................................................................................................... #endif // SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx index 5430e6859c60..9e3322695439 100644 --- a/svtools/inc/svtools/table/gridtablerenderer.hxx +++ b/svtools/inc/svtools/table/gridtablerenderer.hxx @@ -30,6 +30,8 @@ #include <svtools/table/tablemodel.hxx> +#include <boost/scoped_ptr.hpp> + //........................................................................ namespace svt { namespace table { @@ -44,14 +46,11 @@ namespace svt { namespace table This class is able to paint a table grid, table headers, and cell backgrounds according to the selected/active state of cells. - - TODO update the documentation when it's decided whether this renderer - also does value handling */ class GridTableRenderer : public ITableRenderer { private: - GridTableRenderer_Impl* m_pImpl; + ::boost::scoped_ptr< GridTableRenderer_Impl > m_pImpl; public: /** creates a table renderer associated with the given model @@ -73,9 +72,17 @@ namespace svt { namespace table This method returns the index of the last row which has been prepared */ - RowPos getCurrentRow(); + RowPos getCurrentRow() const; + + /** determines whether or not to paint grid lines + */ + bool useGridLines() const; - protected: + /** controls whether or not to paint grid lines + */ + void useGridLines( bool const i_use ); + + public: // ITableRenderer overridables virtual void PaintHeaderArea( OutputDevice& _rDevice, const Rectangle& _rArea, @@ -90,17 +97,34 @@ namespace svt { namespace table virtual void PaintRowHeader( bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, rtl::OUString& _rText ); - virtual void PaintCellImage( ColPos _nColumn, - bool _bActive, bool _bSelected, - OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, Image* _pCellData ); - virtual void PaintCellString( ColPos _nColumn, + const StyleSettings& _rStyle ); + virtual void PaintCell( ColPos const i_col, bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, rtl::OUString& _rText ); + const StyleSettings& _rStyle ); virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect); virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect); + virtual bool FitsIntoCell( + ::com::sun::star::uno::Any const & i_cellContent, + ColPos const i_colPos, RowPos const i_rowPos, + bool const i_active, bool const i_selected, + OutputDevice& i_targetDevice, Rectangle const & i_targetArea + ); + + private: + struct CellRenderContext; + + void impl_paintCellContent( + CellRenderContext const & i_context + ); + void impl_paintCellImage( + CellRenderContext const & i_context, + Image const & i_image + ); + void impl_paintCellText( + CellRenderContext const & i_context, + ::rtl::OUString const & i_text + ); }; //........................................................................ } } // namespace svt::table diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx index 9ef8d583f273..726490a0710b 100644 --- a/svtools/inc/svtools/table/tablecontrol.hxx +++ b/svtools/inc/svtools/table/tablecontrol.hxx @@ -29,13 +29,16 @@ #define SVTOOLS_INC_TABLE_TABLECONTROL_HXX #include "svtools/svtdllapi.h" -#include <svtools/table/tablemodel.hxx> +#include "svtools/table/tablemodel.hxx" +#include "svtools/accessibletable.hxx" +#include "svtools/accessiblefactory.hxx" + #include <vcl/ctrl.hxx> #include <vcl/seleng.hxx> -#include <svtools/table/tabledatawindow.hxx> -#include <svtools/accessibletable.hxx> -#include <com/sun/star/util/Color.hpp> -#include <svtools/accessiblefactory.hxx> + +#include <boost/shared_ptr.hpp> +#include <boost/scoped_ptr.hpp> + //........................................................................ namespace svt { namespace table @@ -43,8 +46,6 @@ namespace svt { namespace table //........................................................................ class TableControl_Impl; - class TableDataWindow; - class AccessibleTableControl_Impl; //==================================================================== //= TableControl @@ -64,31 +65,19 @@ namespace svt { namespace table The control supports the concept of a <em>current</em> (or <em>active</em> cell). The control supports accessibility, this is encapsulated in IAccessibleTable - - // TODO: scrolling? */ class SVT_DLLPUBLIC TableControl : public Control, public IAccessibleTable { private: - DECL_DLLPRIVATE_LINK( ImplMouseButtonDownHdl, MouseEvent* ); - DECL_DLLPRIVATE_LINK( ImplMouseButtonUpHdl, MouseEvent* ); + ::boost::shared_ptr< TableControl_Impl > m_pImpl; - DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* ); - TableControl_Impl* m_pImpl; - ::com::sun::star::uno::Sequence< sal_Int32 > m_nCols; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aText; - Link m_aSelectHdl; - bool m_bSelectionChanged; - bool m_bTooltip; public: - ::std::auto_ptr< AccessibleTableControl_Impl > m_pAccessTable; - TableControl( Window* _pParent, WinBits _nStyle ); ~TableControl(); /// sets a new table model - SVT_DLLPRIVATE void SetModel( PTableModel _pModel ); + void SetModel( PTableModel _pModel ); /// retrieves the current table model PTableModel GetModel() const; @@ -108,9 +97,8 @@ namespace svt { namespace table */ sal_Int32 GetCurrentRow() const; - /** returns the row, which contains the input point*/ - - ColPos GetCurrentRow (const Point& rPoint); + ITableControl& + getTableControlInterface(); /** retrieves the current column @@ -126,7 +114,7 @@ namespace svt { namespace table /** activates the cell at the given position @return - <TRUE/> if the move was successful, <FALSE/> otherwise. Usual + <sal_True/> if the move was successful, <FALSE/> otherwise. Usual failure conditions include some other instance vetoing the move, or impossibility to execute the move at all (for instance because of invalid coordinates). @@ -136,7 +124,7 @@ namespace svt { namespace table /** moves the active cell to the given column, by keeping the active row @return - <TRUE/> if the move was successful, <FALSE/> otherwise. Usual + <sal_True/> if the move was successful, <FALSE/> otherwise. Usual failure conditions include some other instance vetoing the move, or impossibility to execute the move at all (for instance because of invalid coordinates). @@ -149,7 +137,7 @@ namespace svt { namespace table /** moves the active cell to the given row, by keeping the active column @return - <TRUE/> if the move was successful, <FALSE/> otherwise. Usual + <sal_True/> if the move was successful, <FALSE/> otherwise. Usual failure conditions include some other instance vetoing the move, or impossibility to execute the move at all (for instance because of invalid coordinates). @@ -158,22 +146,17 @@ namespace svt { namespace table { return GoTo( GetCurrentColumn(), _nRow ); } - SVT_DLLPRIVATE virtual void Resize(); - virtual void Select(); - SVT_DLLPRIVATE void SetSelectHdl( const Link& rLink ) { m_aSelectHdl = rLink; } - const Link& GetSelectHdl() const { return m_aSelectHdl; } - /**invalidates the table if table has been changed e.g. new row added - */ - void InvalidateDataWindow(RowPos _nRowStart, RowPos _nRowEnd, bool _bRemoved); - /**gets the vector, which contains the selected rows - */ - std::vector<sal_Int32>& GetSelectedRows(); - /**after removing a row, updates the vector which contains the selected rows - if the row, which should be removed, is selected, it will be erased from the vector - */ - SelectionEngine* getSelEngine(); - TableDataWindow* getDataWindow(); + SVT_DLLPRIVATE virtual void Resize(); + virtual void Select(); + void SetSelectHdl( const Link& rLink ); + const Link& GetSelectHdl() const; + + /**after removing a row, updates the vector which contains the selected rows + if the row, which should be removed, is selected, it will be erased from the vector + */ + SelectionEngine* getSelEngine(); + Window& getDataWindow(); // Window overridables virtual void GetFocus(); @@ -181,55 +164,55 @@ namespace svt { namespace table virtual void KeyInput( const KeyEvent& rKEvt ); virtual void StateChanged( StateChangedType i_nStateChange ); - /** Creates and returns the accessible object of the whole GridControl. */ - SVT_DLLPRIVATE virtual XACC CreateAccessible(); - SVT_DLLPRIVATE virtual XACC CreateAccessibleControl( sal_Int32 _nIndex ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; - SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); - SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; - virtual void FillAccessibleStateSet( - ::utl::AccessibleStateSetHelper& rStateSet, - AccessibleTableControlObjType eObjType ) const; - //// Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual void GrabFocus(); - virtual XACC GetAccessible( BOOL bCreate = TRUE ); - virtual Window* GetAccessibleParentWindow() const; - virtual Window* GetWindowInstance(); - virtual sal_Int32 GetAccessibleControlCount() const; - virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); - virtual long GetRowCount() const; - virtual long GetColumnCount() const; - virtual sal_Bool HasRowHeader() const; - virtual sal_Int32 GetSelectedRowCount() const; - virtual bool IsRowSelected( long _nRow ) const; - virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); - virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, BOOL _bOnScreen = TRUE ); - virtual Rectangle calcTableRect( BOOL _bOnScreen = TRUE ); - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); - virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; - virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const; - virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; - virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const; - virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - virtual sal_Bool HasRowHeader(); - virtual sal_Bool HasColHeader(); - virtual sal_Bool isAccessibleAlive( ) const; - virtual void commitGridControlEvent( sal_Int16 _nEventId, const com::sun::star::uno::Any& _rNewValue, const com::sun::star::uno::Any& _rOldValue ); - virtual void RemoveSelectedRow(RowPos _nRowPos); - virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; - ::com::sun::star::uno::Sequence< sal_Int32 >& getColumnsForTooltip(); - ::com::sun::star::uno::Sequence< ::rtl::OUString >& getTextForTooltip(); - void setTooltip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aText, const ::com::sun::star::uno::Sequence< sal_Int32 >& nCols); - void clearSelection(); - void selectionChanged(bool _bChanged); - bool isTooltip(); - - protected: - /// retrieves the XAccessible implementation associated with the GridControl instance - ::svt::IAccessibleFactory& getAccessibleFactory(); + /** Creates and returns the accessible object of the whole GridControl. */ + SVT_DLLPRIVATE virtual XACC CreateAccessible(); + SVT_DLLPRIVATE virtual XACC CreateAccessibleControl( sal_Int32 _nIndex ); + SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const; + SVT_DLLPRIVATE virtual sal_Bool GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ); + SVT_DLLPRIVATE virtual ::rtl::OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType, sal_Int32 _nPosition = -1) const; + virtual void FillAccessibleStateSet( + ::utl::AccessibleStateSetHelper& rStateSet, + AccessibleTableControlObjType eObjType ) const; + + // ............................................................................................................. + // IAccessibleTable + virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; + virtual void GrabFocus(); + virtual XACC GetAccessible( sal_Bool bCreate = sal_True ); + virtual Window* GetAccessibleParentWindow() const; + virtual Window* GetWindowInstance(); + virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ); + virtual long GetRowCount() const; + virtual long GetColumnCount() const; + virtual sal_Bool HasRowHeader() const; + virtual sal_Bool ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint ); + virtual Rectangle calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen = sal_True ); + virtual Rectangle calcTableRect( sal_Bool _bOnScreen = sal_True ); + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const; + virtual ::rtl::OUString GetRowDescription( sal_Int32 _nRow ) const; + virtual ::rtl::OUString GetRowName(sal_Int32 _nIndex) const; + virtual ::rtl::OUString GetColumnDescription( sal_uInt16 _nColumnPos ) const; + virtual ::rtl::OUString GetColumnName( sal_Int32 _nIndex ) const; + virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const; + virtual sal_Bool HasRowHeader(); + virtual sal_Bool HasColHeader(); + virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const; + + virtual sal_Int32 GetSelectedRowCount() const; + virtual sal_Int32 GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const; + virtual bool IsRowSelected( sal_Int32 const i_rowIndex ) const; + virtual void SelectRow( sal_Int32 const i_rowIndex, bool const i_select ); + virtual void SelectAllRows( bool const i_select ); + // ............................................................................................................. + + private: + DECL_DLLPRIVATE_LINK( ImplMouseButtonDownHdl, MouseEvent* ); + DECL_DLLPRIVATE_LINK( ImplMouseButtonUpHdl, MouseEvent* ); + + DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* ); private: TableControl(); // never implemented diff --git a/svtools/inc/svtools/table/tablecontrolinterface.hxx b/svtools/inc/svtools/table/tablecontrolinterface.hxx new file mode 100644 index 000000000000..74e9688d01db --- /dev/null +++ b/svtools/inc/svtools/table/tablecontrolinterface.hxx @@ -0,0 +1,254 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * +************************************************************************/ + +#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX +#define SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX + +#include <sal/types.h> +#include <vcl/event.hxx> +#include <vcl/seleng.hxx> + +#include "svtools/table/tabletypes.hxx" +#include "svtools/table/tablemodel.hxx" + +class Pointer; + +//...................................................................................................................... +namespace svt { namespace table +{ +//...................................................................................................................... + + //================================================================================================================== + //= TableControlAction + //================================================================================================================== + enum TableControlAction + { + /// moves the cursor in the table control one row up, if possible, by keeping the current column + cursorUp, + /// moves the cursor in the table control one row down, if possible, by keeping the current column + cursorDown, + /// moves the cursor in the table control one column to the left, if possible, by keeping the current row + cursorLeft, + /// moves the cursor in the table control one column to the right, if possible, by keeping the current row + cursorRight, + /// moves the cursor to the beginning of the current line + cursorToLineStart, + /// moves the cursor to the end of the current line + cursorToLineEnd, + /// moves the cursor to the first row, keeping the current column + cursorToFirstLine, + /// moves the cursor to the last row, keeping the current column + cursorToLastLine, + /// moves the cursor one page up, keeping the current column + cursorPageUp, + /// moves the cursor one page down, keeping the current column + cursorPageDown, + /// moves the cursor to the top-most, left-most cell + cursorTopLeft, + /// moves the cursor to the bottom-most, right-most cell + cursorBottomRight, + /// selects the row, where the actual cursor is + cursorSelectRow, + /// selects the rows, above the actual cursor is + cursorSelectRowUp, + /// selects the row, beneath the actual cursor is + cursorSelectRowDown, + /// selects the row, from the actual cursor till top + cursorSelectRowAreaTop, + /// selects the row, from the actual cursor till bottom + cursorSelectRowAreaBottom, + + /// invalid and final enumeration value, not to be actually used + invalidTableControlAction + }; + + //================================================================================================================== + //= TableCellArea + //================================================================================================================== + enum TableCellArea + { + CellContent, + ColumnDivider + }; + + //================================================================================================================== + //= TableCell + //================================================================================================================== + struct TableCell + { + ColPos nColumn; + RowPos nRow; + TableCellArea eArea; + + TableCell() + :nColumn( COL_INVALID ) + ,nRow( ROW_INVALID ) + ,eArea( CellContent ) + { + } + + TableCell( ColPos const i_column, RowPos const i_row ) + :nColumn( i_column ) + ,nRow( i_row ) + ,eArea( CellContent ) + { + } + }; + + //================================================================================================================== + //= ColumnMetrics + //================================================================================================================== + struct ColumnMetrics + { + /** the start of the column, in pixels. Might be negative, in case the column is scrolled out of the visible + area. + */ + long nStartPixel; + + /** the end of the column, in pixels, plus 1. Effectively, this is the accumulated width of a all columns + up to the current one. + */ + long nEndPixel; + + ColumnMetrics() + :nStartPixel(0) + ,nEndPixel(0) + { + } + + ColumnMetrics( long const i_start, long const i_end ) + :nStartPixel( i_start ) + ,nEndPixel( i_end ) + { + } + }; + + //================================================================================================================== + //= TableArea + //================================================================================================================== + enum TableArea + { + TableAreaColumnHeaders, + TableAreaRowHeaders, + TableAreaDataArea, + TableAreaAll + }; + + //================================================================================================================== + //= ITableControl + //================================================================================================================== + /** defines a callback interface to be implemented by a concrete table control + */ + class SAL_NO_VTABLE ITableControl + { + public: + /** hides the cell cursor + + The method cares for successive calls, that is, for every call to + ->hideCursor(), you need one call to ->showCursor. Only if the number + of both calls matches, the cursor is really shown. + + @see showCursor + */ + virtual void hideCursor() = 0; + + /** shows the cell cursor + + @see hideCursor + */ + virtual void showCursor() = 0; + + /** dispatches an action to the table control + + @return + <TRUE/> if the action could be dispatched successfully, <FALSE/> otherwise. Usual + failure conditions include some other instance vetoing the action, or impossibility + to execute the action at all (for instance moving up one row when already positioned + on the very first row). + + @see TableControlAction + */ + virtual bool dispatchAction( TableControlAction _eAction ) = 0; + + /** returns selection engine*/ + virtual SelectionEngine* getSelEngine() = 0; + + /** returns the table model + + The returned model is guaranteed to not be <NULL/>. + */ + virtual PTableModel getModel() const = 0; + + /// returns the index of the currently active column + virtual ColPos getCurrentColumn() const = 0; + + /// returns the index of the currently active row + virtual RowPos getCurrentRow() const = 0; + + /// activates the given cell + virtual bool activateCell( ColPos const i_col, RowPos const i_row ) = 0; + + /// retrieves the size of the table window, in pixels + virtual ::Size getTableSizePixel() const = 0; + + /// sets a new mouse pointer for the table window + virtual void setPointer( Pointer const & i_pointer ) = 0; + + /// captures the mouse to the table window + virtual void captureMouse() = 0; + + /// releases the mouse, after it had previously been captured + virtual void releaseMouse() = 0; + + /// invalidates the table window + virtual void invalidate( TableArea const i_what ) = 0; + + /// calculates a width, given in pixels, into a AppFont-based width + virtual long pixelWidthToAppFont( long const i_pixels ) const = 0; + + /// shows a trackign rectangle + virtual void showTracking( Rectangle const & i_location, sal_uInt16 const i_flags ) = 0; + + /// hides a prviously shown tracking rectangle + virtual void hideTracking() = 0; + + /// does a hit test for the given pixel coordinates + virtual TableCell hitTest( const Point& rPoint ) const = 0; + + /// retrieves the metrics for a given column + virtual ColumnMetrics getColumnMetrics( ColPos const i_column ) const = 0; + + /// determines whether a given row is selected + virtual bool isRowSelected( RowPos _nRow ) const = 0; + + virtual ~ITableControl() {}; + }; + +//...................................................................................................................... +} } // namespace svt::table +//...................................................................................................................... + +#endif // SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx deleted file mode 100644 index ea59e05f4e97..000000000000 --- a/svtools/inc/svtools/table/tabledatawindow.hxx +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#ifndef SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX -#define SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX - -#include <vcl/window.hxx> -#include <vcl/seleng.hxx> - -//........................................................................ -namespace svt { namespace table -{ -//........................................................................ - - class TableControl_Impl; - class TableFunctionSet; - - - //==================================================================== - //= TableDataWindow - //==================================================================== - /** the window containing the content area (including headers) of - a table control - */ - class TableDataWindow : public Window - { - friend class TableFunctionSet; - private: - TableControl_Impl& m_rTableControl; - Link m_aMouseButtonDownHdl; - Link m_aMouseButtonUpHdl; - Link m_aSelectHdl; - public: - TableDataWindow( TableControl_Impl& _rTableControl ); - inline void SetMouseButtonDownHdl( const Link& rLink ) { m_aMouseButtonDownHdl = rLink; } - inline const Link& GetMouseButtonDownHdl() const { return m_aMouseButtonDownHdl; } - inline void SetMouseButtonUpHdl( const Link& rLink ) { m_aMouseButtonUpHdl = rLink; } - inline const Link& GetMouseButtonUpHdl() const { return m_aMouseButtonUpHdl; } - inline void SetSelectHdl( const Link& rLink ) { m_aSelectHdl = rLink; } - inline const Link& GetSelectHdl() const { return m_aSelectHdl; } - - // Window overridables - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt); - virtual void MouseButtonDown( const MouseEvent& rMEvt); - virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual void SetPointer( const Pointer& rPointer ); - virtual void CaptureMouse(); - virtual void ReleaseMouse(); - virtual long Notify(NotifyEvent& rNEvt); - virtual void SetControlBackground(const Color& rColor); - virtual void SetControlBackground(); - - void SetBackground(const Wallpaper& rColor); - void SetBackground(); - }; -//........................................................................ -} } // namespace svt::table -//........................................................................ - -#endif // SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/svtools/inc/svtools/table/tableinputhandler.hxx index 32d7f06b6482..a3153d96e8ac 100644 --- a/svtools/inc/svtools/table/tableinputhandler.hxx +++ b/svtools/inc/svtools/table/tableinputhandler.hxx @@ -41,7 +41,7 @@ namespace svt { namespace table { //........................................................................ - class IAbstractTableControl; + class ITableControl; //==================================================================== //= ITableInputHandler @@ -57,16 +57,16 @@ namespace svt { namespace table // or whether it has been sufficiently handled by the ->ITableInputHandler instance // (<FALSE/>). - virtual bool MouseMove ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ) = 0; - virtual bool MouseButtonDown ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ) = 0; - virtual bool MouseButtonUp ( IAbstractTableControl& _rControl, const MouseEvent& rMEvt ) = 0; - virtual bool KeyInput ( IAbstractTableControl& _rControl, const KeyEvent& rKEvt ) = 0; - virtual bool GetFocus ( IAbstractTableControl& _rControl ) = 0; - virtual bool LoseFocus ( IAbstractTableControl& _rControl ) = 0; - virtual bool RequestHelp ( IAbstractTableControl& _rControl, const HelpEvent& rHEvt ) = 0; - virtual bool Command ( IAbstractTableControl& _rControl, const CommandEvent& rCEvt ) = 0; - virtual bool PreNotify ( IAbstractTableControl& _rControl, NotifyEvent& rNEvt ) = 0; - virtual bool Notify ( IAbstractTableControl& _rControl, NotifyEvent& rNEvt ) = 0; + virtual bool MouseMove ( ITableControl& _rControl, const MouseEvent& rMEvt ) = 0; + virtual bool MouseButtonDown ( ITableControl& _rControl, const MouseEvent& rMEvt ) = 0; + virtual bool MouseButtonUp ( ITableControl& _rControl, const MouseEvent& rMEvt ) = 0; + virtual bool KeyInput ( ITableControl& _rControl, const KeyEvent& rKEvt ) = 0; + virtual bool GetFocus ( ITableControl& _rControl ) = 0; + virtual bool LoseFocus ( ITableControl& _rControl ) = 0; + virtual bool RequestHelp ( ITableControl& _rControl, const HelpEvent& rHEvt ) = 0; + virtual bool Command ( ITableControl& _rControl, const CommandEvent& rCEvt ) = 0; + virtual bool PreNotify ( ITableControl& _rControl, NotifyEvent& rNEvt ) = 0; + virtual bool Notify ( ITableControl& _rControl, NotifyEvent& rNEvt ) = 0; virtual ~ITableInputHandler() { } }; diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/svtools/inc/svtools/table/tablemodel.hxx index c463b8da91ab..6e962befefc8 100644..100755 --- a/svtools/inc/svtools/table/tablemodel.hxx +++ b/svtools/inc/svtools/table/tablemodel.hxx @@ -29,16 +29,22 @@ #define SVTOOLS_INC_TABLE_TABLEMODEL_HXX #include "svtools/svtdllapi.h" -#include <svtools/table/tabletypes.hxx> -#include <svtools/table/tablerenderer.hxx> -#include <svtools/table/tableinputhandler.hxx> -#include <rtl/ref.hxx> -#include <sal/types.h> +#include "svtools/table/tabletypes.hxx" +#include "svtools/table/tablerenderer.hxx" +#include "svtools/table/tableinputhandler.hxx" +#include "svtools/table/tablesort.hxx" + #include <com/sun/star/util/Color.hpp> -#include <boost/shared_ptr.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> +#include <rtl/ref.hxx> +#include <sal/types.h> + +#include <boost/shared_ptr.hpp> +#include <boost/optional.hpp> +#include <boost/enable_shared_from_this.hpp> + //........................................................................ namespace svt { namespace table { @@ -46,19 +52,6 @@ namespace svt { namespace table //==================================================================== - //= cell data - //==================================================================== - struct TableContentType - { - ::rtl::OUString sContent; - Image* pImage; - TableContentType() : - sContent(), - pImage( ) - { - } - }; - //==================================================================== //= ScrollbarVisibility //==================================================================== enum ScrollbarVisibility @@ -79,13 +72,24 @@ namespace svt { namespace table //==================================================================== //= ITableModelListener //==================================================================== + typedef sal_Int32 ColumnAttributeGroup; + #define COL_ATTRS_NONE (0x00000000) + /// denotes column attributes related to the width of the column + #define COL_ATTRS_WIDTH (0x00000001) + /// denotes column attributes related to the appearance of the column, i.e. those relevant for rendering + #define COL_ATTRS_APPEARANCE (0x00000002) + /// denotes the entirety of column attributes + #define COL_ATTRS_ALL (0x7FFFFFFF) + + //==================================================================== + //= ITableModelListener + //==================================================================== /** declares an interface to be implemented by components interested in changes in an ->ITableModel */ - class SAL_NO_VTABLE ITableModelListener + class SAL_NO_VTABLE ITableModelListener : public ::boost::enable_shared_from_this< ITableModelListener > { public: - //virtual void onTableModelChanged(PTableModel pTableModel) = 0; /** notifies the listener that one or more rows have been inserted into the table @@ -101,7 +105,8 @@ namespace svt { namespace table the table @param first - the old index of the first removed row + the old index of the first removed row. If this is <code>-1</code>, then all + rows have been removed from the model. @param last the old index of the last removed row. Must not be smaller than ->first @@ -117,27 +122,19 @@ namespace svt { namespace table the index of the last newly inserted row. Must not be smaller than ->first */ - virtual void columnsInserted( ColPos first, ColPos last ) = 0; + virtual void columnInserted( ColPos const i_colIndex ) = 0; /** notifies the listener that one or more columns have been removed from the table - @param first - the old index of the first removed row - @param last - the old index of the last removed row. Must not be smaller - than ->first + @param i_colIndex + the old index of the removed column */ - virtual void columnsRemoved( ColPos first, ColPos last ) = 0; - - /** notifies the listener that a column in the table has moved + virtual void columnRemoved( ColPos const i_colIndex ) = 0; - @param oldIndex - the old index of the column within the model - @param newIndex - the new index of the column within the model + /** notifies the listener that all columns have been removed form the model */ - virtual void columnMoved( ColPos oldIndex, ColPos newIndex ) = 0; + virtual void allColumnsRemoved() = 0; /** notifies the listener that a rectangular cell range in the table has been updated @@ -146,7 +143,24 @@ namespace svt { namespace table they have about the cells in question, in particular any possibly cached cell values. */ - virtual void cellsUpdated( ColPos firstCol, ColPos lastCol, RowPos firstRow, RowPos lastRow ) = 0; + virtual void cellsUpdated( ColPos const i_firstCol, ColPos i_lastCol, RowPos const i_firstRow, RowPos const i_lastRow ) = 0; + + /** notifies the listener that attributes of a given column changed + + @param i_column + the position of the column whose attributes changed + @param i_attributeGroup + a combination of one or more <code>COL_ATTRS_*</code> flags, denoting the attribute group(s) + in which changes occurred. + */ + virtual void columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup ) = 0; + + /** notifies the listener that the metrics of the table changed. + + Metrics here include the column header height, the row header width, the row height, and the presence + of both the row and column header. + */ + virtual void tableMetricsChanged() = 0; /// deletes the listener instance virtual ~ITableModelListener(){}; @@ -173,7 +187,8 @@ namespace svt { namespace table @see setID */ - virtual ColumnID getID() const = 0; + virtual ::com::sun::star::uno::Any + getID() const = 0; /** sets a new column ID @@ -184,7 +199,7 @@ namespace svt { namespace table @see getID */ - virtual bool setID( const ColumnID _nID ) = 0; + virtual void setID( const ::com::sun::star::uno::Any& _nID ) = 0; /** returns the name of the column @@ -201,7 +216,15 @@ namespace svt { namespace table */ virtual void setName( const String& _rName ) = 0; - /** determines whether the column can be resized + /** retrieves the help text to be displayed for the column. + */ + virtual String getHelpText() const = 0; + + /** sets a new the help text to be displayed for the column. + */ + virtual void setHelpText( const String& i_helpText ) = 0; + + /** determines whether the column can be interactively resized @see getMinWidth @see getMaxWidth @@ -217,40 +240,41 @@ namespace svt { namespace table */ virtual void setResizable( bool _bResizable ) = 0; - /** returns the width of the column, in 1/100 millimeters + /** denotes the relative flexibility of the column - The returned value must be a positive ->TableMetrics value. + This flexibility is taken into account when a table control auto-resizes its columns, because the available + space changed. In this case, the columns grow or shrink according to their flexibility. - It can also be COLWIDTH_FIT_TO_VIEW, to indicate that the width of the column - should automatically be adjusted to completely fit the view. For instance, a - model's last column could return this value, to indicate that it is to occupy - all horizontal space remaining in the view, after all other columns have been - layouted. + A value of 0 means the column is not auto-resized at all. + */ + virtual sal_Int32 getFlexibility() const = 0; - If there is more than one column with width COLWIDTH_FIT_TO_VIEW in a model, - they're all layouted equal-width. + /** sets a new flexibility value for the column - If the columns with a read width (i.e. other than COLWIDTH_FIT_TO_VIEW) are, - in sum, wider than the view, then the view is free to choose a real width for any - columns which return COLWIDTH_FIT_TO_VIEW here. + @see getFlexibility + */ + virtual void setFlexibility( sal_Int32 const i_flexibility ) = 0; + + /** returns the width of the column, in app-font unitss + + The returned value must be a positive ->TableMetrics value. @see setWidth @see getMinWidth @see getMaxWidth - @see COLWIDTH_FIT_TO_VIEW */ virtual TableMetrics getWidth() const = 0; /** sets a new width for the column @param _nWidth - the new width, in 1/100 millimeters + the new width, app-font units @see getWidth */ virtual void setWidth( TableMetrics _nWidth ) = 0; - /** returns the minimum width of the column, in 1/100 millimeters, or 0 if the column + /** returns the minimum width of the column, in app-font units, or 0 if the column does not have a minimal width @see setMinWidth @@ -259,7 +283,7 @@ namespace svt { namespace table */ virtual TableMetrics getMinWidth() const = 0; - /** sets the minimum width of the column, in 1/100 millimeters + /** sets the minimum width of the column, in app-font units @see getMinWidth @see setMaxWidth @@ -267,7 +291,7 @@ namespace svt { namespace table */ virtual void setMinWidth( TableMetrics _nMinWidth ) = 0; - /** returns the maximum width of the column, in 1/100 millimeters, or 0 if the column + /** returns the maximum width of the column, in app-font units, or 0 if the column does not have a minimal width @see setMaxWidth @@ -276,7 +300,7 @@ namespace svt { namespace table */ virtual TableMetrics getMaxWidth() const = 0; - /** sets the maximum width of the column, in 1/100 millimeters + /** sets the maximum width of the column, in app-font units @see getMaxWidth @see setMinWidth @@ -284,24 +308,14 @@ namespace svt { namespace table */ virtual void setMaxWidth( TableMetrics _nMaxWidth ) = 0; - /** returns the preferred width of the column, or 0 if the column - does not have a preferred width. - - @see setMaxWidth - @see getMinWidth - @see getWidth + /** retrieves the horizontal alignment to be used for content in this cell */ - virtual TableMetrics getPreferredWidth() const = 0; - /** sets the preferred width of the column, to be used when user resizes column + virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() = 0; - @see getMaxWidth - @see setMinWidth - @see setWidth + /** sets a new the horizontal alignment to be used for content in this cell */ - virtual void setPreferredWidth( TableMetrics _nPrefWidth ) = 0; - - virtual ::com::sun::star::style::HorizontalAlignment getHorizontalAlign() = 0; virtual void setHorizontalAlign(::com::sun::star::style::HorizontalAlignment _xAlign) = 0; + /// deletes the column model instance virtual ~IColumnModel() { } }; @@ -323,9 +337,6 @@ namespace svt { namespace table */ virtual TableSize getRowCount() const = 0; - SVT_DLLPRIVATE virtual void setColumnCount(TableSize _nColCount) = 0; - SVT_DLLPRIVATE virtual void setRowCount(TableSize _nRowCount) = 0; - /** determines whether the table has column headers If this method returns <TRUE/>, the renderer returned by @@ -334,15 +345,6 @@ namespace svt { namespace table @see IColumnRenderer */ virtual bool hasColumnHeaders() const = 0; - /** sets whether the table should have row headers - @see IColumnRenderer - */ - SVT_DLLPRIVATE virtual void setRowHeaders( bool rowHeaders) = 0; - - /** sets whether the table should have column headers - @see IColumnRenderer - */ - SVT_DLLPRIVATE virtual void setColumnHeaders( bool columnHeaders) = 0; /** determines whether the table has row headers @@ -360,14 +362,6 @@ namespace svt { namespace table */ virtual bool isCellEditable( ColPos col, RowPos row ) const = 0; - /** adds the given listener to the list of ->ITableModelListener's - */ - SVT_DLLPRIVATE virtual void addTableModelListener( const PTableModelListener& listener ) = 0; - - /** revokes the given listener from the list of ->ITableModelListener's - */ - SVT_DLLPRIVATE virtual void removeTableModelListener( const PTableModelListener& listener ) = 0; - /** returns a model for a certain column @param column @@ -376,27 +370,15 @@ namespace svt { namespace table @return the model of the column in question. Must not be <NULL/> - - @see getColumnModelByID */ virtual PColumnModel getColumnModel( ColPos column ) = 0; - /** finds a column model by ID - - @param id - the id of the column which is to be looked up - @return - the column model with the given ID, or <NULL/> if there is - no such column - */ - virtual PColumnModel getColumnModelByID( ColumnID id ) = 0; - /** returns a renderer which is able to paint the table represented by this table model @return the renderer to use. Must not be <NULL/> */ - SVT_DLLPRIVATE virtual PTableRenderer getRenderer() const = 0; + virtual PTableRenderer getRenderer() const = 0; /** returns the component handling input in a view associated with the model */ @@ -405,12 +387,10 @@ namespace svt { namespace table /** determines the height of rows in the table. @return - the logical height of rows in the table, in 1/100 millimeters. The height must be + the logical height of rows in the table, in app-font units. The height must be greater 0. */ - SVT_DLLPRIVATE virtual TableMetrics getRowHeight() const = 0; - - SVT_DLLPRIVATE virtual void setRowHeight(TableMetrics _nRowHeight) = 0; + virtual TableMetrics getRowHeight() const = 0; /** determines the height of the column header row @@ -418,10 +398,10 @@ namespace svt { namespace table returned <FALSE/>. @return - the logical height of the column header row, in 1/100 millimeters. + the logical height of the column header row, in app-font units. Must be greater than 0. */ - SVT_DLLPRIVATE virtual TableMetrics getColumnHeaderHeight() const = 0; + virtual TableMetrics getColumnHeaderHeight() const = 0; /** determines the width of the row header column @@ -429,48 +409,105 @@ namespace svt { namespace table returned <FALSE/>. @return - the logical width of the row header column, in 1/100 millimeters. + the logical width of the row header column, in app-font units. Must be greater than 0. */ - SVT_DLLPRIVATE virtual TableMetrics getRowHeaderWidth() const = 0; + virtual TableMetrics getRowHeaderWidth() const = 0; - /** determines the visibility of the vertical scrollbar of the table control - @param overAllHeight the height of the table with all rows - @param actHeight the given height of the table + /** returns the visibilit mode of the vertical scrollbar */ - virtual ScrollbarVisibility getVerticalScrollbarVisibility(int overAllHeight,int actHeight) const = 0; + virtual ScrollbarVisibility getVerticalScrollbarVisibility() const = 0; - /** determines the visibility of the horizontal scrollbar of the table control - @param overAllWidth the width of the table with all columns - @param actWidth the given width of the table + /** returns the visibilit mode of the horizontal scrollbar */ - virtual ScrollbarVisibility getHorizontalScrollbarVisibility(int overAllWidth, int actWidth) const = 0; - virtual bool hasVerticalScrollbar() =0; - virtual bool hasHorizontalScrollbar() = 0; - /** fills cells with content - */ - virtual void setCellContent(const std::vector< std::vector< ::com::sun::star::uno::Any > >& cellContent)=0; - /** gets the content of the cells - */ - virtual std::vector< std::vector< ::com::sun::star::uno::Any > >& getCellContent() = 0; - /**sets title of header rows - */ - SVT_DLLPRIVATE virtual void setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent)=0; - /** gets title of header rows - */ - virtual std::vector<rtl::OUString>& getRowHeaderName() = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::util::Color getLineColor() = 0; - SVT_DLLPRIVATE virtual void setLineColor(::com::sun::star::util::Color _rColor) = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::util::Color getHeaderBackgroundColor() = 0; - SVT_DLLPRIVATE virtual void setHeaderBackgroundColor(::com::sun::star::util::Color _rColor) = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::util::Color getTextColor() = 0; - SVT_DLLPRIVATE virtual void setTextColor(::com::sun::star::util::Color _rColor) = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::util::Color getOddRowBackgroundColor() = 0; - SVT_DLLPRIVATE virtual void setOddRowBackgroundColor(::com::sun::star::util::Color _rColor) = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::util::Color getEvenRowBackgroundColor() = 0; - SVT_DLLPRIVATE virtual void setEvenRowBackgroundColor(::com::sun::star::util::Color _rColor) = 0; - SVT_DLLPRIVATE virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() = 0; - SVT_DLLPRIVATE virtual void setVerticalAlign(::com::sun::star::style::VerticalAlignment _xAlign) = 0; + virtual ScrollbarVisibility getHorizontalScrollbarVisibility() const = 0; + + /** adds a listener to be notified of changes in the table model + */ + virtual void addTableModelListener( const PTableModelListener& i_listener ) = 0; + + /** remove a listener to be notified of changes in the table model + */ + virtual void removeTableModelListener( const PTableModelListener& i_listener ) = 0; + + /** retrieves the content of the given cell + */ + virtual void getCellContent( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any& o_cellContent ) = 0; + + /** returns an object which should be displayed as tooltip for the given cell + + At the moment, only string-convertible values are supported here. In the future, one might imagine displaying + scaled-down versions of a graphic in a cell, and a larger version of that very graphic as tooltip. + + If no tooltip object is provided, then the cell content is used, and displayed as tooltip for the cell + if and only if it doesn't fit into the cell's space itself. + + @param i_col + The column index of the cell in question. COL_ROW_HEADERS is a valid argument here. + @param i_row + The row index of the cell in question. + @param o_cellToolTip + takes the tooltip object upon return. + */ + virtual void getCellToolTip( ColPos const i_col, RowPos const i_row, ::com::sun::star::uno::Any & o_cellToolTip ) = 0; + + /** retrieves title of a given row + */ + virtual ::com::sun::star::uno::Any getRowHeading( RowPos const i_rowPos ) const = 0; + + /** returns the color to be used for rendering the grid lines. + + If this value is not set, a default color from the style settings will be used. + */ + virtual ::boost::optional< ::Color > getLineColor() const = 0; + + /** returns the color to be used for rendering the header background. + + If this value is not set, a default color from the style settings will be used. + */ + virtual ::boost::optional< ::Color > getHeaderBackgroundColor() const = 0; + + /** returns the color to be used for rendering the header text. + + If this value is not set, a default color from the style settings will be used. + */ + virtual ::boost::optional< ::Color > getHeaderTextColor() const = 0; + + /** returns the color to be used for rendering cell texts. + + If this value is not set, a default color from the style settings will be used. + */ + virtual ::boost::optional< ::Color > getTextColor() const = 0; + + /** returns the color to be used for text lines (underline, strikethrough) when rendering cell text. + + If this value is not set, a default color from the style settings will be used. + */ + virtual ::boost::optional< ::Color > getTextLineColor() const = 0; + + /** returns the colors to be used for the row backgrounds. + + If this value is not set, every second row will have a background color derived from the style settings's + selection color, the other rows will not have a special background at all. + + If this value is an empty sequence, the rows will not have a special background at all, instead the + normal background of the complete control will be used. + + If value is a non-empty sequence, then rows will have the background colors as specified in the sequence, + in alternating order. + */ + virtual ::boost::optional< ::std::vector< ::Color > > + getRowBackgroundColors() const = 0; + + /** determines the vertical alignment of content within a cell + */ + virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign() const = 0; + + /** returns an adapter to the sorting functionality of the model + + It is legitimate to return <NULL/> here, in this case, the table model does not support sorting. + */ + virtual ITableDataSort* getSortAdapter() = 0; /// destroys the table model instance virtual ~ITableModel() { } diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx index a875f435d9eb..a0fc93b665c3 100644 --- a/svtools/inc/svtools/table/tablerenderer.hxx +++ b/svtools/inc/svtools/table/tablerenderer.hxx @@ -47,6 +47,7 @@ namespace svt { namespace table class SAL_NO_VTABLE ITableRenderer { public: + /** paints a (part of) header area There are two header areas in a table control: @@ -176,12 +177,10 @@ namespace svt { namespace table the are into which the row header should be painted @param _rStyle the style to be used for drawing - @param _rText - the title of the header row */ virtual void PaintRowHeader( bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, rtl::OUString& _rText ) = 0; + const StyleSettings& _rStyle ) = 0; /** paints a certain cell @@ -208,46 +207,11 @@ namespace svt { namespace table the are into which the cell should be painted @param _rStyle the style to be used for drawing - @param _pCellData - the content of the cell */ - virtual void PaintCellImage( ColPos _nColumn, + virtual void PaintCell( ColPos const i_col, bool _bActive, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, Image* _pCellData ) = 0; - - /** paints a certain cell - - The row to be painted is denoted by the most recent call to - ->PrepareRow. - - @param _bSelected - <TRUE/> if and only if the cell to be painted is - selected currently. This is the case if either - the row or the column of the cell is currently selected. - <br/> - Note that this flag is equal to the respective flag in the - previous ->PrepareRow call, it's passed here for convinience - only. - @param _bActive - <TRUE/> if the cell is currently active. - <br/> - Note that this flag is equal to the respective flag in the - previous ->PrepareRow call, it's passed here for convinience - only. - @param _rDevice - denotes the device to paint onto - @param _rArea - the are into which the cell should be painted - @param _rStyle - the style to be used for drawing - @param _rText - the content of the cell - */ - virtual void PaintCellString( ColPos _nColumn, - bool _bActive, bool _bSelected, - OutputDevice& _rDevice, const Rectangle& _rArea, - const StyleSettings& _rStyle, rtl::OUString& _rText ) = 0; + const StyleSettings& _rStyle ) = 0; /** draws a cell cursor in the given rectangle @@ -263,6 +227,41 @@ namespace svt { namespace table */ virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) = 0; + /** checks whether a given cell content fits into a given target area on a given device. + + @param i_colPos + denotes the column which the cell content would be painted into. Your renderer implementation + would only need this parameter if rendering is done differently for different columns. + + @param i_rowPos + denotes the row which the cell content would be painted into. Your renderer implementation + would only need this parameter if rendering is done differently for different rows. + + @param i_active + is <TRUE/> if and only if the renderer should assume the cell content would be painted for the active + cell. + + @param i_selected + is <TRUE/> if and only if the renderer should assume the cell content would be painted for a selected + cell. + + @param i_targetDevice + denotes the target device for the assumed rendering operation + + @param i_targetArea + denotes the area within the target device for the assumed rendering operation. + + @return + <TRUE/> if and only if the given cell content could be rendered into the given device and the + given area. + */ + virtual bool FitsIntoCell( + ::com::sun::star::uno::Any const & i_cellContent, + ColPos const i_colPos, RowPos const i_rowPos, + bool const i_active, bool const i_selected, + OutputDevice& i_targetDevice, Rectangle const & i_targetArea + ) = 0; + /// deletes the renderer instance virtual ~ITableRenderer() { } }; diff --git a/svtools/inc/svtools/table/tablesort.hxx b/svtools/inc/svtools/table/tablesort.hxx new file mode 100755 index 000000000000..1690b4d51344 --- /dev/null +++ b/svtools/inc/svtools/table/tablesort.hxx @@ -0,0 +1,91 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_TABLESORT_HXX +#define SVTOOLS_TABLESORT_HXX + +#include "svtools/table/tabletypes.hxx" + +//...................................................................................................................... +namespace svt { namespace table +{ +//...................................................................................................................... + + //================================================================================================================== + //= ColumnSortDirection + //================================================================================================================== + enum ColumnSortDirection + { + ColumnSortAscending, + ColumnSortDescending + }; + + //================================================================================================================== + //= ColumnSort + //================================================================================================================== + struct ColumnSort + { + ColPos nColumnPos; + ColumnSortDirection eSortDirection; + + ColumnSort() + :nColumnPos( COL_INVALID ) + ,eSortDirection( ColumnSortAscending ) + { + } + + ColumnSort( ColPos const i_columnPos, ColumnSortDirection const i_sortDirection ) + :nColumnPos( i_columnPos ) + ,eSortDirection( i_sortDirection ) + { + } + }; + + //================================================================================================================== + //= ITableDataSort + //================================================================================================================== + /** provides sorting functionality for the datta underlying an ITableModel + */ + class SAL_NO_VTABLE ITableDataSort + { + public: + /** sorts the rows in the model by the given column's data, in the given direction. + */ + virtual void sortByColumn( ColPos const i_column, ColumnSortDirection const i_sortDirection ) = 0; + + /** retrieves the current sort order of the data + + If the <code>nColumnIndex</code> member of the returned srtructure is <code>COL_INVALID</code>, then + the data is currently not sorted. + */ + virtual ColumnSort getCurrentSortOrder() const = 0; + }; + +//...................................................................................................................... +} } // namespace svt::table +//...................................................................................................................... + +#endif // SVTOOLS_TABLESORT_HXX diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/svtools/inc/svtools/table/tabletypes.hxx index d8ef737b388c..2fd5a550b782 100644 --- a/svtools/inc/svtools/table/tabletypes.hxx +++ b/svtools/inc/svtools/table/tabletypes.hxx @@ -50,14 +50,7 @@ namespace svt { namespace table */ typedef sal_Int32 AnyPos; - /// the ID of a column in a table - typedef sal_Int32 ColumnID; - typedef sal_Int32 TableMetrics; -/** special column width value which indicates that the column should be - automatically resized to fit the view -*/ -#define COLWIDTH_FIT_TO_VIEW ((::svt::table::TableMetrics)-1) /// denotes the column containing the row headers #define COL_ROW_HEADERS ((::svt::table::ColPos)-1) diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index 129ccf76803f..4fb126e5eefe 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -147,11 +147,11 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); - void InsertButton( USHORT nItemId, + void InsertButton( sal_uInt16 nItemId, const Image& rImage, const String& rText, - USHORT nPos = TOOLBOX_APPEND ) + sal_uInt16 nPos = TOOLBOX_APPEND ) { InsertItem( nItemId, rImage, rText, TIB_LEFT | TIB_AUTOSIZE, nPos ); } - void RemoveButton( USHORT nItemId ) + void RemoveButton( sal_uInt16 nItemId ) { RemoveItem( nItemId ); } }; @@ -174,10 +174,10 @@ private: size_t mnUpdateNewPos; size_t mnActiveItemId; size_t mnNewActivePos; - USHORT mnSmallItem; - USHORT mnDummy2; - BOOL mbMinActivate; - BOOL mbDummy1; + sal_uInt16 mnSmallItem; + sal_uInt16 mnDummy2; + sal_Bool mbMinActivate; + sal_Bool mbDummy1; Link maActivateTaskHdl; Link maContextMenuHdl; @@ -193,8 +193,8 @@ public: TaskToolBox( Window* pParent, WinBits nWinStyle = 0 ); ~TaskToolBox(); - void ActivateTaskItem( USHORT nItemId, - BOOL bMinActivate = FALSE ); + void ActivateTaskItem( sal_uInt16 nItemId, + sal_Bool bMinActivate = sal_False ); virtual void ActivateTask(); virtual void ContextMenu(); @@ -208,11 +208,11 @@ public: void StartUpdateTask(); void UpdateTask( const Image& rImage, const String& rText, - BOOL bActive = FALSE ); + sal_Bool bActive = sal_False ); void EndUpdateTask(); const Point& GetContextMenuPos() const { return maContextMenuPos; } - BOOL IsMinActivate() const { return mbMinActivate; } + sal_Bool IsMinActivate() const { return mbMinActivate; } void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; } const Link& GetActivateTaskHdl() const { return maActivateTaskHdl; } @@ -227,18 +227,18 @@ public: class ITaskStatusNotify { public: - virtual BOOL MouseButtonDown( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseButtonUp( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseMove( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL Command( USHORT nItemd, const CommandEvent& rCEvt ); - virtual BOOL UpdateHelp( USHORT nItemd ); + virtual sal_Bool MouseButtonDown( sal_uInt16 nItemd, const MouseEvent& rMEvt ); + virtual sal_Bool MouseButtonUp( sal_uInt16 nItemd, const MouseEvent& rMEvt ); + virtual sal_Bool MouseMove( sal_uInt16 nItemd, const MouseEvent& rMEvt ); + virtual sal_Bool Command( sal_uInt16 nItemd, const CommandEvent& rCEvt ); + virtual sal_Bool UpdateHelp( sal_uInt16 nItemd ); }; // ----------------------- // - TaskStatusFieldItem - // ----------------------- -#define TASKSTATUSFIELDITEM_FLASH ((USHORT)0x0001) +#define TASKSTATUSFIELDITEM_FLASH ((sal_uInt16)0x0001) class TaskStatusFieldItem { @@ -247,8 +247,8 @@ private: Image maImage; XubString maQuickHelpText; XubString maHelpText; - ULONG mnHelpId; - USHORT mnFlags; + rtl::OString maHelpId; + sal_uInt16 mnFlags; public: TaskStatusFieldItem(); @@ -257,7 +257,7 @@ public: const Image& rImage, const XubString& rQuickHelpText, const XubString& rHelpText, - USHORT nFlags ); + sal_uInt16 nFlags ); ~TaskStatusFieldItem(); void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } @@ -268,10 +268,10 @@ public: const XubString& GetQuickHelpText() const { return maQuickHelpText; } void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } - void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } - USHORT GetFlags() const { return mnFlags; } + void SetHelpId( const rtl::OString& rHelpId ) { maHelpId = rHelpId; } + const rtl::OString& GetHelpId() const { return maHelpId; } + void SetFlags( sal_uInt16 nFlags ) { mnFlags = nFlags; } + sal_uInt16 GetFlags() const { return mnFlags; } const TaskStatusFieldItem& operator=( const TaskStatusFieldItem& rItem ); }; @@ -280,10 +280,10 @@ public: // - TaskStatusBar - // ----------------- -#define TASKSTATUSBAR_STATUSFIELDID ((USHORT)61000) +#define TASKSTATUSBAR_STATUSFIELDID ((sal_uInt16)61000) -#define TASKSTATUSBAR_CLOCKID ((USHORT)61000) -#define TASKSTATUSFIELD_CLOCK ((USHORT)0x0001) +#define TASKSTATUSBAR_CLOCKID ((sal_uInt16)61000) +#define TASKSTATUSFIELD_CLOCK ((sal_uInt16)0x0001) class SVT_DLLPUBLIC TaskStatusBar : public StatusBar { @@ -299,19 +299,19 @@ private: long mnClockWidth; long mnItemWidth; long mnFieldWidth; - USHORT mnFieldFlags; - USHORT mnDummy1; - BOOL mbFlashItems; - BOOL mbOutInterval; - BOOL mbDummy1; - BOOL mbDummy2; + sal_uInt16 mnFieldFlags; + sal_uInt16 mnDummy1; + sal_Bool mbFlashItems; + sal_Bool mbOutInterval; + sal_Bool mbDummy1; + sal_Bool mbDummy2; #ifdef _TASKBAR_CXX - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( USHORT nItemId ) const; - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, BOOL& rFieldRect ) const; - SVT_DLLPRIVATE BOOL ImplUpdateClock(); - SVT_DLLPRIVATE BOOL ImplUpdateFlashItems(); - SVT_DLLPRIVATE void ImplUpdateField( BOOL bItems ); + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( sal_uInt16 nItemId ) const; + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, sal_Bool& rFieldRect ) const; + SVT_DLLPRIVATE sal_Bool ImplUpdateClock(); + SVT_DLLPRIVATE sal_Bool ImplUpdateFlashItems(); + SVT_DLLPRIVATE void ImplUpdateField( sal_Bool bItems ); DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); #endif @@ -327,20 +327,20 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ); void InsertStatusField( long nOffset = STATUSBAR_OFFSET, - USHORT nPos = STATUSBAR_APPEND, - USHORT nFlags = TASKSTATUSFIELD_CLOCK ); + sal_uInt16 nPos = STATUSBAR_APPEND, + sal_uInt16 nFlags = TASKSTATUSFIELD_CLOCK ); void RemoveStatusField() { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } - void SetFieldFlags( USHORT nFlags ); - USHORT GetFieldFlags() const { return mnFieldFlags; } + void SetFieldFlags( sal_uInt16 nFlags ); + sal_uInt16 GetFieldFlags() const { return mnFieldFlags; } void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } - void AddStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem, - USHORT nPos = 0xFFFF ); - void ModifyStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem ); - void RemoveStatusFieldItem( USHORT nItemId ); - BOOL GetStatusFieldItem( USHORT nItemId, TaskStatusFieldItem& rItem ) const; + void AddStatusFieldItem( sal_uInt16 nItemId, const TaskStatusFieldItem& rItem, + sal_uInt16 nPos = 0xFFFF ); + void ModifyStatusFieldItem( sal_uInt16 nItemId, const TaskStatusFieldItem& rItem ); + void RemoveStatusFieldItem( sal_uInt16 nItemId ); + sal_Bool GetStatusFieldItem( sal_uInt16 nItemId, TaskStatusFieldItem& rItem ) const; }; // ----------- @@ -367,15 +367,15 @@ private: long mnDummy3; long mnDummy4; WinBits mnWinBits; - USHORT mnLines; - BOOL mbStatusText; - BOOL mbShowItems; - BOOL mbAutoHide; - BOOL mbAlignDummy1; - BOOL mbDummy1; - BOOL mbDummy2; - BOOL mbDummy3; - BOOL mbDummy4; + sal_uInt16 mnLines; + sal_Bool mbStatusText; + sal_Bool mbShowItems; + sal_Bool mbAutoHide; + sal_Bool mbAlignDummy1; + sal_Bool mbDummy1; + sal_Bool mbDummy2; + sal_Bool mbDummy3; + sal_Bool mbDummy4; Link maTaskResizeHdl; #ifdef _TASKBAR_CXX @@ -403,10 +403,10 @@ public: void Format(); - void SetLines( USHORT nLines ); - USHORT GetLines() const { return mnLines; } - void EnableAutoHide( BOOL bAutoHide = TRUE ); - BOOL IsAutoHideEnabled() const { return mbAutoHide; } + void SetLines( sal_uInt16 nLines ); + sal_uInt16 GetLines() const { return mnLines; } + void EnableAutoHide( sal_Bool bAutoHide = sal_True ); + sal_Bool IsAutoHideEnabled() const { return mbAutoHide; } void ShowStatusText( const String& rText ); void HideStatusText(); @@ -445,7 +445,7 @@ class SVT_DLLPUBLIC WindowArrange private: List* mpWinList; void* mpDummy; - ULONG mnDummy; + sal_uLong mnDummy; #ifdef _TASKBAR_CXX SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); @@ -458,12 +458,12 @@ public: WindowArrange(); ~WindowArrange(); - void AddWindow( Window* pWindow, ULONG nPos = LIST_APPEND ) + void AddWindow( Window* pWindow, sal_uLong nPos = LIST_APPEND ) { mpWinList->Insert( (void*)pWindow, nPos ); } void RemoveAllWindows() { mpWinList->Clear(); } - void Arrange( USHORT nType, const Rectangle& rRect ); + void Arrange( sal_uInt16 nType, const Rectangle& rRect ); }; #endif // _TASKBAR_HXX diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx index 9be90a0eaad6..9be90a0eaad6 100644 --- a/svtools/inc/templatefoldercache.hxx +++ b/svtools/inc/svtools/templatefoldercache.hxx diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx index ba62c3ec5a89..ba62c3ec5a89 100644 --- a/svtools/inc/templdlg.hxx +++ b/svtools/inc/svtools/templdlg.hxx diff --git a/svtools/inc/testtool.hxx b/svtools/inc/svtools/testtool.hxx index 5837bfaaa232..0129a326f001 100644 --- a/svtools/inc/testtool.hxx +++ b/svtools/inc/svtools/testtool.hxx @@ -47,7 +47,7 @@ class RemoteControl { friend class StatementFlow; - BOOL m_bIdleInserted; + sal_Bool m_bIdleInserted; #if OSL_DEBUG_LEVEL > 1 EditWindow *m_pDbgWin; #endif @@ -56,14 +56,14 @@ class RemoteControl public: RemoteControl(); ~RemoteControl(); - BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); + sal_Bool QueCommands( sal_uLong nServiceId, SvStream *pIn ); SvStream* GetReturnStream(); DECL_LINK( IdleHdl, Application* ); DECL_LINK( CommandHdl, Application* ); DECL_LINK( QueCommandsEvent, CommunicationLink* ); - ULONG nStoredServiceId; + sal_uLong nStoredServiceId; SvStream *pStoredStream; void ExecuteURL( String &aURL ); diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx index 7b0a81cd2da1..97869f2489cd 100644 --- a/svtools/inc/svtools/textdata.hxx +++ b/svtools/inc/svtools/textdata.hxx @@ -34,71 +34,51 @@ #include <svl/smplhint.hxx> #include <tools/string.hxx> -#define TEXTUNDO_START 100 -#define TEXTUNDO_REMOVECHARS 100 -#define TEXTUNDO_CONNECTPARAS 101 -#define TEXTUNDO_SPLITPARA 102 -#define TEXTUNDO_INSERTCHARS 103 -#define TEXTUNDO_DELCONTENT 104 -#define TEXTUNDO_DELETE 105 -#define TEXTUNDO_CUT 106 -#define TEXTUNDO_PASTE 107 -#define TEXTUNDO_INSERT 108 -#define TEXTUNDO_ATTRIBS 109 -#define TEXTUNDO_DRAGANDDROP 110 -#define TEXTUNDO_READ 111 -#define TEXTUNDO_END 149 - -#define XTEXTUNDO_START 150 -#define XTEXTUNDO_END 199 - -#define TEXTUNDO_USER 200 - // Fuer Notify, wenn alle Absaetze geloescht wurden... #define TEXT_PARA_ALL 0xFFFFFFFF class TextPaM { private: - ULONG mnPara; - USHORT mnIndex; + sal_uLong mnPara; + sal_uInt16 mnIndex; public: TextPaM() { mnPara = 0, mnIndex = 0; } - TextPaM( ULONG nPara, USHORT nIndex ) { mnPara = nPara, mnIndex = nIndex; } + TextPaM( sal_uLong nPara, sal_uInt16 nIndex ) { mnPara = nPara, mnIndex = nIndex; } - ULONG GetPara() const { return mnPara; } - ULONG& GetPara() { return mnPara; } + sal_uLong GetPara() const { return mnPara; } + sal_uLong& GetPara() { return mnPara; } - USHORT GetIndex() const { return mnIndex; } - USHORT& GetIndex() { return mnIndex; } + sal_uInt16 GetIndex() const { return mnIndex; } + sal_uInt16& GetIndex() { return mnIndex; } - inline BOOL operator == ( const TextPaM& rPaM ) const; - inline BOOL operator != ( const TextPaM& rPaM ) const; - inline BOOL operator < ( const TextPaM& rPaM ) const; - inline BOOL operator > ( const TextPaM& rPaM ) const; + inline sal_Bool operator == ( const TextPaM& rPaM ) const; + inline sal_Bool operator != ( const TextPaM& rPaM ) const; + inline sal_Bool operator < ( const TextPaM& rPaM ) const; + inline sal_Bool operator > ( const TextPaM& rPaM ) const; }; -inline BOOL TextPaM::operator == ( const TextPaM& rPaM ) const +inline sal_Bool TextPaM::operator == ( const TextPaM& rPaM ) const { - return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? TRUE : FALSE; + return ( ( mnPara == rPaM.mnPara ) && ( mnIndex == rPaM.mnIndex ) ) ? sal_True : sal_False; } -inline BOOL TextPaM::operator != ( const TextPaM& rPaM ) const +inline sal_Bool TextPaM::operator != ( const TextPaM& rPaM ) const { return !( *this == rPaM ); } -inline BOOL TextPaM::operator < ( const TextPaM& rPaM ) const +inline sal_Bool TextPaM::operator < ( const TextPaM& rPaM ) const { return ( ( mnPara < rPaM.mnPara ) || - ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? TRUE : FALSE; + ( ( mnPara == rPaM.mnPara ) && mnIndex < rPaM.mnIndex ) ) ? sal_True : sal_False; } -inline BOOL TextPaM::operator > ( const TextPaM& rPaM ) const +inline sal_Bool TextPaM::operator > ( const TextPaM& rPaM ) const { return ( ( mnPara > rPaM.mnPara ) || - ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? TRUE : FALSE; + ( ( mnPara == rPaM.mnPara ) && mnIndex > rPaM.mnIndex ) ) ? sal_True : sal_False; } class SVT_DLLPUBLIC TextSelection @@ -120,18 +100,18 @@ public: void Justify(); - BOOL HasRange() const { return maStartPaM != maEndPaM; } + sal_Bool HasRange() const { return maStartPaM != maEndPaM; } - inline BOOL operator == ( const TextSelection& rSel ) const; - inline BOOL operator != ( const TextSelection& rSel ) const; + inline sal_Bool operator == ( const TextSelection& rSel ) const; + inline sal_Bool operator != ( const TextSelection& rSel ) const; }; -inline BOOL TextSelection::operator == ( const TextSelection& rSel ) const +inline sal_Bool TextSelection::operator == ( const TextSelection& rSel ) const { return ( ( maStartPaM == rSel.maStartPaM ) && ( maEndPaM == rSel.maEndPaM ) ); } -inline BOOL TextSelection::operator != ( const TextSelection& rSel ) const +inline sal_Bool TextSelection::operator != ( const TextSelection& rSel ) const { return !( *this == rSel ); } @@ -154,30 +134,30 @@ inline BOOL TextSelection::operator != ( const TextSelection& rSel ) const class SVT_DLLPUBLIC TextHint : public SfxSimpleHint { private: - ULONG mnValue; + sal_uLong mnValue; public: TYPEINFO(); - TextHint( ULONG nId ); - TextHint( ULONG nId, ULONG nValue ); + TextHint( sal_uLong nId ); + TextHint( sal_uLong nId, sal_uLong nValue ); - ULONG GetValue() const { return mnValue; } - void SetValue( ULONG n ) { mnValue = n; } + sal_uLong GetValue() const { return mnValue; } + void SetValue( sal_uLong n ) { mnValue = n; } }; struct TEIMEInfos { String aOldTextAfterStartPos; - USHORT* pAttribs; + sal_uInt16* pAttribs; TextPaM aPos; - USHORT nLen; - BOOL bCursor; - BOOL bWasCursorOverwrite; + sal_uInt16 nLen; + sal_Bool bCursor; + sal_Bool bWasCursorOverwrite; TEIMEInfos( const TextPaM& rPos, const String& rOldTextAfterStartPos ); ~TEIMEInfos(); - void CopyAttribs( const USHORT* pA, USHORT nL ); + void CopyAttribs( const sal_uInt16* pA, sal_uInt16 nL ); void DestroyAttribs(); }; @@ -196,11 +176,11 @@ struct TEIMEInfos template <class T> class ToolsList : public ::std::vector< T > { public: - ULONG Count() const { return static_cast<ULONG>(::std::vector< T >::size()); } - ULONG GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); } - T GetObject( ULONG nIndex ) const { return (*this)[nIndex]; } - void Insert( T pObject, ULONG nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); } - void Remove( ULONG nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); } + sal_uLong Count() const { return static_cast<sal_uLong>(::std::vector< T >::size()); } + sal_uLong GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); } + T GetObject( sal_uLong nIndex ) const { return (*this)[nIndex]; } + void Insert( T pObject, sal_uLong nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); } + void Remove( sal_uLong nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); } }; #endif // _TEXTDATA_HXX diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx index 09c7b042bde3..ba2c440f6d98 100644 --- a/svtools/inc/svtools/texteng.hxx +++ b/svtools/inc/svtools/texteng.hxx @@ -40,7 +40,6 @@ class TextAttrib; class TextCharAttrib; class TextUndo; class TextUndoManager; -class SfxUndoManager; class EditSelFunctionSet; class EditSelEngine; class IdleFormatter; @@ -50,6 +49,11 @@ class SfxUndoAction; class KeyEvent; class Timer; +namespace svl +{ + class IUndoManager; +} + class TextLine; class TETextPortion; #include <svl/brdcst.hxx> @@ -116,110 +120,110 @@ private: Font maFont; Color maTextColor; - USHORT mnCharHeight; - USHORT mnFixCharWidth100; + sal_uInt16 mnCharHeight; + sal_uInt16 mnFixCharWidth100; - ULONG mnMaxTextLen; - ULONG mnMaxTextWidth; - ULONG mnCurTextWidth; - ULONG mnCurTextHeight; - ULONG mnDefTab; + sal_uLong mnMaxTextLen; + sal_uLong mnMaxTextWidth; + sal_uLong mnCurTextWidth; + sal_uLong mnCurTextHeight; + sal_uLong mnDefTab; TxtAlign meAlign; - BOOL mbIsFormatting : 1; // Semaphore wegen der Hook's - BOOL mbFormatted : 1; - BOOL mbUpdate : 1; - BOOL mbModified : 1; - BOOL mbUndoEnabled : 1; - BOOL mbIsInUndo : 1; - BOOL mbDowning : 1; - BOOL mbRightToLeft : 1; - BOOL mbHasMultiLineParas : 1; + sal_Bool mbIsFormatting : 1; // Semaphore wegen der Hook's + sal_Bool mbFormatted : 1; + sal_Bool mbUpdate : 1; + sal_Bool mbModified : 1; + sal_Bool mbUndoEnabled : 1; + sal_Bool mbIsInUndo : 1; + sal_Bool mbDowning : 1; + sal_Bool mbRightToLeft : 1; + sal_Bool mbHasMultiLineParas : 1; TextEngine( const TextEngine& ) : SfxBroadcaster() {} TextEngine& operator=( const TextEngine& ) { return *this; } protected: - void CursorMoved( ULONG nNode ); + void CursorMoved( sal_uLong nNode ); void TextModified(); void ImpInitDoc(); void ImpRemoveText(); TextPaM ImpDeleteText( const TextSelection& rSel ); - TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, BOOL bOverwrite = FALSE ); + TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, sal_Bool bOverwrite = sal_False ); TextPaM ImpInsertText( const TextSelection& rSel, const String& rText ); - TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, BOOL bKeepEndingAttribs = TRUE ); - TextPaM ImpInsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs = TRUE ); - void ImpRemoveChars( const TextPaM& rPaM, USHORT nChars, SfxUndoAction* pCurUndo = 0 ); - TextPaM ImpConnectParagraphs( ULONG nLeft, ULONG nRight ); - void ImpRemoveParagraph( ULONG nPara ); - void ImpInitWritingDirections( ULONG nPara ); + TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, sal_Bool bKeepEndingAttribs = sal_True ); + TextPaM ImpInsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs = sal_True ); + void ImpRemoveChars( const TextPaM& rPaM, sal_uInt16 nChars, SfxUndoAction* pCurUndo = 0 ); + TextPaM ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight ); + void ImpRemoveParagraph( sal_uLong nPara ); + void ImpInitWritingDirections( sal_uLong nPara ); LocaleDataWrapper* ImpGetLocaleDataWrapper(); // to remain compatible in the minor release we copy the above ImpInsertText // function and add the extra parameter we need but make sure this function // gets not exported. First and seconf parameter swapped to have a different signatur. - SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, BOOL bOverwrite = FALSE, BOOL bIsUserInput = sal_False ); + SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, sal_Bool bOverwrite = sal_False, sal_Bool bIsUserInput = sal_False ); // some other new functions needed that must not be exported to remain compatible SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker() const; - SAL_DLLPRIVATE BOOL IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; + SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // Broadcasten bzw. Selektionen anpassen: - void ImpParagraphInserted( ULONG nPara ); - void ImpParagraphRemoved( ULONG nPara ); - void ImpCharsRemoved( ULONG nPara, USHORT nPos, USHORT nChars ); - void ImpCharsInserted( ULONG nPara, USHORT nPos, USHORT nChars ); - void ImpFormattingParagraph( ULONG nPara ); + void ImpParagraphInserted( sal_uLong nPara ); + void ImpParagraphRemoved( sal_uLong nPara ); + void ImpCharsRemoved( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); + void ImpCharsInserted( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); + void ImpFormattingParagraph( sal_uLong nPara ); void ImpTextHeightChanged(); void ImpTextFormatted(); DECL_LINK( IdleFormatHdl, Timer * ); void CheckIdleFormatter(); - void IdleFormatAndUpdate( TextView* pCurView = 0, USHORT nMaxTimerRestarts = 5 ); + void IdleFormatAndUpdate( TextView* pCurView = 0, sal_uInt16 nMaxTimerRestarts = 5 ); - BOOL CreateLines( ULONG nPara ); - void CreateAndInsertEmptyLine( ULONG nPara ); - void ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion* pPortion, USHORT nPortionStart, long nRemainingWidth ); - USHORT SplitTextPortion( ULONG nPara, USHORT nPos ); - void CreateTextPortions( ULONG nPara, USHORT nStartPos ); - void RecalcTextPortion( ULONG nPara, USHORT nStartPos, short nNewChars ); - void SeekCursor( ULONG nNode, USHORT nPos, Font& rFont, OutputDevice* pOutDev ); + sal_Bool CreateLines( sal_uLong nPara ); + void CreateAndInsertEmptyLine( sal_uLong nPara ); + void ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth ); + sal_uInt16 SplitTextPortion( sal_uLong nPara, sal_uInt16 nPos ); + void CreateTextPortions( sal_uLong nPara, sal_uInt16 nStartPos ); + void RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short nNewChars ); + void SeekCursor( sal_uLong nNode, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev ); void FormatDoc(); void FormatFullDoc(); void FormatAndUpdate( TextView* pCurView = 0 ); - BOOL IsFormatting() const { return mbIsFormatting; } + sal_Bool IsFormatting() const { return mbIsFormatting; } void UpdateViews( TextView* pCurView = 0 ); - void SetUpdateMode( BOOL bUp, TextView* pCurView, BOOL bForceUpdate ); + void SetUpdateMode( sal_Bool bUp, TextView* pCurView, sal_Bool bForceUpdate ); void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); void UpdateSelections(); - BOOL IsFormatted() const { return mbFormatted; } + sal_Bool IsFormatted() const { return mbFormatted; } - USHORT GetCharPos( ULONG nPara, USHORT nLine, long nDocPosX, BOOL bSmart = FALSE ); - Rectangle GetEditCursor( const TextPaM& rPaM, BOOL bSpecial, BOOL bPreferPortionStart = FALSE ); - USHORT ImpFindIndex( ULONG nPortion, const Point& rPosInPara, BOOL bSmart ); - long ImpGetPortionXOffset( ULONG nPara, TextLine* pLine, USHORT nTextPortion ); - long ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL bPreferPortionStart = FALSE ); - long ImpGetOutputOffset( ULONG nPara, TextLine* pLine, USHORT nIndex, USHORT nIndex2 ); - BYTE ImpGetRightToLeft( ULONG nPara, USHORT nPos, USHORT* pStart = NULL, USHORT* pEnd = NULL ); - void ImpInitLayoutMode( OutputDevice* pOutDev, BOOL bDrawingR2LPortion = FALSE ); + sal_uInt16 GetCharPos( sal_uLong nPara, sal_uInt16 nLine, long nDocPosX, sal_Bool bSmart = sal_False ); + Rectangle GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal_Bool bPreferPortionStart = sal_False ); + sal_uInt16 ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, sal_Bool bSmart ); + long ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion ); + long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False ); + long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ); + sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL ); + void ImpInitLayoutMode( OutputDevice* pOutDev, sal_Bool bDrawingR2LPortion = sal_False ); TxtAlign ImpGetAlign() const; - ULONG CalcTextHeight(); - ULONG CalcParaHeight( ULONG nParagraph ) const; - ULONG CalcTextWidth( ULONG nPara ); - ULONG CalcTextWidth( ULONG nPara, USHORT nPortionStart, USHORT nPortionLen, const Font* pFont = 0 ); - Range GetInvalidYOffsets( ULONG nPortion ); + sal_uLong CalcTextHeight(); + sal_uLong CalcParaHeight( sal_uLong nParagraph ) const; + sal_uLong CalcTextWidth( sal_uLong nPara ); + sal_uLong CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nPortionLen, const Font* pFont = 0 ); + Range GetInvalidYOffsets( sal_uLong nPortion ); // Fuer Undo/Redo - void InsertContent( TextNode* pNode, ULONG nPara ); - TextPaM SplitContent( ULONG nNode, USHORT nSepPos ); - TextPaM ConnectContents( ULONG nLeftNode ); + void InsertContent( TextNode* pNode, sal_uLong nPara ); + TextPaM SplitContent( sal_uLong nNode, sal_uInt16 nSepPos ); + TextPaM ConnectContents( sal_uLong nLeftNode ); // Ans API uebergebene PaM's und Selektionen auf einen gueltigen Bereich einstellen void ValidateSelection( TextSelection& rSel ) const; @@ -235,80 +239,81 @@ public: String GetTextLines( LineEnd aSeparator = LINEEND_LF ) const; void ReplaceText(const TextSelection& rSel, const String& rText); - ULONG GetTextLen( LineEnd aSeparator = LINEEND_LF ) const; - ULONG GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const; + sal_uLong GetTextLen( LineEnd aSeparator = LINEEND_LF ) const; + sal_uLong GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const; void SetFont( const Font& rFont ); const Font& GetFont() const { return maFont; } - void SetDefTab( USHORT nDefTab ); - USHORT GetDefTab() const; + void SetDefTab( sal_uInt16 nDefTab ); + sal_uInt16 GetDefTab() const; - void SetLeftMargin( USHORT n ); - USHORT GetLeftMargin() const; + void SetLeftMargin( sal_uInt16 n ); + sal_uInt16 GetLeftMargin() const; - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const { return mbUpdate; } + void SetUpdateMode( sal_Bool bUpdate ); + sal_Bool GetUpdateMode() const { return mbUpdate; } - USHORT GetViewCount() const; - TextView* GetView( USHORT nView ) const; + sal_uInt16 GetViewCount() const; + TextView* GetView( sal_uInt16 nView ) const; void InsertView( TextView* pTextView ); void RemoveView( TextView* pTextView ); TextView* GetActiveView() const; void SetActiveView( TextView* pView ); - void SetMaxTextLen( ULONG nLen ); - ULONG GetMaxTextLen() const { return mnMaxTextLen; } + void SetMaxTextLen( sal_uLong nLen ); + sal_uLong GetMaxTextLen() const { return mnMaxTextLen; } - void SetMaxTextWidth( ULONG nWidth ); - ULONG GetMaxTextWidth() const { return mnMaxTextWidth; } + void SetMaxTextWidth( sal_uLong nWidth ); + sal_uLong GetMaxTextWidth() const { return mnMaxTextWidth; } - ULONG GetTextHeight() const; - ULONG CalcTextWidth(); - USHORT GetCharHeight() const { return mnCharHeight; } + sal_uLong GetTextHeight() const; + sal_uLong CalcTextWidth(); + sal_uInt16 GetCharHeight() const { return mnCharHeight; } - ULONG GetParagraphCount() const; - String GetText( ULONG nParagraph ) const; - USHORT GetTextLen( ULONG nParagraph ) const; - ULONG GetTextHeight( ULONG nParagraph ) const; + sal_uLong GetParagraphCount() const; + String GetText( sal_uLong nParagraph ) const; + sal_uInt16 GetTextLen( sal_uLong nParagraph ) const; + sal_uLong GetTextHeight( sal_uLong nParagraph ) const; - USHORT GetLineCount( ULONG nParagraph ) const; - USHORT GetLineLen( ULONG nParagraph, USHORT nLine ) const; + sal_uInt16 GetLineCount( sal_uLong nParagraph ) const; + sal_uInt16 GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const; - void SetRightToLeft( BOOL bR2L ); - BOOL IsRightToLeft() const { return mbRightToLeft; } + void SetRightToLeft( sal_Bool bR2L ); + sal_Bool IsRightToLeft() const { return mbRightToLeft; } - BOOL HasUndoManager() const { return mpUndoManager ? TRUE : FALSE; } - SfxUndoManager& GetUndoManager(); - void UndoActionStart( USHORT nId ); - void UndoActionEnd( USHORT nId ); - void InsertUndo( TextUndo* pUndo, BOOL bTryMerge = FALSE ); - BOOL IsInUndo() { return mbIsInUndo; } - void SetIsInUndo( BOOL bInUndo ) { mbIsInUndo = bInUndo; } + sal_Bool HasUndoManager() const { return mpUndoManager ? sal_True : sal_False; } + ::svl::IUndoManager& + GetUndoManager(); + void UndoActionStart( sal_uInt16 nId = 0 ); + void UndoActionEnd(); + void InsertUndo( TextUndo* pUndo, sal_Bool bTryMerge = sal_False ); + sal_Bool IsInUndo() { return mbIsInUndo; } + void SetIsInUndo( sal_Bool bInUndo ) { mbIsInUndo = bInUndo; } void ResetUndo(); - void EnableUndo( BOOL bEnable ); - BOOL IsUndoEnabled() { return mbUndoEnabled; } + void EnableUndo( sal_Bool bEnable ); + sal_Bool IsUndoEnabled() { return mbUndoEnabled; } - void SetModified( BOOL bModified ) { mbModified = bModified; } - BOOL IsModified() const { return mbModified; } + void SetModified( sal_Bool bModified ) { mbModified = bModified; } + sal_Bool IsModified() const { return mbModified; } - BOOL Read( SvStream& rInput, const TextSelection* pSel = NULL ); + sal_Bool Read( SvStream& rInput, const TextSelection* pSel = NULL ); - BOOL Write( SvStream& rOutput, const TextSelection* pSel = NULL, BOOL bHTML = FALSE ); + sal_Bool Write( SvStream& rOutput, const TextSelection* pSel = NULL, sal_Bool bHTML = sal_False ); - TextPaM GetPaM( const Point& rDocPos, BOOL bSmart = TRUE ); - Rectangle PaMtoEditCursor( const TextPaM& rPaM, BOOL bSpecial = FALSE ); + TextPaM GetPaM( const Point& rDocPos, sal_Bool bSmart = sal_True ); + Rectangle PaMtoEditCursor( const TextPaM& rPaM, sal_Bool bSpecial = sal_False ); String GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = 0 ); - BOOL HasAttrib( USHORT nWhich ) const; - const TextAttrib* FindAttrib( const TextPaM& rPaM, USHORT nWhich ) const; - const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, USHORT nWhich ) const; + sal_Bool HasAttrib( sal_uInt16 nWhich ) const; + const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; + const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; - void RemoveAttribs( ULONG nPara, USHORT nWhich, BOOL bIdleFormatAndUpdate ); - void RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib ); - void RemoveAttribs( ULONG nPara, BOOL bIdleFormatAndUpdate = TRUE ); - void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd, BOOL bIdleFormatAndUpdate = TRUE ); + void RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ); + void RemoveAttrib( sal_uLong nPara, const TextCharAttrib& rAttrib ); + void RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate = sal_True ); + void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate = sal_True ); TxtAlign GetTextAlign() const { return meAlign; } void SetTextAlign( TxtAlign eAlign ); @@ -319,9 +324,9 @@ public: ::com::sun::star::lang::Locale GetLocale(); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); - static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent ); - static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent ); - static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent ); + static sal_Bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); + static sal_Bool DoesKeyMoveCursor( const KeyEvent& rKeyEvent ); + static sal_Bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); }; #endif // _TEXTENG_HXX diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx index 8348c584ba58..de8da807a3dd 100644 --- a/svtools/inc/svtools/textview.hxx +++ b/svtools/inc/svtools/textview.hxx @@ -74,16 +74,16 @@ protected: void ShowSelection(); void HideSelection(); void ShowSelection( const TextSelection& rSel ); - void ImpShowHideSelection( BOOL bShow, const TextSelection* pRange = NULL ); + void ImpShowHideSelection( sal_Bool bShow, const TextSelection* pRange = NULL ); TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent ); - TextPaM ImpDelete( BYTE nMode, BYTE nDelMode ); - void ImpSetSelection( const TextSelection& rNewSel, BOOL bUI ); - BOOL IsInSelection( const TextPaM& rPaM ); + TextPaM ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ); + void ImpSetSelection( const TextSelection& rNewSel, sal_Bool bUI ); + sal_Bool IsInSelection( const TextPaM& rPaM ); void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); - void ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev ); - void ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bEndKey ); + void ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ); + void ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_Bool bEndKey ); void ImpHighlight( const TextSelection& rSel ); void ImpSetSelection( const TextSelection& rSelection ); Point ImpGetOutputStartPos( const Point& rStartDocPos ) const; @@ -92,7 +92,7 @@ protected: void ImpShowDDCursor(); bool ImplTruncateNewText( rtl::OUString& rNewText ) const; - BOOL ImplCheckTextLen( const String& rNewText ); + sal_Bool ImplCheckTextLen( const String& rNewText ); VirtualDevice* GetVirtualDevice(); @@ -118,27 +118,27 @@ public: void Invalidate(); void Scroll( long nHorzScroll, long nVertScroll ); - void ShowCursor( BOOL bGotoCursor = TRUE, BOOL bForceVisCursor = TRUE ); + void ShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool bForceVisCursor = sal_True ); void HideCursor(); - void EnableCursor( BOOL bEnable ); - BOOL IsCursorEnabled() const; + void EnableCursor( sal_Bool bEnable ); + sal_Bool IsCursorEnabled() const; const TextSelection& GetSelection() const; TextSelection& GetSelection(); void SetSelection( const TextSelection& rNewSel ); - void SetSelection( const TextSelection& rNewSel, BOOL bGotoCursor ); - BOOL HasSelection() const; + void SetSelection( const TextSelection& rNewSel, sal_Bool bGotoCursor ); + sal_Bool HasSelection() const; String GetSelected(); String GetSelected( LineEnd aSeparator ); void DeleteSelected(); - void InsertNewText( const rtl::OUString& rNew, BOOL bSelect = FALSE ); + void InsertNewText( const rtl::OUString& rNew, sal_Bool bSelect = sal_False ); // deprecated: use InsertNewText instead - void InsertText( const String& rNew, BOOL bSelect = FALSE ); + void InsertText( const String& rNew, sal_Bool bSelect = sal_False ); - BOOL KeyInput( const KeyEvent& rKeyEvent ); + sal_Bool KeyInput( const KeyEvent& rKeyEvent ); void Paint( const Rectangle& rRect ); void MouseButtonUp( const MouseEvent& rMouseEvent ); void MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -155,8 +155,8 @@ public: void Undo(); void Redo(); - BOOL Read( SvStream& rInput ); - BOOL Write( SvStream& rOutput ); + sal_Bool Read( SvStream& rInput ); + sal_Bool Write( SvStream& rOutput ); void SetStartDocPos( const Point& rPos ); const Point& GetStartDocPos() const; @@ -164,26 +164,26 @@ public: Point GetDocPos( const Point& rWindowPos ) const; Point GetWindowPos( const Point& rDocPos ) const; - void SetInsertMode( BOOL bInsert ); - BOOL IsInsertMode() const; + void SetInsertMode( sal_Bool bInsert ); + sal_Bool IsInsertMode() const; - void SetAutoIndentMode( BOOL bAutoIndent ); - BOOL IsAutoIndentMode() const; + void SetAutoIndentMode( sal_Bool bAutoIndent ); + sal_Bool IsAutoIndentMode() const; - void SetReadOnly( BOOL bReadOnly ); - BOOL IsReadOnly() const; + void SetReadOnly( sal_Bool bReadOnly ); + sal_Bool IsReadOnly() const; - void SetAutoScroll( BOOL bAutoScroll ); - BOOL IsAutoScroll() const; + void SetAutoScroll( sal_Bool bAutoScroll ); + sal_Bool IsAutoScroll() const; - BOOL SetCursorAtPoint( const Point& rPointPixel ); - BOOL IsSelectionAtPoint( const Point& rPointPixel ); + sal_Bool SetCursorAtPoint( const Point& rPointPixel ); + sal_Bool IsSelectionAtPoint( const Point& rPointPixel ); - void SetPaintSelection( BOOL bPaint); - BOOL IsPaintSelection() const; + void SetPaintSelection( sal_Bool bPaint); + sal_Bool IsPaintSelection() const; - void SetHighlightSelection( BOOL bSelectByHighlight ); - BOOL IsHighlightSelection() const; + void SetHighlightSelection( sal_Bool bSelectByHighlight ); + sal_Bool IsHighlightSelection() const; void EraseVirtualDevice(); @@ -193,8 +193,8 @@ public: TextPaM PageDown( const TextPaM& rPaM ); TextPaM CursorUp( const TextPaM& rPaM ); TextPaM CursorDown( const TextPaM& rPaM ); - TextPaM CursorLeft( const TextPaM& rPaM, USHORT nCharacterIteratorMode ); - TextPaM CursorRight( const TextPaM& rPaM, USHORT nCharacterIteratorMode ); + TextPaM CursorLeft( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); + TextPaM CursorRight( const TextPaM& rPaM, sal_uInt16 nCharacterIteratorMode ); TextPaM CursorWordLeft( const TextPaM& rPaM ); TextPaM CursorWordRight( const TextPaM& rPaM ); TextPaM CursorStartOfLine( const TextPaM& rPaM ); @@ -205,8 +205,8 @@ public: TextPaM CursorEndOfDoc(); // Old, remove! - TextPaM CursorLeft( const TextPaM& rPaM, BOOL bWordMode = FALSE ); - TextPaM CursorRight( const TextPaM& rPaM, BOOL bWordMode = FALSE ); + TextPaM CursorLeft( const TextPaM& rPaM, sal_Bool bWordMode = sal_False ); + TextPaM CursorRight( const TextPaM& rPaM, sal_Bool bWordMode = sal_False ); /** Drag and Drop, deleting and selection regards all text that has an attribute diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx index 555ecb45ed8f..80e1a7e82d36 100644 --- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx +++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx @@ -89,7 +89,7 @@ namespace svt virtual void DataChanged( const DataChangedEvent& i_rDataChanedEvent ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( BOOL i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ); private: ::std::auto_ptr< PanelTabBar_Impl > m_pImpl; diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx index 6d1b6d2fed46..9a6f29784040 100644 --- a/svtools/inc/svtools/toolpanel/toolpanel.hxx +++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx @@ -33,7 +33,6 @@ #include <rtl/ustring.hxx> #include <vcl/image.hxx> -#include <vcl/smartid.hxx> #include <boost/noncopyable.hpp> @@ -63,7 +62,7 @@ namespace svt virtual Image GetImage() const = 0; /// retrieves the help ID associated with the panel, if any. - virtual SmartId GetHelpID() const = 0; + virtual rtl::OString GetHelpID() const = 0; /** activates the panel diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx index 9be60324b5b8..8c277c80c9df 100644 --- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx +++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx @@ -178,7 +178,7 @@ namespace svt virtual void GetFocus(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( BOOL i_bCreate ); + GetComponentInterface( sal_Bool i_bCreate ); private: ::std::auto_ptr< ToolPanelDeck_Impl > m_pImpl; diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx index af01de65c316..af01de65c316 100644 --- a/svtools/inc/tooltiplbox.hxx +++ b/svtools/inc/svtools/tooltiplbox.hxx diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 262b9a12a2f5..397dccfc0fe6 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -572,11 +572,11 @@ public: void CopyImageMap( const ImageMap& rImgMap ); void CopyGraphic( const Graphic& rGrf ); void CopyString( const String& rStr ); - void CopyString( USHORT nFmt, const String& rStr ); - void CopyAny( USHORT nFmt, const ::com::sun::star::uno::Any& rAny ); + void CopyString( sal_uInt16 nFmt, const String& rStr ); + void CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny ); - void CopyByteString( ULONG nFormatId, const ByteString& rStr ); - void CopyAnyData( ULONG nFormatId, const sal_Char* pData, ULONG nLen ); + void CopyByteString( sal_uLong nFormatId, const ByteString& rStr ); + void CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ); sal_Bool HasAnyData() const; diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index e8c0c075121b..6d9ca1bb379d 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -65,10 +65,10 @@ class SvListEntry; class SvTreeEntryList : public List // SvEntryListStd { public: - SvTreeEntryList(USHORT nInitPos=16, USHORT nResize=16 ) + SvTreeEntryList(sal_uInt16 nInitPos=16, sal_uInt16 nResize=16 ) : List( nInitPos, nResize ) {} - SvTreeEntryList(USHORT BlockSize, USHORT InitSize, USHORT Resize ) + SvTreeEntryList(sal_uInt16 BlockSize, sal_uInt16 InitSize, sal_uInt16 Resize ) : List(BlockSize, InitSize, Resize ) {} @@ -83,8 +83,8 @@ friend class SvListView; private: SvListEntry* pParent; SvTreeEntryList* pChilds; - ULONG nAbsPos; - ULONG nListPos; + sal_uLong nAbsPos; + sal_uLong nListPos; void SetListPositions(); void InvalidateChildrensListPositions() @@ -95,14 +95,14 @@ public: SvListEntry(); SvListEntry( const SvListEntry& ); virtual ~SvListEntry(); - BOOL HasChilds() { return (BOOL)(pChilds!=0); } - BOOL HasChildListPos() const + sal_Bool HasChilds() { return (sal_Bool)(pChilds!=0); } + sal_Bool HasChildListPos() const { if( pParent && !(pParent->nListPos & 0x80000000) ) - return TRUE; - else return FALSE; + return sal_True; + else return sal_False; } - ULONG GetChildListPos() const + sal_uLong GetChildListPos() const { if( pParent && (pParent->nListPos & 0x80000000) ) pParent->SetListPositions(); @@ -118,26 +118,26 @@ class SvViewData friend class SvTreeList; friend class SvListView; - ULONG nVisPos; + sal_uLong nVisPos; protected: - USHORT nFlags; + sal_uInt16 nFlags; public: SvViewData(); SvViewData( const SvViewData& ); virtual ~SvViewData(); - BOOL IsSelected() const { return (BOOL)(nFlags&SVLISTENTRYFLAG_SELECTED)!=0; } - BOOL IsExpanded() const { return (BOOL)(nFlags&SVLISTENTRYFLAG_EXPANDED)!=0; } - BOOL HasFocus() const { return (BOOL)(nFlags&SVLISTENTRYFLAG_FOCUSED)!=0; } - void SetFocus( BOOL bFocus) + sal_Bool IsSelected() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_SELECTED)!=0; } + sal_Bool IsExpanded() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_EXPANDED)!=0; } + sal_Bool HasFocus() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_FOCUSED)!=0; } + void SetFocus( sal_Bool bFocus) { if ( !bFocus ) nFlags &= (~SVLISTENTRYFLAG_FOCUSED); else nFlags |= SVLISTENTRYFLAG_FOCUSED; } - BOOL IsCursored() const { return (BOOL)(nFlags&SVLISTENTRYFLAG_CURSORED)!=0; } - void SetCursored( BOOL bCursored ) + sal_Bool IsCursored() const { return (sal_Bool)(nFlags&SVLISTENTRYFLAG_CURSORED)!=0; } + void SetCursored( sal_Bool bCursored ) { if ( !bCursored ) nFlags &= (~SVLISTENTRYFLAG_CURSORED); @@ -145,7 +145,7 @@ public: nFlags |= SVLISTENTRYFLAG_CURSORED; } - USHORT GetFlags() const { return nFlags; } + sal_uInt16 GetFlags() const { return nFlags; } void SetSelectable( bool bSelectable ) { @@ -173,38 +173,38 @@ class SVT_DLLPUBLIC SvTreeList friend class SvListView; List aViewList; - ULONG nEntryCount; + sal_uLong nEntryCount; Link aCloneLink; Link aCompareLink; SvSortMode eSortMode; - USHORT nRefCount; + sal_uInt16 nRefCount; - BOOL bAbsPositionsValid; + sal_Bool bAbsPositionsValid; SvListEntry* FirstVisible() const { return First(); } - SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, USHORT* pDepth=0 ) const; - SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT* pDepth=0 ) const; - SvListEntry* LastVisible( const SvListView*,USHORT* pDepth=0 ) const; - SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const; - SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, USHORT& rDelta ) const; - - BOOL IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const; - SvListEntry* GetEntryAtVisPos( const SvListView*,ULONG nVisPos ) const; - ULONG GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const; - ULONG GetVisibleCount( const SvListView* ) const; - ULONG GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const; + SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const; + SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const; + SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const; + + sal_Bool IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const; + SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; + sal_uLong GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const; + sal_uLong GetVisibleCount( const SvListView* ) const; + sal_uLong GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const; SvListEntry* FirstSelected( const SvListView*) const; SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const; SvListEntry* PrevSelected( const SvListView*,SvListEntry* pEntry ) const; SvListEntry* LastSelected( const SvListView*) const; - BOOL Select( SvListView*,SvListEntry* pEntry, BOOL bSelect=TRUE ); - ULONG SelectChilds( SvListView*,SvListEntry* pParent, BOOL bSelect ); - void SelectAll( SvListView*,BOOL bSelect ); // ruft nicht Select-Hdl - ULONG GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const; + sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True ); + sal_uLong SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect ); + void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl + sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const; void Expand( SvListView*,SvListEntry* pParent ); void Collapse( SvListView*,SvListEntry* pParent ); @@ -212,12 +212,12 @@ class SVT_DLLPUBLIC SvTreeList SVT_DLLPRIVATE void SetAbsolutePositions(); SVT_DLLPRIVATE SvTreeEntryList*CloneChilds( SvTreeEntryList* pChilds, SvListEntry* pNewParent, - ULONG& nCloneCount ) const; + sal_uLong& nCloneCount ) const; SVT_DLLPRIVATE void SetListPositions( SvTreeEntryList* ); // rPos wird bei SortModeNone nicht geaendert SVT_DLLPRIVATE void GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, - ULONG& rPos ); + sal_uLong& rPos ); SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent ); protected: @@ -231,57 +231,57 @@ public: void InsertView( SvListView* ); void RemoveView( SvListView* ); - ULONG GetViewCount() const { return aViewList.Count(); } - SvListView* GetView(ULONG nPos) const {return (SvListView*)aViewList.GetObject(nPos);} - void Broadcast( USHORT nActionId, SvListEntry* pEntry1=0, - SvListEntry* pEntry2=0, ULONG nPos=0 ); + sal_uLong GetViewCount() const { return aViewList.Count(); } + SvListView* GetView(sal_uLong nPos) const {return (SvListView*)aViewList.GetObject(nPos);} + void Broadcast( sal_uInt16 nActionId, SvListEntry* pEntry1=0, + SvListEntry* pEntry2=0, sal_uLong nPos=0 ); // informiert alle Listener void InvalidateEntry( SvListEntry* ); - ULONG GetEntryCount() const { return nEntryCount; } + sal_uLong GetEntryCount() const { return nEntryCount; } SvListEntry* First() const; - SvListEntry* Next( SvListEntry* pEntry, USHORT* pDepth=0 ) const; - SvListEntry* Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const; - SvListEntry* Last( USHORT* pDepth=0 ) const; + SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvListEntry* Last( sal_uInt16* pDepth=0 ) const; SvListEntry* FirstChild( SvListEntry* pParent ) const; SvListEntry* NextSibling( SvListEntry* pEntry ) const; SvListEntry* PrevSibling( SvListEntry* pEntry ) const; SvListEntry* LastSibling( SvListEntry* pEntry ) const; - ULONG Insert( SvListEntry* pEntry,SvListEntry* pPar,ULONG nPos=LIST_APPEND); - ULONG Insert( SvListEntry* pEntry,ULONG nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); } + sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=LIST_APPEND); + sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); } void InsertTree( SvListEntry* pTree, SvListEntry* pTarget ); void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, - ULONG nListPos ); + sal_uLong nListPos ); // Entries muessen im gleichen Model stehen! void Move( SvListEntry* pSource, SvListEntry* pTarget ); // erzeugt ggf. Child-List - ULONG Move( SvListEntry* pSource, SvListEntry* pTargetParent, - ULONG nListPos); + sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, + sal_uLong nListPos); void Copy( SvListEntry* pSource, SvListEntry* pTarget ); - ULONG Copy( SvListEntry* pSource, SvListEntry* pTargetParent, - ULONG nListPos); + sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, + sal_uLong nListPos); - BOOL Remove( SvListEntry* pEntry ); + sal_Bool Remove( SvListEntry* pEntry ); void Clear(); - BOOL HasChilds( SvListEntry* pEntry ) const; - BOOL HasParent( SvListEntry* pEntry ) const { return (BOOL)(pEntry->pParent!=pRootItem); } - BOOL IsChild( SvListEntry* pParent, SvListEntry* pChild ) const; - BOOL IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; - SvListEntry* GetEntry( SvListEntry* pParent, ULONG nPos ) const; - SvListEntry* GetEntry( ULONG nRootPos ) const; - SvListEntry* GetEntryAtAbsPos( ULONG nAbsPos ) const; + sal_Bool HasChilds( SvListEntry* pEntry ) const; + sal_Bool HasParent( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent!=pRootItem); } + sal_Bool IsChild( SvListEntry* pParent, SvListEntry* pChild ) const; + sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; + SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const; + SvListEntry* GetEntry( sal_uLong nRootPos ) const; + SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; SvListEntry* GetParent( SvListEntry* pEntry ) const; SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const; SvTreeEntryList* GetChildList( SvListEntry* pParent ) const; - ULONG GetAbsPos( SvListEntry* pEntry ) const; - ULONG GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); } - ULONG GetChildCount( SvListEntry* pParent ) const; - USHORT GetDepth( SvListEntry* pEntry ) const; - BOOL IsAtRootDepth( SvListEntry* pEntry ) const { return (BOOL)(pEntry->pParent==pRootItem); } + sal_uLong GetAbsPos( SvListEntry* pEntry ) const; + sal_uLong GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); } + sal_uLong GetChildCount( SvListEntry* pParent ) const; + sal_uInt16 GetDepth( SvListEntry* pEntry ) const; + sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent==pRootItem); } // das Model ruft zum Clonen von Entries den Clone-Link auf, // damit man sich nicht vom Model ableiten muss, wenn man @@ -289,14 +289,14 @@ public: // Deklaration des Clone-Handlers: // DECL_LINK(CloneHdl,SvListEntry*); // der Handler muss einen SvListEntry* zurueckgeben - SvListEntry* Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const; + SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const; void SetCloneLink( const Link& rLink ) { aCloneLink=rLink; } const Link& GetCloneLink() const { return aCloneLink; } virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries - USHORT GetRefCount() const { return nRefCount; } - void SetRefCount( USHORT nRef ) { nRefCount = nRef; } + sal_uInt16 GetRefCount() const { return nRefCount; } + void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; } void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; } SvSortMode GetSortMode() const { return eSortMode; } @@ -312,9 +312,9 @@ class SVT_DLLPUBLIC SvListView { friend class SvTreeList; - ULONG nVisibleCount; - ULONG nSelectionCount; - BOOL bVisPositionsValid; + sal_uLong nVisibleCount; + sal_uLong nSelectionCount; + sal_Bool bVisPositionsValid; SVT_DLLPRIVATE void InitTable(); SVT_DLLPRIVATE void ClearTable(); @@ -324,8 +324,8 @@ protected: Table aDataTable; // Mapping SvListEntry -> ViewData SvTreeList* pModel; - void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,ULONG nChildPos); - void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,ULONG nChildPos); + void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); + void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); void ActionInserted( SvListEntry* pEntry ); void ActionInsertedTree( SvListEntry* pEntry ); void ActionRemoving( SvListEntry* pEntry ); @@ -340,40 +340,40 @@ public: void Clear(); SvTreeList* GetModel() const { return pModel; } virtual void SetModel( SvTreeList* ); - virtual void ModelNotification( USHORT nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, ULONG nPos ); + virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, + SvListEntry* pEntry2, sal_uLong nPos ); - ULONG GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );} + sal_uLong GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );} SvListEntry* FirstVisible() const { return pModel->FirstVisible(); } - SvListEntry* NextVisible( SvListEntry* pEntry, USHORT* pDepth=0 ) const {return pModel->NextVisible(this,pEntry,pDepth); } - SvListEntry* PrevVisible( SvListEntry* pEntry, USHORT* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); } - SvListEntry* LastVisible( USHORT* pDepth=0 ) const { return pModel->LastVisible(this,pDepth);} - SvListEntry* NextVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); } - SvListEntry* PrevVisible( SvListEntry* pEntry, USHORT& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); } + SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->NextVisible(this,pEntry,pDepth); } + SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); } + SvListEntry* LastVisible( sal_uInt16* pDepth=0 ) const { return pModel->LastVisible(this,pDepth);} + SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); } + SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); } - ULONG GetSelectionCount() const { return nSelectionCount; } + sal_uLong GetSelectionCount() const { return nSelectionCount; } SvListEntry* FirstSelected() const { return pModel->FirstSelected(this);} SvListEntry* NextSelected( SvListEntry* pEntry ) const { return pModel->NextSelected(this,pEntry); } SvListEntry* PrevSelected( SvListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); } SvListEntry* LastSelected() const { return pModel->LastSelected(this); } - SvListEntry* GetEntryAtVisPos( ULONG nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); } - ULONG GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); } + SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); } + sal_uLong GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); } - ULONG GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); } - ULONG GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } + sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); } + sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } void Expand( SvListEntry* pParent ) { pModel->Expand((SvListView*)this,pParent); } void Collapse( SvListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); } - BOOL Select( SvListEntry* pEntry, BOOL bSelect=TRUE ) { return pModel->Select((SvListView*)this,pEntry,bSelect); } - ULONG SelectChilds( SvListEntry* pParent, BOOL bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); } + sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True ) { return pModel->Select((SvListView*)this,pEntry,bSelect); } + sal_uLong SelectChilds( SvListEntry* pParent, sal_Bool bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); } // ruft nicht Select-Hdl - virtual void SelectAll( BOOL bSelect, BOOL ) { pModel->SelectAll((SvListView*)this, bSelect); } - BOOL IsEntryVisible( SvListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); } - BOOL IsExpanded( SvListEntry* pEntry ) const; - BOOL IsSelected( SvListEntry* pEntry ) const; - BOOL HasEntryFocus( SvListEntry* pEntry ) const; - void SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const; + virtual void SelectAll( sal_Bool bSelect, sal_Bool ) { pModel->SelectAll((SvListView*)this, bSelect); } + sal_Bool IsEntryVisible( SvListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); } + sal_Bool IsExpanded( SvListEntry* pEntry ) const; + sal_Bool IsSelected( SvListEntry* pEntry ) const; + sal_Bool HasEntryFocus( SvListEntry* pEntry ) const; + void SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const; SvViewData* GetViewData( SvListEntry* pEntry ) const; - BOOL HasViewData() const { return aDataTable.Count() > 1;} // eine ROOT gibts immer + sal_Bool HasViewData() const { return aDataTable.Count() > 1;} // eine ROOT gibts immer virtual SvViewData* CreateViewData( SvListEntry* pEntry ); virtual void InitViewData( SvViewData*, SvListEntry* pEntry ); @@ -381,38 +381,38 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving( SvListEntry* pSource, SvListEntry* pTargetParent, - ULONG nPos ); + sal_uLong nPos ); virtual void ModelHasMoved( SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); virtual void ModelHasEntryInvalidated( SvListEntry* pEntry ); }; -inline BOOL SvListView::IsExpanded( SvListEntry* pEntry ) const +inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->IsExpanded(); } -inline BOOL SvListView::IsSelected( SvListEntry* pEntry ) const +inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->IsSelected(); } -inline BOOL SvListView::HasEntryFocus( SvListEntry* pEntry ) const +inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->HasFocus(); } -inline void SvListView::SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const +inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const { DBG_ASSERT(pEntry,"SetEntryFocus:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); pData->SetFocus(bFocus); } @@ -420,22 +420,22 @@ inline void SvListView::SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const { #ifndef DBG_UTIL - return (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + return (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); #else - SvViewData* pResult = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); + SvViewData* pResult = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pResult,"Entry not in model or wrong view"); return pResult; #endif } -inline BOOL SvTreeList::HasChilds( SvListEntry* pEntry ) const +inline sal_Bool SvTreeList::HasChilds( SvListEntry* pEntry ) const { if ( !pEntry ) pEntry = pRootItem; - return (BOOL)(pEntry->pChilds != 0); + return (sal_Bool)(pEntry->pChilds != 0); } -inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, ULONG nPos ) const +inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const { if ( !pParent ) pParent = pRootItem; SvListEntry* pRet = 0; @@ -444,7 +444,7 @@ inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, ULONG nPos ) con return pRet; } -inline SvListEntry* SvTreeList::GetEntry( ULONG nRootPos ) const +inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const { SvListEntry* pRet; if ( nEntryCount ) @@ -475,18 +475,18 @@ class ClassName : public SvTreeList \ public: \ Type First() const \ { return (Type)SvTreeList::First(); } \ - Type Next( SvListEntry* pEntry, USHORT* pDepth=0 ) const \ + Type Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \ { return (Type)SvTreeList::Next(pEntry,pDepth); } \ - Type Prev( SvListEntry* pEntry, USHORT* pDepth=0 ) const \ + Type Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const \ { return (Type)SvTreeList::Prev(pEntry,pDepth); } \ - Type Last( USHORT* pDepth=0 ) const \ + Type Last( sal_uInt16* pDepth=0 ) const \ { return (Type)SvTreeList::Last(pDepth); } \ \ - Type Clone( SvListEntry* pEntry, ULONG& nCloneCount ) const \ + Type Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const \ { return (Type)SvTreeList::Clone(pEntry,nCloneCount); } \ - Type GetEntry( SvListEntry* pParent, ULONG nPos ) const \ + Type GetEntry( SvListEntry* pParent, sal_uLong nPos ) const \ { return (Type)SvTreeList::GetEntry(pParent,nPos); } \ - Type GetEntry( ULONG nRootPos ) const \ + Type GetEntry( sal_uLong nRootPos ) const \ { return (Type)SvTreeList::GetEntry(nRootPos); } \ Type GetParent( SvListEntry* pEntry ) const \ { return (Type)SvTreeList::GetParent(pEntry); } \ @@ -502,7 +502,7 @@ public: \ using SvTreeList::LastSibling; \ Type LastSibling( Type pEntry ) const \ { return (Type)SvTreeList::LastSibling(pEntry); } \ - Type GetEntryAtAbsPos( ULONG nAbsPos ) const \ + Type GetEntryAtAbsPos( sal_uLong nAbsPos ) const \ { return (Type)SvTreeList::GetEntryAtAbsPos( nAbsPos); } \ }; diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx index 5c417e887aee..561fd8eae086 100644 --- a/svtools/inc/svtools/ttprops.hxx +++ b/svtools/inc/svtools/ttprops.hxx @@ -37,7 +37,7 @@ class SfxPoolItem; class Bitmap; -// Defines zur Steuerung der Ausführung von Slots +// Defines zur Steuerung der Ausf�hrung von Slots #define EXECUTE_NO 0 #define EXECUTE_POSSIBLE 1 #define EXECUTE_YES 2 @@ -61,10 +61,10 @@ class Bitmap; class SVT_DLLPUBLIC TTProperties : public ApplicationProperty { - USHORT nDonePRs; // Verwaltung für die Properties, die nur einmal gerufen werden mussen. - SVT_DLLPRIVATE BOOL RequestProperty( USHORT nRequest ); + sal_uInt16 nDonePRs; // Verwaltung f�r die Properties, die nur einmal gerufen werden mussen. + SVT_DLLPRIVATE sal_Bool RequestProperty( sal_uInt16 nRequest ); - BOOL HasSlots(){ return nPropertyVersion == TT_PROPERTIES_VERSION; } + sal_Bool HasSlots(){ return nPropertyVersion == TT_PROPERTIES_VERSION; } public: TYPEINFO(); @@ -76,31 +76,31 @@ public: , nPropertyVersion( 0 ) {} - BOOL GetSlots(); + sal_Bool GetSlots(); /// ExecuteFunction - USHORT mnSID; + sal_uInt16 mnSID; SfxPoolItem** mppArgs; - USHORT mnMode; - USHORT ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs = NULL, USHORT nMode = 0 ); + sal_uInt16 mnMode; + sal_uInt16 ExecuteFunction( sal_uInt16 nSID, SfxPoolItem** ppArgs = NULL, sal_uInt16 nMode = 0 ); /// Img Bitmap *mpBmp; - BOOL Img( Bitmap *pBmp ); + sal_Bool Img( Bitmap *pBmp ); - static SvtResId GetSvtResId( USHORT nId ); + static SvtResId GetSvtResId( sal_uInt16 nId ); - ULONG nSidOpenUrl; - ULONG nSidFileName; - ULONG nSidNewDocDirect; - ULONG nSidCopy; - ULONG nSidPaste; - ULONG nSidSourceView; - ULONG nSidSelectAll; - ULONG nSidReferer; + sal_uLong nSidOpenUrl; + sal_uLong nSidFileName; + sal_uLong nSidNewDocDirect; + sal_uLong nSidCopy; + sal_uLong nSidPaste; + sal_uLong nSidSourceView; + sal_uLong nSidSelectAll; + sal_uLong nSidReferer; - USHORT nActualPR; - USHORT nPropertyVersion; // Wird bei jedem call gesetzt. + sal_uInt16 nActualPR; + sal_uInt16 nPropertyVersion; // Wird bei jedem call gesetzt. }; #endif // _SVTOOLS_TTPROPS_HXX diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx index 4a1d4ea3f42e..982e9c20be5a 100644 --- a/svtools/inc/txtattr.hxx +++ b/svtools/inc/svtools/txtattr.hxx @@ -49,17 +49,17 @@ class Font; class SVT_DLLPUBLIC TextAttrib { private: - USHORT mnWhich; + sal_uInt16 mnWhich; protected: - TextAttrib( USHORT nWhich ) { mnWhich = nWhich; } + TextAttrib( sal_uInt16 nWhich ) { mnWhich = nWhich; } TextAttrib( const TextAttrib& rAttr ) { mnWhich = rAttr.mnWhich; } public: virtual ~TextAttrib(); - USHORT Which() const { return mnWhich; } + sal_uInt16 Which() const { return mnWhich; } virtual void SetFont( Font& rFont ) const = 0; virtual TextAttrib* Clone() const = 0; @@ -151,84 +151,84 @@ class TextCharAttrib { private: TextAttrib* mpAttr; - USHORT mnStart; - USHORT mnEnd; + sal_uInt16 mnStart; + sal_uInt16 mnEnd; protected: public: - TextCharAttrib( const TextAttrib& rAttr, USHORT nStart, USHORT nEnd ); + TextCharAttrib( const TextAttrib& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd ); TextCharAttrib( const TextCharAttrib& rTextCharAttrib ); ~TextCharAttrib(); const TextAttrib& GetAttr() const { return *mpAttr; } - USHORT Which() const { return mpAttr->Which(); } + sal_uInt16 Which() const { return mpAttr->Which(); } - USHORT GetStart() const { return mnStart; } - USHORT& GetStart() { return mnStart; } + sal_uInt16 GetStart() const { return mnStart; } + sal_uInt16& GetStart() { return mnStart; } - USHORT GetEnd() const { return mnEnd; } - USHORT& GetEnd() { return mnEnd; } + sal_uInt16 GetEnd() const { return mnEnd; } + sal_uInt16& GetEnd() { return mnEnd; } - inline USHORT GetLen() const; + inline sal_uInt16 GetLen() const; - inline void MoveForward( USHORT nDiff ); - inline void MoveBackward( USHORT nDiff ); + inline void MoveForward( sal_uInt16 nDiff ); + inline void MoveBackward( sal_uInt16 nDiff ); - inline void Expand( USHORT nDiff ); - inline void Collaps( USHORT nDiff ); + inline void Expand( sal_uInt16 nDiff ); + inline void Collaps( sal_uInt16 nDiff ); - inline BOOL IsIn( USHORT nIndex ); - inline BOOL IsInside( USHORT nIndex ); - inline BOOL IsEmpty(); + inline sal_Bool IsIn( sal_uInt16 nIndex ); + inline sal_Bool IsInside( sal_uInt16 nIndex ); + inline sal_Bool IsEmpty(); }; -inline USHORT TextCharAttrib::GetLen() const +inline sal_uInt16 TextCharAttrib::GetLen() const { DBG_ASSERT( mnEnd >= mnStart, "TextCharAttrib: nEnd < nStart!" ); return mnEnd-mnStart; } -inline void TextCharAttrib::MoveForward( USHORT nDiff ) +inline void TextCharAttrib::MoveForward( sal_uInt16 nDiff ) { DBG_ASSERT( ((long)mnEnd + nDiff) <= 0xFFFF, "TextCharAttrib: MoveForward?!" ); mnStart = mnStart + nDiff; mnEnd = mnEnd + nDiff; } -inline void TextCharAttrib::MoveBackward( USHORT nDiff ) +inline void TextCharAttrib::MoveBackward( sal_uInt16 nDiff ) { DBG_ASSERT( ((long)mnStart - nDiff) >= 0, "TextCharAttrib: MoveBackward?!" ); mnStart = mnStart - nDiff; mnEnd = mnEnd - nDiff; } -inline void TextCharAttrib::Expand( USHORT nDiff ) +inline void TextCharAttrib::Expand( sal_uInt16 nDiff ) { DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" ); mnEnd = mnEnd + nDiff; } -inline void TextCharAttrib::Collaps( USHORT nDiff ) +inline void TextCharAttrib::Collaps( sal_uInt16 nDiff ) { DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" ); mnEnd = mnEnd - nDiff; } -inline BOOL TextCharAttrib::IsIn( USHORT nIndex ) +inline sal_Bool TextCharAttrib::IsIn( sal_uInt16 nIndex ) { return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); } -inline BOOL TextCharAttrib::IsInside( USHORT nIndex ) +inline sal_Bool TextCharAttrib::IsInside( sal_uInt16 nIndex ) { return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); } -inline BOOL TextCharAttrib::IsEmpty() +inline sal_Bool TextCharAttrib::IsEmpty() { return mnStart == mnEnd; } diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx index e53a40dca7e7..e53a40dca7e7 100644 --- a/svtools/inc/txtcmp.hxx +++ b/svtools/inc/svtools/txtcmp.hxx diff --git a/svtools/inc/svtools/unitconv.hxx b/svtools/inc/svtools/unitconv.hxx index a75e89e5d02a..51aa3aa61f30 100644 --- a/svtools/inc/svtools/unitconv.hxx +++ b/svtools/inc/svtools/unitconv.hxx @@ -41,11 +41,11 @@ typedef long (*FUNC_CONVERT)(long); // Functions ------------------------------------------------------------- -SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE ); -SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE ); +SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, sal_Bool bAll = sal_False ); +SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, sal_Bool bAll = sal_False ); SVT_DLLPUBLIC long CalcToUnit( float nIn, SfxMapUnit eUnit ); -SVT_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ); +SVT_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor ); SVT_DLLPUBLIC long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ); SVT_DLLPUBLIC long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem ); diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx index 8bf8898d6b2a..8bf8898d6b2a 100644 --- a/svtools/inc/unoevent.hxx +++ b/svtools/inc/svtools/unoevent.hxx diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx index adf8b7d0c9b9..adf8b7d0c9b9 100644 --- a/svtools/inc/unoimap.hxx +++ b/svtools/inc/svtools/unoimap.hxx diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index a13563843906..8c61d8517210 100644 --- a/svtools/inc/svtools/valueset.hxx +++ b/svtools/inc/svtools/valueset.hxx @@ -149,7 +149,7 @@ Mit CalcWindowSizePixel() kann die genaue Fenstergroesse fuer eine bestimmte Itemgroesse berechnet werden. Dazu muessen vorher aber alle relevanten Daten (Spaltenanzahl/...) gesetzt werden und falls keine Zeilenanzahl eingestellt wird, muessen auch alle Items eingefuegt werden. Falls das -Window mit WB_BORDER/Border=TRUE erzeugt wurde, muss die Groesse mit +Window mit WB_BORDER/Border=sal_True erzeugt wurde, muss die Groesse mit SetOutputSizePixel() gesetzt werden, im anderen Fall koennen auch die anderen Groessen-Methoden benutzt werden. Mit CalcItemSize() laesst sich die innere und aeussere Groesse eines Items berechnen (dabei wird der @@ -169,7 +169,7 @@ Da die Ausgabeflaeche vorberechnet wird, sollten erst alle Items eingefuegt werden und dann erst Show() aufgerufen werden. Wenn dies nicht gemacht wird, erscheint das erste Paint etwas langsamer. Deshalb sollte, wenn dieses Control aus der Resource geladen wird und das Control erst im Programm -mit Items versorgt wird, mit Hide = TRUE geladen werden und im Programm +mit Items versorgt wird, mit Hide = sal_True geladen werden und im Programm dann mit Show() angezeigt werden. Bei einem sichbaren Control kann die Erzeugung der neuen Ausgabeflaeche @@ -179,7 +179,7 @@ vor dem Paint aktiviert werden, indem Format() aufgerufen wird. Wenn man ein Drag and Drop aus dem ValueSet heraus starten will, muss der Command-Handler ueberlagert werden. Aus diesem muss dann StartDrag -aufgerufen werden. Wenn diese Methode TRUE zurueckliefert, kann mit +aufgerufen werden. Wenn diese Methode sal_True zurueckliefert, kann mit ExecuteDrag() der Drag-Vorgang gestartet werden, ansonsten sollte keine Verarbeitung stattfinden. Diese Methode sorgt dafuer, das das ValueSet seine Verarbeitung abbricht und gegebenenfalls den Eintrag selektiert. Es @@ -218,7 +218,7 @@ gewuenschten WinBits (vor Show) mit SetStyle() gesetzt werden. // - ValueSet-Item-Typen - // ----------------------- -#define VIB_NODOUBLECLICK ((USHORT)0x0080) +#define VIB_NODOUBLECLICK ((sal_uInt16)0x0080) // ------------------ // - ValueSet-Typen - @@ -237,8 +237,8 @@ gewuenschten WinBits (vor Show) mit SetStyle() gesetzt werden. // - ValueSet - // ------------ -#define VALUESET_APPEND ((USHORT)-1) -#define VALUESET_ITEM_NOTFOUND ((USHORT)-1) +#define VALUESET_APPEND ((sal_uInt16)-1) +#define VALUESET_ITEM_NOTFOUND ((sal_uInt16)-1) class SVT_DLLPUBLIC ValueSet : public Control { @@ -254,27 +254,27 @@ private: long mnLines; long mnUserItemWidth; long mnUserItemHeight; - USHORT mnOldItemId; - USHORT mnSelItemId; - USHORT mnHighItemId; + sal_uInt16 mnOldItemId; + sal_uInt16 mnSelItemId; + sal_uInt16 mnHighItemId; size_t mnDropPos; - USHORT mnCols; - USHORT mnCurCol; - USHORT mnUserCols; - USHORT mnUserVisLines; - USHORT mnFirstLine; - USHORT mnSpacing; - USHORT mnFrameStyle; - BOOL mbFormat; - BOOL mbHighlight; - BOOL mbSelection; - BOOL mbNoSelection; - BOOL mbDrawSelection; - BOOL mbBlackSel; - BOOL mbDoubleSel; - BOOL mbScroll; - BOOL mbDropPos; - BOOL mbFullMode; + sal_uInt16 mnCols; + sal_uInt16 mnCurCol; + sal_uInt16 mnUserCols; + sal_uInt16 mnUserVisLines; + sal_uInt16 mnFirstLine; + sal_uInt16 mnSpacing; + sal_uInt16 mnFrameStyle; + sal_Bool mbFormat; + sal_Bool mbHighlight; + sal_Bool mbSelection; + sal_Bool mbNoSelection; + sal_Bool mbDrawSelection; + sal_Bool mbBlackSel; + sal_Bool mbDoubleSel; + sal_Bool mbScroll; + sal_Bool mbDropPos; + sal_Bool mbFullMode; Color maColor; Link maDoubleClickHdl; Link maSelectHdl; @@ -285,27 +285,27 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SVT_DLLPRIVATE void ImplInitScrollBar(); SVT_DLLPRIVATE void ImplDeleteItems(); SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem ); SVT_DLLPRIVATE void ImplDrawItemText( const XubString& rStr ); SVT_DLLPRIVATE void ImplDrawSelect(); - SVT_DLLPRIVATE void ImplHideSelect( USHORT nItemId ); - SVT_DLLPRIVATE void ImplHighlightItem( USHORT nItemId, BOOL bIsSelection = TRUE ); - SVT_DLLPRIVATE void ImplDrawDropPos( BOOL bShow ); + SVT_DLLPRIVATE void ImplHideSelect( sal_uInt16 nItemId ); + SVT_DLLPRIVATE void ImplHighlightItem( sal_uInt16 nItemId, sal_Bool bIsSelection = sal_True ); + SVT_DLLPRIVATE void ImplDrawDropPos( sal_Bool bShow ); SVT_DLLPRIVATE void ImplDraw(); using Window::ImplScroll; - SVT_DLLPRIVATE BOOL ImplScroll( const Point& rPos ); - SVT_DLLPRIVATE size_t ImplGetItem( const Point& rPoint, BOOL bMove = FALSE ) const; + SVT_DLLPRIVATE sal_Bool ImplScroll( const Point& rPos ); + SVT_DLLPRIVATE size_t ImplGetItem( const Point& rPoint, sal_Bool bMove = sal_False ) const; SVT_DLLPRIVATE ValueSetItem* ImplGetItem( size_t nPos ); SVT_DLLPRIVATE ValueSetItem* ImplGetFirstItem(); - SVT_DLLPRIVATE USHORT ImplGetVisibleItemCount() const; - SVT_DLLPRIVATE ValueSetItem* ImplGetVisibleItem( USHORT nVisiblePos ); + SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; + SVT_DLLPRIVATE ValueSetItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos ); SVT_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ); - SVT_DLLPRIVATE BOOL ImplHasAccessibleListeners(); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, BOOL bCancel ); + SVT_DLLPRIVATE sal_Bool ImplHasAccessibleListeners(); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, sal_Bool bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, sal_Bool bCancel ); DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* ); DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); #endif @@ -316,8 +316,8 @@ private: protected: - BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); - USHORT ShowDropPos( const Point& rPos ); + sal_Bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + sal_uInt16 ShowDropPos( const Point& rPos ); void HideDropPos(); protected: @@ -347,68 +347,68 @@ public: virtual void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void InsertItem( USHORT nItemId, const Image& rImage, + void InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos = VALUESET_APPEND ); - void InsertItem( USHORT nItemId, const Color& rColor, + void InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos = VALUESET_APPEND ); - void InsertItem( USHORT nItemId, + void InsertItem( sal_uInt16 nItemId, const Image& rImage, const XubString& rStr, size_t nPos = VALUESET_APPEND ); - void InsertItem( USHORT nItemId, + void InsertItem( sal_uInt16 nItemId, const Color& rColor, const XubString& rStr, size_t nPos = VALUESET_APPEND ); - void InsertItem( USHORT nItemId, + void InsertItem( sal_uInt16 nItemId, size_t nPos = VALUESET_APPEND ); - void InsertSpace( USHORT nItemId, + void InsertSpace( sal_uInt16 nItemId, size_t nPos = VALUESET_APPEND ); - void RemoveItem( USHORT nItemId ); + void RemoveItem( sal_uInt16 nItemId ); void CopyItems( const ValueSet& rValueSet ); void Clear(); size_t GetItemCount() const; - size_t GetItemPos( USHORT nItemId ) const; - USHORT GetItemId( size_t nPos ) const; - USHORT GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( USHORT nItemId ) const; - - void EnableFullItemMode( BOOL bFullMode = TRUE ); - BOOL IsFullItemModeEnabled() const { return mbFullMode; } - void SetColCount( USHORT nNewCols = 1 ); - USHORT GetColCount() const { return mnUserCols; } - void SetLineCount( USHORT nNewLines = 0 ); - USHORT GetLineCount() const { return mnUserVisLines; } + size_t GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemId( size_t nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + Rectangle GetItemRect( sal_uInt16 nItemId ) const; + + void EnableFullItemMode( sal_Bool bFullMode = sal_True ); + sal_Bool IsFullItemModeEnabled() const { return mbFullMode; } + void SetColCount( sal_uInt16 nNewCols = 1 ); + sal_uInt16 GetColCount() const { return mnUserCols; } + void SetLineCount( sal_uInt16 nNewLines = 0 ); + sal_uInt16 GetLineCount() const { return mnUserVisLines; } void SetItemWidth( long nItemWidth = 0 ); long GetItemWidth() const { return mnUserItemWidth; } void SetItemHeight( long nLineHeight = 0 ); long GetItemHeight() const { return mnUserItemHeight; } - void SetFirstLine( USHORT nNewLine = 0 ); - USHORT GetFirstLine() const { return mnFirstLine; } + void SetFirstLine( sal_uInt16 nNewLine = 0 ); + sal_uInt16 GetFirstLine() const { return mnFirstLine; } - void SelectItem( USHORT nItemId ); - USHORT GetSelectItemId() const { return mnSelItemId; } - BOOL IsItemSelected( USHORT nItemId ) const - { return ((!mbNoSelection && (nItemId == mnSelItemId)) ? TRUE : FALSE); } + void SelectItem( sal_uInt16 nItemId ); + sal_uInt16 GetSelectItemId() const { return mnSelItemId; } + sal_Bool IsItemSelected( sal_uInt16 nItemId ) const + { return ((!mbNoSelection && (nItemId == mnSelItemId)) ? sal_True : sal_False); } void SetNoSelection(); - BOOL IsNoSelection() const { return mbNoSelection; } - - void SetItemBits( USHORT nItemId, USHORT nBits ); - USHORT GetItemBits( USHORT nItemId ) const; - void SetItemImage( USHORT nItemId, const Image& rImage ); - Image GetItemImage( USHORT nItemId ) const; - void SetItemColor( USHORT nItemId, const Color& rColor ); - Color GetItemColor( USHORT nItemId ) const; - void SetItemData( USHORT nItemId, void* pData ); - void* GetItemData( USHORT nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rStr ); - XubString GetItemText( USHORT nItemId ) const; + sal_Bool IsNoSelection() const { return mbNoSelection; } + + void SetItemBits( sal_uInt16 nItemId, sal_uInt16 nBits ); + sal_uInt16 GetItemBits( sal_uInt16 nItemId ) const; + void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemImage( sal_uInt16 nItemId ) const; + void SetItemColor( sal_uInt16 nItemId, const Color& rColor ); + Color GetItemColor( sal_uInt16 nItemId ) const; + void SetItemData( sal_uInt16 nItemId, void* pData ); + void* GetItemData( sal_uInt16 nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rStr ); + XubString GetItemText( sal_uInt16 nItemId ) const; void SetColor( const Color& rColor ); void SetColor() { SetColor( Color( COL_TRANSPARENT ) ); } Color GetColor() const { return maColor; } - BOOL IsColor() const { return maColor.GetTransparency() == 0; } + sal_Bool IsColor() const { return maColor.GetTransparency() == 0; } - void SetExtraSpacing( USHORT nNewSpacing ); - USHORT GetExtraSpacing() { return mnSpacing; } + void SetExtraSpacing( sal_uInt16 nNewSpacing ); + sal_uInt16 GetExtraSpacing() { return mnSpacing; } void Format(); @@ -416,9 +416,9 @@ public: void EndSelection(); Size CalcWindowSizePixel( const Size& rItemSize, - USHORT nCalcCols = 0, - USHORT nCalcLines = 0 ); - Size CalcItemSizePixel( const Size& rSize, BOOL bOut = TRUE ) const; + sal_uInt16 nCalcCols = 0, + sal_uInt16 nCalcLines = 0 ); + Size CalcItemSizePixel( const Size& rSize, sal_Bool bOut = sal_True ) const; long GetScrollWidth() const; void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx index 99d1ec4461a8..5fd4ddca4c02 100644 --- a/svtools/inc/wallitem.hxx +++ b/svtools/inc/svtools/wallitem.hxx @@ -45,7 +45,7 @@ class Window; class SfxItemSet; typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetSvxBrushTabPageRanges)(); +typedef sal_uInt16* (*GetSvxBrushTabPageRanges)(); class Graphic; class String; diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx index ce5275d3c252..76535089b51b 100644 --- a/svtools/inc/svtools/wizardmachine.hxx +++ b/svtools/inc/svtools/wizardmachine.hxx @@ -152,8 +152,8 @@ namespace svt // restrict access to some aspects of our base class SVT_DLLPRIVATE void AddPage( TabPage* pPage ) { WizardDialog::AddPage(pPage); } SVT_DLLPRIVATE void RemovePage( TabPage* pPage ) { WizardDialog::RemovePage(pPage); } - SVT_DLLPRIVATE void SetPage( USHORT nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); } - // TabPage* GetPage( USHORT nLevel ) const { return WizardDialog::GetPage(nLevel); } + SVT_DLLPRIVATE void SetPage( sal_uInt16 nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); } + // TabPage* GetPage( sal_uInt16 nLevel ) const { return WizardDialog::GetPage(nLevel); } // TODO: probably the complete page handling (next, previous etc.) should be prohibited ... // IMPORTANT: diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx index bbd050b39ea2..5e5721551d1c 100644 --- a/svtools/inc/svtools/wizdlg.hxx +++ b/svtools/inc/svtools/wizdlg.hxx @@ -65,7 +65,7 @@ berechnet und genommen. ShowPrevPage()/ShowNextPage() zeigt die vorherige/naechste TabPage an. Dazu wird zuerst der Deactivate-Handler vom Dialog gerufen und -wenn dieser TRUE zurueckgegeben hat, wird der Acivate-Handler +wenn dieser sal_True zurueckgegeben hat, wird der Acivate-Handler vom Dialog gerufen und die entsprechende TabPage angezeigt. Finnsh() kann gerufen werden, wenn der Finnish-Button betaetigt wird. Dort wird dann auch noch der Deactivate-Page-Handler vom @@ -116,10 +116,10 @@ Level 0 die erste Seite ist. Der DeactivatePage()-Handler wird gerufen, wenn eine neue TabPage angezeigt werden soll. In diesem Handler kann noch eine Fehler- ueberprufung stattfinden und das Umschalten gegebenenfalls verhindert -werden, indem FALSE zurueckgegeben wird. Der Handler kann auch als +werden, indem sal_False zurueckgegeben wird. Der Handler kann auch als Link gesetzt werden. Die Defaultimplementierung ruft den Link und gibt den Rueckgabewert des Links zurueck und wenn kein Link gesetzt -ist, wird TRUE zurueckgegeben. +ist, wird sal_True zurueckgegeben. -------------------------------------------------------------------------- @@ -145,7 +145,7 @@ maNextBtn.SetClickHdl( LINK( this, MyWizardDlg, ImplNextHdl ) ); SetViewWindow( &maPreview ); // Show line between Buttons and Page -ShowButtonFixedLine( TRUE ); +ShowButtonFixedLine( sal_True ); // Call ActivatePage, because the first page should be created an activated ActivatePage(); @@ -228,7 +228,7 @@ private: PushButton* mpPrevBtn; PushButton* mpNextBtn; Window* mpViewWindow; - USHORT mnCurLevel; + sal_uInt16 mnCurLevel; WindowAlign meViewAlign; Link maActivateHdl; Link maDeactivateHdl; @@ -256,7 +256,7 @@ private: SVT_DLLPRIVATE void ImplPosCtrls(); SVT_DLLPRIVATE void ImplPosTabPage(); SVT_DLLPRIVATE void ImplShowTabPage( TabPage* pPage ); - SVT_DLLPRIVATE TabPage* ImplGetPage( USHORT nLevel ) const; + SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const; #endif public: @@ -271,16 +271,16 @@ public: virtual void ActivatePage(); virtual long DeactivatePage(); - BOOL ShowPrevPage(); - BOOL ShowNextPage(); - BOOL ShowPage( USHORT nLevel ); - BOOL Finnish( long nResult = 0 ); - USHORT GetCurLevel() const { return mnCurLevel; } + sal_Bool ShowPrevPage(); + sal_Bool ShowNextPage(); + sal_Bool ShowPage( sal_uInt16 nLevel ); + sal_Bool Finnish( long nResult = 0 ); + sal_uInt16 GetCurLevel() const { return mnCurLevel; } void AddPage( TabPage* pPage ); void RemovePage( TabPage* pPage ); - void SetPage( USHORT nLevel, TabPage* pPage ); - TabPage* GetPage( USHORT nLevel ) const; + void SetPage( sal_uInt16 nLevel, TabPage* pPage ); + TabPage* GetPage( sal_uInt16 nLevel ) const; void AddButton( Button* pButton, long nOffset = 0 ); void RemoveButton( Button* pButton ); @@ -290,8 +290,8 @@ public: void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; } PushButton* GetNextButton() const { return mpNextBtn; } - void ShowButtonFixedLine( BOOL bVisible ); - BOOL IsButtonFixedLineVisible(); + void ShowButtonFixedLine( sal_Bool bVisible ); + sal_Bool IsButtonFixedLineVisible(); void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } Window* GetViewWindow() const { return mpViewWindow; } diff --git a/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx index 05461cc84ffb..be1852701f33 100644 --- a/svtools/inc/svtools/wmf.hxx +++ b/svtools/inc/svtools/wmf.hxx @@ -32,17 +32,17 @@ #include "svtools/svtdllapi.h" #include <svtools/fltcall.hxx> -BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL ); +sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL ); -SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); +SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem ); -SVT_DLLPUBLIC BOOL ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, BOOL bPlaceable = TRUE ); +SVT_DLLPUBLIC sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, sal_Bool bPlaceable = sal_True ); -BOOL ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL ); +sal_Bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL ); -SVT_DLLPUBLIC BOOL WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafile( SvStream& rStream, const GDIMetaFile& rMTF ); -SVT_DLLPUBLIC BOOL WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); +SVT_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF ); #endif diff --git a/svtools/inc/svtools/xtextedt.hxx b/svtools/inc/svtools/xtextedt.hxx index cd2b5117150a..915541824b5c 100644 --- a/svtools/inc/svtools/xtextedt.hxx +++ b/svtools/inc/svtools/xtextedt.hxx @@ -32,10 +32,6 @@ #include <svtools/texteng.hxx> #include <svtools/textview.hxx> -#define XTEXTUNDO_REPLACEALL (XTEXTUNDO_START+1) -#define XTEXTUNDO_INDENTBLOCK 122 -#define XTEXTUNDO_UNINDENTBLOCK 123 - namespace com { namespace sun { namespace star { @@ -56,25 +52,25 @@ public: void SetGroupChars( const String& r ) { maGroupChars = r; } TextSelection MatchGroup( const TextPaM& rCursor ) const; - BOOL Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward = TRUE ); + sal_Bool Search( TextSelection& rSel, const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bForward = sal_True ); }; class SVT_DLLPUBLIC ExtTextView : public TextView { protected: - BOOL ImpIndentBlock( BOOL bRight ); + sal_Bool ImpIndentBlock( sal_Bool bRight ); public: ExtTextView( ExtTextEngine* pEng, Window* pWindow ); ~ExtTextView(); - BOOL MatchGroup(); + sal_Bool MatchGroup(); - BOOL Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bForward ); - USHORT Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, BOOL bAll, BOOL bForward ); + sal_Bool Search( const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bForward ); + sal_uInt16 Replace( const ::com::sun::star::util::SearchOptions& rSearchOptions, sal_Bool bAll, sal_Bool bForward ); - BOOL IndentBlock(); - BOOL UnindentBlock(); + sal_Bool IndentBlock(); + sal_Bool UnindentBlock(); }; #endif // _XTEXTEDT_HXX diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx index 9c3d1b6429ee..ed4a4c6760b4 100644 --- a/svtools/inc/svtools/xwindowitem.hxx +++ b/svtools/inc/svtools/xwindowitem.hxx @@ -50,8 +50,8 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem public: TYPEINFO(); XWindowItem(); - explicit XWindowItem( USHORT nWhich, Window * pWin ); - XWindowItem( USHORT nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin ); + explicit XWindowItem( sal_uInt16 nWhich, Window * pWin ); + XWindowItem( sal_uInt16 nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin ); XWindowItem( const XWindowItem &rItem ); ~XWindowItem(); |