diff options
| author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
|---|---|---|
| committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-02-15 17:14:59 +0100 |
| commit | 6d5f0ed03385c7d9854dd65cfb741e5b95b33ad1 (patch) | |
| tree | 15e080f9af62c6cf43cb5d930d23c40c51d99732 /svx/inc | |
| parent | 1007c2d0c2348bb268f8e06f406cc776aaf0f0d5 (diff) | |
| parent | aed6bcebef74ed9b4260aca16e20586babef45ca (diff) | |
accfixes: merged to m100
Diffstat (limited to 'svx/inc')
275 files changed, 3203 insertions, 3249 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index a8ad139bae..d51b4e9437 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -87,7 +87,7 @@ public: SdrDragView &rView, const SdrMarkList& rMark, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void TakeSdrDragComment(String& rStr) const; virtual bool BeginSdrDrag(); @@ -118,7 +118,7 @@ public: SdrDragView &rView, const SdrMarkList& rMark, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void MoveSdrDrag(const Point& rPnt); virtual Pointer GetSdrDragPointer() const; @@ -143,7 +143,7 @@ public: const SdrMarkList& rMark, SdrHdlKind eDrgHdl = HDL_MOVE, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void MoveSdrDrag(const Point& rPnt); virtual Pointer GetSdrDragPointer() const; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 65ca239e5a..2100c10f0a 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -117,18 +117,18 @@ private: FixedLine maSeparator; FixedText maInfoBar; Point maDragStartPos; - ULONG mnCurActionPos; + sal_uIntPtr mnCurActionPos; GalleryBrowserMode meMode; GalleryBrowserMode meLastMode; - BOOL mbCurActionIsLinkage; + sal_Bool mbCurActionIsLinkage; void InitSettings(); - void ImplUpdateViews( USHORT nSelectionId ); + void ImplUpdateViews( sal_uInt16 nSelectionId ); void ImplUpdateInfoBar(); - ULONG ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos ); - void ImplSelectItemId( ULONG nItemId ); - void ImplExecute( USHORT nId ); + sal_uIntPtr ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos ); + void ImplSelectItemId( sal_uIntPtr nItemId ); + void ImplExecute( sal_uInt16 nId ); // Control virtual void Resize(); @@ -148,7 +148,7 @@ private: public: - static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags ); + static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags ); public: @@ -167,15 +167,15 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); void StartDrag( Window* pWindow, const Point* pDragPoint = NULL ); void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL ); void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL ); - BOOL KeyInput( const KeyEvent& rEvt, Window* pWindow ); + sal_Bool KeyInput( const KeyEvent& rEvt, Window* pWindow ); }; #endif diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 3dd7994848..1ab5d2b494 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -83,13 +83,13 @@ protected: INetURLObject aURL; String aUserName; String aTitle; - BOOL bIsValid; - BOOL bIsThumbBmp; + sal_Bool bIsValid; + sal_Bool bIsThumbBmp; virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - BOOL CreateThumb( const Graphic& rGraphic ); + sal_Bool CreateThumb( const Graphic& rGraphic ); public: @@ -97,13 +97,13 @@ public: virtual ~SgaObject() {}; virtual SgaObjKind GetObjKind() const = 0; - virtual UINT16 GetVersion() const = 0; + virtual sal_uInt16 GetVersion() const = 0; virtual Bitmap GetThumbBmp() const { return aThumbBmp; } const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; } const INetURLObject& GetURL() const { return aURL; } - BOOL IsValid() const { return bIsValid; } - BOOL IsThumbBitmap() const { return bIsThumbBmp; } + sal_Bool IsValid() const { return bIsValid; } + sal_Bool IsThumbBitmap() const { return bIsThumbBmp; } const String GetTitle() const; void SetTitle( const String& rTitle ); @@ -123,9 +123,9 @@ private: GalSoundType eSoundType; virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 6; } + virtual sal_uInt16 GetVersion() const { return 6; } public: @@ -150,12 +150,12 @@ class SgaObjectSvDraw : public SgaObject private: - BOOL CreateThumb( const FmFormModel& rModel ); + sal_Bool CreateThumb( const FmFormModel& rModel ); virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const { return 5; } public: @@ -168,7 +168,7 @@ public: public: - static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); + static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; // ---------------- @@ -182,9 +182,9 @@ private: void Init( const Graphic& rGraphic, const INetURLObject& rURL ); virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const { return 5; } public: diff --git a/svx/inc/makefile.mk b/svx/inc/makefile.mk deleted file mode 100644 index 37a079a68a..0000000000 --- a/svx/inc/makefile.mk +++ /dev/null @@ -1,50 +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=svx -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LOCALIZE_ME=globlmn_tmpl.hrc - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 2ab9811be2..e5d10ec002 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -919,7 +919,7 @@ #include "vcl/cursor.hxx" #include "vcl/decoview.hxx" #include "vcl/dndhelp.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/fntstyle.hxx" #include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" @@ -938,7 +938,7 @@ #include "vcl/unohelp.hxx" #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vos/mutex.hxx" #include "vos/ref.hxx" #include "vos/refernce.hxx" diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index 19e735265b..a8d8c42067 100644 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -140,10 +140,10 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC virtual String getValue() const; virtual String getType() const; - virtual BOOL getChecked() const; - virtual void setChecked( BOOL bCheck ); - virtual BOOL getDefaultChecked() const; - virtual void setDefaultChecked( BOOL bCheck ); + virtual sal_Bool getChecked() const; + virtual void setChecked( sal_Bool bCheck ); + virtual sal_Bool getDefaultChecked() const; + virtual void setDefaultChecked( sal_Bool bCheck ); // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); @@ -170,8 +170,8 @@ class ImpSjJScriptRadioArray: public SjJSbxArrayObject { VCRadioManager* pMgr; public: - INT32 ImpSjJScriptRadioArray::getLength() const; - SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const; + sal_Int32 ImpSjJScriptRadioArray::getLength() const; + SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const; SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const; // Konstruktor @@ -192,15 +192,15 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl virtual String getType() const; // Properties von SjJScriptCheckboxObject - virtual BOOL getChecked() const; - virtual void setChecked( BOOL bCheck ); - virtual BOOL getDefaultChecked() const; - virtual void setDefaultChecked( BOOL bCheck ); + virtual sal_Bool getChecked() const; + virtual void setChecked( sal_Bool bCheck ); + virtual sal_Bool getDefaultChecked() const; + virtual void setDefaultChecked( sal_Bool bCheck ); // getValue() wird in der Basisklasse definiert virtual void setValue( const String & aStrg ); // yyy Raus zum inkompatiblen - //virtual INT32 getLength(); + //virtual sal_Int32 getLength(); // Methoden des Objektes virtual void click(); @@ -230,9 +230,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual String getValue() const; virtual String getType() const; - virtual INT32 getLength(); - virtual INT32 getSelectedIndex() const; - virtual void setSelectedIndex( INT32 nNo ); + virtual sal_Int32 getLength(); + virtual sal_Int32 getSelectedIndex() const; + virtual void setSelectedIndex( sal_Int32 nNo ); // liefert eine Array von Option-Objekten //yyy Raus zum inkompatiblen @@ -262,9 +262,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr void onFocus(); // SjJSbxArrayObject-Methoden - virtual INT32 getLength() const; + virtual sal_Int32 getLength() const; // Zugriff "uber den Index - virtual SjJSbxObject * getElement( INT32 nIndex ) const; + virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; // Zugriff "uber den Namen // native Java-Methoden k"onnen (noch) nicht "uberladen werden //virtual SjJSbxObject * getElement_String( const String & aName ) const; @@ -273,19 +273,19 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p ); // zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997 - virtual void setOption( INT32 nIndex, const String & aOptionText, + virtual void setOption( sal_Int32 nIndex, const String & aOptionText, const String & aOptionValue, - BOOL bDefaultSelected, BOOL bSelected ); + sal_Bool bDefaultSelected, sal_Bool bSelected ); // Schnittstelle fuer die Properties der Option-Objekte - virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const; - virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex ); - virtual BOOL getOptionSelected( INT32 nIndex ) const; - virtual void setOptionSelected( BOOL bSelected, INT32 nIndex ); - virtual String getOptionText( INT32 nIndex ) const; - virtual void setOptionText( const String & sText, INT32 nIndex ); - virtual void setOptionValue( const String & sText, INT32 nIndex ); - virtual String getOptionValue( INT32 nIndex ) const; + virtual sal_Bool getOptionDefaultSelected( sal_Int32 nIndex ) const; + virtual void setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex ); + virtual sal_Bool getOptionSelected( sal_Int32 nIndex ) const; + virtual void setOptionSelected( sal_Bool bSelected, sal_Int32 nIndex ); + virtual String getOptionText( sal_Int32 nIndex ) const; + virtual void setOptionText( const String & sText, sal_Int32 nIndex ); + virtual void setOptionValue( const String & sText, sal_Int32 nIndex ); + virtual String getOptionValue( sal_Int32 nIndex ) const; }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -294,21 +294,21 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase { - USHORT nListBoxIndex; + sal_uInt16 nListBoxIndex; public: // Methoden von Java --> C++ (f"ur Properties) //-------------------------------------------- - virtual BOOL getdefaultSelected() const; - virtual void setdefaultSelected( BOOL bSelected ); - virtual INT32 getIndex() const; - virtual BOOL getSelected() const; - virtual void setSelected( BOOL bSelected ); + virtual sal_Bool getdefaultSelected() const; + virtual void setdefaultSelected( sal_Bool bSelected ); + virtual sal_Int32 getIndex() const; + virtual sal_Bool getSelected() const; + virtual void setSelected( sal_Bool bSelected ); //yyy Zum Vollupdate raus: /* - virtual INT32 getSelectedIndex() const; - virtual void setSelectedIndex( INT32 nNo ); + virtual sal_Int32 getSelectedIndex() const; + virtual void setSelectedIndex( sal_Int32 nNo ); */ @@ -331,7 +331,7 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr // keine ! // Konstruktor - ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex ); + ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -343,9 +343,9 @@ class SjJSbxFormsArray: public SfxJSArray public: // SjJSbxArrayObject-Methoden - virtual INT32 getLength() const; + virtual sal_Int32 getLength() const; // Zugriff "uber den Index - virtual SjJSbxObject * getElement( INT32 nIndex ) const; + virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; // Zugriff "uber den Namen // native Java-Methoden k"onnen (noch) nicht "uberladen werden virtual SjJSbxObject * getElement_String( const String & aName ) const; @@ -593,8 +593,8 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual void setTarget( const String & sValue ); // SjJSbxArrayObject-Methoden - INT32 getLength() const; - SjJSbxObject* getElement( INT32 nIndex ) const; + sal_Int32 getLength() const; + SjJSbxObject* getElement( sal_Int32 nIndex ) const; SjJSbxObject* getElement_String( const String & aName ) const; // liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index a48f552f88..05678c6a80 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -47,9 +47,9 @@ friend class ImpItemEdit; Link aSetDirtyHdl; ImpItemListRow* pAktChangeEntry; long nLastWhichOfs; - USHORT nLastWhich; - USHORT nLastWhichOben; - USHORT nLastWhichUnten; + sal_uInt16 nLastWhich; + sal_uInt16 nLastWhichOben; + sal_uInt16 nLastWhichUnten; FASTBOOL bWhichesButNames; FASTBOOL bDontHideIneffectiveItems; FASTBOOL bDontSortItems; @@ -58,15 +58,15 @@ friend class ImpItemEdit; private: #if _SOLAR__PRIVATE void ImpCtor(); - void ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum); - ImpItemListRow* ImpGetEntry(ULONG nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); } + void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum); + ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); } void ImpSaveWhich(); void ImpRestoreWhich(); #endif // __PRIVATE protected: virtual long GetRowCount() const; - virtual BOOL SeekRow(long nRow); - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const; + virtual sal_Bool SeekRow(long nRow); + virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const; virtual void DoubleClick(const BrowserMouseEvent&); virtual void KeyInput(const KeyEvent& rEvt); virtual void Select(); @@ -78,9 +78,9 @@ public: virtual ~_SdrItemBrowserControl(); void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); - ULONG GetCurrentPos() const; - USHORT GetCurrentWhich() const; - virtual FASTBOOL BegChangeEntry(ULONG nPos); + sal_uIntPtr GetCurrentPos() const; + sal_uInt16 GetCurrentWhich() const; + virtual FASTBOOL BegChangeEntry(sal_uIntPtr nPos); virtual FASTBOOL EndChangeEntry(); virtual void BrkChangeEntry(); @@ -92,7 +92,7 @@ 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; const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } XubString GetNewEntryValue() const { return pEditControl->GetText(); } diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx index 08e80c153e..2aacf73d30 100644 --- a/svx/inc/svx/SmartTagCtl.hxx +++ b/svx/inc/svx/SmartTagCtl.hxx @@ -72,11 +72,11 @@ private: void FillMenu(); DECL_LINK( MenuSelect, PopupMenu * ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxSmartTagsControl( USHORT nId, Menu&, SfxBindings& ); + SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxSmartTagsControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index d6ad34ee74..ca068a2e07 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem public: TYPEINFO(); - SvxSmartTagItem( const USHORT nId, + SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, @@ -76,10 +76,10 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; // leer - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index f050ed2ac1..a043e0a3d1 100644 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -58,7 +58,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow public: SpellDialogChildWindow ( Window*pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (); diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index faf381d8a2..24097b692a 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -46,24 +46,24 @@ class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem public: TYPEINFO(); - SvxHorJustifyItem( const USHORT nId ); + SvxHorJustifyItem( const sal_uInt16 nId ); SvxHorJustifyItem( const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify) { @@ -81,24 +81,24 @@ class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem public: TYPEINFO(); - SvxVerJustifyItem( const USHORT nId ); + SvxVerJustifyItem( const sal_uInt16 nId ); SvxVerJustifyItem( const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify) { @@ -117,24 +117,24 @@ public: SvxOrientationItem( const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); SvxOrientationItem( - INT32 nRotation, BOOL bStacked, - const USHORT nId ); + sal_Int32 nRotation, sal_Bool bStacked, + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) { @@ -142,28 +142,28 @@ public: return *this; } - /** Returns TRUE, if the item represents STACKED state. */ - BOOL IsStacked() const; + /** Returns sal_True, if the item represents STACKED state. */ + sal_Bool IsStacked() const; /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */ - INT32 GetRotation( INT32 nStdAngle = 0 ) const; + sal_Int32 GetRotation( sal_Int32 nStdAngle = 0 ) const; /** Fills this item according to passed item values. */ - void SetFromRotation( INT32 nRotation, BOOL bStacked ); + void SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked ); }; //------------------------------------------------------------------------ class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem { - INT16 nLeftMargin; - INT16 nTopMargin; - INT16 nRightMargin; - INT16 nBottomMargin; + sal_Int16 nLeftMargin; + sal_Int16 nTopMargin; + sal_Int16 nRightMargin; + sal_Int16 nBottomMargin; public: TYPEINFO(); - SvxMarginItem( const USHORT nId ); - SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/, - INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/, - const USHORT nId ); + SvxMarginItem( const sal_uInt16 nId ); + SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/, + sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/, + const sal_uInt16 nId ); SvxMarginItem( const SvxMarginItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -173,20 +173,20 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; - - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - INT16 GetLeftMargin() const {return nLeftMargin; } - BOOL SetLeftMargin(INT16 nLeft); - INT16 GetTopMargin() const {return nTopMargin; } - BOOL SetTopMargin(INT16 nTop); - INT16 GetRightMargin() const {return nRightMargin; } - BOOL SetRightMargin(INT16 nRight); - INT16 GetBottomMargin() const {return nBottomMargin; } - BOOL SetBottomMargin(INT16 nBottom); + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; + + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + + sal_Int16 GetLeftMargin() const {return nLeftMargin; } + sal_Bool SetLeftMargin(sal_Int16 nLeft); + sal_Int16 GetTopMargin() const {return nTopMargin; } + sal_Bool SetTopMargin(sal_Int16 nTop); + sal_Int16 GetRightMargin() const {return nRightMargin; } + sal_Bool SetRightMargin(sal_Int16 nRight); + sal_Int16 GetBottomMargin() const {return nBottomMargin; } + sal_Bool SetBottomMargin(sal_Int16 nBottom); inline SvxMarginItem& operator=(const SvxMarginItem& rMargin) { diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index 6964784388..78b828ed1c 100644 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -50,11 +50,11 @@ private: SvxBmpMask &rBmpMask; protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxBmpMaskSelectItem( USHORT nId, SvxBmpMask& rMask, + SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask, SfxBindings& rBindings ); }; @@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow { public: SvxBmpMaskChildWindow( Window*, - USHORT, SfxBindings*, + sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow); @@ -130,12 +130,12 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow Image maImgPipette; Image maImgPipetteH; - virtual BOOL Close(); + virtual sal_Bool Close(); #ifdef BMPMASK_PRIVATE - USHORT InitColorArrays( Color* pSrcCols, Color* pDstCols, - ULONG* pTols ); + sal_uInt16 InitColorArrays( Color* pSrcCols, Color* pDstCols, + sal_uIntPtr* pTols ); Bitmap ImpMask( const Bitmap& rBitmap ); BitmapEx ImpMask( const BitmapEx& rBitmapEx ); @@ -164,14 +164,14 @@ public: void SetColor( const Color& rColor ); void PipetteClicked(); - BOOL NeedsColorTable() const; + sal_Bool NeedsColorTable() const; void SetColorTable( const XColorTable* pColorTable ); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); Graphic Mask( const Graphic& rGraphic ); - BOOL IsEyedropping() const; + sal_Bool IsEyedropping() const; void onSelect( MaskSet* pSet ); diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index ee4bd71039..fa6f282ed3 100644 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx @@ -86,7 +86,7 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D // Um den Blickpunkt drehen, Position wird dabei veraendert void RotateAroundLookAt(double fHAngle, double fVAngle); - void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE) + void SetAutoAdjustProjection(FASTBOOL bAdjust = sal_True) { bAutoAdjustProjection = bAdjust; } FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; } }; diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index 43d5272719..942160d319 100644 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -58,7 +58,7 @@ public: void SetFont( const Font& rFont ); - void SelectCharacter( sal_uInt32 cNew, BOOL bFocus = FALSE ); + void SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False ); sal_UCS4 GetSelectCharacter() const; Link GetDoubleClickHdl() const { return aDoubleClkHdl; } @@ -76,12 +76,12 @@ public: int FirstInView( void) const; int LastInView( void) const; int PixelToMapIndex( const Point&) const; - void SelectIndex( int index, BOOL bFocus = FALSE ); + void SelectIndex( int index, sal_Bool bFocus = sal_False ); void DeSelect(); - inline sal_Bool IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; } - inline USHORT GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); } - USHORT GetRowPos(USHORT _nPos) const; - USHORT GetColumnPos(USHORT _nPos) const; + inline sal_Bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } + inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } + sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; + sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -119,7 +119,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible; long nX; long nY; - BOOL bDrag; + sal_Bool bDrag; sal_Int32 nSelectedIndex; @@ -130,7 +130,7 @@ private: private: void DrawChars_Impl( int n1, int n2); - void InitSettings( BOOL bForeground, BOOL bBackground); + void InitSettings( sal_Bool bForeground, sal_Bool bBackground); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; DECL_LINK( VscrollHdl, ScrollBar* ); diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 4aefcf2791..51e9fdf9c5 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -54,8 +54,8 @@ private: using SvTreeListBox::InsertEntry; // Avoid ambiguity with new InsertEntry: virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent, - BOOL bChildsOnDemand, - ULONG nPos, void* pUserData, + sal_Bool bChildsOnDemand, + sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ); public: @@ -67,23 +67,23 @@ public: ~SvxCheckListBox(); void InsertEntry ( const String& rStr, - USHORT nPos = LISTBOX_APPEND, + sal_uInt16 nPos = LISTBOX_APPEND, void* pUserData = NULL, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - void RemoveEntry ( USHORT nPos ); + void RemoveEntry ( sal_uInt16 nPos ); - void SelectEntryPos ( USHORT nPos, BOOL bSelect = TRUE ); - USHORT GetSelectEntryPos () const; + void SelectEntryPos ( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); + sal_uInt16 GetSelectEntryPos () const; - String GetText ( USHORT nPos ) const; - USHORT GetCheckedEntryCount() const; - void CheckEntryPos ( USHORT nPos, BOOL bCheck = TRUE ); - BOOL IsChecked ( USHORT nPos ) const; + String GetText ( sal_uInt16 nPos ) const; + sal_uInt16 GetCheckedEntryCount() const; + void CheckEntryPos ( sal_uInt16 nPos, sal_Bool bCheck = sal_True ); + sal_Bool IsChecked ( sal_uInt16 nPos ) const; void ToggleCheckButton ( SvLBoxEntry* pEntry ); - void* SetEntryData ( USHORT nPos, void* pNewData ); - void* GetEntryData ( USHORT nPos ) const; + void* SetEntryData ( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData ( sal_uInt16 nPos ) const; virtual void MouseButtonDown ( const MouseEvent& rMEvt ); virtual void KeyInput ( const KeyEvent& rKEvt ); diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 129e7e747f..732a40766a 100644 --- a/svx/inc/svx/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -192,13 +192,13 @@ class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem public: TYPEINFO(); SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/, - USHORT nId ); - SvxChartStyleItem(SvStream& rIn, USHORT nId ); + sal_uInt16 nId ); + SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHSTYLE_COUNT; } + sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; } SvxChartStyle GetValue() const { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; @@ -210,16 +210,16 @@ class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem public: TYPEINFO(); SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/, - USHORT nId ); - SvxChartRegressItem(SvStream& rIn, USHORT nId ); + sal_uInt16 nId ); + SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHREGRESS_COUNT; } + sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; } SvxChartRegress GetValue() const { return (SvxChartRegress)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -229,14 +229,14 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem public: TYPEINFO(); SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartDataDescrItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHDESCR_COUNT; } + sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; } SvxChartDataDescr GetValue() const { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; @@ -248,14 +248,14 @@ class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem public: TYPEINFO(); SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartLegendPosItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHLEGEND_COUNT; } + sal_uInt16 GetValueCount() const { return CHLEGEND_COUNT; } SvxChartLegendPos GetValue() const { return (SvxChartLegendPos)SfxEnumItem::GetValue(); } }; @@ -267,17 +267,17 @@ class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem public: TYPEINFO(); SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartTextOrderItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - USHORT GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; @@ -289,14 +289,14 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem public: TYPEINFO(); SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartTextOrientItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrient GetValue() const { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; @@ -308,18 +308,18 @@ class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem public: TYPEINFO(); SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartKindErrorItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHERROR_COUNT; } + sal_uInt16 GetValueCount() const { return CHERROR_COUNT; } SvxChartKindError GetValue() const { return (SvxChartKindError)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -329,18 +329,18 @@ class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem public: TYPEINFO(); SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartIndicateItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHINDICATE_COUNT; } + sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; } SvxChartIndicate GetValue() const { return (SvxChartIndicate)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -351,13 +351,13 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem public: TYPEINFO(); - SvxDoubleItem(double fValue /*= 0.0*/, USHORT nId ); - SvxDoubleItem(SvStream& rIn, USHORT nId ); + SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId ); + SvxDoubleItem(SvStream& rIn, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); @@ -369,8 +369,8 @@ public: virtual int operator == (const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; virtual double GetMin() const; virtual double GetMax() const; diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 4ad3933603..09ec2a94e8 100644 --- a/svx/inc/svx/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -43,20 +43,20 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl { SfxPoolItem* pClipboardFmtItem; PopupMenu* pPopup; - USHORT nItemId; - BOOL bDisabled; + sal_uInt16 nItemId; + sal_Bool bDisabled; void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); - SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxClipBoardControl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index a55b929610..0ede4f8a44 100644 --- a/svx/inc/svx/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -46,20 +46,20 @@ protected: public: TYPEINFO(); - SvxClipboardFmtItem( USHORT nId = 0 ); + SvxClipboardFmtItem( sal_uInt16 nId = 0 ); SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); - void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX ); - void AddClipbrdFormat( ULONG nId, const String& rName, - USHORT nPos = USHRT_MAX ); - USHORT Count() const; + void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); + void AddClipbrdFormat( sal_uIntPtr nId, const String& rName, + sal_uInt16 nPos = USHRT_MAX ); + sal_uInt16 Count() const; - ULONG GetClipbrdFormatId( USHORT nPos ) const; - const String& GetClipbrdFormatName( USHORT nPos ) const; + sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const; + const String& GetClipbrdFormatName( sal_uInt16 nPos ) const; }; diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 5ffcab526d..a649f75964 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -49,7 +49,7 @@ class SvxColorValueSet : public ValueSet, public DragSourceHelper private: - BOOL bLeft; + sal_Bool bLeft; Point aDragPosPixel; protected: @@ -70,7 +70,7 @@ public: SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); SvxColorValueSet( Window* pParent, const ResId& rResId ); - BOOL IsLeftButton() const { return bLeft; } + sal_Bool IsLeftButton() const { return bLeft; } }; /************************************************************************* @@ -82,7 +82,7 @@ public: class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow { public: - SvxColorChildWindow( Window*, USHORT, SfxBindings*, + SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(SvxColorChildWindow); @@ -101,10 +101,10 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener private: XColorTable* pColorTable; SvxColorValueSet aColorSet; - USHORT nLeftSlot; - USHORT nRightSlot; - USHORT nCols; - USHORT nLines; + sal_uInt16 nLeftSlot; + sal_uInt16 nRightSlot; + sal_uInt16 nCols; + sal_uInt16 nLines; long nCount; Size aColorSize; Size aItemSize; @@ -122,7 +122,7 @@ private: //#endif protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Resizing( Size& rSize ); @@ -135,7 +135,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void SetSlotIDs( USHORT nLeft, USHORT nRight ) + void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } virtual long Notify( NotifyEvent& rNEvt ); diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx index 6ba07e23ae..1ac685ff3b 100644 --- a/svx/inc/svx/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx @@ -64,7 +64,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); void SetAttributes( const SfxItemSet& rInAttrs ); - USHORT GetLineDeltaAnz(); + sal_uInt16 GetLineDeltaAnz(); void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 17c31d6d5e..b733119b81 100644 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -45,11 +45,11 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow { public: - SvxContourDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow ); - static void UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked, + static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); }; @@ -71,11 +71,11 @@ class SvxContourDlgItem : public SfxControllerItem protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); + SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); }; /************************************************************************* @@ -104,12 +104,12 @@ public: Window* pParent, const ResId& rResId ); ~SvxContourDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( BOOL bLinked ); + void SetGraphicLinked( sal_Bool bLinked ); const Graphic& GetGraphic() const; - BOOL IsGraphicChanged() const; + sal_Bool IsGraphicChanged() const; void SetPolyPolygon( const PolyPolygon& rPolyPoly ); PolyPolygon GetPolyPolygon(); @@ -117,12 +117,12 @@ public: void SetEditingObject( void* pObj ); const void* GetEditingObject() const; - void Update( const Graphic& rGraphic, BOOL bGraphicLinked, + void Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); static PolyPolygon CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect = NULL, - const ULONG nFlags = 0L ); + const sal_uIntPtr nFlags = 0L ); static void ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic, const MapUnit eUnit, const Size& rDisplaySize ); }; diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 853fd75470..8cb459bc04 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -64,7 +64,7 @@ class SVX_DLLPUBLIC RedlinData public: RedlinData(); virtual ~RedlinData(); - BOOL bDisabled; + sal_Bool bDisabled; DateTime aDateTime; void* pData; }; @@ -84,12 +84,12 @@ private: Color aPrivColor; public: - SvLBoxColorString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr, + SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol); SvLBoxColorString(); ~SvLBoxColorString(); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; }; @@ -99,12 +99,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable private: - BOOL bIsCalc; - USHORT nDatePos; - BOOL bAuthor; - BOOL bDate; - BOOL bComment; - USHORT nDaTiMode; + sal_Bool bIsCalc; + sal_uInt16 nDatePos; + sal_Bool bAuthor; + sal_Bool bDate; + sal_Bool bComment; + sal_uInt16 nDaTiMode; DateTime aDaTiFirst; DateTime aDaTiLast; DateTime aDaTiFilterFirst; @@ -129,35 +129,35 @@ public: ~SvxRedlinTable(); // For FilterPage only { - void SetFilterDate(BOOL bFlag=TRUE); - void SetDateTimeMode(USHORT nMode); + void SetFilterDate(sal_Bool bFlag=sal_True); + void SetDateTimeMode(sal_uInt16 nMode); void SetFirstDate(const Date&); void SetLastDate(const Date&); void SetFirstTime(const Time&); void SetLastTime(const Time&); - void SetFilterAuthor(BOOL bFlag=TRUE); + void SetFilterAuthor(sal_Bool bFlag=sal_True); void SetAuthor(const String &); - void SetFilterComment(BOOL bFlag=TRUE); + void SetFilterComment(sal_Bool bFlag=sal_True); void SetCommentParams( const utl::SearchParam* pSearchPara ); void UpdateFilterTest(); // } For FilterPage only - void SetCalcView(BOOL bFlag=TRUE); - BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData); - BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData); + void SetCalcView(sal_Bool bFlag=sal_True); + sal_Bool IsValidCalcEntry(const String& ,RedlinData *pUserData); + sal_Bool IsValidWriterEntry(const String& ,RedlinData *pUserData); // keine NULL-Ptr. ueberpruefung { - BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); - BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime); - BOOL IsValidComment(const String* pComment); + sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); + sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime); + sal_Bool IsValidComment(const String* pComment); // } SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData, - SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND); + SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData,const Color&, - SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND); + SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); virtual SvLBoxEntry* CreateEntry() const; @@ -204,7 +204,7 @@ private: String aActionStr; String aRangeStr; String aStrMyName; - BOOL bModified; + sal_Bool bModified; DECL_LINK( SelDateHdl, ListBox* ); DECL_LINK( RowEnableHdl, CheckBox* ); @@ -216,9 +216,9 @@ private: protected: - void ShowDateFields(USHORT nKind); - void EnableDateLine1(BOOL bFlag); - void EnableDateLine2(BOOL bFlag); + void ShowDateFields(sal_uInt16 nKind); + void EnableDateLine1(sal_Bool bFlag); + void EnableDateLine2(sal_Bool bFlag); public: SvxTPFilter( Window * pParent); @@ -237,15 +237,15 @@ public: Time GetLastTime() const; void SetLastTime(const Time &aTime); - void SetDateMode(USHORT nMode); - USHORT GetDateMode(); + void SetDateMode(sal_uInt16 nMode); + sal_uInt16 GetDateMode(); void ClearAuthors(); - void InsertAuthor( const String& rString, USHORT nPos = LISTBOX_APPEND ); - USHORT GetSelectedAuthorPos(); + void InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 GetSelectedAuthorPos(); String GetSelectedAuthor()const; - void SelectedAuthorPos(USHORT nPos); - USHORT SelectAuthor(const String& aString); + void SelectedAuthorPos(sal_uInt16 nPos); + sal_uInt16 SelectAuthor(const String& aString); void SetComment(const String &rComment); String GetComment()const; @@ -253,27 +253,27 @@ public: // Methoden fuer Calc { void SetRange(const String& rString); String GetRange() const; - void HideRange(BOOL bHide=TRUE); - void DisableRange(BOOL bFlag=TRUE); + void HideRange(sal_Bool bHide=sal_True); + void DisableRange(sal_Bool bFlag=sal_True); void SetFocusToRange(); // } Methoden fuer Calc - void HideClocks(BOOL bHide=TRUE); - void DisableRef(BOOL bFlag); + void HideClocks(sal_Bool bHide=sal_True); + void DisableRef(sal_Bool bFlag); - BOOL IsDate(); - BOOL IsAuthor(); - BOOL IsRange(); - BOOL IsAction(); - BOOL IsComment(); + sal_Bool IsDate(); + sal_Bool IsAuthor(); + sal_Bool IsRange(); + sal_Bool IsAction(); + sal_Bool IsComment(); - void ShowAction(BOOL bShow=TRUE); + void ShowAction(sal_Bool bShow=sal_True); - void CheckDate(BOOL bFlag=TRUE); - void CheckAuthor(BOOL bFlag=TRUE); - void CheckRange(BOOL bFlag=TRUE); - void CheckAction(BOOL bFlag=TRUE); - void CheckComment(BOOL bFlag=TRUE); + void CheckDate(sal_Bool bFlag=sal_True); + void CheckAuthor(sal_Bool bFlag=sal_True); + void CheckRange(sal_Bool bFlag=sal_True); + void CheckAction(sal_Bool bFlag=sal_True); + void CheckComment(sal_Bool bFlag=sal_True); ListBox* GetLbAction(); @@ -352,21 +352,21 @@ public: void InsertCalcHeader(); SvxRedlinTable* GetTableControl(); - void EnableAccept(BOOL nFlag=TRUE); - void EnableAcceptAll(BOOL nFlag=TRUE); - void EnableReject(BOOL nFlag=TRUE); - void EnableRejectAll(BOOL nFlag=TRUE); - void EnableUndo(BOOL nFlag=TRUE); + void EnableAccept(sal_Bool nFlag=sal_True); + void EnableAcceptAll(sal_Bool nFlag=sal_True); + void EnableReject(sal_Bool nFlag=sal_True); + void EnableRejectAll(sal_Bool nFlag=sal_True); + void EnableUndo(sal_Bool nFlag=sal_True); - void DisableAccept() {EnableAccept(FALSE);} - void DisableAcceptAll() {EnableAcceptAll(FALSE);} - void DisableReject() {EnableReject(FALSE);} - void DisableRejectAll() {EnableRejectAll(FALSE);} - void DisableUndo() {EnableUndo(FALSE);} + void DisableAccept() {EnableAccept(sal_False);} + void DisableAcceptAll() {EnableAcceptAll(sal_False);} + void DisableReject() {EnableReject(sal_False);} + void DisableRejectAll() {EnableRejectAll(sal_False);} + void DisableUndo() {EnableUndo(sal_False);} - void ShowUndo(BOOL nFlag=TRUE); - void HideUndo() {ShowUndo(FALSE);} - BOOL IsUndoVisible(); + void ShowUndo(sal_Bool nFlag=sal_True); + void HideUndo() {ShowUndo(sal_False);} + sal_Bool IsUndoVisible(); Size GetMinSizePixel(); @@ -415,8 +415,8 @@ public: void ShowFilterPage(); void ShowViewPage(); - BOOL IsFilterPageVisible(); - BOOL IsViewPageVisible(); + sal_Bool IsFilterPageVisible(); + sal_Bool IsViewPageVisible(); SvxTPFilter* GetFilterPage(); SvxTPView* GetViewPage(); diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx index 39be134f0d..ea0b53feec 100644 --- a/svx/inc/svx/cube3d.hxx +++ b/svx/inc/svx/cube3d.hxx @@ -55,7 +55,7 @@ private: // Parameter basegfx::B3DPoint aCubePos; basegfx::B3DVector aCubeSize; - UINT16 nSideFlags; + sal_uInt16 nSideFlags; // BOOLeans unsigned bPosIsCenter : 1; @@ -69,8 +69,8 @@ public: E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize); E3dCubeObj(); - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); @@ -81,11 +81,11 @@ public: void SetCubeSize(const basegfx::B3DVector& rNew); const basegfx::B3DVector& GetCubeSize() { return aCubeSize; } - void SetPosIsCenter(BOOL bNew); - BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; } + void SetPosIsCenter(sal_Bool bNew); + sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; } - void SetSideFlags(UINT16 nNew); - UINT16 GetSideFlags() { return nSideFlags; } + void SetSideFlags(sal_uInt16 nNew); + sal_uInt16 GetSideFlags() { return nSideFlags; } // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". virtual void TakeObjNameSingul(String& rName) const; diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx index 736dee6e72..9b758e8f5e 100644 --- a/svx/inc/svx/databaseregistrationui.hxx +++ b/svx/inc/svx/databaseregistrationui.hxx @@ -44,7 +44,7 @@ namespace svx /** opens a dialog which allows the user to administrate the database registrations */ - USHORT SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); + sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); //........................................................................ } // namespace svx diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 22e2ab820e..48ae012e5e 100755 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -57,7 +57,7 @@ namespace svxform static ::connectivity::simple::createDataAccessToolsFactoryFunction s_pFactoryCreationFunc; //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time) - mutable BOOL m_bCreateAlready; + mutable sal_Bool m_bCreateAlready; private: mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory; diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index 2c95c76c06..ac1445450a 100644 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -44,14 +44,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes private: // Compound-Objekt Color aDefaultAmbientColor; - BOOL bDefaultCreateNormals; - BOOL bDefaultCreateTexture; + sal_Bool bDefaultCreateNormals; + sal_Bool bDefaultCreateTexture; // Cube-Objekt basegfx::B3DPoint aDefaultCubePos; basegfx::B3DVector aDefaultCubeSize; - UINT16 nDefaultCubeSideFlags; - BOOL bDefaultCubePosIsCenter; + sal_uInt16 nDefaultCubeSideFlags; + sal_Bool bDefaultCubePosIsCenter; // Sphere-Objekt basegfx::B3DPoint aDefaultSphereCenter; @@ -59,18 +59,18 @@ private: // Lathe-Objekt long nDefaultLatheEndAngle; - BOOL bDefaultLatheSmoothed; - BOOL bDefaultLatheSmoothFrontBack; - BOOL bDefaultLatheCharacterMode; - BOOL bDefaultLatheCloseFront; - BOOL bDefaultLatheCloseBack; + sal_Bool bDefaultLatheSmoothed; + sal_Bool bDefaultLatheSmoothFrontBack; + sal_Bool bDefaultLatheCharacterMode; + sal_Bool bDefaultLatheCloseFront; + sal_Bool bDefaultLatheCloseBack; // Extrude-Objekt - BOOL bDefaultExtrudeSmoothed; - BOOL bDefaultExtrudeSmoothFrontBack; - BOOL bDefaultExtrudeCharacterMode; - BOOL bDefaultExtrudeCloseFront; - BOOL bDefaultExtrudeCloseBack; + sal_Bool bDefaultExtrudeSmoothed; + sal_Bool bDefaultExtrudeSmoothFrontBack; + sal_Bool bDefaultExtrudeCharacterMode; + sal_Bool bDefaultExtrudeCloseFront; + sal_Bool bDefaultExtrudeCloseBack; public: // Konstruktor @@ -84,20 +84,20 @@ public: const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; } - BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; } - void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; } - BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; } - void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; } + sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; } + void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; } + sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; } + void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; } // Cube-Objekt const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; } - UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } - void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; } - BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } - void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; } + sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } + void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; } + sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } + void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; } // Sphere-Objekt const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; } @@ -108,28 +108,28 @@ public: // Lathe-Objekt long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } - BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } - void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; } - BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } - void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; } - BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } - void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; } - BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } - void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; } - BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } - void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; } + sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } + void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; } + sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } + void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; } + sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } + void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; } + sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } + void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; } + sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } + void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; } // Extrude-Objekt - BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } - void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; } - BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } - void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } - BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } - void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; } - BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } - void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; } - BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } - void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; } + sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } + void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; } + sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } + void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } + sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } + void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; } + sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } + void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; } + sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } + void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; } }; #endif // _E3D_DEFLT3D_HXX diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index a6c2d52f41..d9ac41c68b 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -82,7 +82,7 @@ public: |* eines Objekts |* \************************************************************************/ -typedef UINT16 CTL_STATE; +typedef sal_uInt16 CTL_STATE; #define CS_NOHORZ 1 // no horizontal input information is used #define CS_NOVERT 2 // no vertikal input information is used @@ -91,15 +91,15 @@ class SvxRectCtlAccessibleContext; class SVX_DLLPUBLIC SvxRectCtl : public Control { private: - SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground ); + SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); SVX_DLLPRIVATE void InitRectBitmap( void ); SVX_DLLPRIVATE Bitmap& GetRectBitmap( void ); SVX_DLLPRIVATE void Resize_Impl(); protected: SvxRectCtlAccessibleContext* pAccContext; - USHORT nBorderWidth; - USHORT nRadius; + sal_uInt16 nBorderWidth; + sal_uInt16 nRadius; Size aSize; Point aPtLT, aPtMT, aPtRT; Point aPtLM, aPtMM, aPtRM; @@ -124,7 +124,7 @@ protected: Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM, - USHORT nBorder = 200, USHORT nCircle = 80, CTL_STYLE eStyle = CS_RECT ); + sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); virtual ~SvxRectCtl(); virtual void Paint( const Rectangle& rRect ); @@ -140,7 +140,7 @@ public: void SetState( CTL_STATE nState ); - UINT8 GetNumOfChilds( void ) const; // returns number of usable radio buttons + sal_uInt8 GetNumOfChilds( void ) const; // returns number of usable radio buttons Rectangle CalculateFocusRectangle( void ) const; Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; @@ -168,7 +168,7 @@ private: protected: Font aFont; Size aFontSize; - BOOL bPositive; + sal_Bool bPositive; public: SvxAngleCtl( Window* pParent, const ResId& rResId ); @@ -189,9 +189,9 @@ class SVX_DLLPUBLIC SvxBitmapCtl { protected: Size aSize; - USHORT nLines; + sal_uInt16 nLines; Color aPixelColor, aBackgroundColor; - const USHORT* pBmpArray; + const sal_uInt16* pBmpArray; public: SvxBitmapCtl( Window* pParent, const Size& rSize ); @@ -199,8 +199,8 @@ public: XOBitmap GetXBitmap(); - void SetBmpArray( const USHORT* pPixel ) { pBmpArray = pPixel; } - void SetLines( USHORT nLns ) { nLines = nLns; } + void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; } + void SetLines( sal_uInt16 nLns ) { nLines = nLns; } void SetPixelColor( Color aColor ) { aPixelColor = aColor; } void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; } }; @@ -216,19 +216,19 @@ private: using OutputDevice::SetLineColor; protected: - USHORT nLines, nSquares; + sal_uInt16 nLines, nSquares; Color aPixelColor; Color aBackgroundColor; Color aLineColor; Size aRectSize; - USHORT* pPixel; - BOOL bPaintable; + sal_uInt16* pPixel; + sal_Bool bPaintable; - void ChangePixel( USHORT nPixel ); + void ChangePixel( sal_uInt16 nPixel ); public: SvxPixelCtl( Window* pParent, const ResId& rResId, - USHORT nNumber = 8 ); + sal_uInt16 nNumber = 8 ); ~SvxPixelCtl(); virtual void Paint( const Rectangle& rRect ); @@ -240,14 +240,14 @@ public: void SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; } void SetLineColor( const Color& rCol ) { aLineColor = rCol; } - USHORT GetLineCount() const { return nLines; } + sal_uInt16 GetLineCount() const { return nLines; } Color GetPixelColor() const { return aPixelColor; } Color GetBackgroundColor() const { return aBackgroundColor; } - USHORT GetBitmapPixel( const USHORT nPixelNumber ); - USHORT* GetBitmapPixelPtr() { return pPixel; } + sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber ); + sal_uInt16* GetBitmapPixelPtr() { return pPixel; } - void SetPaintable( BOOL bTmp ) { bPaintable = bTmp; } + void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; } void Reset(); }; @@ -266,7 +266,7 @@ public: virtual void Fill( const XColorTable* pTab ); void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); }; /************************************************************************* @@ -278,20 +278,20 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox { public: - HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); - HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE ); + HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); + HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XHatchList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rXHatch, USHORT nDist = 0 ); + const XHatch& rXHatch, sal_uInt16 nDist = 0 ); private: XHatchList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; }; /************************************************************************* @@ -302,20 +302,20 @@ private: class SVX_DLLPUBLIC GradientLB : public ListBox { public: - GradientLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); - GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE ); + GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); + GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XGradientList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XGradientList* pList, const String& rStr, - const XGradient& rXGradient, USHORT nDist = 0 ); + const XGradient& rXGradient, sal_uInt16 nDist = 0 ); private: XGradientList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; }; /************************************************************************* @@ -326,13 +326,13 @@ private: class SVX_DLLPUBLIC BitmapLB : public ListBox { public: - BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); + BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XBitmapList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XBitmapList* pList, const String& rStr, const Bitmap& rBmp); @@ -341,7 +341,7 @@ private: Bitmap aBitmap; XBitmapList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; SVX_DLLPRIVATE void SetVirtualDevice(); }; @@ -402,9 +402,9 @@ public: virtual void Fill( const XDashList* pList ); void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, USHORT nDist = 0 ); + const XDash& rDash, sal_uInt16 nDist = 0 ); void FillStyles(); }; @@ -420,12 +420,12 @@ public: LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} - virtual void Fill( const XLineEndList* pList, BOOL bStart = TRUE ); + virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True ); void Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL, - BOOL bStart = TRUE ); - void Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL, - BOOL bStart = TRUE ); + sal_Bool bStart = sal_True ); + void Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL, + sal_Bool bStart = sal_True ); }; ////////////////////////////////////////////////////////////////////////////// @@ -485,7 +485,7 @@ public: void SetLineAttributes(const SfxItemSet& rItemSet); - void ShowSymbol( BOOL b ) { mbWithSymbol = b; }; + void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; }; void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 2a816bc13c..d82cd462d3 100644 --- a/svx/inc/svx/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -48,7 +48,7 @@ public: TYPEINFO(); SvxColorTableItem(); SvxColorTableItem( XColorTable* pTable, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxColorTableItem( const SvxColorTableItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -58,8 +58,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XColorTable* GetColorTable() const { return pColorTable; } void SetColorTable( XColorTable* pTable ) { @@ -82,7 +82,7 @@ public: TYPEINFO(); SvxGradientListItem(); SvxGradientListItem( XGradientList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxGradientListItem( const SvxGradientListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -92,8 +92,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XGradientList* GetGradientList() const { return pGradientList; } void SetGradientList( XGradientList* pList ) { @@ -117,7 +117,7 @@ public: TYPEINFO(); SvxHatchListItem(); SvxHatchListItem( XHatchList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxHatchListItem( const SvxHatchListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -127,8 +127,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XHatchList* GetHatchList() const { return pHatchList; } void SetHatchList( XHatchList* pList ) { @@ -152,7 +152,7 @@ public: TYPEINFO(); SvxBitmapListItem(); SvxBitmapListItem( XBitmapList* pBL, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxBitmapListItem( const SvxBitmapListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -162,8 +162,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XBitmapList* GetBitmapList() const { return pBitmapList; } void SetBitmapList( XBitmapList* pList ) { @@ -187,7 +187,7 @@ public: TYPEINFO(); SvxDashListItem(); SvxDashListItem( XDashList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxDashListItem( const SvxDashListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -197,8 +197,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XDashList* GetDashList() const { return pDashList; } void SetDashList( XDashList* pList ); @@ -221,7 +221,7 @@ public: TYPEINFO(); SvxLineEndListItem(); SvxLineEndListItem( XLineEndList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxLineEndListItem( const SvxLineEndListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -231,8 +231,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XLineEndList* GetLineEndList() const { return pLineEndList; } void SetLineEndList( XLineEndList* pList ) { diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 5d22acf2ac..431395f206 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -44,18 +44,18 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem public: TYPEINFO(); SvxB3DVectorItem(); - SvxB3DVectorItem( USHORT nWhich, const basegfx::B3DVector& rVal ); - SvxB3DVectorItem( USHORT nWhich, SvStream & ); + SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal ); + SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & ); SvxB3DVectorItem( const SvxB3DVectorItem& ); ~SvxB3DVectorItem(); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const basegfx::B3DVector& GetValue() const { return aVal; } void SetValue( const basegfx::B3DVector& rNewVal ) { @@ -63,7 +63,7 @@ public: aVal = rNewVal; } - virtual USHORT GetVersion (USHORT nFileFormatVersion) const; + virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; #endif diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 1c5e595fde..3762cef780 100644 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -57,7 +57,7 @@ class E3dUndoAction : public SdrUndoAction virtual ~E3dUndoAction (); - virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; }; /************************************************************************\ @@ -100,7 +100,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction SdrObject* pObject; E3dView* pView; - BOOL bUseSubObjects; + sal_Bool bUseSubObjects; const SfxItemSet aNewSet; const SfxItemSet aOldSet; @@ -111,11 +111,11 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction E3dObject* pInObject, const SfxItemSet& rNewSet, const SfxItemSet& rOldSet, - BOOL bUseSubObj); + sal_Bool bUseSubObj); virtual ~E3dAttributesUndoAction(); - virtual BOOL CanRepeat(SfxRepeatTarget& rView) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const; virtual void Undo(); virtual void Redo(); virtual void Repeat(); diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index 73a4fc7645..aa352276c3 100644 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -89,7 +89,7 @@ public: sal_Bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator=(const SdrObject&); @@ -102,7 +102,7 @@ public: const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; } // Aufbrechen - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx index ca106ba8ee..4f7ae5fc3e 100644 --- a/svx/inc/svx/extrusioncolorcontrol.hxx +++ b/svx/inc/svx/extrusioncolorcontrol.hxx @@ -41,10 +41,10 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~ExtrusionColorControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx index 4e0b001950..fdd8b857d0 100644 --- a/svx/inc/svx/f3dchild.hxx +++ b/svx/inc/svx/f3dchild.hxx @@ -42,7 +42,7 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow { public: - Svx3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Svx3DChildWindow); }; diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 1e2bcc5fab..d3e990a0f4 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -61,17 +61,17 @@ private: SvxFillTypeBox* pFillTypeLB; SvxFillAttrBox* pFillAttrLB; - BOOL bUpdate; - BOOL bIgnoreStatusUpdate; - USHORT eLastXFS; + sal_Bool bUpdate; + sal_Bool bIgnoreStatusUpdate; + sal_uInt16 eLastXFS; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFillToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index b56d69fd02..6a7c087d17 100644 --- a/svx/inc/svx/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx @@ -45,13 +45,13 @@ #define SVX_HIDESHADOWCTL 0x01 //CHINA001 copy from chardlg.hxx -#define DISABLE_CASEMAP ((USHORT)0x0001) -#define DISABLE_WORDLINE ((USHORT)0x0002) -#define DISABLE_BLINK ((USHORT)0x0004) -#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) +#define DISABLE_CASEMAP ((sal_uInt16)0x0001) +#define DISABLE_WORDLINE ((sal_uInt16)0x0002) +#define DISABLE_BLINK ((sal_uInt16)0x0004) +#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008) -#define DISABLE_LANGUAGE ((USHORT)0x0010) -#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) +#define DISABLE_LANGUAGE ((sal_uInt16)0x0010) +#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020) //CHINA001 flags for SvxCharBasePage's child class #define SVX_PREVIEW_CHARACTER 0x01 diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index a338a9e8fa..28eab86c02 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -201,7 +201,7 @@ private: // der Rest ... Image aImgLightOn; Image aImgLightOff; - BOOL bUpdate; + sal_Bool bUpdate; ViewType3D eViewType; Size aSize; @@ -226,7 +226,7 @@ private: // ItemSet used to remember set 2d attributes SfxItemSet* mpRemember2DAttributes; - BOOL bOnly3DChanged; + sal_Bool bOnly3DChanged; //------------------------------------ @@ -247,8 +247,8 @@ private: SVX_DLLPRIVATE void Construct(); SVX_DLLPRIVATE void Reset(); - SVX_DLLPRIVATE BOOL LBSelectColor( ColorLB* pLb, const Color& rColor ); - SVX_DLLPRIVATE USHORT GetLightSource( const PushButton* pBtn = NULL ); + SVX_DLLPRIVATE sal_Bool LBSelectColor( ColorLB* pLb, const Color& rColor ); + SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = NULL ); SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = NULL ); SVX_DLLPRIVATE bool GetUILightState( ImageButton& aBtn ) const; @@ -263,7 +263,7 @@ public: ~Svx3DWin(); void InitColorLB( const SdrModel* pDoc ); - BOOL IsUpdateMode() const { return bUpdate; } + sal_Bool IsUpdateMode() const { return bUpdate; } void Update( SfxItemSet& rSet ); void GetAttr( SfxItemSet& rSet ); @@ -283,11 +283,11 @@ class Svx3DCtrlItem : public SfxControllerItem Svx3DWin* p3DWin; protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); public: - Svx3DCtrlItem( USHORT, Svx3DWin*, SfxBindings* ); + Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* ); }; /************************************************************************* @@ -299,14 +299,14 @@ class Svx3DCtrlItem : public SfxControllerItem class SvxConvertTo3DItem : public SfxControllerItem { - BOOL bState; + sal_Bool bState; protected: - virtual void StateChanged(UINT16 nSId, SfxItemState eState, const SfxPoolItem* pState); + virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState); public: - SvxConvertTo3DItem(UINT16 nId, SfxBindings* pBindings); - BOOL GetState() const { return bState; } + SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings); + sal_Bool GetState() const { return bState; } }; #endif // _SVX_FLOAT3D_HXX diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 31f391399a..4ee8aa89c9 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -49,7 +49,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/uno3.hxx> diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index ee5c157d47..2de9754f66 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -69,7 +69,7 @@ public: virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); - virtual void MovePage(USHORT nPgNum, USHORT nNewPos); + virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx index 12296f64c1..5b90a37f7f 100644 --- a/svx/inc/svx/fmpage.hxx +++ b/svx/inc/svx/fmpage.hxx @@ -61,10 +61,10 @@ public: virtual SdrPage* Clone() const; using SdrPage::Clone; - virtual void InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND, + virtual void InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual SdrObject* RemoveObject(sal_uLong nObjNum); // Zugriff auf alle Formulare const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const; diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index 4bd8310950..0d928dae48 100644 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -71,7 +71,7 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormats.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <cppuhelper/weakref.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index cccc48b8bf..10655cc07d 100644 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -97,8 +97,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, - UINT32 _nInventor, - UINT16 _nLabelObjectID, + sal_uInt32 _nInventor, + sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, @@ -114,7 +114,7 @@ public: using E3dView::Paste; virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); - virtual BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); + virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); /** grab the focus to the first form control on the view @param _bForceSync @@ -128,7 +128,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 5ba448e344..f8ff8b9abe 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -49,13 +49,13 @@ private: //#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); - SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState, + SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); //#endif public: - SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& ); + SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontMenuControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 20badbeb75..44daa284c2 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window private: FontPrevWin_Impl* pImpl; - SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground ); + SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); public: SvxFontPrevWindow( Window* pParent, const ResId& rId ); @@ -70,15 +70,15 @@ public: void SetColor( const Color& rColor ); void ResetColor(); void SetBackColor( const Color& rColor ); - void UseResourceText( BOOL bUse = TRUE ); + void UseResourceText( sal_Bool bUse = sal_True ); void Paint( const Rectangle& ); - BOOL IsTwoLines() const; - void SetTwoLines(BOOL bSet); + sal_Bool IsTwoLines() const; + void SetTwoLines(sal_Bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); - void SetFontWidthScale( UINT16 nScaleInPercent ); + void SetFontWidthScale( sal_uInt16 nScaleInPercent ); void AutoCorrectFontColor( void ); diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index 5b46d28ab5..330b54de0e 100644 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -51,11 +51,11 @@ private: //#endif protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxFontSizeMenuControl( USHORT nId, Menu&, SfxBindings& ); + SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontSizeMenuControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index e8bcd3777c..8cf5fd497b 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -96,7 +96,7 @@ public: void SetNoSelection(); /** Returns the position of the entry currently selected or LIST_APPEND. */ - ULONG GetSelectEntryPos() const; + sal_uLong GetSelectEntryPos() const; /** Returns the text of the selected entry or an empty string. */ XubString GetSelectEntry() const; diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 756b76c868..f1e7e3ef2a 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -73,11 +73,11 @@ class SvxFontWorkControllerItem : public SfxControllerItem SvxFontWorkDialog &rFontWorkDlg; protected: - virtual void StateChanged(USHORT nSID, SfxItemState eState, + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); public: - SvxFontWorkControllerItem(USHORT nId, SvxFontWorkDialog&, SfxBindings&); + SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&); }; /************************************************************************* @@ -89,7 +89,7 @@ public: class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow { public: - SvxFontWorkChildWindow(Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow); }; @@ -126,11 +126,11 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow SfxBindings& rBindings; Timer aInputTimer; - BOOL bUserZoomedIn; + sal_Bool bUserZoomedIn; - USHORT nLastStyleTbxId; - USHORT nLastAdjustTbxId; - USHORT nLastShadowTbxId; + sal_uInt16 nLastStyleTbxId; + sal_uInt16 nLastAdjustTbxId; + sal_uInt16 nLastShadowTbxId; long nSaveShadowX; long nSaveShadowY; long nSaveShadowAngle; @@ -164,7 +164,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow void SetShowForm_Impl(const XFormTextHideFormItem*); void SetOutline_Impl(const XFormTextOutlineItem*); void SetShadow_Impl(const XFormTextShadowItem*, - BOOL bRestoreValues = FALSE); + sal_Bool bRestoreValues = sal_False); void SetShadowColor_Impl(const XFormTextShadowColorItem*); void SetShadowXVal_Impl(const XFormTextShadowXValItem*); void SetShadowYVal_Impl(const XFormTextShadowYValItem*); @@ -186,7 +186,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow ~SvxFontWorkDialog(); void SetColorTable(const XColorTable* pTable); - void SetActive(BOOL bActivate = TRUE); + void SetActive(sal_Bool bActivate = sal_True); void CreateStdFormObj(SdrView& rView, SdrPageView& rPV, const SfxItemSet& rAttr, SdrObject& rOldObj, diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 26b7bae756..d2c11fc762 100644 --- a/svx/inc/svx/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx @@ -63,10 +63,10 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~FontWorkShapeTypeControl(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); }; diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 81e7031a37..7a61f98709 100644 --- a/svx/inc/svx/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx @@ -49,14 +49,14 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~FormatPaintBrushToolBoxControl(); virtual void DoubleClick(); virtual void Click(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); private: DECL_LINK( WaitDoubleClickHdl, void* ); diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index 22100d3e0a..09d4c3814b 100644 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -128,7 +128,7 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, returns the widths in the passed parameters. */ - bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec ) const; + bool GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, returns the color in the passed parameter. */ @@ -159,7 +159,7 @@ public: void SelectAllVisibleBorders( bool bSelect = true ); /** Sets the passed line widths to all selected frame borders (in twips). */ - void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec ); + void SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec ); /** Sets the passed color to all selected frame borders. */ void SetColorToSelection( const Color& rColor ); diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx index 01ba5ce90b..8b7d0a13f3 100644 --- a/svx/inc/svx/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -47,7 +47,7 @@ class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow { public: - GalleryChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); ~GalleryChildWindow(); SFX_DECL_CHILDWINDOW( GalleryChildWindow ); @@ -88,7 +88,7 @@ private: void InitSettings(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void GetFocus(); @@ -107,10 +107,10 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; - BOOL KeyInput( const KeyEvent& rKEvt, Window* pWindow ); + sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); }; #endif // _SVX_GALBRWS_HXX_ diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx index a5a74d5881..d405635d3b 100644 --- a/svx/inc/svx/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -65,7 +65,7 @@ private: Rectangle aPreviewRect; GalleryTheme* mpTheme; - SVX_DLLPRIVATE BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; + SVX_DLLPRIVATE sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; SVX_DLLPRIVATE void InitSettings(); // Window @@ -145,14 +145,14 @@ private: Link maSelectHdl; GalleryTheme* mpTheme; - ULONG mnCurRow; - BOOL mbInit; + sal_uIntPtr mnCurRow; + sal_Bool mbInit; void InitSettings(); // BrowseBox - virtual BOOL SeekRow( long nRow ); - virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const; + virtual sal_Bool SeekRow( long nRow ); + virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; virtual void DoubleClick( const BrowserMouseEvent& rEvt ); virtual void Select(); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); @@ -181,7 +181,7 @@ 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; // from IAccessibleTableProvider virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx index 2f42bc32fe..a5bb4b8856 100644 --- a/svx/inc/svx/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -118,57 +118,57 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; - static BOOL FillThemeList( List& rThemeList ); + static sal_Bool FillThemeList( List& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL - static BOOL FillObjList( const String& rThemeName, List& rObjList ); - static BOOL FillObjList( ULONG nThemeId, List& rObjList ); + static sal_Bool FillObjList( const String& rThemeName, List& rObjList ); + static sal_Bool FillObjList( sal_uIntPtr nThemeId, List& rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); - static BOOL InsertURL( const String& rThemeName, const String& rURL ); - static BOOL InsertURL( ULONG nThemeId, const String& rURL ); + static sal_Bool InsertURL( const String& rThemeName, const String& rURL ); + static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL ); - static BOOL InsertURL( const String& rThemeName, const String& rURL, - const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ ); - static BOOL InsertURL( ULONG nThemeId, const String& rURL, - const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ ); + static sal_Bool InsertURL( const String& rThemeName, const String& rURL, + const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ ); + static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL, + const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ ); - static ULONG GetObjCount( const String& rThemeName ); - static ULONG GetObjCount( ULONG nThemeId ); + static sal_uIntPtr GetObjCount( const String& rThemeName ); + static sal_uIntPtr GetObjCount( sal_uIntPtr nThemeId ); - static BOOL GetGraphicObj( const String& rThemeName, ULONG nPos, + static sal_Bool GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos, Graphic* pGraphic = NULL, Bitmap* pThumb = NULL, - BOOL bProgess = FALSE ); - static BOOL GetGraphicObj( ULONG nThemeId, ULONG nPos, + sal_Bool bProgess = sal_False ); + static sal_Bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, Graphic* pGraphic = NULL, Bitmap* pThumb = NULL, - BOOL bProgess = FALSE ); + sal_Bool bProgess = sal_False ); - static BOOL InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ); - static BOOL InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic ); + static sal_Bool InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ); + static sal_Bool InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic ); - static ULONG GetSdrObjCount( const String& rThemeName ); - static ULONG GetSdrObjCount( ULONG nThemeId ); + static sal_uIntPtr GetSdrObjCount( const String& rThemeName ); + static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId ); - static BOOL GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, + static sal_Bool GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos, SdrModel* pModel = NULL, Bitmap* pThumb = NULL ); - static BOOL GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos, + static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos, SdrModel* pModel = NULL, Bitmap* pThumb = NULL ); - static BOOL InsertSdrObj( const String& rThemeName, FmFormModel& rModel ); - static BOOL InsertSdrObj( ULONG nThemeId, FmFormModel& rModel ); + static sal_Bool InsertSdrObj( const String& rThemeName, FmFormModel& rModel ); + static sal_Bool InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel ); - static BOOL BeginLocking( const String& rThemeName ); - static BOOL BeginLocking( ULONG nThemeId ); + static sal_Bool BeginLocking( const String& rThemeName ); + static sal_Bool BeginLocking( sal_uIntPtr nThemeId ); - static BOOL EndLocking( const String& rThemeName ); - static BOOL EndLocking( ULONG nThemeId ); + static sal_Bool EndLocking( const String& rThemeName ); + static sal_Bool EndLocking( sal_uIntPtr nThemeId ); - static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); + static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; #endif // _GALLERY_HXX_ diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index 6cd5ca8589..8e3ca7a522 100644 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -52,12 +52,12 @@ private: INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - UINT32 nFileNumber; - UINT32 nId; - BOOL bReadOnly; - BOOL bImported; - BOOL bModified; - BOOL bThemeNameFromResource; + sal_uInt32 nFileNumber; + sal_uInt32 nId; + sal_Bool bReadOnly; + sal_Bool bImported; + sal_Bool bModified; + sal_Bool bThemeNameFromResource; GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; @@ -65,31 +65,31 @@ private: public: GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, - UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported, - BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource ); + sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported, + sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; const String& GetThemeName() const { return aName; } - UINT32 GetFileNumber() const { return nFileNumber; } + sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } const INetURLObject& GetSdvURL() const { return aSdvURL; } - BOOL IsImported() const { return bImported; } - BOOL IsReadOnly() const { return bReadOnly; } - BOOL IsDefault() const; + sal_Bool IsImported() const { return bImported; } + sal_Bool IsReadOnly() const { return bReadOnly; } + sal_Bool IsDefault() const; - BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } + sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } - BOOL IsModified() const { return bModified; } - void SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } + sal_Bool IsModified() const { return bModified; } + void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } void SetName( const String& rNewName ); - BOOL IsNameFromResource() const { return bThemeNameFromResource; } + sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } - UINT32 GetId() const { return nId; } - void SetId( UINT32 nNewId, BOOL bResetThemeName ); + sal_uInt32 GetId() const { return nId; } + void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* ) @@ -133,8 +133,8 @@ private: INetURLObject aRelURL; INetURLObject aUserURL; rtl_TextEncoding nReadTextEncoding; - ULONG nLastFileNumber; - BOOL bMultiPath; + sal_uIntPtr nLastFileNumber; + sal_Bool bMultiPath; void ImplLoad( const String& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); @@ -142,7 +142,7 @@ private: void ImplWriteImportList(); SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); - GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId ); + GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); @@ -155,17 +155,17 @@ public: SVX_DLLPUBLIC static Gallery* GetGalleryInstance(); - ULONG GetThemeCount() const { return aThemeList.Count(); } - const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); } + sal_uIntPtr GetThemeCount() const { return aThemeList.Count(); } + const GalleryThemeEntry* GetThemeInfo( sal_uIntPtr nPos ) { return aThemeList.GetObject( nPos ); } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } - SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName ); - String GetThemeName( ULONG nThemeId ) const; + SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); + String GetThemeName( sal_uIntPtr nThemeId ) const; - SVX_DLLPUBLIC BOOL CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 ); - BOOL CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); - BOOL RenameTheme( const String& rOldName, const String& rNewName ); - SVX_DLLPUBLIC BOOL RemoveTheme( const String& rThemeName ); + SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); + sal_Bool CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); + sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); + SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName ); SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener ); SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ); @@ -177,7 +177,7 @@ public: const INetURLObject& GetUserURL() const { return aUserURL; } const INetURLObject& GetRelativeURL() const { return aRelURL; } - BOOL IsMultiPath() const { return bMultiPath; } + sal_Bool IsMultiPath() const { return bMultiPath; } }; #endif // _SVX_GALLERY1_HXX_ diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index 57f98ccca9..22f54336db 100644 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -73,7 +73,7 @@ enum SgaObjKind // - Defines - // ----------- -#define IV_IMAPINFO (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000) +#define IV_IMAPINFO (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000) #define ID_IMAPINFO 2 #define USERDATA_HDL() (LINK(this,SgaUserDataFactory,MakeUserData)) @@ -104,16 +104,16 @@ class ImageMap; class Gallery; SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); -USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE ); -BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); -BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); -SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen ); +sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False ); +sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); +sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); +SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen ); String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); -BOOL FileExists( const INetURLObject& rURL ); -BOOL CreateDir( const INetURLObject& rURL ); -BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); -BOOL KillFile( const INetURLObject& rURL ); +sal_Bool FileExists( const INetURLObject& rURL ); +sal_Bool CreateDir( const INetURLObject& rURL ); +sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); +sal_Bool KillFile( const INetURLObject& rURL ); BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); @@ -173,7 +173,7 @@ class SVX_DLLPUBLIC GalleryProgress GalleryProgress( GraphicFilter* pFilter = NULL ); ~GalleryProgress(); - void Update( ULONG nVal, ULONG nMaxVal ); + void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ); }; // ----------------------- @@ -201,7 +201,7 @@ private: protected: - GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ); + GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ); ~GalleryTransferable(); void InitData( bool bLazy ); @@ -238,25 +238,25 @@ class GalleryHint : public SfxHint { private: - ULONG mnType; + sal_uIntPtr mnType; String maThemeName; String maStringData; - ULONG mnData1; - ULONG mnData2; + sal_uIntPtr mnData1; + sal_uIntPtr mnData2; public: - GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {} - GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} - ULONG GetType() const { return mnType; } + sal_uIntPtr GetType() const { return mnType; } const String& GetThemeName() const { return maThemeName; } const String& GetStringData() const { return maStringData; } - ULONG GetData1() const { return mnData1; } - ULONG GetData2() const { return mnData2; } + sal_uIntPtr GetData1() const { return mnData1; } + sal_uIntPtr GetData2() const { return mnData2; } }; #endif diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 6a51190ce6..45e5c040dd 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -56,7 +56,7 @@ struct GalleryObject INetURLObject aURL; sal_uInt32 nOffset; SgaObjKind eObjKind; - BOOL bDummy; + sal_Bool bDummy; }; DECLARE_LIST( GalleryObjectList, GalleryObject* ) @@ -73,7 +73,7 @@ class ListBox; struct GalDragParams { Region aDragRegion; - ULONG nDragObjPos; + sal_uIntPtr nDragObjPos; String aThemeName; String aFileName; SgaObjKind eObjKind; @@ -106,24 +106,24 @@ private: SotStorageRef aSvDrawStorageRef; Gallery* pParent; GalleryThemeEntry* pThm; - ULONG mnThemeLockCount; - ULONG mnBroadcasterLockCount; - ULONG nDragPos; - BOOL bDragging; - BOOL bAbortActualize; + sal_uIntPtr mnThemeLockCount; + sal_uIntPtr mnBroadcasterLockCount; + sal_uIntPtr nDragPos; + sal_Bool bDragging; + sal_Bool bAbortActualize; void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - BOOL ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry ); + sal_Bool ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); - const GalleryObject* ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); } + const GalleryObject* ImplGetGalleryObject( sal_uIntPtr nPos ) const { return aObjectList.GetObject( nPos ); } SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL ); - ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } + sal_uIntPtr ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; - INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN ); - void ImplSetModified( BOOL bModified ); - void ImplBroadcast( ULONG nUpdatePos ); + INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN ); + void ImplSetModified( sal_Bool bModified ); + void ImplBroadcast( sal_uIntPtr nUpdatePos ); GalleryTheme(); GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ); @@ -131,16 +131,16 @@ private: public: - static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ); + static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly ); - ULONG GetObjectCount() const { return aObjectList.Count(); } + sal_uIntPtr GetObjectCount() const { return aObjectList.Count(); } - SVX_DLLPUBLIC SgaObject* AcquireObject( ULONG nPos ); + SVX_DLLPUBLIC SgaObject* AcquireObject( sal_uIntPtr nPos ); SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); - SVX_DLLPUBLIC BOOL InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos ); - BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ); + SVX_DLLPUBLIC sal_Bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); + SVX_DLLPUBLIC sal_Bool RemoveObject( sal_uIntPtr nPos ); + sal_Bool ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; @@ -154,69 +154,69 @@ public: SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const; const INetURLObject& GetSdvURL() const; - SVX_DLLPUBLIC UINT32 GetId() const; - void SetId( UINT32 nNewId, BOOL bResetThemeName ); + SVX_DLLPUBLIC sal_uInt32 GetId() const; + void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); - void SetDragging( BOOL bSet ) { bDragging = bSet; } - BOOL IsDragging() const { return bDragging; } + void SetDragging( sal_Bool bSet ) { bDragging = bSet; } + sal_Bool IsDragging() const { return bDragging; } void LockTheme() { ++mnThemeLockCount; } - BOOL UnlockTheme(); + sal_Bool UnlockTheme(); void LockBroadcaster() { mnBroadcasterLockCount++; } - SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 ); - BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } + SVX_DLLPUBLIC void UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 ); + sal_Bool IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } - void SetDragPos( ULONG nPos ) { nDragPos = nPos; } - ULONG GetDragPos() const { return nDragPos; } + void SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; } + sal_uIntPtr GetDragPos() const { return nDragPos; } - BOOL IsThemeNameFromResource() const; + sal_Bool IsThemeNameFromResource() const; - SVX_DLLPUBLIC BOOL IsImported() const; - SVX_DLLPUBLIC BOOL IsReadOnly() const; - SVX_DLLPUBLIC BOOL IsDefault() const; - BOOL IsModified() const; + SVX_DLLPUBLIC sal_Bool IsImported() const; + SVX_DLLPUBLIC sal_Bool IsReadOnly() const; + SVX_DLLPUBLIC sal_Bool IsDefault() const; + sal_Bool IsModified() const; SVX_DLLPUBLIC void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL ); - void AbortActualize() { bAbortActualize = TRUE; } + void AbortActualize() { bAbortActualize = sal_True; } Gallery* GetParent() const { return pParent; } SotStorageRef GetSvDrawStorage() const { return aSvDrawStorageRef; } public: - SgaObjKind GetObjectKind( ULONG nPos ) const + SgaObjKind GetObjectKind( sal_uIntPtr nPos ) const { DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" ); return ImplGetGalleryObject( nPos )->eObjKind; } - const INetURLObject& GetObjectURL( ULONG nPos ) const + const INetURLObject& GetObjectURL( sal_uIntPtr nPos ) const { DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" ); return ImplGetGalleryObject( nPos )->aURL; } - BOOL GetThumb( ULONG nPos, Bitmap& rBmp, BOOL bProgress = FALSE ); + sal_Bool GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False ); - SVX_DLLPUBLIC BOOL GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos = LIST_APPEND ); + SVX_DLLPUBLIC sal_Bool GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL GetModel( ULONG nPos, SdrModel& rModel, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertModel( const FmFormModel& rModel, ULONG nInsertPos = LIST_APPEND ); + SVX_DLLPUBLIC sal_Bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL GetModelStream( ULONG nPos, SotStorageStreamRef& rModelStreamRef, BOOL bProgress = FALSE ); - BOOL InsertModelStream( const SotStorageStreamRef& rModelStream, ULONG nInsertPos = LIST_APPEND ); + sal_Bool GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False ); + sal_Bool InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL GetURL( ULONG nPos, INetURLObject& rURL, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertURL( const INetURLObject& rURL, ULONG nInsertPos = LIST_APPEND ); - BOOL InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos = LIST_APPEND ); + sal_Bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = LIST_APPEND ); + sal_Bool InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos ); + sal_Bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); - void CopyToClipboard( Window* pWindow, ULONG nPos ); - void StartDrag( Window* pWindow, ULONG nPos ); + void CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ); + void StartDrag( Window* pWindow, sal_uIntPtr nPos ); public: diff --git a/svx/inc/svx/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 0d965bdd2a..c96ec4dc43 100644 --- a/svx/inc/svx/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -35,19 +35,19 @@ const double PrecisionLimit = 1.0e-14; -const UINT32 E3dInventor = UINT32('E')*0x00000001+ - UINT32('3')*0x00000100+ - UINT32('D')*0x00010000+ - UINT32('1')*0x01000000; +const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ + sal_uInt32('3')*0x00000100+ + sal_uInt32('D')*0x00010000+ + sal_uInt32('1')*0x01000000; -const UINT16 E3D_SCENE_ID = 1; -const UINT16 E3D_POLYSCENE_ID = 2; -const UINT16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject -const UINT16 E3D_CUBEOBJ_ID = 4; -const UINT16 E3D_SPHEREOBJ_ID = 5; -const UINT16 E3D_EXTRUDEOBJ_ID = 6; -const UINT16 E3D_LATHEOBJ_ID = 7; -const UINT16 E3D_COMPOUNDOBJ_ID = 8; -const UINT16 E3D_POLYGONOBJ_ID = 9; +const sal_uInt16 E3D_SCENE_ID = 1; +const sal_uInt16 E3D_POLYSCENE_ID = 2; +const sal_uInt16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject +const sal_uInt16 E3D_CUBEOBJ_ID = 4; +const sal_uInt16 E3D_SPHEREOBJ_ID = 5; +const sal_uInt16 E3D_EXTRUDEOBJ_ID = 6; +const sal_uInt16 E3D_LATHEOBJ_ID = 7; +const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8; +const sal_uInt16 E3D_POLYGONOBJ_ID = 9; #endif // _E3D_GLOBL3D_HXX diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index 97d8de5782..571ccd55b1 100644 --- a/svx/inc/svx/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { public: TYPEINFO(); - TbxImageItem( USHORT nWhich = 0, UINT16 nImage = 0 ); + TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -57,10 +57,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafFilterToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); }; @@ -74,10 +74,10 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; @@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------ @@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ----------------------------- @@ -111,7 +111,7 @@ class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ---------------------------------- @@ -122,7 +122,7 @@ class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxContro { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // --------------------------------- @@ -133,7 +133,7 @@ class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------ @@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------------- @@ -155,7 +155,7 @@ class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxCon { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ----------------------------- @@ -166,10 +166,10 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafModeToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index ade161ab2c..f5ea3fa5f0 100644 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -65,10 +65,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control GraphCtrlUserCall* pUserCall; WinBits nWinStyle; SdrObjKind eObjKind; - USHORT nPolyEdit; - BOOL bEditMode; - BOOL bSdrMode; - BOOL bAnim; + sal_uInt16 nPolyEdit; + sal_Bool bEditMode; + sal_Bool bSdrMode; + sal_Bool bAnim; DECL_LINK( UpdateHdl, Timer* ); @@ -103,17 +103,17 @@ public: void SetWinStyle( WinBits nWinBits ); WinBits GetWinStyle() const { return nWinStyle; } - void SetGraphic( const Graphic& rGraphic, BOOL bNewModel = TRUE ); + void SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True ); const Graphic& GetGraphic() const { return aGraphic; } const Size& GetGraphicSize() const { return aGraphSize; } const Point& GetMousePos() const { return aMousePos; } - void SetEditMode( const BOOL bEditMode ); - BOOL IsEditMode() const { return bEditMode; } + void SetEditMode( const sal_Bool bEditMode ); + sal_Bool IsEditMode() const { return bEditMode; } - void SetPolyEditMode( const USHORT nPolyEdit ); - USHORT GetPolyEditMode() const { return nPolyEdit; } + void SetPolyEditMode( const sal_uInt16 nPolyEdit ); + sal_uInt16 GetPolyEditMode() const { return nPolyEdit; } void SetObjKind( const SdrObjKind eObjKind ); SdrObjKind GetObjKind() const { return eObjKind; } @@ -121,7 +121,7 @@ public: SdrModel* GetSdrModel() const { return pModel; } SdrView* GetSdrView() const { return pView; } SdrObject* GetSelectedSdrObject() const; - BOOL IsChanged() const { return bSdrMode ? pModel->IsChanged() : FALSE; } + sal_Bool IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; } void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; } const Link& GetMousePosLink() const { return aMousePosLink; } diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index f25d37c8e4..193ea1fda3 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -38,25 +38,25 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 nLeft, nRight, nTop, nBottom; public: - SvxGrfCrop( USHORT ); + SvxGrfCrop( sal_uInt16 ); SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom, - USHORT ); + sal_uInt16 ); virtual ~SvxGrfCrop(); // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; - virtual SvStream& Store(SvStream &, USHORT nIVer) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, + sal_uInt8 nMemberId = 0 ); void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } void SetRight( sal_Int32 nVal ) { nRight = nVal; } diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index e754b32ced..ac7d75c65a 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter { public: - static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); + static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); static void DisableGraphicFilterSlots( SfxItemSet& rSet ); }; diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 496891c758..c5d35dbdba 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -288,7 +288,7 @@ private: sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource // (with respect to the data source capabilities) // defaults to (insert | update | delete) - USHORT m_nLastColId; + sal_uInt16 m_nLastColId; long m_nLastRowId; sal_Bool m_bDesignMode : 1; // default = sal_False @@ -393,7 +393,7 @@ 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; void RemoveRows(sal_Bool bNewCursor); diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 41fb9146aa..bf7373066d 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -54,21 +54,21 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual BOOL FillItemSet( SfxItemSet& rOutSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); virtual void Reset( const SfxItemSet& rSet ); virtual ~SvxHFPage(); - void DisableDeleteQueryBox() { bDisableQueryBox = TRUE; } - void EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; } + void DisableDeleteQueryBox() { bDisableQueryBox = sal_True; } + void EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; } void EnableDynamicSpacing(); protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet, - USHORT nSetId ); + SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet, + sal_uInt16 nSetId ); FixedLine aFrm; CheckBox aTurnOnBox; @@ -86,10 +86,10 @@ protected: SvxPageWindow aBspWin; PushButton aBackgroundBtn; - USHORT nId; + sal_uInt16 nId; SfxItemSet* pBBSet; - BOOL bDisableQueryBox; - BOOL bEnableBackgroundSelector; + sal_Bool bDisableQueryBox; + sal_Bool bEnableBackgroundSelector; FASTBOOL bInReset; void InitHandler(); @@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: SvxHeaderPage( Window* pParent, const SfxItemSet& rSet ); @@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index 1beecda742..e32dd9c97c 100644 --- a/svx/inc/svx/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx @@ -55,18 +55,18 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem String sIntName; SvxMacroTableDtor* pMacroTable; - USHORT nMacroEvents; + sal_uInt16 nMacroEvents; public: TYPEINFO(); - SvxHyperlinkItem( USHORT _nWhich = SID_HYPERLINK_GETLINK ): + SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ): SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; }; SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ); - SvxHyperlinkItem( USHORT nWhich, String& rName, String& rURL, + SvxHyperlinkItem( sal_uInt16 nWhich, String& rName, String& rURL, String& rTarget, String& rIntName, SvxLinkInsertMode eTyp = HLINK_FIELD, - USHORT nEvents = 0, + sal_uInt16 nEvents = 0, SvxMacroTableDtor *pMacroTbl =NULL ); virtual ~SvxHyperlinkItem () { delete pMacroTable; } @@ -74,8 +74,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const String& GetName() const { return sName; } void SetName(const String& rName) { sName = rName; } @@ -92,16 +92,16 @@ public: SvxLinkInsertMode GetInsertMode() const { return eType; } void SetInsertMode( SvxLinkInsertMode eNew ) { eType = eNew; } - void SetMacro( USHORT nEvent, const SvxMacro& rMacro ); + void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ); void SetMacroTable( const SvxMacroTableDtor& rTbl ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; } - void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; } - USHORT GetMacroEvents() const { return nMacroEvents; } + void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; } + sal_uInt16 GetMacroEvents() const { return nMacroEvents; } - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVer ) const; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVer ) const; }; diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index 457cb7c5e6..28158e6d7a 100644 --- a/svx/inc/svx/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx @@ -47,7 +47,7 @@ private: AbstractSvxHpLinkDlg* mpDlg; public: - SvxHlinkDlgWrapper( Window*pParent, USHORT nId, + SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper); diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx index 0a1f5ad95a..dd7836f2ed 100644 --- a/svx/inc/svx/hyprlink.hxx +++ b/svx/inc/svx/hyprlink.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow { public: - SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId, + SvxHyperlinkDlgWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper); }; diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index dc587513b8..69db4e715c 100644 --- a/svx/inc/svx/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { public: - SvxIMapDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow ); @@ -101,13 +101,13 @@ class SvxIMapDlgItem : public SfxControllerItem protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxIMapDlgItem( USHORT nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ); + SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ); }; @@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow SvxIMapDlgItem aIMapItem; virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); #ifdef _IMAPDLG_PRIVATE @@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK( MiscHdl, void* ); void DoOpen(); - BOOL DoSave(); + sal_Bool DoSave(); #endif @@ -171,7 +171,7 @@ public: Window* pParent, const ResId& rResId ); ~SvxIMapDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx index c1e43e59fa..0a5a8a0fce 100644 --- a/svx/inc/svx/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx @@ -37,20 +37,20 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxInsertStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SvxInsertStatusBarControl(); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - BOOL bInsert; + sal_Bool bInsert; #ifdef _SVX_INSCTRL_CXX SVX_DLLPRIVATE void DrawItemText_Impl(); diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx index b81e74e2d6..84c8599759 100644 --- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx +++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx @@ -54,20 +54,20 @@ class IPolyPolygonEditorController { public: virtual void DeleteMarkedPoints() = 0; - virtual BOOL IsDeleteMarkedPointsPossible() const = 0; + virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0; virtual void RipUpAtMarkedPoints() = 0; virtual bool IsRipUpAtMarkedPointsPossible() const = 0; - virtual BOOL IsSetMarkedSegmentsKindPossible() const = 0; + virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0; - virtual BOOL IsSetMarkedPointsSmoothPossible() const = 0; + virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0; - virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ) = 0; + virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0; virtual bool IsOpenCloseMarkedObjectsPossible() const = 0; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0; }; diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index 85d67a6ca6..f36c21405a 100644 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -43,10 +43,10 @@ class SfxObjectShell; class SvxLineBox : public LineLB { BmpColorMode meBmpMode; - USHORT nCurPos; + sal_uInt16 nCurPos; Timer aDelayTimer; Size aLogicalSize; - BOOL bRelease; + sal_Bool bRelease; SfxObjectShell* mpSh; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -77,11 +77,11 @@ class SvxColorBox : public ColorLB { using Window::Update; - USHORT nCurPos; - USHORT nId; + sal_uInt16 nCurPos; + sal_uInt16 nId; Timer aDelayTimer; Size aLogicalSize; - BOOL bRelease; + sal_Bool bRelease; ::rtl::OUString maCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -152,17 +152,17 @@ public: SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillTypeBox(); - void Selected() { bSelect = TRUE; } - BOOL IsRelease() { return bRelease;} + void Selected() { bSelect = sal_True; } + sal_Bool IsRelease() { return bRelease;} protected: virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); private: - USHORT nCurPos; - BOOL bSelect; - BOOL bRelease; + sal_uInt16 nCurPos; + sal_Bool bSelect; + sal_Bool bRelease; #ifdef _SVX_ITEMWIN_CXX void ReleaseFocus_Impl(); @@ -177,7 +177,7 @@ public: SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillAttrBox(); - BOOL IsRelease() { return bRelease;} + sal_Bool IsRelease() { return bRelease;} protected: virtual long PreNotify( NotifyEvent& rNEvt ); @@ -185,8 +185,8 @@ protected: virtual void Select(); private: - USHORT nCurPos; - BOOL bRelease; + sal_uInt16 nCurPos; + sal_Bool bRelease; #ifdef _SVX_ITEMWIN_CXX void ReleaseFocus_Impl(); diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index a1f78a6a04..ddf8538350 100644 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -58,7 +58,7 @@ class SvtLanguageTable; // load language strings from resource -SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ); +SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg ); class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { @@ -69,34 +69,34 @@ private: Image m_aCheckedImage; Image m_aCheckedImageHC; String m_aAllString; - com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang; + com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; - INT16 m_nLangList; - BOOL m_bHasLangNone; - BOOL m_bLangNoneIsLangAll; - BOOL m_bWithCheckmark; + sal_Int16 m_nLangList; + sal_Bool m_bHasLangNone; + sal_Bool m_bLangNoneIsLangAll; + sal_Bool m_bWithCheckmark; SVX_DLLPRIVATE void Init(); - SVX_DLLPRIVATE USHORT ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked ); - SVX_DLLPRIVATE USHORT ImplInsertLanguage(LanguageType, USHORT, sal_Int16 ); + SVX_DLLPRIVATE sal_uInt16 ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked ); + SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 ); public: - SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE); - SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck = FALSE); + SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False); + SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False); ~SvxLanguageBox(); - void SetLanguageList( INT16 nLangList, - BOOL bHasLangNone, BOOL bLangNoneIsLangAll = FALSE, - BOOL bCheckSpellAvail = FALSE ); + void SetLanguageList( sal_Int16 nLangList, + sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False, + sal_Bool bCheckSpellAvail = sal_False ); - USHORT InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND ); - USHORT InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND ); - USHORT InsertLanguage( const LanguageType eLangType, - BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertLanguage( const LanguageType eLangType, + sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); - void SelectLanguage( const LanguageType eLangType, BOOL bSelect = TRUE ); + void SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True ); LanguageType GetSelectLanguage() const; - BOOL IsLanguageSelected( const LanguageType eLangType ) const; + sal_Bool IsLanguageSelected( const LanguageType eLangType ) const; }; #if ENABLE_LAYOUT @@ -110,7 +110,7 @@ class SVX_DLLPUBLIC SvxLanguageBox : public ListBox DECL_GET_WINDOW (SvxLanguageBox);*/ public: - SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE ); + SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False ); ~SvxLanguageBox (); void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false); diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx index eb1ce3e118..75ecbac8dc 100644 --- a/svx/inc/svx/lathe3d.hxx +++ b/svx/inc/svx/lathe3d.hxx @@ -98,12 +98,12 @@ private: sal_Bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs); virtual void operator=(const SdrObject&); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". virtual void TakeObjNameSingul(String& rName) const; @@ -114,7 +114,7 @@ private: const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; } // Aufbrechen - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 26e3f1fc74..9feff08a9f 100644 --- a/svx/inc/svx/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -44,13 +44,13 @@ public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); virtual SfxPopupWindow* CreatePopupWindowCascading(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); SFX_DECL_TOOLBOX_CONTROL(); - SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTableToolBoxControl(); }; @@ -66,10 +66,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxColumnsToolBoxControl(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 0a699a72aa..f710210e93 100644 --- a/svx/inc/svx/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -44,7 +44,7 @@ protected: String aActionStr; SvxPopupWindowListBox * pPopupWin; - void Impl_SetInfo( USHORT nCount ); + void Impl_SetInfo( sal_uInt16 nCount ); DECL_LINK( PopupModeEndHdl, void * ); DECL_LINK( SelectHdl, void * ); @@ -52,12 +52,12 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxListBoxControl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -72,10 +72,10 @@ class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxUndoRedoControl(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx index 3daef66ffd..44a758922c 100644 --- a/svx/inc/svx/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx @@ -50,15 +50,15 @@ private: XLineStyleItem* pStyleItem; XLineDashItem* pDashItem; - BOOL bUpdate; + sal_Bool bUpdate; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineStyleToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); @@ -73,10 +73,10 @@ class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineWidthToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineWidthToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; @@ -90,10 +90,10 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); @@ -109,11 +109,11 @@ class SvxLineEndWindow : public SfxPopupWindow private: XLineEndList* pLineEndList; ValueSet aLineEndSet; - USHORT nCols; - USHORT nLines; - ULONG nLineEndWidth; + sal_uInt16 nCols; + sal_uInt16 nLines; + sal_uIntPtr nLineEndWidth; Size aBmpSize; - BOOL bPopupMode; + sal_Bool bPopupMode; bool mbInResize; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -126,7 +126,7 @@ private: protected: virtual void Resizing( Size& rSize ); virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void PopupModeEnd(); /** This function is called when the window gets the focus. It grabs @@ -136,10 +136,10 @@ protected: virtual void GetFocus (void); public: - SvxLineEndWindow( USHORT nId, + SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle ); - SvxLineEndWindow( USHORT nId, + SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const String& rWndTitle ); @@ -147,7 +147,7 @@ public: void StartSelection(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; }; @@ -160,10 +160,10 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineEndToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx index c03617ed55..5fffe7eb1e 100644 --- a/svx/inc/svx/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx @@ -37,18 +37,18 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxModifyControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - BOOL bState; + sal_Bool bState; #ifdef _SVX_MODCTRL_CXX SVX_DLLPRIVATE void DrawItemText_Impl(); diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index a20eecf424..df4e5d7407 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -249,7 +249,7 @@ #define DFF_msofbtSelection 0xF119 // an FDGSL followed by the SPIDs of the shapes in the selection X 0 -// Werte fuer den ULONG im DFF_PST_TextHeaderAtom +// Werte fuer den sal_uIntPtr im DFF_PST_TextHeaderAtom enum DFF_TextHeader { DFFTH_TITLE, DFFTH_BODY, @@ -273,15 +273,15 @@ enum DFF_TextHeader { // Transform #define DFF_Prop_Rotation 4 // Fixed Point 16.16 degrees // Protection -#define DFF_Prop_LockRotation 119 // BOOL No rotation -#define DFF_Prop_LockAspectRatio 120 // BOOL Don't allow changes in aspect ratio -#define DFF_Prop_LockPosition 121 // BOOL Don't allow the shape to be moved -#define DFF_Prop_LockAgainstSelect 122 // BOOL Shape may not be selected -#define DFF_Prop_LockCropping 123 // BOOL No cropping this shape -#define DFF_Prop_LockVertices 124 // BOOL Edit Points not allowed -#define DFF_Prop_LockText 125 // BOOL Do not edit text -#define DFF_Prop_LockAdjustHandles 126 // BOOL Do not adjust -#define DFF_Prop_LockAgainstGrouping 127 // BOOL Do not group this shape +#define DFF_Prop_LockRotation 119 // sal_Bool No rotation +#define DFF_Prop_LockAspectRatio 120 // sal_Bool Don't allow changes in aspect ratio +#define DFF_Prop_LockPosition 121 // sal_Bool Don't allow the shape to be moved +#define DFF_Prop_LockAgainstSelect 122 // sal_Bool Shape may not be selected +#define DFF_Prop_LockCropping 123 // sal_Bool No cropping this shape +#define DFF_Prop_LockVertices 124 // sal_Bool Edit Points not allowed +#define DFF_Prop_LockText 125 // sal_Bool Do not edit text +#define DFF_Prop_LockAdjustHandles 126 // sal_Bool Do not adjust +#define DFF_Prop_LockAgainstGrouping 127 // sal_Bool Do not group this shape // Text #define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host #define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs) @@ -295,11 +295,11 @@ enum DFF_TextHeader { #define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation #define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes) #define DFF_Prop_txdir 139 // MSO_TXDIR Bi-Di Text direction -#define DFF_Prop_SelectText 187 // BOOL TRUE if single click selects text, FALSE if two clicks -#define DFF_Prop_AutoTextMargin 188 // BOOL use host's margin calculations -#define DFF_Prop_RotateText 189 // BOOL Rotate text with shape -#define DFF_Prop_FitShapeToText 190 // BOOL Size shape to fit text size -#define DFF_Prop_FitTextToShape 191 // BOOL Size text to fit shape size +#define DFF_Prop_SelectText 187 // sal_Bool sal_True if single click selects text, sal_False if two clicks +#define DFF_Prop_AutoTextMargin 188 // sal_Bool use host's margin calculations +#define DFF_Prop_RotateText 189 // sal_Bool Rotate text with shape +#define DFF_Prop_FitShapeToText 190 // sal_Bool Size shape to fit text size +#define DFF_Prop_FitTextToShape 191 // sal_Bool Size text to fit shape size // GeoText #define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string #define DFF_Prop_gtextRTF 193 // char* RTF text string @@ -307,22 +307,22 @@ enum DFF_TextHeader { #define DFF_Prop_gtextSize 195 // LONG default point size #define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16 #define DFF_Prop_gtextFont 197 // WCHAR* font family name -#define DFF_Prop_gtextFReverseRows 240 // BOOL 8000 Reverse row order -#define DFF_Prop_fGtext 241 // BOOL 4000 Has text effect -#define DFF_Prop_gtextFVertical 242 // BOOL 2000 Rotate characters -#define DFF_Prop_gtextFKern 243 // BOOL 1000 Kern characters -#define DFF_Prop_gtextFTight 244 // BOOL 800 Tightening or tracking -#define DFF_Prop_gtextFStretch 245 // BOOL 400 Stretch to fit shape -#define DFF_Prop_gtextFShrinkFit 246 // BOOL 200 Char bounding box -#define DFF_Prop_gtextFBestFit 247 // BOOL 100 Scale text-on-path -#define DFF_Prop_gtextFNormalize 248 // BOOL 80 Stretch char height -#define DFF_Prop_gtextFDxMeasure 249 // BOOL 40 Do not measure along path -#define DFF_Prop_gtextFBold 250 // BOOL 20 Bold font -#define DFF_Prop_gtextFItalic 251 // BOOL 10 Italic font -#define DFF_Prop_gtextFUnderline 252 // BOOL 8 Underline font -#define DFF_Prop_gtextFShadow 253 // BOOL 4 Shadow font -#define DFF_Prop_gtextFSmallcaps 254 // BOOL 2 Small caps font -#define DFF_Prop_gtextFStrikethrough 255 // BOOL 1 Strike through font +#define DFF_Prop_gtextFReverseRows 240 // sal_Bool 8000 Reverse row order +#define DFF_Prop_fGtext 241 // sal_Bool 4000 Has text effect +#define DFF_Prop_gtextFVertical 242 // sal_Bool 2000 Rotate characters +#define DFF_Prop_gtextFKern 243 // sal_Bool 1000 Kern characters +#define DFF_Prop_gtextFTight 244 // sal_Bool 800 Tightening or tracking +#define DFF_Prop_gtextFStretch 245 // sal_Bool 400 Stretch to fit shape +#define DFF_Prop_gtextFShrinkFit 246 // sal_Bool 200 Char bounding box +#define DFF_Prop_gtextFBestFit 247 // sal_Bool 100 Scale text-on-path +#define DFF_Prop_gtextFNormalize 248 // sal_Bool 80 Stretch char height +#define DFF_Prop_gtextFDxMeasure 249 // sal_Bool 40 Do not measure along path +#define DFF_Prop_gtextFBold 250 // sal_Bool 20 Bold font +#define DFF_Prop_gtextFItalic 251 // sal_Bool 10 Italic font +#define DFF_Prop_gtextFUnderline 252 // sal_Bool 8 Underline font +#define DFF_Prop_gtextFShadow 253 // sal_Bool 4 Shadow font +#define DFF_Prop_gtextFSmallcaps 254 // sal_Bool 2 Small caps font +#define DFF_Prop_gtextFStrikethrough 255 // sal_Bool 1 Strike through font // Blip #define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate. #define DFF_Prop_cropFromBottom 257 // LONG @@ -342,10 +342,10 @@ enum DFF_TextHeader { #define DFF_Prop_pibPrint 271 // IMsoBlip* Blip to display when printing #define DFF_Prop_pibPrintName 272 // WCHAR* Blip file name #define DFF_Prop_pibPrintFlags 273 // MSO_BLIPFLAGS Blip flags -#define DFF_Prop_fNoHitTestPicture 316 // BOOL Do not hit test the picture -#define DFF_Prop_pictureGray 317 // BOOL grayscale display -#define DFF_Prop_pictureBiLevel 318 // BOOL bi-level display -#define DFF_Prop_pictureActive 319 // BOOL Server is active (OLE objects only) +#define DFF_Prop_fNoHitTestPicture 316 // sal_Bool Do not hit test the picture +#define DFF_Prop_pictureGray 317 // sal_Bool grayscale display +#define DFF_Prop_pictureBiLevel 318 // sal_Bool bi-level display +#define DFF_Prop_pictureActive 319 // sal_Bool Server is active (OLE objects only) // Geometry #define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space. #define DFF_Prop_geoTop 321 // LONG @@ -371,12 +371,12 @@ enum DFF_TextHeader { #define DFF_Prop_pFormulas 342 // LONG #define DFF_Prop_textRectangles 343 // LONG #define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect -#define DFF_Prop_fShadowOK 378 // BOOL Shadow may be set -#define DFF_Prop_f3DOK 379 // BOOL 3D may be set -#define DFF_Prop_fLineOK 380 // BOOL Line style may be set -#define DFF_Prop_fGtextOK 381 // BOOL Text effect (FontWork) supported +#define DFF_Prop_fShadowOK 378 // sal_Bool Shadow may be set +#define DFF_Prop_f3DOK 379 // sal_Bool 3D may be set +#define DFF_Prop_fLineOK 380 // sal_Bool Line style may be set +#define DFF_Prop_fGtextOK 381 // sal_Bool Text effect (FontWork) supported #define DFF_Prop_fFillShadeShapeOK 382 // BOOL -#define DFF_Prop_fFillOK 383 // BOOL OK to fill the shape through the UI or VBA? +#define DFF_Prop_fFillOK 383 // sal_Bool OK to fill the shape through the UI or VBA? // FillStyle #define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill #define DFF_Prop_fillColor 385 // MSO_CLR Foreground color @@ -407,11 +407,11 @@ enum DFF_TextHeader { #define DFF_Prop_fillShapeOriginX 410 // LONG #define DFF_Prop_fillShapeOriginY 411 // LONG #define DFF_Prop_fillShadeType 412 // MSO_SHADETYPE Type of shading, if a shaded (gradient) fill. -#define DFF_Prop_fFilled 443 // BOOL Is shape filled? -#define DFF_Prop_fHitTestFill 444 // BOOL Should we hit test fill? -#define DFF_Prop_fillShape 445 // BOOL Register pattern on shape -#define DFF_Prop_fillUseRect 446 // BOOL Use the large rect? -#define DFF_Prop_fNoFillHitTest 447 // BOOL Hit test a shape as though filled +#define DFF_Prop_fFilled 443 // sal_Bool Is shape filled? +#define DFF_Prop_fHitTestFill 444 // sal_Bool Should we hit test fill? +#define DFF_Prop_fillShape 445 // sal_Bool Register pattern on shape +#define DFF_Prop_fillUseRect 446 // sal_Bool Use the large rect? +#define DFF_Prop_fNoFillHitTest 447 // sal_Bool Hit test a shape as though filled // LineStyle #define DFF_Prop_lineColor 448 // MSO_CLR Color of line #define DFF_Prop_lineOpacity 449 // LONG Not implemented @@ -437,11 +437,11 @@ enum DFF_TextHeader { #define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end #define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines #define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines -#define DFF_Prop_fArrowheadsOK 507 // BOOL Allow arrowheads if prop. is set -#define DFF_Prop_fLine 508 // BOOL Any line? -#define DFF_Prop_fHitTestLine 509 // BOOL Should we hit test lines? -#define DFF_Prop_lineFillShape 510 // BOOL Register pattern on shape -#define DFF_Prop_fNoLineDrawDash 511 // BOOL Draw a dashed line if no line +#define DFF_Prop_fArrowheadsOK 507 // sal_Bool Allow arrowheads if prop. is set +#define DFF_Prop_fLine 508 // sal_Bool Any line? +#define DFF_Prop_fHitTestLine 509 // sal_Bool Should we hit test lines? +#define DFF_Prop_lineFillShape 510 // sal_Bool Register pattern on shape +#define DFF_Prop_fNoLineDrawDash 511 // sal_Bool Draw a dashed line if no line // ShadowStyle #define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect #define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color @@ -461,8 +461,8 @@ enum DFF_TextHeader { #define DFF_Prop_shadowWeight 527 // LONG scaling factor #define DFF_Prop_shadowOriginX 528 // LONG #define DFF_Prop_shadowOriginY 529 // LONG -#define DFF_Prop_fShadow 574 // BOOL Any shadow? -#define DFF_Prop_fshadowObscured 575 // BOOL Excel5-style shadow +#define DFF_Prop_fShadow 574 // sal_Bool Any shadow? +#define DFF_Prop_fshadowObscured 575 // sal_Bool Excel5-style shadow // PerspectiveStyle #define DFF_Prop_perspectiveType 576 // MSO_XFORMTYPE Where transform applies #define DFF_Prop_perspectiveOffsetX 577 // LONG The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter. @@ -476,7 +476,7 @@ enum DFF_TextHeader { #define DFF_Prop_perspectiveWeight 585 // LONG Scaling factor #define DFF_Prop_perspectiveOriginX 586 // LONG #define DFF_Prop_perspectiveOriginY 587 // LONG -#define DFF_Prop_fPerspective 639 // BOOL On/off +#define DFF_Prop_fPerspective 639 // sal_Bool On/off // 3D Object #define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16 #define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16 @@ -487,8 +487,8 @@ enum DFF_TextHeader { #define DFF_Prop_c3DExtrudePlane 646 // LONG Extrusion direction #define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. #define DFF_Prop_c3DCrMod 648 // MSO_CLR Modification for BW views -#define DFF_Prop_f3D 700 // BOOL Does this shape have a 3D effect? -#define DFF_Prop_fc3DMetallic 701 // BOOL Use metallic specularity? +#define DFF_Prop_f3D 700 // sal_Bool Does this shape have a 3D effect? +#define DFF_Prop_fc3DMetallic 701 // sal_Bool Use metallic specularity? #define DFF_Prop_fc3DUseExtrusionColor 702 // BOOL #define DFF_Prop_fc3DLightFace 703 // BOOL // 3D Style @@ -521,20 +521,20 @@ enum DFF_TextHeader { #define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity #define DFF_Prop_fc3DConstrainRotation 763 // BOOL #define DFF_Prop_fc3DRotationCenterAuto 764 // BOOL -#define DFF_Prop_fc3DParallel 765 // BOOL Parallel projection? -#define DFF_Prop_fc3DKeyHarsh 766 // BOOL Is key lighting harsh? -#define DFF_Prop_fc3DFillHarsh 767 // BOOL Is fill lighting harsh? +#define DFF_Prop_fc3DParallel 765 // sal_Bool Parallel projection? +#define DFF_Prop_fc3DKeyHarsh 766 // sal_Bool Is key lighting harsh? +#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh? // Shape #define DFF_Prop_hspMaster 769 // MSO_HSP master shape #define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector #define DFF_Prop_bWMode 772 // MSO_BWMODE Settings for modifications to be made when in different forms of black-and-white mode. #define DFF_Prop_bWModePureBW 773 // MSO_BWMODE #define DFF_Prop_bWModeBW 774 // MSO_BWMODE -#define DFF_Prop_fOleIcon 826 // BOOL For OLE objects, whether the object is in icon form -#define DFF_Prop_fPreferRelativeResize 827 // BOOL For UI only. Prefer relative resizing. -#define DFF_Prop_fLockShapeType 828 // BOOL Lock the shape type (don't allow Change Shape) +#define DFF_Prop_fOleIcon 826 // sal_Bool For OLE objects, whether the object is in icon form +#define DFF_Prop_fPreferRelativeResize 827 // sal_Bool For UI only. Prefer relative resizing. +#define DFF_Prop_fLockShapeType 828 // sal_Bool Lock the shape type (don't allow Change Shape) #define DFF_Prop_fDeleteAttachedObject 830 // BOOL -#define DFF_Prop_fBackground 831 // BOOL If TRUE, this is the background shape. +#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape. // Callout #define DFF_Prop_spcot 832 // MSO_SPCOT Callout type @@ -543,13 +543,13 @@ enum DFF_TextHeader { #define DFF_Prop_spcod 835 // MSO_SPCOD Callout drop type #define DFF_Prop_dxyCalloutDropSpecified 836 // LONG if mso_spcodSpecified, the actual drop distance #define DFF_Prop_dxyCalloutLengthSpecified 837 // LONG if fCalloutLengthSpecified, the actual distance -#define DFF_Prop_fCallout 889 // BOOL Is the shape a callout? -#define DFF_Prop_fCalloutAccentBar 890 // BOOL does callout have accent bar -#define DFF_Prop_fCalloutTextBorder 891 // BOOL does callout have a text border +#define DFF_Prop_fCallout 889 // sal_Bool Is the shape a callout? +#define DFF_Prop_fCalloutAccentBar 890 // sal_Bool does callout have accent bar +#define DFF_Prop_fCalloutTextBorder 891 // sal_Bool does callout have a text border #define DFF_Prop_fCalloutMinusX 892 // BOOL #define DFF_Prop_fCalloutMinusY 893 // BOOL -#define DFF_Prop_fCalloutDropAuto 894 // BOOL If true, then we occasionally invert the drop distance -#define DFF_Prop_fCalloutLengthSpecified 895 // BOOL if true, we look at dxyCalloutLengthSpecified +#define DFF_Prop_fCalloutDropAuto 894 // sal_Bool If true, then we occasionally invert the drop distance +#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified // GroupShape #define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set) @@ -563,13 +563,13 @@ enum DFF_TextHeader { #define DFF_Prop_lidRegroup 904 // LONG Regroup ID #define DFF_Prop_tableProperties 927 // LONG #define DFF_Prop_tableRowProperties 928 // LONG* -#define DFF_Prop_fEditedWrap 953 // BOOL Has the wrap polygon been edited? -#define DFF_Prop_fBehindDocument 954 // BOOL Word-only (shape is behind text) -#define DFF_Prop_fOnDblClickNotify 955 // BOOL Notify client on a double click -#define DFF_Prop_fIsButton 956 // BOOL A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. -#define DFF_Prop_fOneD 957 // BOOL 1D adjustment -#define DFF_Prop_fHidden 958 // BOOL Do not display -#define DFF_Prop_fPrint 959 // BOOL Print this shape +#define DFF_Prop_fEditedWrap 953 // sal_Bool Has the wrap polygon been edited? +#define DFF_Prop_fBehindDocument 954 // sal_Bool Word-only (shape is behind text) +#define DFF_Prop_fOnDblClickNotify 955 // sal_Bool Notify client on a double click +#define DFF_Prop_fIsButton 956 // sal_Bool A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. +#define DFF_Prop_fOneD 957 // sal_Bool 1D adjustment +#define DFF_Prop_fHidden 958 // sal_Bool Do not display +#define DFF_Prop_fPrint 959 // sal_Bool Print this shape // entsprechende BitFlags #define DFF_PBit_EditedWrap 0x00000040 #define DFF_PBit_BehindDocument 0x00000020 @@ -1078,17 +1078,17 @@ enum MSO_LineCap { // BStore-Container // FBSE - File Blip Store Entry typedef struct _MSOF_BSE { - BYTE btWin32; // Required type on Win32 - BYTE btMacOS; // Required type on Mac - BYTE rgbUid[16]; // Identifier of blip - USHORT tag; // currently unused - ULONG size; // Blip size in stream - ULONG cRef; // Reference count on the blip - ULONG /*MSOFO*/ foDelay; // File offset in the delay stream - BYTE usage; // How this blip is used (MSOBLIPUSAGE) - BYTE cbName; // length of the blip name - BYTE unused2; // for the future - BYTE unused3; // for the future + sal_uInt8 btWin32; // Required type on Win32 + sal_uInt8 btMacOS; // Required type on Mac + sal_uInt8 rgbUid[16]; // Identifier of blip + sal_uInt16 tag; // currently unused + sal_uIntPtr size; // Blip size in stream + sal_uIntPtr cRef; // Reference count on the blip + sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream + sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE) + sal_uInt8 cbName; // length of the blip name + sal_uInt8 unused2; // for the future + sal_uInt8 unused3; // for the future } MSO_FBSE; typedef enum { @@ -1188,12 +1188,12 @@ typedef enum { #ifdef Hier_noch_was_aus_der_Doku /* The secondary, or data, UID - should always be set. */ -BYTE m_rgbUid[16]; +sal_uInt8 m_rgbUid[16]; /* The primary UID - this defaults to 0, in which case the primary ID is that of the internal data. NOTE!: The primary UID is only saved to disk if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.inst and blip_signature is one of the values defined in MSO_BI */ -BYTE m_rgbUidPrimary[16]; // optional based on the above check +sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check /* Metafile Blip overhead = 34 bytes. m_cb gives the number of bytes required to store an uncompressed version of the file, m_cbSave @@ -1205,18 +1205,18 @@ int m_cb; // Cache of the metafile size RECT m_rcBounds; // Boundary of metafile drawing commands POINT m_ptSize; // Size of metafile in EMUs int m_cbSave; // Cache of saved size (size of m_pvBits) -BYTE m_fCompression; // MSO_BLIPCOMPRESSION -BYTE m_fFilter; // always mso_filterNone +sal_uInt8 m_fCompression; // MSO_BLIPCOMPRESSION +sal_uInt8 m_fFilter; // always mso_filterNone void *m_pvBits; // Compressed bits of metafile. /* The secondary, or data, UID - should always be set. */ -BYTE m_rgbUid[16]; +sal_uInt8 m_rgbUid[16]; /* The primary UID - this defaults to 0, in which case the primary ID is that of the internal data. NOTE!: The primary UID is only saved to disk if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.finst and blip_signature is one of the values defined in MSO_BI*/ -BYTE m_rgbUidPrimary[16]; // optional based on the above check -BYTE m_bTag; +sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check +sal_uInt8 m_bTag; void *m_pvBits; // raster bits of the blip. #endif diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 94e4660a13..e592f6886c 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -123,14 +123,14 @@ public: const String* pNumStr = NULL ); - void GetInitSettings( USHORT& nCatLbPos, + void GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, - USHORT& nFmtLbSelPos, + sal_uInt16& nFmtLbSelPos, SvStrings& rFmtEntries, String& rPrevString, Color*& rpPrevColor ); - void CategoryChanged( USHORT nCatLbPos, + void CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, SvStrings& rFmtEntries ); @@ -138,34 +138,34 @@ public: short& rFmtSelPos, SvStrings& rFmtEntries ); - void FormatChanged( USHORT nFmtLbPos, + void FormatChanged( sal_uInt16 nFmtLbPos, String& rPreviewStr, Color*& rpFontColor ); - BOOL AddFormat( String& rFormat, + sal_Bool AddFormat( String& rFormat, xub_StrLen& rErrPos, - USHORT& rCatLbSelPos, + sal_uInt16& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ); - BOOL RemoveFormat( const String& rFormat, - USHORT& rCatLbSelPos, + sal_Bool RemoveFormat( const String& rFormat, + sal_uInt16& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ); void MakeFormat( String& rFormat, - BOOL bThousand, - BOOL bNegRed, - USHORT nPrecision, - USHORT nLeadingZeroes, - USHORT nCurrencyEntryPos); + sal_Bool bThousand, + sal_Bool bNegRed, + sal_uInt16 nPrecision, + sal_uInt16 nLeadingZeroes, + sal_uInt16 nCurrencyEntryPos); void GetOptions( const String& rFormat, - BOOL& rThousand, - BOOL& rNegRed, - USHORT& rPrecision, - USHORT& rLeadingZeroes, - USHORT& rCatLbPos ); + sal_Bool& rThousand, + sal_Bool& rNegRed, + sal_uInt16& rPrecision, + sal_uInt16& rLeadingZeroes, + sal_uInt16& rCatLbPos ); void MakePreviewString( const String& rFormatStr, String& rPreviewStr, @@ -176,11 +176,11 @@ public: Color*& rpFontColor, double nValue); - BOOL IsUserDefined( const String& rFmtString ); - BOOL IsTmpCurrencyFormat( const String& rFmtString ); - BOOL FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); + sal_Bool IsUserDefined( const String& rFmtString ); + sal_Bool IsTmpCurrencyFormat( const String& rFmtString ); + sal_Bool FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); - void ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; } + void ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; } sal_uInt32 GetUpdateDataCount() const; void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); @@ -195,25 +195,25 @@ public: String GetComment4Entry(short nEntry); short GetCategory4Entry(short nEntry); - BOOL GetUserDefined4Entry(short nEntry); + sal_Bool GetUserDefined4Entry(short nEntry); String GetFormat4Entry(short nEntry); void SetComment4Entry(short nEntry,String aCommentString); - BOOL IsBankingSymbol(USHORT nPos); - void SetCurrencySymbol(USHORT nPos); + sal_Bool IsBankingSymbol(sal_uInt16 nPos); + void SetCurrencySymbol(sal_uInt16 nPos); sal_uInt32 GetCurrencySymbol(); - USHORT FindCurrencyFormat( const String& rFmtString ); - USHORT FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking); + sal_uInt16 FindCurrencyFormat( const String& rFmtString ); + sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,sal_Bool bTmpBanking); NfCurrencyEntry* GetCurCurrencyEntry(); void SetCurCurrencyEntry(NfCurrencyEntry*); short GetListPos4Entry(sal_uInt32 nIdx); short GetListPos4Entry( const String& rFmtString ); - void GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos ); - void GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag ); + void GetCurrencySymbols( SvStringsDtor& rList, sal_uInt16* pPos ); + void GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bFlag ); - USHORT FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking ); - BOOL IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString); + sal_uInt16 FindCurrencyTableEntry( const String& rFmtString, sal_Bool &bTestBanking ); + sal_Bool IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,const String &rFmtString); void GetCurrencyFormats(SvStrings& rList); @@ -225,7 +225,7 @@ private: SvxNumberValueType eValType; String aValStr; double nValNum; - BOOL bUndoAddList; + sal_Bool bUndoAddList; SvULongs aAddList; SvULongs aDelList; SvULongs aCurEntryList; @@ -235,13 +235,13 @@ private: LanguageType eCurLanguage; SvUShorts aCurCurrencyList; NfCurrencyEntry* pCurCurrencyEntry; - BOOL bBankingSymbol; - USHORT nCurCurrencyEntryPos; + sal_Bool bBankingSymbol; + sal_uInt16 nCurCurrencyEntryPos; SvStrings aCurrencyFormatList; #ifdef _SVX_NUMFMTSH_CXX SVX_DLLPRIVATE short FillEntryList_Impl( SvStrings& rList ); - SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,USHORT aPrivCat, short &Pos); + SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,sal_uInt16 aPrivCat, short &Pos); SVX_DLLPRIVATE short FillEListWithFormats_Impl( SvStrings& rList,short nSelPos, NfIndexTableOffset eOffsetStart, NfIndexTableOffset eOffsetEnd); @@ -253,12 +253,12 @@ private: SVX_DLLPRIVATE short FillEListWithUserCurrencys( SvStrings& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos ); - SVX_DLLPRIVATE BOOL IsRemoved_Impl( sal_uInt32 nKey ); - SVX_DLLPRIVATE BOOL IsAdded_Impl( sal_uInt32 nKey ); + SVX_DLLPRIVATE sal_Bool IsRemoved_Impl( sal_uInt32 nKey ); + SVX_DLLPRIVATE sal_Bool IsAdded_Impl( sal_uInt32 nKey ); SVX_DLLPRIVATE void GetPreviewString_Impl( String& rString, Color*& rpColor ); - SVX_DLLPRIVATE void PosToCategory_Impl( USHORT nPos, short& rCategory ); - SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, USHORT& rPos ); + SVX_DLLPRIVATE void PosToCategory_Impl( sal_uInt16 nPos, short& rCategory ); + SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, sal_uInt16& rPos ); #endif }; diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index 94177b5928..de5994e448 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -47,23 +47,23 @@ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem public: TYPEINFO(); - SvxNumberInfoItem( const USHORT nId ); + SvxNumberInfoItem( const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const USHORT nId ); + const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal, - const USHORT nId ); + const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, - const USHORT nId ); + const sal_uInt16 nId ); // if both double and String are supplied, String is used for text formats SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, - const String& rValueStr, const USHORT nId ); + const String& rValueStr, const sal_uInt16 nId ); SvxNumberInfoItem( const SvxNumberInfoItem& ); ~SvxNumberInfoItem(); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx index 63915d0500..3dcf80000a 100644 --- a/svx/inc/svx/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -55,7 +55,7 @@ class SvxNumRule; struct SvxBmpItemInfo { SvxBrushItem* pBrushItem; - USHORT nItemId; + sal_uInt16 nItemId; }; /*-----------------09/09/97 01:05pm----------------- @@ -64,8 +64,8 @@ struct SvxBmpItemInfo class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { Color aLineColor; - USHORT nPageType; - BOOL bHTMLMode; + sal_uInt16 nPageType; + sal_Bool bHTMLMode; Rectangle aOrgRect; VirtualDevice* pVDev; @@ -80,12 +80,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ); + SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ); ~SvxNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void SetHTMLMode(BOOL bSet) {bHTMLMode = bSet;} + void SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;} void SetNumberingSettings( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< @@ -109,13 +109,13 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet { String sBullets; Timer aFormatTimer; - BOOL bGrfNotFound; + sal_Bool bGrfNotFound; protected: DECL_LINK(FormatHdl_Impl, Timer*); - void SetGrfNotFound(BOOL bSet) {bGrfNotFound = bSet;} - BOOL IsGrfNotFound()const {return bGrfNotFound;} + void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;} + sal_Bool IsGrfNotFound()const {return bGrfNotFound;} Timer& GetFormatTimer() {return aFormatTimer;} @@ -136,8 +136,8 @@ class SvxNumberingPreview : public Window Font aStdFont; long nPageWidth; const String* pOutlineNames; - BOOL bPosition; - UINT16 nActLevel; + sal_Bool bPosition; + sal_uInt16 nActLevel; protected: virtual void Paint( const Rectangle& rRect ); @@ -145,7 +145,7 @@ class SvxNumberingPreview : public Window public: SvxNumberingPreview(Window* pParent, const ResId& rResId ) : Window(pParent, rResId), - pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) + pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX) { SetBorderStyle( WINDOW_BORDER_MONO ); } void SetNumRule(const SvxNumRule* pNum) @@ -155,8 +155,8 @@ class SvxNumberingPreview : public Window void SetOutlineNames(const String* pNames) {pOutlineNames = pNames;} void SetPositionMode() - { bPosition = TRUE;} - void SetLevel(USHORT nSet) {nActLevel = nSet;} + { bPosition = sal_True;} + void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 775c3fbb58..3da99724c9 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -92,10 +92,10 @@ public: SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList); SVX_DLLPUBLIC virtual ~E3dObjList(); - virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* NbcRemoveObject(ULONG nObjNum); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); + virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); + virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum); + virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum); }; /************************************************************************* @@ -141,7 +141,7 @@ protected: // and no instances should be created from anyone, so i move the constructors // to protected area E3dObject(); - E3dObject(BOOL bIsFromChart); + E3dObject(sal_Bool bIsFromChart); public: TYPEINFO(); @@ -150,8 +150,8 @@ public: virtual ~E3dObject(); - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -193,7 +193,7 @@ public: // TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - USHORT GetLogicalGroup() { return 0; } + sal_uInt16 GetLogicalGroup() { return 0; } virtual void operator=(const SdrObject&); virtual SdrObjGeoData *NewGeoData() const; @@ -205,7 +205,7 @@ public: void SetSelected(bool bNew); // Aufbrechen - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; @@ -255,28 +255,28 @@ public : virtual sal_uInt32 GetHdlCount() const; virtual void AddToHdlList(SdrHdlList& rHdlList) const; - // DoubleSided: TRUE/FALSE - BOOL GetDoubleSided() const + // DoubleSided: sal_True/FALSE + sal_Bool GetDoubleSided() const { return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); } - // NormalsKind: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetNormalsKind() const { return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); } - // NormalsInvert: TRUE/FALSE - BOOL GetNormalsInvert() const + // NormalsInvert: sal_True/FALSE + sal_Bool GetNormalsInvert() const { return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); } - // TextureProjX: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetTextureProjectionX() const { return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); } - // TextureProjY: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetTextureProjectionY() const { return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); } - // Shadow3D: TRUE/FALSE - BOOL GetShadow3D() const + // Shadow3D: sal_True/FALSE + sal_Bool GetShadow3D() const { return ((const Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); } // MaterialColor: Color @@ -295,24 +295,24 @@ public : sal_uInt16 GetMaterialSpecularIntensity() const { return ((const Svx3DMaterialSpecularIntensityItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); } - // TextureFilter: TRUE/FALSE - BOOL GetTextureFilter() const + // TextureFilter: sal_True/FALSE + sal_Bool GetTextureFilter() const { return ((const Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); } // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry - BOOL GetReducedLineGeometry() const + sal_Bool GetReducedLineGeometry() const { return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void RecalcSnapRect(); // Parameter Geometrieerzeugung setzen/lesen - BOOL GetCreateNormals() const { return bCreateNormals; } - void SetCreateNormals(BOOL bNew); + sal_Bool GetCreateNormals() const { return bCreateNormals; } + void SetCreateNormals(sal_Bool bNew); - BOOL GetCreateTexture() const { return bCreateTexture; } - void SetCreateTexture(BOOL bNew); + sal_Bool GetCreateTexture() const { return bCreateTexture; } + void SetCreateTexture(sal_Bool bNew); // Copy-Operator virtual void operator=(const SdrObject&); diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 668990b383..31c0cfaa5a 100644 --- a/svx/inc/svx/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx @@ -40,7 +40,7 @@ private: void* pPtr; public: - OfaPtrItem( USHORT nWhich, void *pPtr ); + OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); OfaPtrItem( const OfaPtrItem& ); virtual int operator==( const SfxPoolItem& ) const; diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index c3afa9c847..06f466de73 100644 --- a/svx/inc/svx/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx @@ -28,22 +28,22 @@ #define _SVX_OPTGENRL_HXX // Defines for setting the fokus of a Edit via a slot from external. -#define UNKNOWN_EDIT ((USHORT)0) -#define COMPANY_EDIT ((USHORT)1) -#define FIRSTNAME_EDIT ((USHORT)2) -#define LASTNAME_EDIT ((USHORT)3) -#define STREET_EDIT ((USHORT)4) -#define COUNTRY_EDIT ((USHORT)5) -#define PLZ_EDIT ((USHORT)6) -#define CITY_EDIT ((USHORT)7) -#define STATE_EDIT ((USHORT)8) -#define TITLE_EDIT ((USHORT)9) -#define POSITION_EDIT ((USHORT)10) -#define SHORTNAME_EDIT ((USHORT)11) -#define TELPRIV_EDIT ((USHORT)12) -#define TELCOMPANY_EDIT ((USHORT)13) -#define FAX_EDIT ((USHORT)14) -#define EMAIL_EDIT ((USHORT)15) +#define UNKNOWN_EDIT ((sal_uInt16)0) +#define COMPANY_EDIT ((sal_uInt16)1) +#define FIRSTNAME_EDIT ((sal_uInt16)2) +#define LASTNAME_EDIT ((sal_uInt16)3) +#define STREET_EDIT ((sal_uInt16)4) +#define COUNTRY_EDIT ((sal_uInt16)5) +#define PLZ_EDIT ((sal_uInt16)6) +#define CITY_EDIT ((sal_uInt16)7) +#define STATE_EDIT ((sal_uInt16)8) +#define TITLE_EDIT ((sal_uInt16)9) +#define POSITION_EDIT ((sal_uInt16)10) +#define SHORTNAME_EDIT ((sal_uInt16)11) +#define TELPRIV_EDIT ((sal_uInt16)12) +#define TELCOMPANY_EDIT ((sal_uInt16)13) +#define FAX_EDIT ((sal_uInt16)14) +#define EMAIL_EDIT ((sal_uInt16)15) #endif // #ifndef _SVX_OPTGENRL_HXX diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx index 9fbd0098e9..b1e92e9556 100644 --- a/svx/inc/svx/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx @@ -43,42 +43,42 @@ class SvxGridTabPage; class SVX_DLLPUBLIC SvxOptionsGrid { protected: - UINT32 nFldDrawX; - UINT32 nFldDivisionX; - UINT32 nFldDrawY; - UINT32 nFldDivisionY; - UINT32 nFldSnapX; - UINT32 nFldSnapY; - BOOL bUseGridsnap:1; - BOOL bSynchronize:1; - BOOL bGridVisible:1; - BOOL bEqualGrid: 1; + sal_uInt32 nFldDrawX; + sal_uInt32 nFldDivisionX; + sal_uInt32 nFldDrawY; + sal_uInt32 nFldDivisionY; + sal_uInt32 nFldSnapX; + sal_uInt32 nFldSnapY; + sal_Bool bUseGridsnap:1; + sal_Bool bSynchronize:1; + sal_Bool bGridVisible:1; + sal_Bool bEqualGrid: 1; public: SvxOptionsGrid(); ~SvxOptionsGrid(); - void SetFldDrawX( UINT32 nSet){nFldDrawX = nSet;} - void SetFldDivisionX(UINT32 nSet){nFldDivisionX = nSet;} - void SetFldDrawY ( UINT32 nSet){nFldDrawY = nSet;} - void SetFldDivisionY(UINT32 nSet){nFldDivisionY = nSet;} - void SetFldSnapX( UINT32 nSet){nFldSnapX = nSet;} - void SetFldSnapY ( UINT32 nSet){nFldSnapY = nSet;} - void SetUseGridSnap( BOOL bSet ) {bUseGridsnap = bSet;} - void SetSynchronize( BOOL bSet ) {bSynchronize = bSet;} - void SetGridVisible( BOOL bSet ) {bGridVisible = bSet;} - void SetEqualGrid( BOOL bSet ) {bEqualGrid = bSet;} - - UINT32 GetFldDrawX( ) const { return nFldDrawX; } - UINT32 GetFldDivisionX() const { return nFldDivisionX;} - UINT32 GetFldDrawY ( ) const { return nFldDrawY; } - UINT32 GetFldDivisionY() const { return nFldDivisionY;} - UINT32 GetFldSnapX( ) const { return nFldSnapX; } - UINT32 GetFldSnapY ( ) const { return nFldSnapY; } - BOOL GetUseGridSnap( ) const { return bUseGridsnap; } - BOOL GetSynchronize( ) const { return bSynchronize; } - BOOL GetGridVisible( ) const { return bGridVisible; } - BOOL GetEqualGrid() const { return bEqualGrid; } + void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;} + void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;} + void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;} + void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;} + void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;} + void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;} + void SetUseGridSnap( sal_Bool bSet ) {bUseGridsnap = bSet;} + void SetSynchronize( sal_Bool bSet ) {bSynchronize = bSet;} + void SetGridVisible( sal_Bool bSet ) {bGridVisible = bSet;} + void SetEqualGrid( sal_Bool bSet ) {bEqualGrid = bSet;} + + sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; } + sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;} + sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; } + sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;} + sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; } + sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; } + sal_Bool GetUseGridSnap( ) const { return bUseGridsnap; } + sal_Bool GetSynchronize( ) const { return bSynchronize; } + sal_Bool GetGridVisible( ) const { return bGridVisible; } + sal_Bool GetEqualGrid() const { return bEqualGrid; } }; // class SvxGridItem ----------------------------------------------------- @@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem friend class SvxGridTabPage; public: - SvxGridItem( USHORT _nWhich) : SfxPoolItem(_nWhich){}; + SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; SvxGridItem( const SvxGridItem& pTestItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -114,7 +114,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -163,8 +163,8 @@ protected: MetricField aMtrFldBezAngle; private: - BOOL bAttrModified; -// BOOL bEqualGrid; // Neu + sal_Bool bAttrModified; +// sal_Bool bEqualGrid; // Neu #ifdef _SVX_OPTGRID_CXX DECL_LINK( ClickRotateHdl_Impl, void * ); diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index 3fcdecfda1..77e9ca1885 100644 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -69,13 +69,13 @@ private: Color aFtColor; SvxBoxItem* pFtBorder; - BOOL bFooter :1; - BOOL bHeader :1; - BOOL bTable :1; - BOOL bHorz :1; - BOOL bVert :1; + sal_Bool bFooter :1; + sal_Bool bHeader :1; + sal_Bool bTable :1; + sal_Bool bHorz :1; + sal_Bool bVert :1; - USHORT eUsage; + sal_uInt16 eUsage; String aLeftText; String aRightText; @@ -84,8 +84,8 @@ protected: virtual void Paint( const Rectangle& rRect ); virtual void DrawPage( const Point& rPoint, - const BOOL bSecond, - const BOOL bEnabled ); + const sal_Bool bSecond, + const sal_Bool bEnabled ); public: SvxPageWindow( Window* pParent, const ResId& rId ); @@ -143,20 +143,20 @@ public: const Color& GetFtColor() const { return aFtColor; } const SvxBoxItem& GetFtBorder() const { return *pFtBorder; } - void SetUsage( USHORT eU ) { eUsage = eU; } - USHORT GetUsage() const { return eUsage;} + void SetUsage( sal_uInt16 eU ) { eUsage = eU; } + sal_uInt16 GetUsage() const { return eUsage;} - void SetHeader( BOOL bNew ) { bHeader = bNew; } - BOOL GetHeader() const { return bHeader;} - void SetFooter( BOOL bNew ) { bFooter = bNew; } - BOOL GetFooter() const { return bFooter;} + void SetHeader( sal_Bool bNew ) { bHeader = bNew; } + sal_Bool GetHeader() const { return bHeader;} + void SetFooter( sal_Bool bNew ) { bFooter = bNew; } + sal_Bool GetFooter() const { return bFooter;} - void SetTable( BOOL bNew ) { bTable = bNew; } - BOOL GetTable() const { return bTable;} - void SetHorz( BOOL bNew ) { bHorz = bNew; } - BOOL GetHorz() const { return bHorz;} - void SetVert( BOOL bNew ) { bVert = bNew; } - BOOL GetVert() const { return bVert;} + void SetTable( sal_Bool bNew ) { bTable = bNew; } + sal_Bool GetTable() const { return bTable;} + void SetHorz( sal_Bool bNew ) { bHorz = bNew; } + sal_Bool GetHorz() const { return bHorz;} + void SetVert( sal_Bool bNew ) { bVert = bNew; } + sal_Bool GetVert() const { return bVert;} void EnableFrameDirection(sal_Bool bEnable); //uses enum SvxFrameDirection diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index d2921d1559..6abe7a1600 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -81,13 +81,13 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem private: String aDescName; // Name der Vorlage SvxNumType eNumType; // Numerierung - BOOL bLandscape; // Portrait / Landscape - USHORT eUse; // Layout + sal_Bool bLandscape; // Portrait / Landscape + sal_uInt16 eUse; // Layout public: TYPEINFO(); - SvxPageItem( const USHORT nId ); + SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -98,17 +98,17 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; // Ausrichtung - USHORT GetPageUsage() const { return eUse; } - void SetPageUsage(USHORT eU) { eUse= eU; } + sal_uInt16 GetPageUsage() const { return eUse; } + void SetPageUsage(sal_uInt16 eU) { eUse= eU; } - BOOL IsLandscape() const { return bLandscape; } - void SetLandscape(BOOL bL) { bLandscape = bL; } + sal_Bool IsLandscape() const { return bLandscape; } + void SetLandscape(sal_Bool bL) { bLandscape = bL; } // Numerierung SvxNumType GetNumType() const { return eNumType; } @@ -135,9 +135,9 @@ Dieses Item dient als Container fuer Header- und Footer-Attribute. class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem { public: - SvxSetItem( const USHORT nId, const SfxItemSet& rSet ); + SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ); SvxSetItem( const SvxSetItem& rItem ); - SvxSetItem( const USHORT nId, SfxItemSet* pSet ); + SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -146,8 +146,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; }; diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index 3a40b616b1..c1dd168c52 100644 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -59,15 +59,15 @@ private: long nRightMargin; short nFirstLineOfst; // Abstaende - USHORT nUpper; - USHORT nLower; + sal_uInt16 nUpper; + sal_uInt16 nLower; // Ausrichtung SvxAdjust eAdjust; // Letzte Zeile im Blocksatz SvxAdjust eLastLine; // Zeilenabstand SvxPrevLineSpace eLine; - USHORT nLineVal; + sal_uInt16 nLineVal; String aText; Rectangle Lines[9]; @@ -75,7 +75,7 @@ private: protected: virtual void Paint( const Rectangle& rRect ); - void DrawParagraph( BOOL bAll ); + void DrawParagraph( sal_Bool bAll ); public: SvxParaPrevWindow( Window* pParent, const ResId& rId ); @@ -83,11 +83,11 @@ public: void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } void SetRightMargin( long nNew ) { nRightMargin = nNew; } - void SetUpper( USHORT nNew ) { nUpper = nNew; } - void SetLower( USHORT nNew ) { nLower = nNew; } + void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } + void SetLower( sal_uInt16 nNew ) { nLower = nNew; } void SetAdjust( SvxAdjust eNew ) { eAdjust = eNew; } void SetLastLine( SvxAdjust eNew ) { eLastLine = eNew; } - void SetLineSpace( SvxPrevLineSpace eNew, USHORT nNew = 0 ) + void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 ) { eLine = eNew; nLineVal = nNew; } void SetText( const String& rStr ) { aText = rStr; } void SetSize( Size aNew ) { aSize = aNew; } @@ -95,18 +95,18 @@ public: short GetFirstLineOfst() const { return nFirstLineOfst; } long GetLeftMargin() const { return nLeftMargin; } long GetRightMargin() const { return nRightMargin; } - USHORT GetUpper() const { return nUpper; } - USHORT GetLower() const { return nLower; } + sal_uInt16 GetUpper() const { return nUpper; } + sal_uInt16 GetLower() const { return nLower; } SvxAdjust GetAdjust() const { return eAdjust; } SvxPrevLineSpace GetLineEnum() const { return eLine; } - USHORT GetLineValue() const { return nLineVal; } + sal_uInt16 GetLineValue() const { return nLineVal; } String GetText() const { return aText; } Size GetSize() const { return aSize; } void OutputSizeChanged(); - void Draw( BOOL bAll ) { DrawParagraph( bAll ); } + void Draw( sal_Bool bAll ) { DrawParagraph( bAll ); } }; #endif diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx index 617c89014d..b4d6bfef0c 100644 --- a/svx/inc/svx/passwd.hxx +++ b/svx/inc/svx/passwd.hxx @@ -66,13 +66,13 @@ private: Link aCheckPasswordHdl; - BOOL bEmpty; + sal_Bool bEmpty; DECL_LINK( ButtonHdl, OKButton * ); DECL_LINK( EditModifyHdl, Edit * ); public: - SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords = FALSE, BOOL bDisableOldPassword = FALSE ); + SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False ); ~SvxPasswordDialog(); String GetOldPassword() const { return aOldPasswdED.GetText(); } diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index b6f5ec7802..45547511d0 100644 --- a/svx/inc/svx/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -46,13 +46,13 @@ private: public: // with nKind = SID_INSERT_SOUND or // nKind = SID_INSERT_VIDEO - SvxPluginFileDlg (Window *pParent, USHORT nKind ); + SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind ); ~SvxPluginFileDlg (); ErrCode Execute(); String GetPath() const; - static bool IsAvailable (USHORT nKind); + static bool IsAvailable (sal_uInt16 nKind); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx index 2078925c44..692fa22d29 100644 --- a/svx/inc/svx/polygn3d.hxx +++ b/svx/inc/svx/polygn3d.hxx @@ -38,7 +38,7 @@ private: basegfx::B3DPolyPolygon aPolyPoly3D; basegfx::B3DPolyPolygon aPolyNormals3D; basegfx::B2DPolyPolygon aPolyTexture2D; - BOOL bLineOnly; + sal_Bool bLineOnly; SVX_DLLPRIVATE void CreateDefaultNormals(); SVX_DLLPRIVATE void CreateDefaultTexture(); @@ -56,18 +56,18 @@ public: E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, const basegfx::B2DPolyPolygon& rPolyTexture2D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj(); virtual ~E3dPolygonObj(); @@ -76,14 +76,14 @@ public: const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; } const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; } - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); // LineOnly? - BOOL GetLineOnly() { return bLineOnly; } - void SetLineOnly(BOOL bNew); + sal_Bool GetLineOnly() { return bLineOnly; } + void SetLineOnly(sal_Bool bNew); }; #endif // _E3D_POLYGON3D_HXX diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx index f0f33110e3..500cb19196 100644 --- a/svx/inc/svx/polysc3d.hxx +++ b/svx/inc/svx/polysc3d.hxx @@ -44,7 +44,7 @@ public: E3dPolyScene(); E3dPolyScene(E3dDefaultAttributes& rDefault); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; }; #endif // _E3D_POLYSC3D_HXX diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx index 466baf121b..1219b29cc5 100644 --- a/svx/inc/svx/postattr.hxx +++ b/svx/inc/svx/postattr.hxx @@ -46,9 +46,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem public: TYPEINFO(); - SvxPostItAuthorItem( USHORT nWhich ); + SvxPostItAuthorItem( sal_uInt16 nWhich ); - SvxPostItAuthorItem( const String& rAuthor, USHORT nWhich ); + SvxPostItAuthorItem( const String& rAuthor, sal_uInt16 nWhich ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -78,9 +78,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem public: TYPEINFO(); - SvxPostItDateItem( USHORT nWhich ); + SvxPostItDateItem( sal_uInt16 nWhich ); - SvxPostItDateItem( const String& rDate, USHORT nWhich ); + SvxPostItDateItem( const String& rDate, sal_uInt16 nWhich ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -109,9 +109,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem public: TYPEINFO(); - SvxPostItTextItem( USHORT nWhich ); + SvxPostItTextItem( sal_uInt16 nWhich ); - SvxPostItTextItem( const String& rText, USHORT nWhich ); + SvxPostItTextItem( const String& rText, sal_uInt16 nWhich ); // "pure virtual Methoden" vom SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index a0f3fa725f..f24971d338 100644 --- a/svx/inc/svx/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx @@ -47,14 +47,14 @@ private: public: SFX_DECL_STATUSBAR_CONTROL(); - SvxPosSizeStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SvxPosSizeStatusBarControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); - static ULONG GetDefItemWidth( const StatusBar& rStb ); + static sal_uIntPtr GetDefItemWidth( const StatusBar& rStb ); }; diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx index 15863f498e..8f08c0c8d4 100644 --- a/svx/inc/svx/relfld.hxx +++ b/svx/inc/svx/relfld.hxx @@ -46,12 +46,12 @@ class SVX_DLLPUBLIC SvxRelativeField : public MetricField { private: - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; - BOOL bRelativeMode; - BOOL bRelative; - BOOL bNegativeEnabled; + sal_uInt16 nRelMin; + sal_uInt16 nRelMax; + sal_uInt16 nRelStep; + sal_Bool bRelativeMode; + sal_Bool bRelative; + sal_Bool bNegativeEnabled; protected: void Modify(); @@ -60,12 +60,12 @@ public: SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 ); SvxRelativeField( Window* pParent, const ResId& rResId ); - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void EnableNegativeMode() {bNegativeEnabled = TRUE;} + void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, + sal_uInt16 nStep = 5 ); + sal_Bool IsRelativeMode() const { return bRelativeMode; } + void SetRelative( sal_Bool bRelative = sal_False ); + sal_Bool IsRelative() const { return bRelative; } + void EnableNegativeMode() {bNegativeEnabled = sal_True;} }; diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 6b281d3e80..b7365016a9 100644 --- a/svx/inc/svx/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx @@ -47,21 +47,21 @@ class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem public: TYPEINFO(); - SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, USHORT nWhich=0); + SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0); SvxRotateModeItem( const SvxRotateModeItem& rItem ); ~SvxRotateModeItem(); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 51f83c79ac..8564b5ffc2 100644 --- a/svx/inc/svx/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx @@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow { public: - SvxRubyChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxRubyChildWindow ); @@ -128,7 +128,7 @@ class SvxRubyDialog : public SfxModelessDialog long nLastPos; long nCurrentEdit; - BOOL bModified; + sal_Bool bModified; com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl; SfxBindings* pBindings; @@ -152,13 +152,13 @@ class SvxRubyDialog : public SfxModelessDialog void AssertOneEntry(); void Update(); - virtual BOOL Close(); + virtual sal_Bool Close(); long GetLastPos() const {return nLastPos;} void SetLastPos(long nSet) {nLastPos = nSet;} - BOOL IsModified() const {return bModified;} - void SetModified(BOOL bSet) {bModified = bSet;} + sal_Bool IsModified() const {return bModified;} + void SetModified(sal_Bool bSet) {bModified = bSet;} void EnableControls(sal_Bool bEnable) { diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index b82213e69a..5c920b2d4e 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -63,13 +63,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener SvxObjectItem *pObjectItem; //Objekt Window *pEditWin; SvxRuler_Impl *pRuler_Imp; - BOOL bAppSetNullOffset :1; - BOOL bHorz :1; + sal_Bool bAppSetNullOffset :1; + sal_Bool bHorz :1; long lLogicNullOffset; // in logischen Koordinaten long lAppNullOffset; // in logischen Koordinaten long lMinFrame; // minimale Framebreite in Pixel long lInitialDragPos; - USHORT nFlags; + sal_uInt16 nFlags; enum { NONE = 0x0000, DRAG_OBJECT = 0x0001, @@ -82,28 +82,28 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL } nDragType; - USHORT nDefTabType; - USHORT nTabCount; - USHORT nTabBufSize; + sal_uInt16 nDefTabType; + sal_uInt16 nTabCount; + sal_uInt16 nTabBufSize; long lDefTabDist; long lTabPos; RulerTab *pTabs; // Tabpositionen in Pixel RulerIndent *pIndents; // Absatzraender in Pixel RulerBorder *pBorders; - USHORT nBorderCount; + sal_uInt16 nBorderCount; RulerBorder *pObjectBorders; SfxBindings *pBindings; long nDragOffset; long nMaxLeft; long nMaxRight; - BOOL bValid; - BOOL bListening; - BOOL bActive; + sal_Bool bValid; + sal_Bool bListening; + sal_Bool bActive; //#if 0 // _SOLAR__PRIVATE void StartListening_Impl(); - long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE ); - void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE); - USHORT GetObjectBordersOff(USHORT nIdx) const; + long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True ); + void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True); + sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const; // Seitenr"ander oder umgebender Rahmen void UpdateFrame(const SvxLongLRSpaceItem *); @@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener // Seitenposition und -breite void Update(const SvxPagePosSizeItem *); // Spalten - void Update(const SvxColumnItem *, USHORT nSID); + void Update(const SvxColumnItem *, sal_uInt16 nSID); // Object Selektion void Update(const SvxObjectItem *); // Protect @@ -192,8 +192,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener DECL_LINK( MenuSelect, Menu * ); void PrepareProportional_Impl(RulerType); - USHORT GetNextVisible(USHORT nColumn); - USHORT GetPrevVisible(USHORT nColumn); + sal_uInt16 GetNextVisible(sal_uInt16 nColumn); + sal_uInt16 GetPrevVisible(sal_uInt16 nColumn); //#endif void Update(); @@ -217,16 +217,16 @@ protected: // Berechnung der Grenzwerte fuer Objectgrenzen // Werte sind bezogen auf die Seite - virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const; - BOOL IsActLastColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ; - BOOL IsActFirstColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const; - USHORT GetActLeftColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const; - USHORT GetActRightColumn ( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const; - long CalcPropMaxRight(USHORT nCol=USHRT_MAX) const; + virtual sal_Bool CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const; + sal_Bool IsActLastColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ; + sal_Bool IsActFirstColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const; + sal_uInt16 GetActLeftColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const; + sal_uInt16 GetActRightColumn ( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const; + long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const; public: #define SVXRULER_SUPPORT_TABS 0x0001 @@ -240,7 +240,7 @@ public: SvxRuler(Window* pParent, Window *pEditWin, - USHORT nRulerFlags, + sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); ~SvxRuler(); @@ -248,7 +248,7 @@ public: void SetMinFrameSize(long lSize); long GetMinFrameSize() const ; - USHORT GetRulerFlags() const { return nFlags; } + sal_uInt16 GetRulerFlags() const { return nFlags; } void SetDefTabDist(long); long GetDefTabDist() const; @@ -257,13 +257,13 @@ public: void SetNullOffsetLogic(long lOff = 0); long GetNullOffsetLogic() const { return lAppNullOffset; } - void SetActive(BOOL bOn = TRUE); - BOOL IsActive() const { return bActive; } + void SetActive(sal_Bool bOn = sal_True); + sal_Bool IsActive() const { return bActive; } void ForceUpdate() { Update(); } //#i24363# tab stops relative to indent - void SetTabsRelativeToIndent( BOOL bRel = TRUE ); + void SetTabsRelativeToIndent( sal_Bool bRel = sal_True ); }; #endif diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx index 7a3d42eebf..46dbc77dea 100644 --- a/svx/inc/svx/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx @@ -44,8 +44,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -60,7 +60,7 @@ private: public: TYPEINFO(); - SvxLongLRSpaceItem(long lLeft, long lRight, USHORT nId); + SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); @@ -80,8 +80,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -96,7 +96,7 @@ private: public: TYPEINFO(); - SvxLongULSpaceItem(long lUpper, long lLower, USHORT nId); + SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); @@ -115,8 +115,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lHeight; protected: virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -145,13 +145,13 @@ struct SvxColumnDescription { long nStart; /* Spaltenbeginn */ long nEnd; /* Spaltenende */ - BOOL bVisible; /* Sichtbarkeit */ + sal_Bool bVisible; /* Sichtbarkeit */ long nEndMin; //min. possible position of end long nEndMax; //max. possible position of end SvxColumnDescription(): - nStart(0), nEnd(0), bVisible(TRUE), nEndMin(0), nEndMax(0) {} + nStart(0), nEnd(0), bVisible(sal_True), nEndMin(0), nEndMax(0) {} SvxColumnDescription(const SvxColumnDescription &rCopy) : nStart(rCopy.nStart), nEnd(rCopy.nEnd), @@ -159,13 +159,13 @@ struct SvxColumnDescription nEndMin(rCopy.nEndMin), nEndMax(rCopy.nEndMax) {} - SvxColumnDescription(long start, long end, BOOL bVis = TRUE): + SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True): nStart(start), nEnd(end), bVisible(bVis), nEndMin(0), nEndMax(0) {} SvxColumnDescription(long start, long end, - long endMin, long endMax, BOOL bVis = TRUE): + long endMin, long endMax, sal_Bool bVis = sal_True): nStart(start), nEnd(end), bVisible(bVis), nEndMin(endMin), nEndMax(endMax) @@ -194,9 +194,9 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem long nLeft, // Linker Rand bei Tabelle nRight; // Rechter Rand bei Tabelle; bei Spalten immer gleich // zum umgebenden Rahmen - USHORT nActColumn; // die aktuelle Spalte - BOOL bTable; // Tabelle? - BOOL bOrtho; // Gleichverteilte Spalten + sal_uInt16 nActColumn; // die aktuelle Spalte + sal_Bool bTable; // Tabelle? + sal_Bool bOrtho; // Gleichverteilte Spalten void DeleteAndDestroyColumns(); @@ -210,47 +210,47 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); public: TYPEINFO(); // rechter Rand des umgebenden Rahmens // nLeft, nRight jeweils der Abstand zum umgebenden Rahmen - SvxColumnItem(USHORT nAct = 0); // Spalten - SvxColumnItem(USHORT nActCol, - USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern + SvxColumnItem(sal_uInt16 nAct = 0); // Spalten + SvxColumnItem(sal_uInt16 nActCol, + sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Tabelle mit Raendern SvxColumnItem(const SvxColumnItem &); ~SvxColumnItem(); const SvxColumnItem &operator=(const SvxColumnItem &); - USHORT Count() const { return aColumns.Count(); } - SvxColumnDescription &operator[](USHORT i) + sal_uInt16 Count() const { return aColumns.Count(); } + SvxColumnDescription &operator[](sal_uInt16 i) { return *(SvxColumnDescription*)aColumns[i]; } - const SvxColumnDescription &operator[](USHORT i) const + const SvxColumnDescription &operator[](sal_uInt16 i) const { return *(SvxColumnDescription*)aColumns[i]; } - void Insert(const SvxColumnDescription &rDesc, USHORT nPos) { + void Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos) { SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc); aColumns.Insert(pDesc, nPos); } void Append(const SvxColumnDescription &rDesc) { Insert(rDesc, Count()); } void SetLeft(long left) { nLeft = left; } void SetRight(long right) { nRight = right; } - void SetActColumn(USHORT nCol) { nActColumn = nCol; } + void SetActColumn(sal_uInt16 nCol) { nActColumn = nCol; } - USHORT GetActColumn() const { return nActColumn; } - BOOL IsFirstAct() const { return nActColumn == 0; } - BOOL IsLastAct() const { return nActColumn == Count()-1; } + sal_uInt16 GetActColumn() const { return nActColumn; } + sal_Bool IsFirstAct() const { return nActColumn == 0; } + sal_Bool IsLastAct() const { return nActColumn == Count()-1; } long GetLeft() { return nLeft; } long GetRight() { return nRight; } - BOOL IsTable() const { return bTable; } + sal_Bool IsTable() const { return bTable; } - BOOL CalcOrtho() const; - void SetOrtho(BOOL bVal) { bOrtho = bVal; } - BOOL IsOrtho () const { return FALSE ; } + sal_Bool CalcOrtho() const; + void SetOrtho(sal_Bool bVal) { bOrtho = bVal; } + sal_Bool IsOrtho () const { return sal_False ; } - BOOL IsConsistent() const { return nActColumn < aColumns.Count(); } + sal_Bool IsConsistent() const { return nActColumn < aColumns.Count(); } long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte }; @@ -263,7 +263,7 @@ private: long nEndX; /* Ende in X-Richtung */ long nStartY; /* Beginn in Y-Richtung */ long nEndY; /* Ende in Y-Richtung */ - BOOL bLimits; /* Grenzwertkontrolle durch die Applikation */ + sal_Bool bLimits; /* Grenzwertkontrolle durch die Applikation */ protected: virtual int operator==( const SfxPoolItem& ) const; @@ -274,18 +274,18 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. public: TYPEINFO(); SvxObjectItem(long nStartX, long nEndX, long nStartY, long nEndY, - BOOL bLimits = FALSE); + sal_Bool bLimits = sal_False); SvxObjectItem(const SvxObjectItem &); - BOOL HasLimits() const { return bLimits; } + sal_Bool HasLimits() const { return bLimits; } long GetStartX() const { return nStartX; } long GetEndX() const { return nEndX; } diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index 3021447ed6..70581851f2 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -128,7 +128,7 @@ public: { return ((const Svx3DFocalLengthItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); } // Two sided lighting: - BOOL GetTwoSidedLighting() const + sal_Bool GetTwoSidedLighting() const { return ((const Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); } // Lightcolor: @@ -154,21 +154,21 @@ public: { return ((const Svx3DAmbientcolorItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); } // Light on/off: - BOOL GetLightOnOff1() const + sal_Bool GetLightOnOff1() const { return ((const Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); } - BOOL GetLightOnOff2() const + sal_Bool GetLightOnOff2() const { return ((const Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); } - BOOL GetLightOnOff3() const + sal_Bool GetLightOnOff3() const { return ((const Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); } - BOOL GetLightOnOff4() const + sal_Bool GetLightOnOff4() const { return ((const Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); } - BOOL GetLightOnOff5() const + sal_Bool GetLightOnOff5() const { return ((const Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); } - BOOL GetLightOnOff6() const + sal_Bool GetLightOnOff6() const { return ((const Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); } - BOOL GetLightOnOff7() const + sal_Bool GetLightOnOff7() const { return ((const Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); } - BOOL GetLightOnOff8() const + sal_Bool GetLightOnOff8() const { return ((const Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); } // Light direction: @@ -198,9 +198,9 @@ public: { return ((const Svx3DShadeModeItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); } // set flag to draw only selected - void SetDrawOnlySelected(BOOL bNew) { bDrawOnlySelected = bNew; } + void SetDrawOnlySelected(sal_Bool bNew) { bDrawOnlySelected = bNew; } bool GetDrawOnlySelected() const { return bDrawOnlySelected; } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcMove(const Size& rSize); @@ -233,7 +233,7 @@ public: B3dCamera& GetCameraSet() { return aCameraSet; } // Aufbrechen - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); basegfx::B3DVector GetShadowPlaneDirection() const; void SetShadowPlaneDirection(const basegfx::B3DVector& rVec); @@ -243,7 +243,7 @@ public: // create moves virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 952664d6bf..50d033a70d 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -38,10 +38,10 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: TYPEINFO(); SdrAngleItem(): SfxInt32Item() {} - SdrAngleItem(USHORT nId, INT32 nAngle=0): SfxInt32Item(nId,nAngle) {} - SdrAngleItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} + SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {} + SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 81abd5ec63..fec281036d 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -64,8 +64,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); #ifdef SDR_ISPOOLABLE diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index c0a4aac44e..bf053e7129 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -99,8 +99,8 @@ private: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; @@ -129,7 +129,7 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem //--------------------------- class SdrTextWordWrapItem : public SdrOnOffItem { public: - SdrTextWordWrapItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} + SdrTextWordWrapItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} SdrTextWordWrapItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn ) {} }; @@ -138,7 +138,7 @@ public: //------------------------------- class SdrTextAutoGrowSizeItem : public SdrOnOffItem { public: - SdrTextAutoGrowSizeItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} + SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} SdrTextAutoGrowSizeItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn ) {} }; diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx index 69807c148c..6bd396aded 100644 --- a/svx/inc/svx/sdgcoitm.hxx +++ b/svx/inc/svx/sdgcoitm.hxx @@ -46,7 +46,7 @@ public: SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //------------------- @@ -63,7 +63,7 @@ public: SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //------------------- @@ -80,7 +80,7 @@ public: SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGCOITM_HXX diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx index dd01de87f8..40dde4bcf0 100644 --- a/svx/inc/svx/sdgcpitm.hxx +++ b/svx/inc/svx/sdgcpitm.hxx @@ -43,12 +43,12 @@ public: SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0, sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0, - USHORT nWhichId = SDRATTR_GRAFCROP ) : + sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; }; #endif // _SDGCPITM_HXX diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index 122e38c87e..456fec9bc4 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -42,14 +42,14 @@ public: TYPEINFO(); - SdrGrafGamma100Item( ULONG nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} + SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif // _SDGGAITM_HXX diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx index aa175ee728..a5afe0152c 100644 --- a/svx/inc/svx/sdginitm.hxx +++ b/svx/inc/svx/sdginitm.hxx @@ -42,11 +42,11 @@ public: TYPEINFO(); - SdrGrafInvertItem( BOOL bInvert = FALSE ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} + SdrGrafInvertItem( sal_Bool bInvert = sal_False ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGINITM_HXX diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx index 8ba0c1a507..15dfbaf1b2 100644 --- a/svx/inc/svx/sdgluitm.hxx +++ b/svx/inc/svx/sdgluitm.hxx @@ -46,7 +46,7 @@ public: SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //---------------------- @@ -63,7 +63,7 @@ public: SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGLUITM_HXX diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index 0924028e26..9d99816319 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -43,15 +43,15 @@ public: TYPEINFO(); - SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (USHORT)eMode ) {} + SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetValueCount() const; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx index ad3895df1f..68536b21f9 100644 --- a/svx/inc/svx/sdgtritm.hxx +++ b/svx/inc/svx/sdgtritm.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem public: TYPEINFO(); - SdrGrafTransparenceItem( USHORT nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} + SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGTRITM_HXX diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index a1b4904176..bfe7d76bf1 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -40,10 +40,10 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: TYPEINFO(); SdrMetricItem(): SfxInt32Item() {} - SdrMetricItem(USHORT nId, INT32 nVal=0): SfxInt32Item(nId,nVal) {} - SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} + SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {} + SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual FASTBOOL HasMetrics() const; virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 01980c7b24..f1af6372e9 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -40,12 +40,12 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: TYPEINFO(); SdrOnOffItem(): SfxBoolItem() {} - SdrOnOffItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {} - SdrOnOffItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} + SdrOnOffItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {} + SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual String GetValueTextByVal(BOOL bVal) const; + virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 8e373039f5..b0d3750c6e 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item public: TYPEINFO(); SdrPercentItem(): SfxUInt16Item() {} - SdrPercentItem(USHORT nId, UINT16 nVal=0): SfxUInt16Item(nId,nVal) {} - SdrPercentItem(USHORT nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} + SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {} + SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; @@ -63,10 +63,10 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item public: TYPEINFO(); SdrSignedPercentItem(): SfxInt16Item() {} - SdrSignedPercentItem( USHORT nId, INT16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} - SdrSignedPercentItem( USHORT nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} + SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} + SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 13fb76bcb0..f8664ac731 100644 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -37,7 +37,7 @@ //------------------------------ class SdrShadowItem: public SdrOnOffItem { public: - SdrShadowItem(BOOL bShadow=FALSE): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {} + SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {} SdrShadowItem(SvStream& rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {} }; diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx index 56b4a5d4af..583f3c0753 100644 --- a/svx/inc/svx/sdshtitm.hxx +++ b/svx/inc/svx/sdshtitm.hxx @@ -35,7 +35,7 @@ //--------------------- class SdrShadowTransparenceItem: public SdrPercentItem { public: - SdrShadowTransparenceItem(USHORT nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {} + SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {} SdrShadowTransparenceItem(SvStream& rIn) : SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,rIn) {} }; diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index d157330438..221d3070bd 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -34,10 +34,10 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item { public: TYPEINFO(); - SdrTextAniAmountItem(INT16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} + SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual FASTBOOL HasMetrics() const; virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index 43e34abbbd..65f7daec2e 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -33,7 +33,7 @@ // Anzahl der Durchlaeufe. 0=Endlos. class SdrTextAniCountItem: public SfxUInt16Item { public: - SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} + SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {} }; diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 66eded48ae..6c96af0ed2 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -43,17 +43,17 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT, class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(USHORT)eDir) {} + SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {} SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx index be89a2bcb5..0c1a4261c5 100644 --- a/svx/inc/svx/sdtagitm.hxx +++ b/svx/inc/svx/sdtagitm.hxx @@ -35,7 +35,7 @@ //------------------------------------ class SdrTextAutoGrowHeightItem: public SdrOnOffItem { public: - SdrTextAutoGrowHeightItem(BOOL bAuto=TRUE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} + SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {} }; @@ -44,7 +44,7 @@ public: //------------------------------------ class SdrTextAutoGrowWidthItem: public SdrOnOffItem { public: - SdrTextAutoGrowWidthItem(BOOL bAuto=FALSE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} + SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} SdrTextAutoGrowWidthItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn) {} }; diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx index 905766cfe2..b0a4e968c5 100644 --- a/svx/inc/svx/sdtaiitm.hxx +++ b/svx/inc/svx/sdtaiitm.hxx @@ -32,13 +32,13 @@ class SdrTextAniStartInsideItem: public SdrYesNoItem { public: - SdrTextAniStartInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} + SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {} }; class SdrTextAniStopInsideItem: public SdrYesNoItem { public: - SdrTextAniStopInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} + SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {} }; diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index 07a823d8e1..2e1c35a1ba 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -45,17 +45,17 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // Kopfbuendig (so wie man e class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(USHORT)eAdj) {} + SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; @@ -72,17 +72,17 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // Linksbuendig verankert class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(USHORT)eAdj) {} + SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {} SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index bf6b495d12..652aeff192 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -45,8 +45,8 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Einfach nur Blinken. Direction und Amount ohne Wirkung. // Frequenz siehe Delay, 0=0.5Hz (Delay=250). // Count=Anzahl der blinker. 0=Endlos. -// StartInside: FALSE=beginnend mit Pause, TRUE=Beginnend mit Puls -// StopInside: FALSE=Nach Count blinkern nicht sichtbar, TRUE=sichtbar +// StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls +// StopInside: sal_False=Nach Count blinkern nicht sichtbar, sal_True=sichtbar // (nur wenn Count!=0) // - SDRTEXTANI_SCROLL: // Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden @@ -54,12 +54,12 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz) // Count=Durchlaufanzahl (0=Endlos) // Direction: ist eben die Richtung in die gescrollt wird. -// StartInside: FALSE=Schrift wird auch beim ersten Durchlauf reingescrollt -// TRUE=Der linke Teil der Schrift steht beim ersten Durchlauf +// StartInside: sal_False=Schrift wird auch beim ersten Durchlauf reingescrollt +// sal_True=Der linke Teil der Schrift steht beim ersten Durchlauf // bereits da (im sichtbaren "Scrollbereich") -// StopInside: FALSE=Schrift wird auch beim letzten Durchlauf vollstaendig +// StopInside: sal_False=Schrift wird auch beim letzten Durchlauf vollstaendig // rausgescrollt -// TRUE=Schrift wird beim letzten Durchlauf nicht rausgescrollt +// sal_True=Schrift wird beim letzten Durchlauf nicht rausgescrollt // (nur wenn Count!=0) // Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten // Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf @@ -74,31 +74,31 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Alle andern Parameter wie SDRTEXTANI_SCROLL // - SDRTEXTANI_SLIDE: // Schrift wird nur reingeschoben bis zur Originalposition. -// -> also wie SCROLL mit StartInside=FALSE, StopInside=TRUE +// -> also wie SCROLL mit StartInside=sal_False, StopInside=TRUE // und Count=1. Count=0 wird als Count=1 interpretiert. // Fuer jeden Count>1 wird der Text jedoch ruekwaerts wieder vollstaendig // rausgeschoben (aehnlich wie ALTERNATE) und dann wieder reingeschoben. // StopInside wird nicht ausgewertet, weil immer Inside gestoppt wird. // StartInside wird nicht ausgewertet, weil immer Outside gestartet wird. // Alle andern Parameter wie SDRTEXTANI_SCROLL -// StartInside,StopInside: Bei TRUE ist die anfaengliche/entgueltige +// StartInside,StopInside: Bei sal_True ist die anfaengliche/entgueltige // Textposition abhaengig von der Textverankerung am Zeichenobjekt. Sie // entspricht der Textposition bei normalem Paint (ohne Laufschrift). class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(USHORT)eKind) {} + SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {} SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index b1d1715f4b..1e92e58a2a 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -34,10 +34,10 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item { public: TYPEINFO(); - SdrTextAniDelayItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} + SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx index d11e0834e7..2b522791ae 100644 --- a/svx/inc/svx/sdtcfitm.hxx +++ b/svx/inc/svx/sdtcfitm.hxx @@ -35,7 +35,7 @@ //------------------------------------ class SdrTextContourFrameItem: public SdrOnOffItem { public: - SdrTextContourFrameItem(BOOL bOn=FALSE): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {} + SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {} SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {} }; diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index a551bcc840..0473590b7c 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem public: TYPEINFO(); - SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE ); + SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False ); SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, @@ -46,8 +46,8 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); #ifdef SDR_ISPOOLABLE SVX_DLLPRIVATE virtual int IsPoolable() const; diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index 362f444d3d..af1a797fac 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -51,21 +51,21 @@ enum SdrFitToSizeType {SDRTEXTFIT_NONE, // - kein FitToSize class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(USHORT)eFit) {} + SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {} SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue(BOOL bVal); + virtual sal_Bool GetBoolValue() const; + virtual void SetBoolValue(sal_Bool bVal); }; #endif diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 7b39551988..3529024ff2 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -40,11 +40,11 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: TYPEINFO(); SdrYesNoItem(): SfxBoolItem() {} - SdrYesNoItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {} - SdrYesNoItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} + SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {} + SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual String GetValueTextByVal(BOOL bVal) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; #ifdef SDR_ISPOOLABLE virtual int IsPoolable() const; diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx index 77c8f91898..718576fc66 100644 --- a/svx/inc/svx/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx @@ -37,19 +37,19 @@ class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxSelectionModeControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - USHORT nState; + sal_uInt16 nState; #ifdef _SVX_SELCTRL_CXX SVX_DLLPRIVATE void DrawItemText_Impl(); diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 19cf26d3dc..e7470f0081 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -72,11 +72,11 @@ private: SvxSimpTblContainer aPrivContainer; HeaderBar aHeaderBar; long nOldPos; - USHORT nHeaderItemId; - BOOL bResizeFlag; - BOOL bPaintFlag; - BOOL bSortDirection; - USHORT nSortCol; + sal_uInt16 nHeaderItemId; + sal_Bool bResizeFlag; + sal_Bool bPaintFlag; + sal_Bool bSortDirection; + sal_uInt16 nSortCol; Window* pMyParentWin; DECL_LINK( StartDragHdl, HeaderBar* ); @@ -112,7 +112,7 @@ public: ~SvxSimpleTable(); void InsertHeaderEntry(const XubString& rText, - USHORT nCol=HEADERBAR_APPEND, + sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HIB_STDSTYLE); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); @@ -137,11 +137,11 @@ public: void ShowTable(); void HideTable(); - BOOL IsVisible() const; + sal_Bool IsVisible() const; void EnableTable(); void DisableTable(); - BOOL IsEnabled() const; + sal_Bool IsEnabled() const; void TableToTop(); void SetPosPixel( const Point& rNewPos ); @@ -154,11 +154,11 @@ public: Size GetSizePixel() const; Size GetOutputSizePixel() const; - USHORT GetSelectedCol(); - void SortByCol(USHORT,BOOL bDir=TRUE); - BOOL GetSortDirection(){ return bSortDirection;} - USHORT GetSortedCol(){ return nSortCol;} - SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const; + sal_uInt16 GetSelectedCol(); + void SortByCol(sal_uInt16,sal_Bool bDir=sal_True); + sal_Bool GetSortDirection(){ return bSortDirection;} + sal_uInt16 GetSortedCol(){ return nSortCol;} + SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const; CommandEvent GetCommandEvent()const; inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx index 0d02126497..0024d7c1df 100644 --- a/svx/inc/svx/sphere3d.hxx +++ b/svx/inc/svx/sphere3d.hxx @@ -67,8 +67,8 @@ public: sal_uInt32 GetVerticalSegments() const { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index f767586559..2ae756edb4 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -64,7 +64,7 @@ struct SearchDlg_Impl; struct SearchAttrItem { - USHORT nSlot; + sal_uInt16 nSlot; SfxPoolItem* pItem; }; @@ -82,17 +82,17 @@ public: void Put( const SfxItemSet& rSet ); SfxItemSet& Get( SfxItemSet& rSet ); void Clear(); - USHORT Count() const { return SrchAttrItemList::Count(); } - SearchAttrItem& operator[](USHORT nPos) const + sal_uInt16 Count() const { return SrchAttrItemList::Count(); } + SearchAttrItem& operator[](sal_uInt16 nPos) const { return SrchAttrItemList::operator[]( nPos ); } - SearchAttrItem& GetObject( USHORT nPos ) const + SearchAttrItem& GetObject( sal_uInt16 nPos ) const { return SrchAttrItemList::GetObject( nPos ); } // der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen) void Insert( const SearchAttrItem& rItem ) { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); } // l"oscht die Pointer auf die Items - void Remove( USHORT nPos, USHORT nLen = 1 ); + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ); }; #ifndef SV_NODIALOG @@ -107,7 +107,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow { SvxSearchDialog *dialog; public: - SvxSearchDialogWrapper( Window*pParent, USHORT nId, + SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); ~SvxSearchDialogWrapper (); @@ -140,7 +140,7 @@ public: SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); ~SvxSearchDialog(); - virtual BOOL Close(); + virtual sal_Bool Close(); // Window virtual void Activate(); @@ -153,12 +153,12 @@ public: const SearchAttrItemList* GetReplaceItemList() const { return pReplaceList; } - inline BOOL HasSearchAttributes() const; - inline BOOL HasReplaceAttributes() const; + inline sal_Bool HasSearchAttributes() const; + inline sal_Bool HasReplaceAttributes() const; PushButton& GetReplaceBtn() { return aReplaceBtn; } - INT32 GetTransliterationFlags() const; + sal_Int32 GetTransliterationFlags() const; private: FixedText aSearchText; @@ -214,14 +214,14 @@ private: CheckBox aAllSheetsCB; SfxBindings& rBindings; - BOOL bWriter; - BOOL bSearch; - BOOL bFormat; - USHORT nOptions; + sal_Bool bWriter; + sal_Bool bSearch; + sal_Bool bFormat; + sal_uInt16 nOptions; FASTBOOL bSet; FASTBOOL bReadOnly; FASTBOOL bConstruct; - ULONG nModifyFlag; + sal_uIntPtr nModifyFlag; String aStylesStr; String aLayoutStr; LocalizedString aCalcStr; @@ -240,7 +240,7 @@ private: SvxSearchController* pSearchSetController; SvxSearchController* pReplaceSetController; - mutable INT32 nTransliterationFlags; + mutable sal_Int32 nTransliterationFlags; #ifdef _SVX_SRCHDLG_CXX DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit ); @@ -260,31 +260,31 @@ private: void Init_Impl( int bHasItemSet ); void InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ); - void Remember_Impl( const String &rStr,BOOL bSearch ); + void Remember_Impl( const String &rStr,sal_Bool bSearch ); void PaintAttrText_Impl(); - String& BuildAttrText_Impl( String& rStr, BOOL bSrchFlag ) const; + String& BuildAttrText_Impl( String& rStr, sal_Bool bSrchFlag ) const; void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ); - void EnableControls_Impl( const USHORT nFlags ); + void EnableControls_Impl( const sal_uInt16 nFlags ); void EnableControl_Impl( Control* pCtrl ); void SetItem_Impl( const SvxSearchItem* pItem ); void SetModifyFlag_Impl( const Control* pCtrl ); void SaveToModule_Impl(); - void ApplyTransliterationFlags_Impl( INT32 nSettings ); + void ApplyTransliterationFlags_Impl( sal_Int32 nSettings ); #endif }; #include <sfx2/layout-post.hxx> -inline BOOL SvxSearchDialog::HasSearchAttributes() const +inline sal_Bool SvxSearchDialog::HasSearchAttributes() const { int bLen = aSearchAttrText.GetText().Len(); return ( aSearchAttrText.IsEnabled() && bLen ); } -inline BOOL SvxSearchDialog::HasReplaceAttributes() const +inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const { int bLen = aReplaceAttrText.GetText().Len(); return ( aReplaceAttrText.IsEnabled() && bLen ); diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx index 735e677d4f..dec9c9403d 100644 --- a/svx/inc/svx/subtoolboxcontrol.hxx +++ b/svx/inc/svx/subtoolboxcontrol.hxx @@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxSubToolBoxControl(); virtual SfxPopupWindowType GetPopupWindowType() const; diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index ddcfd87707..5f184972fa 100644 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -71,10 +71,10 @@ protected: Pointer aAktCreatePointer; - INT32 nAutoCloseDistPix; - INT32 nFreeHandMinDistPix; - UINT32 nAktInvent; // Aktuell eingestelltes - UINT16 nAktIdent; // Obj fuer Neuerzeugung + sal_Int32 nAutoCloseDistPix; + sal_Int32 nFreeHandMinDistPix; + sal_uInt32 nAktInvent; // Aktuell eingestelltes + sal_uInt16 nAktIdent; // Obj fuer Neuerzeugung unsigned bAutoTextEdit : 1; // Textedit nach dem erzeugen eines Textrahmens starten unsigned b1stPointAsCenter : 1; @@ -92,9 +92,9 @@ protected: sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); - void ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/); - void HideCreateObj(/*OutputDevice* pOut, BOOL bFull*/); - BOOL CheckEdgeMode(); + void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); + void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); + sal_Bool CheckEdgeMode(); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -102,14 +102,14 @@ protected: virtual ~SdrCreateView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); virtual void BrkAction(); virtual void TakeActionRect(Rectangle& rRect) const; - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); void SetActiveLayer(const String& rName) { aAktLayer=rName; } const String& GetActiveLayer() const { return aAktLayer; } @@ -119,70 +119,70 @@ public: // Ist der MeasureLayer nicht gesetzt (Leerstring), so // wird der ActiveLayer auch fuer Bemassung verwendet. void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); } - void SetEditMode(BOOL bOn=TRUE) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } - void SetCreateMode(BOOL bOn=TRUE) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } - void SetGluePointEditMode(BOOL bOn=TRUE) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } + void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } + void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } + void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } // Feststellen, ob Textwerkzeug aktiviert - BOOL IsTextTool() const; + sal_Bool IsTextTool() const; // Feststellen, ob Objektverbinderwerkzeug aktiviert - BOOL IsEdgeTool() const; + sal_Bool IsEdgeTool() const; // Feststellen, ob Bemassungswerkzeug aktiviert - BOOL IsMeasureTool() const; + sal_Bool IsMeasureTool() const; - void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor); - void TakeCurrentObj(UINT16& nIdent, UINT32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } - UINT32 GetCurrentObjInventor() const { return nAktInvent; } - UINT16 GetCurrentObjIdentifier() const { return nAktIdent; } + void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor); + void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } + sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; } + sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } // Starten des normalen Create - BOOL BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); void MovCreateObj(const Point& rPnt); - BOOL EndCreateObj(SdrCreateCmd eCmd); + sal_Bool EndCreateObj(SdrCreateCmd eCmd); void BckCreateObj(); // z.B. wieder 1 Polygonpunkt zurueck. void BrkCreateObj(); - BOOL IsCreateObj() const { return pAktCreate!=NULL; } + sal_Bool IsCreateObj() const { return pAktCreate!=NULL; } SdrObject* GetCreateObj() const { return pAktCreate; } // BegCreateCaptionObj() erzeugt ein SdrCaptionObj (Legendenobjekt). // rObjSiz ist die anfaengliche Groesse des Legenden-Textrahmens. // gedraggd wird lediglich die Laenge des Zipfel. - BOOL BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); - // Wenn TextEditAfterCreate auf TRUE steht (das ist der Default), + // Wenn TextEditAfterCreate auf sal_True steht (das ist der Default), // dann wird nach dem erzeugen eines Textrahmenobjekts (OBJ_TEXT, // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION) // automatisch ein TextEdit (SdrObjEditView::SdrBeginTextEdit) gestartet. - BOOL IsTextEditAfterCreate() const { return bAutoTextEdit; } - void SetTextEditAfterCreate(BOOL bOn) { bAutoTextEdit = bOn; } + sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; } + void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; } // Erzeugen eines Kreises/Rechtecks/Textrahmens wobei der 1. Punkt // nicht die linke obere Ecke, sondern das Zentrum des Objekts vorgibt. // Persistentes Flag. Default=FALSE. - BOOL IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } - void SetCreate1stPointAsCenter(BOOL bOn) { b1stPointAsCenter = bOn; } + sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } + void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; } // Fuer Polylines (OBJ_PLIN) und Freihandlinien (OBJ_FREELINE). Ist dieses - // Flag TRUE, werden diese beiden Objekttypen implizit geschlossen und in + // Flag sal_True, werden diese beiden Objekttypen implizit geschlossen und in // Polygon (OBJ_POLY) bzw. Freihandflaeche (OBJ_FREEFILL) gewandelt falls // zum Ende des Create die Distanz zwischen Startpunkt und Endpunkt des // Objekts <=n Pixel ist, wobei SetAutoCloseDistPix vorgegeben wird. // Default=TRUE. - BOOL IsAutoClosePolys() const { return bAutoClosePolys; } - void SetAutoClosePolys(BOOL bOn) { bAutoClosePolys=bOn; } + sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; } + void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; } // Default=5 Pixel. - USHORT GetAutoCloseDistPix() const { return USHORT(nAutoCloseDistPix); } - void SetAutoCloseDistPix(USHORT nVal) { nAutoCloseDistPix=nVal; } + sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); } + void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; } // Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der // Erzeugung einer Freihandlinie. // Default=10 Pixel. - USHORT GetFreeHandMinDistPix() const { return USHORT(nFreeHandMinDistPix); } - void SetFreeHandMinDistPix(USHORT nVal) { nFreeHandMinDistPix=nVal; } + sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); } + void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; } // Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible // Create-Interface am PathObj beibehalten moechte muss das nachfolgende @@ -190,19 +190,19 @@ public: // OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL // Dieses Flag hat nur voruebergehenden Character. Die betroffenen // Applikationen sollten alsbald umgestellt werden. - // Default=FALSE; - BOOL IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } - void SetUseIncompatiblePathCreateInterface(BOOL bOn) { bUseIncompatiblePathCreateInterface = bOn; } + // Default=sal_False; + sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } + void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; } void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV); void HideConnectMarker(); // Attribute des ggf. gerade in der Erzeugung befindlichen Objekts /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); }; #endif //_SVDCRTV_HXX diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx index a7215fc763..1ce470bcaa 100644 --- a/svx/inc/svx/svddef.hxx +++ b/svx/inc/svx/svddef.hxx @@ -95,7 +95,7 @@ #define SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1) /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */ #define SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0) /* 1097 */ /* 1097 */ /* 1080 long, def=0 */ #define SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1) /* 1098 */ /* 1098 */ /* 1081 long, def=0 */ -#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 BOOL, def=TRUE */ +#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */ #define SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=SDRTEXTFIT_NONE */ #define SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4) /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */ #define SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5) /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */ @@ -105,15 +105,15 @@ #define SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9) /* 1106 */ /* 1106 */ /* 1089 long, def=0 - Pool V2 */ #define SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10) /* 1107 */ /* 1107 */ /* 1090 long, def=0 - Pool V2 */ #define SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11) /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */ -#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 BOOL, def=FALSE - Pool V2 */ +#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */ #define SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13) /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */ #define SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */ #define SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15) /* 1112 */ /* 1112 */ /* 1095 enum, def=SDRTEXTANI_LEFT - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 BOOL, def=FALSE - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 BOOL, def=FALSE - Pool V2/V4 */ -#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 USHORT, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 USHORT, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 USHORT, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */ +#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */ +#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 sal_uInt16, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */ #define SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21) /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */ #define SDRATTR_CUSTOMSHAPE_ADJUSTMENT (SDRATTR_MISC_FIRST +22) /* 1119 */ /* 1119 */ /* 1102 */ /* Pool V2 */ #define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +23) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ @@ -168,10 +168,10 @@ // Nur fuer Interfaceing, not implemented yet. /* V4+ */ #define SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1) /* 1180 */ /* 1172 */ /* 1127 */ /* 1110 */ /* Pool V1: 1058 */ -#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 BOOL, def=FALSE */ -#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 BOOL, def=FALSE */ -#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 BOOL, def=TRUE */ -#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 USHORT, def=0 */ +#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 sal_Bool, def=sal_False */ +#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 sal_Bool, def=sal_False */ +#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 sal_Bool, def=sal_True */ +#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 sal_uInt16, def=0 */ #define SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4) /* 1184 String, def="" */ #define SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5) /* 1185 String, def="" */ #define SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6) /* 1186 long, def=0 */ diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 0b3c7a52de..78ecc43a8e 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -84,12 +84,12 @@ protected: void* aReservePtr4; FASTBOOL bShown; // Xor sichrbar? - USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden + sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden FASTBOOL bMinMoved; // MinMove durchbrochen? FASTBOOL bHorFixed; // nur Vertikal draggen FASTBOOL bVerFixed; // nur Horizontal draggen - FASTBOOL bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet + FASTBOOL bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben. FASTBOOL bOrtho4; FASTBOOL bOrtho8; @@ -98,19 +98,19 @@ protected: protected: void Clear(FASTBOOL bLeaveOne); - Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); } + Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata public: SdrDragStat(): aPnts(1024,16,16) { pUser=NULL; Reset(); } - ~SdrDragStat() { Clear(FALSE); } + ~SdrDragStat() { Clear(sal_False); } void Reset(); SdrView* GetView() const { return pView; } void SetView(SdrView* pV) { pView=pV; } SdrPageView* GetPageView() const { return pPageView; } void SetPageView(SdrPageView* pPV) { pPageView=pPV; } - const Point& GetPoint(ULONG nNum) const { return *((Point*)aPnts.GetObject(nNum)); } - ULONG GetPointAnz() const { return aPnts.Count(); } + const Point& GetPoint(sal_uIntPtr nNum) const { return *((Point*)aPnts.GetObject(nNum)); } + sal_uIntPtr GetPointAnz() const { return aPnts.Count(); } const Point& GetStart() const { return GetPoint(0); } Point& Start() { return Pnt(0); } const Point& GetPrev() const { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); } @@ -133,10 +133,10 @@ public: void SetShown(FASTBOOL bOn) { bShown=bOn; } FASTBOOL IsMinMoved() const { return bMinMoved; } - void SetMinMoved() { bMinMoved=TRUE; } - void ResetMinMoved() { bMinMoved=FALSE; } - void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } - USHORT GetMinMove() const { return nMinMov; } + void SetMinMoved() { bMinMoved=sal_True; } + void ResetMinMoved() { bMinMoved=sal_False; } + void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } + sal_uInt16 GetMinMove() const { return nMinMov; } FASTBOOL IsHorFixed() const { return bHorFixed; } void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; } @@ -146,16 +146,16 @@ public: // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!" // z.B. fuer den Winkel des Kreisbogen... FASTBOOL IsNoSnap() const { return bWantNoSnap; } - void SetNoSnap(FASTBOOL bOn=TRUE) { bWantNoSnap=bOn; } + void SetNoSnap(FASTBOOL bOn=sal_True) { bWantNoSnap=bOn; } // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins) // sinnvoll auf ihm angewendet werden kann. // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt) FASTBOOL IsOrtho4Possible() const { return bOrtho4; } - void SetOrtho4Possible(FASTBOOL bOn=TRUE) { bOrtho4=bOn; } + void SetOrtho4Possible(FASTBOOL bOn=sal_True) { bOrtho4=bOn; } // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien) FASTBOOL IsOrtho8Possible() const { return bOrtho8; } - void SetOrtho8Possible(FASTBOOL bOn=TRUE) { bOrtho8=bOn; } + void SetOrtho8Possible(FASTBOOL bOn=sal_True) { bOrtho8=bOn; } // Wird vom gedraggten Objekt gesetzt FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } @@ -170,7 +170,7 @@ public: Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(FASTBOOL bSaveReal=FALSE); + void NextPoint(FASTBOOL bSaveReal=sal_False); void PrevPoint(); FASTBOOL CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index d973c8b878..ee7636fa75 100644 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -67,10 +67,10 @@ protected: SdrMarkList aFollowingEdges; // Wenn Knoten gedraggd werden, sollen alle Kanten als Xor folgen SdrHdlKind eDragHdl; - ULONG nDragXorPolyLimit; - ULONG nDragXorPointLimit; - USHORT nRubberEdgeDraggingLimit; - USHORT nDetailedEdgeDraggingLimit; + sal_uIntPtr nDragXorPolyLimit; + sal_uIntPtr nDragXorPointLimit; + sal_uInt16 nRubberEdgeDraggingLimit; + sal_uInt16 nDetailedEdgeDraggingLimit; unsigned bFramDrag : 1; // z.Zt. FrameDrag unsigned bDragSpecial : 1; // z.Zt. Special Obj-Dragging @@ -110,7 +110,7 @@ protected: virtual ~SdrDragView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -124,72 +124,72 @@ public: // In der Regel ist das die linke obere Ecke des zu erwartenden neuen // SnapRects. Ausnahme: CaptionObj. Dort ist es die Position des // "Schwanzendes". - // Bei Returncode FALSE konnte ich die Position nicht bestimmen + // Bei Returncode sal_False konnte ich die Position nicht bestimmen // (z.B. Punktverschiebung, Mehrfachselektion, Schieben der // Spiegelschse, ...) - BOOL TakeDragObjAnchorPos(Point& rPos, BOOL bTopRight = FALSE ) const; + sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const; // Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese // Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und // wird zum Ende des Draggings destruiert. - virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); + virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); void MovDragObj(const Point& rPnt); - BOOL EndDragObj(BOOL bCopy=FALSE); + sal_Bool EndDragObj(sal_Bool bCopy=sal_False); void BrkDragObj(); - BOOL IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } + sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } SdrHdl* GetDragHdl() const { return pDragHdl; } SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; } - BOOL IsDraggingPoints() const { return eDragHdl==HDL_POLY; } - BOOL IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } + sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; } + sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } // Wer das beim BegDrag oder mittendrin schon festlegen will. - // (Wird bei jedem BegDrag auf FALSE zurueckgesetzt, also nach + // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach // BegDrag setzen.) - void SetDragWithCopy(BOOL bOn) { bDragWithCopy = bOn; } - BOOL IsDragWithCopy() const { return bDragWithCopy; } + void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; } + sal_Bool IsDragWithCopy() const { return bDragWithCopy; } - void SetInsertGluePoint(BOOL bOn) { bInsGluePoint = bOn; } - BOOL IsInsertGluePoint() const { return bInsGluePoint; } + void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; } + sal_Bool IsInsertGluePoint() const { return bInsGluePoint; } // Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt. - BOOL IsInsObjPointPossible() const; - BOOL IsInsPointPossible() const { return IsInsObjPointPossible(); } + sal_Bool IsInsObjPointPossible() const; + sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); } sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); } void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); } - BOOL EndInsObjPoint(SdrCreateCmd eCmd); + sal_Bool EndInsObjPoint(SdrCreateCmd eCmd); void BrkInsObjPoint() { BrkDragObj(); } - BOOL IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } + sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; } - BOOL IsInsObjPointMode() const { return bInsObjPointMode; } + void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; } + sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; } - BOOL IsInsGluePointPossible() const; - BOOL BegInsGluePoint(const Point& rPnt); + sal_Bool IsInsGluePointPossible() const; + sal_Bool BegInsGluePoint(const Point& rPnt); void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); } - BOOL EndInsGluePoint() { return EndDragObj(); } + sal_Bool EndInsGluePoint() { return EndDragObj(); } void BrkInsGluePoint() { BrkDragObj(); } - BOOL IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } + sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsGluePointMode(BOOL bOn) { bInsGluePointMode = bOn; } - BOOL IsInsGluePointMode() const { return bInsGluePointMode; } + void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; } + sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; } // Begrenzungslinien ueber's gesamte Win waehrend des Draggens // Persistent. Default=FALSE. - void SetDragStripes(BOOL bOn); - BOOL IsDragStripes() const { return bDragStripes; } + void SetDragStripes(sal_Bool bOn); + sal_Bool IsDragStripes() const { return bDragStripes; } // Handles waehrend des Draggens verstecken - //HMHvoid SetDragHdlHide(BOOL bOn); + //HMHvoid SetDragHdlHide(sal_Bool bOn); //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; } // Beim Draggen von Polygonpunkten und Klebepunkten // die Maus verstecken. Default=FALSE - void SetMouseHideWhileDraggingPoints(BOOL bOn) { bMouseHideWhileDraggingPoints = bOn; } - BOOL IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } + void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; } + sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } // Beim Draggen werden i.d.R. die Konturen der markierten Objekte // als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt, @@ -198,22 +198,22 @@ public: // hat diese Einstellung keine Auswirkung. // Auch waerend des Draggens umschaltbar. // Default=Off - void SetNoDragXorPolys(BOOL bOn); - BOOL IsNoDragXorPolys() const { return bNoDragXorPolys; } + void SetNoDragXorPolys(sal_Bool bOn); + sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; } // Uebersteigt die Anzahl der markierten Objekte den hier eingestellten // Wert, wird implizit (temporaer) auf NoDragPolys geschaltet. // PolyPolygone etc werden entsprechend als mehrere Objekte gewertet. // Default=100 - void SetDragXorPolyLimit(ULONG nObjAnz) { nDragXorPolyLimit=nObjAnz; } - ULONG GetDragXorPolyLimit() const { return nDragXorPolyLimit; } + void SetDragXorPolyLimit(sal_uIntPtr nObjAnz) { nDragXorPolyLimit=nObjAnz; } + sal_uIntPtr GetDragXorPolyLimit() const { return nDragXorPolyLimit; } // Wie DragXorPolyLimit, jedoch bezogen auf die Gesamtpunktanzahl // aller Polygone. Default=500. // Auf NoDragPolys wird (temporaer) geschaltet, wenn eins der Limits // ueberstiegen wird. - void SetDragXorPointLimit(ULONG nPntAnz) { nDragXorPointLimit=nPntAnz; } - ULONG GetDragXorPointLimit() const { return nDragXorPointLimit; } + void SetDragXorPointLimit(sal_uIntPtr nPntAnz) { nDragXorPointLimit=nPntAnz; } + sal_uIntPtr GetDragXorPointLimit() const { return nDragXorPointLimit; } void SetSolidDragging(bool bOn); bool IsSolidDragging() const; @@ -221,14 +221,14 @@ public: // Dragging/Creating von Verbindern: // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Verbinder an Objektscheitelpunkte ankleben - // Default=TRUE=Ja - void SetAutoVertexConnectors(BOOL bOn) { bAutoVertexCon = bOn; } - BOOL IsAutoVertexConnectors() const { return bAutoVertexCon; } + // Default=sal_True=Ja + void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; } + sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; } // Verbinder an Objektecken ankleben - // Default=FALSE=Nein - void SetAutoCornerConnectors(BOOL bOn) { bAutoCornerCon = bOn; } - BOOL IsAutoCornerConnectors() const { return bAutoCornerCon; } + // Default=sal_False=Nein + void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; } + sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; } // Dragging von verbundenen Objekten (Nodes): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -237,22 +237,22 @@ public: // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar. // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich. // Defaultwert ist 10 - void SetDetailedEdgeDragging(BOOL bOn); // Default an - BOOL IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } + void SetDetailedEdgeDragging(sal_Bool bOn); // Default an + sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } - void SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz); - USHORT GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; } + void SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz); + sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; } // EdgeDraggingLimit: Sind mehr als nEdgeObjAnz Kanten betroffen, werden // diese beim interaktiven Draggen nicht mit angezeigt. // Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen // als die kompletten Neuberechnungen beim DetailedEdgeDragging. // Defaultwert ist 100 - void SetRubberEdgeDragging(BOOL bOn); // Default an - BOOL IsRubberEdgeDragging() const { return bRubberEdgeDragging; } + void SetRubberEdgeDragging(sal_Bool bOn); // Default an + sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; } - void SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz); - USHORT GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; } + void SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz); + sal_uInt16 GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; } // Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen): // - Sind bis max 10 Verbinder betroffen werden diese bei jedem @@ -264,29 +264,29 @@ public: // Ist ein spezieller Dragmode eingeschaltet, wie Rotate, Mirror oder Crook, // dann leitet ein Hit auf das markierte Objekt genau dieses Dragging ein. - // Setzt man MarkedHitMovesAlways auf TRUE, so leitet ein Hit auf das + // Setzt man MarkedHitMovesAlways auf sal_True, so leitet ein Hit auf das // markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode. // Dieses Flag ist persistent und sollte von der App fuer den Anwender // konfigurierbar sein! - void SetMarkedHitMovesAlways(BOOL bOn) { bMarkedHitMovesAlways = bOn; } - BOOL IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } + void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; } + sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } // Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte // als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE. - void SetMirrRefDragObj(BOOL bOn) { bMirrRefDragObj = bOn; } - BOOL IsMirrRefDragObj() const { return bMirrRefDragObj; } + void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; } + sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; } - BOOL IsOrthoDesired() const; + sal_Bool IsOrthoDesired() const; // Beim Resize die Mitte als Referenz // Default=FALSE. - BOOL IsResizeAtCenter() const { return bResizeAtCenter; } - void SetResizeAtCenter(BOOL bOn) { bResizeAtCenter = bOn; } + sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; } + void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; } // Symmetrisches Crook // Default=FALSE. - BOOL IsCrookAtCenter() const { return bCrookAtCenter; } - void SetCrookAtCenter(BOOL bOn) { bCrookAtCenter = bOn; } + sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; } + void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; } // Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die // View, nicht auf die einzelnen PageViews. Von der View wird diese @@ -305,7 +305,7 @@ public: // Das DragLimit ist bezogen auf die Page des Objekts. // (Oder auf die View??? Muss ich mal^^^^recherchieren. Joe.) - // FALSE=Kein Limit. + // sal_False=Kein Limit. // Das Rueckgabe-Rect muss absolute Koordinaten enthalten. Der Maximale // Dragbereich wird von der View dann so gewaehlt, dass das SnapRect des // Objekts bis Maximal auf die Kante des LimitRects gemoved bzw. gesized @@ -314,7 +314,7 @@ public: // Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal // ueberschritten werden koennte... // Implementiert fuer Move und Resize. - virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; + virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; }; #endif //_SVDDRGV_HXX diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 88ea8fc715..267b7a4952 100644 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -149,12 +149,12 @@ protected: void ImpBroadcastEdgesOfMarkedNodes(); // Konvertierung der markierten Objekte in Poly bzw. Bezier. - void ImpConvertTo(BOOL bPath, BOOL bLineToArea); + void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea); // Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und // fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein // MarkEntry noch ein ModelChgBroadcast generiert. - SdrObject* ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea); + SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea); // Setzen der beiden Flags bToTopPossible und bToBtmPossible. // bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig @@ -177,11 +177,11 @@ protected: // fuer DismantleMarkedObjects sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const; sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const; - void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines); + void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines); void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, - BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect); - void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion); - BOOL ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; + sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect); + void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion); + sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); // Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo. @@ -223,11 +223,11 @@ public: void AddUndoActions( std::vector< SdrUndoAction* >& ); // Layerverwaltung. Mit Undo. - SdrLayer* InsertNewLayer(const String& rName, USHORT nPos=0xFFFF); + SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); // Loeschen eines Layer inkl. aller darauf befindlichen Objekte void DeleteLayer(const String& rName); // Verschieben eines Layer (Layerreihenfolge aendern) - void MoveLayer(const String& rName, USHORT nNewPos); + void MoveLayer(const String& rName, sal_uInt16 nNewPos); // Markierte Objekte die ausserhalb ihrer Page liegen // werden ggf. einer anderen Page zugewiesen @@ -235,23 +235,23 @@ public: void ForceMarkedObjToAnotherPage(); void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); } - BOOL IsReadOnly() const { ForcePossibilities(); return bReadOnly; } + sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; } // Loeschen aller markierten Objekte void DeleteMarkedObj(); - BOOL IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } + sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } // Logisch- umschliessendes Rect aller markierten Objekte setzen. // Das das wirklich geschieht ist nicht garantiert, denn eine // waagerechte Linie hat z.B. immer eine Hoehe von 0. - void SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy=FALSE); + void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); long GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false); void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); - void MirrorMarkedObjHorizontal(BOOL bCopy=FALSE); - void MirrorMarkedObjVertical(BOOL bCopy=FALSE); + void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False); + void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False); long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false); @@ -259,28 +259,28 @@ public: // Markierte Objekte kopieren und anstelle der alten markieren void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect, BOOL bCopy=FALSE) { SetMarkedObjRect(rRect,bCopy); } - void MoveAllMarked(const Size& rSiz, BOOL bCopy=FALSE) { MoveMarkedObj (rSiz,bCopy); } - void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, BOOL bCopy=FALSE) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } + void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); } + void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj (rSiz,bCopy); } + void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } long GetAllMarkedRotate() const { return GetMarkedObjRotate(); } - void RotateAllMarked(const Point& rRef, long nWink, BOOL bCopy=FALSE) { RotateMarkedObj(rRef,nWink,bCopy); } - void MirrorAllMarked(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE) { MirrorMarkedObj(rRef1,rRef2,bCopy); } - void MirrorAllMarkedHorizontal(BOOL bCopy=FALSE) { MirrorMarkedObjHorizontal(bCopy); } - void MirrorAllMarkedVertical(BOOL bCopy=FALSE) { MirrorMarkedObjVertical(bCopy); } + void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); } + void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); } + void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); } + void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); } long GetAllMarkedShear() const { return GetMarkedObjShear(); } - void ShearAllMarked(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } - void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } + void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } + void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } void CopyMarked() { CopyMarkedObj(); } - BOOL IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } - BOOL IsResizeAllowed(BOOL bProp=FALSE) const; - BOOL IsRotateAllowed(BOOL b90Deg=FALSE) const; - BOOL IsMirrorAllowed(BOOL b45Deg=FALSE, BOOL b90Deg=FALSE) const; - BOOL IsTransparenceAllowed() const; - BOOL IsGradientAllowed() const; - BOOL IsShearAllowed() const; - BOOL IsEdgeRadiusAllowed() const; - BOOL IsCrookAllowed(BOOL bNoContortion=FALSE) const; - BOOL IsDistortAllowed(BOOL bNoContortion=FALSE) const; + sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } + sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const; + sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const; + sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const; + sal_Bool IsTransparenceAllowed() const; + sal_Bool IsGradientAllowed() const; + sal_Bool IsShearAllowed() const; + sal_Bool IsEdgeRadiusAllowed() const; + sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const; + sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const; // Vereinigen mehrerer Objekte zu einem PolyPolygon: // - Rechtecke/Kreise/Text... werden implizit gewandelt. @@ -306,9 +306,9 @@ public: // Memberobjekten um PathObjs handelt. // bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw. // Beziersegmente zerlegt - void DismantleMarkedObjects(BOOL bMakeLines=FALSE); - BOOL IsCombinePossible(BOOL bNoPolyPoly=FALSE) const; - BOOL IsDismantlePossible(BOOL bMakeLines=FALSE) const; + void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False); + sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const; + sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const; // Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert // anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt @@ -317,7 +317,7 @@ public: // wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall // returniert die Methode mit FALSE. // Die Methode generiert u.a. auch eine Undo-Action. - BOOL InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0); + sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0); // Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert // anschliessend mir, *pOldObj wandert ins Undo. @@ -327,13 +327,13 @@ public: // ReplaceObject(...); // ... // EndUndo(); - void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark=TRUE); + void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True); - void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll); - void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; - void MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; - SfxItemSet GetAttrFromMarked(BOOL bOnlyHardAttr) const; - void SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll); + void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; + void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; + SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const; + void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); // Geometrische Attribute (Position, Groesse, Drehwinkel) // Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt. @@ -348,14 +348,14 @@ public: SfxStyleSheet* GetStyleSheetFromMarked() const; // z.Zt. noch ohne Undo :( - void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // Alle markierten Objekte zu einer Gruppe zusammenfassen. // Anschliessend wird die neue Gruppe markiert. Bei einer @@ -373,25 +373,25 @@ public: // zusaetzlich markiert. void UnGroupMarked(); - BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } - BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } - BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } + sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } + sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } + sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } - // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die BOOL- - // Funktionen returnen TRUE, wenn wenigstens eins der markierten + // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool- + // Funktionen returnen sal_True, wenn wenigstens eins der markierten // Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten // werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX. - BOOL IsConvertToPathObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); } - BOOL IsConvertToPolyObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); } - BOOL IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } - void ConvertMarkedToPathObj(BOOL bLineToArea); - void ConvertMarkedToPolyObj(BOOL bLineToArea); + sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); } + sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); } + sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } + void ConvertMarkedToPathObj(sal_Bool bLineToArea); + void ConvertMarkedToPolyObj(sal_Bool bLineToArea); // Alle markierten Objekte untereinander ausrichten. Normalerweise werden - // das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen + // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen // die BoundRects ausgerichtet. - void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects=FALSE); - BOOL IsAlignPossible() const; + void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False); + sal_Bool IsAlignPossible() const; // Markierte Objekte etwas nach "oben" holen void MovMarkedToTop(); @@ -419,12 +419,12 @@ public: // Feststellen, ob nach vorn/hinten stellen moeglich ist // GetMaxToTop/BtmObj() wird von diesen Methoden nur begrenzt // beruecksichtigt, d.h. es kann vorkommen dass IsToTopPossible() - // TRUE liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei + // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei // Mehrfachselektion), weil eine von der abgeleiteten View ueber // GetMaxToTopObj() auferlegte Restriktion dies verhindert. - BOOL IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } - BOOL IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } - BOOL IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } + sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } + sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } + sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } // Ueber diese Methoden stellt die View fest, wie weit ein Objekt // nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das @@ -436,21 +436,21 @@ public: // Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die // Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach // jedem SdrObjList::SetObjectOrdNum(nOldPos,nNewPos); - virtual void ObjOrderChanged(SdrObject* pObj, ULONG nOldPos, ULONG nNewPos); + virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos); // Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj // markiert sind und diese in der Lage sind ein StarView-Metafile zu // liefern, konvertiert diese Methode das Metafile in Drawingobjekte. // Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt. void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL); - BOOL IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } + sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } // Wird der Modus VirtualObjectBundling eingeschaltet, werden beim // ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren // in ihrer Z-Order buendig zusammengehalten (Writer). - // Defaulteinstellung ist FALSE=ausgeschaltet. - void SetVirtualObjectBundling(BOOL bOn) { bBundleVirtObj=bOn; } - BOOL IsVirtualObjectBundling() const { return bBundleVirtObj; } + // Defaulteinstellung ist sal_False=ausgeschaltet. + void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; } + sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; } // von der SdrMarkView ueberladen fuer den internen gebrauch virtual void MarkListHasChanged(); diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index 1c16f444c3..a9be48c593 100644 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -105,7 +105,7 @@ protected: Link aOldCalcFieldValueLink; // Zum rufen des alten Handlers Point aMacroDownPos; - USHORT nMacroTol; + sal_uInt16 nMacroTol; unsigned bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung) unsigned bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung) @@ -125,13 +125,13 @@ protected: // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen. // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein. - OutlinerView* ImpMakeOutlinerView(Window* pWin, BOOL bNoPaint, OutlinerView* pGivenView) const; + OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; - // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn + // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn // kein Text vorhanden ist. - BOOL ImpIsTextEditAllSelected() const; + sal_Bool ImpIsTextEditAllSelected() const; void ImpMakeTextCursorAreaVisible(); // Handler fuer AutoGrowing Text bei aktivem Outliner @@ -151,7 +151,7 @@ protected: public: // Actionhandling fuer Macromodus - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BrkAction(); @@ -166,8 +166,8 @@ public: //************************************************************************ // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken // editiert werden sollen. Default=TRUE. Persistent. - void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; } - BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; } + void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; } + sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; } // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View // angemeldete Win verwendet. @@ -178,7 +178,7 @@ public: // Ueber den Parameter pEditOutliner kann die Applikation einen eigenen // Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert // nach Aufruf von SdrBeginTextEdit der SdrObjEditView und wird von dieser - // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die + // spaeter via delete zerstoert (falls bDontDeleteOutliner=sal_False). Die // SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an // dieser Instanz und ausserdem auch den StatusEventHdl. // Ebenso kann eine spezifische OutlinerView vorgegeben werden. @@ -194,23 +194,23 @@ public: virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False); virtual bool IsTextEdit() const; - // TRUE=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert + // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem // der Text ja bekanntlich hor. und vert. zentriert wird. - BOOL IsTextEditFrame() const; + sal_Bool IsTextEditFrame() const; - // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb der + // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der // des Objektbereichs oder der OutlinerView liegt. - BOOL IsTextEditHit(const Point& rHit, short nTol) const; + sal_Bool IsTextEditHit(const Point& rHit, short nTol) const; - // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb des + // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des // Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames // umschliesst. - BOOL IsTextEditFrameHit(const Point& rHit) const; + sal_Bool IsTextEditFrameHit(const Point& rHit) const; // Bei aktiver Selektion, also zwischen MouseButtonDown und // MouseButtonUp liefert diese Methode immer TRUE. - BOOL IsTextEditInSelectionMode() const; + sal_Bool IsTextEditInSelectionMode() const; // Folgende Methode addiert einen passenden Offset zum MouseEvent // um diesen an den Outliner weiterzureichen. @@ -234,24 +234,24 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); - BOOL Cut(ULONG nFormat=SDR_ANYFORMAT); - BOOL Yank(ULONG nFormat=SDR_ANYFORMAT); - BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); + sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); + sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); + sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // #97766# make virtual to change implementation e.g. for SdOutlineView virtual sal_uInt16 GetScriptType() const; /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // Intern: Beim Splitteraufziehen neue OutlinerView... virtual void AddWindowToPaintView(OutputDevice* pNewWin); @@ -262,16 +262,16 @@ public: //************************************************************************ // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei // SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument - // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE). - void SetMacroMode(BOOL bOn) { bMacroMode=bOn; } - BOOL IsMacroMode() const { return bMacroMode; } - BOOL BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); - BOOL BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). + void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; } + sal_Bool IsMacroMode() const { return bMacroMode; } + sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); + sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); - BOOL EndMacroObj(); - BOOL IsMacroObj() const { return pMacroObj!=NULL; } - BOOL IsMacroObjDown() const { return bMacroDown; } + sal_Bool EndMacroObj(); + sal_Bool IsMacroObj() const { return pMacroObj!=NULL; } + sal_Bool IsMacroObjDown() const { return bMacroDown; } /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ @@ -282,7 +282,7 @@ public: rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */ - virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; /** returns a format paint brush set from the current selection */ virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 3abbde007a..593551d0da 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -41,11 +41,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per -// static BOOL CopyData(pData,nLen,nFormat); +// static sal_Bool CopyData(pData,nLen,nFormat); // bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in // dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das -// Flag SdrModel::SetStreamingSdrModel(TRUE) gesetzt wird. -// ULONG SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define +// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird. +// sal_uIntPtr SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define class SdrOutliner; class SdrModel; @@ -62,7 +62,7 @@ namespace com { namespace sun { namespace star { namespace lang { // Ist pMod<>NULL, dann wird der MapMode des uebergebenen // Models verwendet. Die resultierende Default-Fonthoehe bleibt // jedoch dieselbe (die logische Fonthoehe wird umgerechnet). -SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod ); +SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod ); // Globale Defaulteinstellungen fuer die DrawingEngine. // Diese Einstellungen sollte man direkt beim Applikationsstart @@ -73,7 +73,7 @@ friend class SdrAttrObj; String aFontName; FontFamily eFontFamily; Color aFontColor; - ULONG nFontHeight; + sal_uIntPtr nFontHeight; MapUnit eMapUnit; Fraction aMapFraction; @@ -96,8 +96,8 @@ public: // 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen // beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss // man als Fonthoehe 480 angeben um 24 Point als default zu erhalten. - static void SetFontHeight(ULONG nHeight) { GetDefaults().nFontHeight=nHeight; } - static ULONG GetFontHeight() { return GetDefaults().nFontHeight; } + static void SetFontHeight(sal_uIntPtr nHeight) { GetDefaults().nFontHeight=nHeight; } + static sal_uIntPtr GetFontHeight() { return GetDefaults().nFontHeight; } // Der MapMode wird fuer den globalen Outliner benoetigt. // Gleichzeitig bekommt auch jedes neu instanziierte SdrModel // diesen MapMode default zugewiesen. @@ -119,26 +119,26 @@ public: // Ist pMod<>NULL, dann wird der MapMode des uebergebenen // Models verwendet. Die resultierende Default-Fonthoehe bleibt // jedoch dieselbe (die logische Fonthoehe wird umgerechnet). - friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod ); + friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod ); }; class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle -// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert. +// Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { Container aArr; public: - UShortCont(USHORT nBlock, USHORT nInit, USHORT nResize): aArr(nBlock,nInit,nResize) {} + UShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize): aArr(nBlock,nInit,nResize) {} void Clear() { aArr.Clear(); } - void Insert(USHORT nElem, ULONG nPos=CONTAINER_APPEND) { aArr.Insert((void*)ULONG(nElem),nPos); } - void Remove(ULONG nPos) { aArr.Remove(nPos); } - void Replace(USHORT nElem, ULONG nPos) { aArr.Replace((void*)ULONG(nElem),nPos); } - USHORT GetObject(ULONG nPos) const { return USHORT(ULONG(aArr.GetObject(nPos))); } - ULONG GetPos(USHORT nElem) const { return aArr.GetPos((void*)(ULONG)nElem); } - ULONG GetCount() const { return aArr.Count(); } + void Insert(sal_uInt16 nElem, sal_uIntPtr nPos=CONTAINER_APPEND) { aArr.Insert((void*)sal_uIntPtr(nElem),nPos); } + void Remove(sal_uIntPtr nPos) { aArr.Remove(nPos); } + void Replace(sal_uInt16 nElem, sal_uIntPtr nPos) { aArr.Replace((void*)sal_uIntPtr(nElem),nPos); } + sal_uInt16 GetObject(sal_uIntPtr nPos) const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); } + sal_uIntPtr GetPos(sal_uInt16 nElem) const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); } + sal_uIntPtr GetCount() const { return aArr.Count(); } void Sort(); }; @@ -151,7 +151,7 @@ private: //#endif // __PRIVATE public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} - void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; + void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const; #ifdef This_Is_Just_For_A_Comment Compare() muss returnieren: -1 falls *pElem1<*pElem2 @@ -184,25 +184,25 @@ class ImpSdrHdcMerk ImpColorMerk* pFarbMerk; ImpClipMerk* pClipMerk; Color* pLineColorMerk; - USHORT nMode; + sal_uInt16 nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=TRUE); + ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=sal_True); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } - void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const; + void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const; }; //#endif // __PRIVATE //////////////////////////////////////////////////////////////////////////////////////////////////// // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen -// Liefert TRUE, wenn der Set solchen Items enthaelt. -BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE=NULL); +// Liefert sal_True, wenn der Set solchen Items enthaelt. +sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL); // zurueck erhaelt man einen neuen WhichTable den // man dann irgendwann mit delete platthauen muss. -USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd); +sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd); //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -217,46 +217,46 @@ class Link; class SVX_DLLPUBLIC SvdProgressInfo { private: - ULONG nSumActionCount; // Summe aller Actions - ULONG nSumCurAction; // Summe aller bearbeiteten Actions + sal_uIntPtr nSumActionCount; // Summe aller Actions + sal_uIntPtr nSumCurAction; // Summe aller bearbeiteten Actions - ULONG nActionCount; // Anzahl der Actions im akt. Obj. - ULONG nCurAction; // Anzahl bearbeiteter Act. im akt. Obj. + sal_uIntPtr nActionCount; // Anzahl der Actions im akt. Obj. + sal_uIntPtr nCurAction; // Anzahl bearbeiteter Act. im akt. Obj. - ULONG nInsertCount; // Anzahl einzufuegender Act. im akt. Obj. - ULONG nCurInsert; // Anzahl bereits eingefuegter Actions + sal_uIntPtr nInsertCount; // Anzahl einzufuegender Act. im akt. Obj. + sal_uIntPtr nCurInsert; // Anzahl bereits eingefuegter Actions - ULONG nObjCount; // Anzahl der selektierten Objekte - ULONG nCurObj; // Aktuelles Objekt + sal_uIntPtr nObjCount; // Anzahl der selektierten Objekte + sal_uIntPtr nCurObj; // Aktuelles Objekt Link *pLink; public: SvdProgressInfo( Link *_pLink ); - void Init( ULONG _nSumActionCount, ULONG _nObjCount ); + void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ); - BOOL SetNextObject(); + sal_Bool SetNextObject(); - void SetActionCount( ULONG _nActionCount ); - void SetInsertCount( ULONG _nInsertCount ); + void SetActionCount( sal_uIntPtr _nActionCount ); + void SetInsertCount( sal_uIntPtr _nInsertCount ); - BOOL ReportActions( ULONG nAnzActions ); - BOOL ReportInserts( ULONG nAnzInserts ); + sal_Bool ReportActions( sal_uIntPtr nAnzActions ); + sal_Bool ReportInserts( sal_uIntPtr nAnzInserts ); - ULONG GetSumActionCount() const { return nSumActionCount; }; - ULONG GetSumCurAction() const { return nSumCurAction; }; - ULONG GetObjCount() const { return nObjCount; }; - ULONG GetCurObj() const { return nCurObj; }; + sal_uIntPtr GetSumActionCount() const { return nSumActionCount; }; + sal_uIntPtr GetSumCurAction() const { return nSumCurAction; }; + sal_uIntPtr GetObjCount() const { return nObjCount; }; + sal_uIntPtr GetCurObj() const { return nCurObj; }; - ULONG GetActionCount() const { return nActionCount; }; - ULONG GetCurAction() const { return nCurAction; }; + sal_uIntPtr GetActionCount() const { return nActionCount; }; + sal_uIntPtr GetCurAction() const { return nCurAction; }; - ULONG GetInsertCount() const { return nInsertCount; }; - ULONG GetCurInsert() const { return nCurInsert; }; + sal_uIntPtr GetInsertCount() const { return nInsertCount; }; + sal_uIntPtr GetCurInsert() const { return nCurInsert; }; void ReportError(); - BOOL ReportRescales( ULONG nAnzRescales ); + sal_Bool ReportRescales( sal_uIntPtr nAnzRescales ); }; @@ -287,18 +287,18 @@ class AutoTimer; class OLEObjCache : public Container { - ULONG nSize; + sal_uIntPtr nSize; AutoTimer* pTimer; void UnloadOnDemand(); - BOOL UnloadObj( SdrOle2Obj* pObj ); + sal_Bool UnloadObj( SdrOle2Obj* pObj ); DECL_LINK( UnloadCheckHdl, AutoTimer* ); public: OLEObjCache(); SVX_DLLPUBLIC ~OLEObjCache(); - void SetSize(ULONG nNewSize); + void SetSize(sal_uIntPtr nNewSize); void InsertObj(SdrOle2Obj* pObj); void RemoveObj(SdrOle2Obj* pObj); }; @@ -315,7 +315,7 @@ public: SdrOutliner* pOutliner; SdrEngineDefaults* pDefaults; ResMgr* pResMgr; - ULONG nExchangeFormat; + sal_uIntPtr nExchangeFormat; OLEObjCache aOLEObjCache; diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx index d2613c0ea3..ba13437a6c 100644 --- a/svx/inc/svx/svdglev.hxx +++ b/svx/inc/svx/svdglev.hxx @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView void ImpCopyMarkedGluePoints(); typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*); typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*); - void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); + void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); protected: @@ -74,15 +74,15 @@ public: // checken bzw. setzen/loeschen will. // Moegliche Werte fuer nThisEsc sind z.Zt. // SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM - TRISTATE IsMarkedGluePointsEscDir(USHORT nThisEsc) const; - void SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn); - BOOL IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const; + void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn); + sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Checken/setzen, ob die Klebepunktpositionen relativ zur - // Objektgroesse sind (Percent=TRUE) oder nicht (Percent=FALSE) + // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False) TRISTATE IsMarkedGluePointsPercent() const; - void SetMarkedGluePointsPercent(BOOL bOn); - BOOL IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + void SetMarkedGluePointsPercent(sal_Bool bOn); + sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // bVert=FALSE: Horizontales Alignment checken/setzen // SDRHORZALIGN_CENTER @@ -94,23 +94,23 @@ public: // SDRVERTALIGN_TOP // SDRVERTALIGN_BOTTOM // SDRVERTALIGN_DONTCARE (nur bei Get()) - USHORT GetMarkedGluePointsAlign(BOOL bVert) const; - void SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign); - BOOL IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const; + void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign); + sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Alle merkierten Klebepunkte entfernen void DeleteMarkedGluePoints(); - BOOL IsDeleteMarkedGluePointsPossible() const; + sal_Bool IsDeleteMarkedGluePointsPossible() const; void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false); void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false); - void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE); - void MirrorMarkedGluePointsHorizontal(BOOL bCopy=FALSE); - void MirrorMarkedGluePointsVertical(BOOL bCopy=FALSE); - void ShearMarkedGluePoints(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE); - void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE); - void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE); + void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False); + void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False); + void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False); + void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False); + void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); + void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert); }; diff --git a/svx/inc/svx/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 396ab1cff5..4ccabac281 100644 --- a/svx/inc/svx/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx @@ -53,7 +53,7 @@ ResMgr* ImpGetResMgr(); class SdrResId: ResId { public: - SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {} + SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {} }; // ResourceCache fuer haeuffig benoetigte Strings diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index 34d2ec3125..ebb4dae590 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -64,25 +64,25 @@ class SdrObject; class SVX_DLLPUBLIC SdrGluePoint { // Bezugspunkt ist SdrObject::GetSnapRect().Center() // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align) - // bNoPercent=TRUE : Position ist in log Einh, rel zum Bezugspunkt + // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt Point aPos; - USHORT nEscDir; - USHORT nId; - USHORT nAlign; + sal_uInt16 nEscDir; + sal_uInt16 nId; + sal_uInt16 nAlign; FASTBOOL bNoPercent:1; FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt FASTBOOL bUserDefined:1; // #i38892# public: - SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; } - SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; } + SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } + SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } void SetPos(const Point& rNewPos) { aPos=rNewPos; } - USHORT GetEscDir() const { return nEscDir; } - void SetEscDir(USHORT nNewEsc) { nEscDir=nNewEsc; } - USHORT GetId() const { return nId; } - void SetId(USHORT nNewId) { nId=nNewId; } + sal_uInt16 GetEscDir() const { return nEscDir; } + void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; } + sal_uInt16 GetId() const { return nId; } + void SetId(sal_uInt16 nNewId) { nId=nNewId; } bool IsPercent() const { return !bNoPercent; } void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt @@ -93,12 +93,12 @@ public: FASTBOOL IsUserDefined() const { return bUserDefined; } void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; } - USHORT GetAlign() const { return nAlign; } - void SetAlign(USHORT nAlg) { nAlign=nAlg; } - USHORT GetHorzAlign() const { return nAlign&0x00FF; } - void SetHorzAlign(USHORT nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); } - USHORT GetVertAlign() const { return nAlign&0xFF00; } - void SetVertAlign(USHORT nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } + sal_uInt16 GetAlign() const { return nAlign; } + void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } + sal_uInt16 GetHorzAlign() const { return nAlign&0x00FF; } + void SetHorzAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); } + sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } + void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; @@ -106,8 +106,8 @@ public: void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); long GetAlignAngle() const; void SetAlignAngle(long nWink); - long EscDirToAngle(USHORT nEsc) const; - USHORT EscAngleToDir(long nWink) const; + long EscDirToAngle(sal_uInt16 nEsc) const; + sal_uInt16 EscAngleToDir(long nWink) const; void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); @@ -119,22 +119,22 @@ public: class SVX_DLLPUBLIC SdrGluePointList { Container aList; protected: - SdrGluePoint* GetObject(USHORT i) const { return (SdrGluePoint*)(aList.GetObject(i)); } + SdrGluePoint* GetObject(sal_uInt16 i) const { return (SdrGluePoint*)(aList.GetObject(i)); } public: SdrGluePointList(): aList(1024,4,4) {} SdrGluePointList(const SdrGluePointList& rSrcList): aList(1024,4,4) { *this=rSrcList; } ~SdrGluePointList() { Clear(); } void Clear(); void operator=(const SdrGluePointList& rSrcList); - USHORT GetCount() const { return USHORT(aList.Count()); } + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } // Beim Insert wird dem Objekt (also dem GluePoint) automatisch eine Id zugewiesen. // ReturnCode ist der Index des neuen GluePoints in der Liste - USHORT Insert(const SdrGluePoint& rGP); - void Delete(USHORT nPos) { delete (SdrGluePoint*)aList.Remove(nPos); } - SdrGluePoint& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrGluePoint& operator[](USHORT nPos) const { return *GetObject(nPos); } - USHORT FindGluePoint(USHORT nId) const; - USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=FALSE, FASTBOOL bNext=FALSE, USHORT nId0=0) const; + sal_uInt16 Insert(const SdrGluePoint& rGP); + void Delete(sal_uInt16 nPos) { delete (SdrGluePoint*)aList.Remove(nPos); } + SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } + sal_uInt16 FindGluePoint(sal_uInt16 nId) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=sal_False, FASTBOOL bNext=sal_False, sal_uInt16 nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 777117c925..d426a0a226 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -214,14 +214,14 @@ public: SdrObject* GetObj() const { return pObj; } void SetObj(SdrObject* pNewObj); - BOOL IsSelected() const { return bSelect; } - void SetSelected(BOOL bJa=TRUE); + sal_Bool IsSelected() const { return bSelect; } + void SetSelected(sal_Bool bJa=sal_True); - void Set1PixMore(BOOL bJa=TRUE); + void Set1PixMore(sal_Bool bJa=sal_True); void SetDrehWink(long n); - BOOL IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } - BOOL IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } + sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } + sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; } sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; } @@ -232,8 +232,8 @@ public: void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; } sal_uInt32 GetPointNum() const { return nPPntNum; } - void SetPlusHdl(BOOL bOn) { bPlusHdl=bOn; } - BOOL IsPlusHdl() const { return bPlusHdl; } + void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; } + sal_Bool IsPlusHdl() const { return bPlusHdl; } void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; } sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; } @@ -242,7 +242,7 @@ public: bool IsHdlHit(const Point& rPnt) const; // #97016# II - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; void SetMoveOutside( bool bMoveOutside ); @@ -286,13 +286,13 @@ private: SVX_DLLPRIVATE void CallColorChangeLink(); public: - SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), BOOL bLum = FALSE); + SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False); virtual ~SdrHdlColor(); - BOOL IsUseLuminance() const { return bUseLuminance; } + sal_Bool IsUseLuminance() const { return bUseLuminance; } Color GetColor() const { return aMarkerColor; } - void SetColor(Color aNew, BOOL bCallLink = FALSE); + void SetColor(Color aNew, sal_Bool bCallLink = sal_False); const Size& GetSize() const { return aMarkerSize; } void SetSize(const Size& rNew); @@ -324,10 +324,10 @@ private: virtual void CreateB2dIAObject(); public: - SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad = TRUE); + SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True); virtual ~SdrHdlGradient(); - BOOL IsGradient() const { return bGradient; } + sal_Bool IsGradient() const { return bGradient; } // set the associated color handles void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; } @@ -341,13 +341,13 @@ public: DECL_LINK(ColorChangeHdl, SdrHdl*); // transformation call, create gradient from this handle - void FromIAOToItem(SdrObject* pObj, BOOL bSetItemOnObject, BOOL bUndo); + void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo); // selection flags for interaction - BOOL IsMoveSingleHandle() const { return bMoveSingleHandle; } - void SetMoveSingleHandle(BOOL bNew) { bMoveSingleHandle = bNew; } - BOOL IsMoveFirstHandle() const { return bMoveFirstHandle; } - void SetMoveFirstHandle(BOOL bNew) { bMoveFirstHandle = bNew; } + sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; } + void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; } + sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; } + void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; } }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -414,7 +414,7 @@ public: void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } - BOOL IsHorzDrag() const; + sal_Bool IsHorzDrag() const; virtual Pointer GetPointer() const; }; @@ -455,10 +455,10 @@ class ImplHdlListData; class SVX_DLLPUBLIC SdrHdlList { protected: - ULONG mnFocusIndex; + sal_uIntPtr mnFocusIndex; SdrMarkView* pView; Container aList; - USHORT nHdlSize; + sal_uInt16 nHdlSize; unsigned bRotateShear : 1; unsigned bDistortShear : 1; @@ -468,8 +468,8 @@ protected: private: SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64) {} SVX_DLLPRIVATE void operator=(const SdrHdlList&) {} - SVX_DLLPRIVATE BOOL operator==(const SdrHdlList&) const { return FALSE; } - SVX_DLLPRIVATE BOOL operator!=(const SdrHdlList&) const { return FALSE; } + SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; } + SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; } public: SdrHdlList(SdrMarkView* pV); @@ -489,28 +489,28 @@ public: // 2.Level PageView (Pointer) // 3.Level Position (x+y) void Sort(); - ULONG GetHdlCount() const { return aList.Count(); } - SdrHdl* GetHdl(ULONG nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); } - ULONG GetHdlNum(const SdrHdl* pHdl) const; - void SetHdlSize(USHORT nSiz); - USHORT GetHdlSize() const { return nHdlSize; } - void SetMoveOutside(BOOL bOn); - BOOL IsMoveOutside() const { return bMoveOutside; } - void SetRotateShear(BOOL bOn); - BOOL IsRotateShear() const { return bRotateShear; } - void SetDistortShear(BOOL bOn); - BOOL IsDistortShear() const { return bDistortShear; } - void SetFineHdl(BOOL bOn); - BOOL IsFineHdl() const { return bFineHandles; } + sal_uIntPtr GetHdlCount() const { return aList.Count(); } + SdrHdl* GetHdl(sal_uIntPtr nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); } + sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const; + void SetHdlSize(sal_uInt16 nSiz); + sal_uInt16 GetHdlSize() const { return nHdlSize; } + void SetMoveOutside(sal_Bool bOn); + sal_Bool IsMoveOutside() const { return bMoveOutside; } + void SetRotateShear(sal_Bool bOn); + sal_Bool IsRotateShear() const { return bRotateShear; } + void SetDistortShear(sal_Bool bOn); + sal_Bool IsDistortShear() const { return bDistortShear; } + void SetFineHdl(sal_Bool bOn); + sal_Bool IsFineHdl() const { return bFineHandles; } // AddHdl uebernimmt das Handle in sein Eigentum. Es muss // also auf dem Heap stehen, da Clear() ein delete macht. - void AddHdl(SdrHdl* pHdl, BOOL bAtBegin=FALSE); - SdrHdl* RemoveHdl(ULONG nNum); + void AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False); + SdrHdl* RemoveHdl(sal_uIntPtr nNum); // Zuletzt eingefuegte Handles werden am ehesten getroffen // (wenn Handles uebereinander liegen). - SdrHdl* IsHdlListHit(const Point& rPnt, BOOL bBack=FALSE, BOOL bNext=FALSE, SdrHdl* pHdl0=NULL) const; + SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index d1b5896118..12db219469 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -68,7 +68,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - FASTBOOL IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; + FASTBOOL IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; @@ -83,7 +83,7 @@ public: class SVX_DLLPUBLIC SdrHelpLineList { Container aList; protected: - SdrHelpLine* GetObject(USHORT i) const { return (SdrHelpLine*)(aList.GetObject(i)); } + SdrHelpLine* GetObject(sal_uInt16 i) const { return (SdrHelpLine*)(aList.GetObject(i)); } public: SdrHelpLineList(): aList(1024,4,4) {} SdrHelpLineList(const SdrHelpLineList& rSrcList): aList(1024,4,4) { *this=rSrcList; } @@ -92,13 +92,13 @@ public: void operator=(const SdrHelpLineList& rSrcList); bool operator==(const SdrHelpLineList& rCmp) const; bool operator!=(const SdrHelpLineList& rCmp) const { return !operator==(rCmp); } - USHORT GetCount() const { return USHORT(aList.Count()); } - void Insert(const SdrHelpLine& rHL, USHORT nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); } - void Delete(USHORT nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900# - void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } - SdrHelpLine& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrHelpLine& operator[](USHORT nPos) const { return *GetObject(nPos); } - USHORT HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } + void Insert(const SdrHelpLine& rHL, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); } + void Delete(sal_uInt16 nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900# + void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } + SdrHelpLine& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } + sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx index dcae622822..8762af596b 100644 --- a/svx/inc/svx/svditer.hxx +++ b/svx/inc/svx/svditer.hxx @@ -46,14 +46,14 @@ class SVX_DLLPUBLIC SdrObjListIter { List maObjList; sal_uInt32 mnIndex; - BOOL mbReverse; + sal_Bool mbReverse; - void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder); + void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder); void ImpProcessMarkList(const SdrMarkList& rMarkList, SdrIterMode eMode); - void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder); + void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder); public: - SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE); + SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); /** This variant lets the user choose the order in which to travel over the objects. @param bUseZOrder @@ -61,17 +61,17 @@ public: Otherwise the navigation position as returned by SdrObject::GetNavigationPosition() is used. */ - SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE); + SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); /* SJ: the following function can now be used with every SdrObject and is no longer limited to group objects */ - SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE); + SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); /** Iterates over a list of marked objects received from the SdrMarkView. */ - SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE); + SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False); void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); } - BOOL IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); } + sal_Bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); } SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); } sal_uInt32 Count() { return maObjList.Count(); } diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index f6edf9f229..d31403293c 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -44,7 +44,7 @@ protected: String maTitle; String maDescription; SdrModel* pModel; // zum Broadcasten - UINT16 nType; // 0=Userdefined,1=Standardlayer + sal_uInt16 nType; // 0=Userdefined,1=Standardlayer SdrLayerID nID; protected: SdrLayer(SdrLayerID nNewID, const String& rNewName) { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; } @@ -69,7 +69,7 @@ public: // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll. // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName() // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined". - void SetStandardLayer(FASTBOOL bStd=TRUE); + void SetStandardLayer(FASTBOOL bStd=sal_True); FASTBOOL IsStandardLayer() const { return nType==1; } }; @@ -105,30 +105,30 @@ public: void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; } void SetModel(SdrModel* pNewModel); SdrModel* GetModel() const { return pModel; } - void InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); } - SdrLayer* RemoveLayer(USHORT nPos); + void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); } + SdrLayer* RemoveLayer(sal_uInt16 nPos); // Alle Layer loeschen void ClearLayer(); // Neuer Layer wird angelegt und eingefuegt - SdrLayer* NewLayer(const String& rName, USHORT nPos=0xFFFF); + SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); } - void MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF); - SdrLayer* MoveLayer(USHORT nPos, USHORT nNewPos); + void MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF); + SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos); // Neuer Layer, Name wird aus der Resource geholt - SdrLayer* NewStandardLayer(USHORT nPos=0xFFFF); + SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF); // Iterieren ueber alle Layer - USHORT GetLayerCount() const { return USHORT(aLayer.Count()); } - SdrLayer* GetLayer(USHORT i) { return (SdrLayer*)(aLayer.GetObject(i)); } - const SdrLayer* GetLayer(USHORT i) const { return (SdrLayer*)(aLayer.GetObject(i)); } + sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.Count()); } + SdrLayer* GetLayer(sal_uInt16 i) { return (SdrLayer*)(aLayer.GetObject(i)); } + const SdrLayer* GetLayer(sal_uInt16 i) const { return (SdrLayer*)(aLayer.GetObject(i)); } - USHORT GetLayerPos(SdrLayer* pLayer) const; + sal_uInt16 GetLayerPos(SdrLayer* pLayer) const; SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const; SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const; - SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } - const SdrLayer* GetLayerPerID(USHORT nID) const; + SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } + const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; void SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; } const String& GetControlLayerName() const { return aControlLayerName; } diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index 90e8c286a6..0fc348ecd7 100644 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrUShortCont sal_Bool mbSorted; private: - void CheckSort(ULONG nPos); + void CheckSort(sal_uLong nPos); public: SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize) @@ -98,9 +98,9 @@ public: } } - void Insert(sal_uInt16 nElem, ULONG nPos = CONTAINER_APPEND) + void Insert(sal_uInt16 nElem, sal_uLong nPos = CONTAINER_APPEND) { - maArray.Insert((void*)ULONG(nElem),nPos); + maArray.Insert((void*)sal_uLong(nElem),nPos); if(mbSorted) { @@ -108,14 +108,14 @@ public: } } - void Remove(ULONG nPos) + void Remove(sal_uLong nPos) { maArray.Remove(nPos); } - void Replace(sal_uInt16 nElem, ULONG nPos) + void Replace(sal_uInt16 nElem, sal_uLong nPos) { - maArray.Replace((void*)ULONG(nElem), nPos); + maArray.Replace((void*)sal_uLong(nElem), nPos); if(mbSorted) { @@ -123,24 +123,24 @@ public: } } - sal_uInt16 GetObject(ULONG nPos) const + sal_uInt16 GetObject(sal_uLong nPos) const { return sal_uInt16(sal_uIntPtr(maArray.GetObject(nPos))); } - ULONG GetPos(sal_uInt16 nElem) const + sal_uLong GetPos(sal_uInt16 nElem) const { - return maArray.GetPos((void*)(ULONG)nElem); + return maArray.GetPos((void*)(sal_uLong)nElem); } - ULONG GetCount() const + sal_uLong GetCount() const { return maArray.Count(); } sal_Bool Exist(sal_uInt16 nElem) const { - return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(ULONG)nElem)); + return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(sal_uLong)nElem)); } }; @@ -321,20 +321,20 @@ public: mbSorted = sal_False; } - ULONG GetMarkCount() const + sal_uLong GetMarkCount() const { return maList.Count(); } - SdrMark* GetMark(ULONG nNum) const + SdrMark* GetMark(sal_uLong nNum) const { return (SdrMark*)(maList.GetObject(nNum)); } - ULONG FindObject(const SdrObject* pObj) const; + sal_uLong FindObject(const SdrObject* pObj) const; void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True); - void DeleteMark(ULONG nNum); - void ReplaceMark(const SdrMark& rNewMark, ULONG nNum); + void DeleteMark(sal_uLong nNum); + void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum); void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False); sal_Bool DeletePageView(const SdrPageView& rPV); sal_Bool InsertPageView(const SdrPageView& rPV); diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index a80908756f..20e9b650c5 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -166,15 +166,15 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts -// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv -#define LOADREFCOUNTS (FALSE) +// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv +#define LOADREFCOUNTS (sal_False) struct SdrDocumentStreamInfo { FASTBOOL mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; - BOOL mbDummy1 : 1; + sal_Bool mbDummy1 : 1; }; struct SdrModelImpl; @@ -205,27 +205,27 @@ protected: m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe SdrOutliner* pHitTestOutliner;// ein Outliner fuer den HitTest - ULONG nDefTextHgt; // Default Texthoehe in logischen Einheiten + sal_uIntPtr nDefTextHgt; // Default Texthoehe in logischen Einheiten OutputDevice* pRefOutDev; // ReferenzDevice fuer die EditEngine - ULONG nProgressAkt; // fuer den - ULONG nProgressMax; // ProgressBar- - ULONG nProgressOfs; // -Handler + sal_uIntPtr nProgressAkt; // fuer den + sal_uIntPtr nProgressMax; // ProgressBar- + sal_uIntPtr nProgressOfs; // -Handler rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool; SfxStyleSheet* pDefaultStyleSheet; sfx2::LinkManager* pLinkManager; // LinkManager Container* pUndoStack; Container* pRedoStack; SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige - USHORT nUndoLevel; // Undo-Klammerung + sal_uInt16 nUndoLevel; // Undo-Klammerung bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action - USHORT nProgressPercent; // fuer den ProgressBar-Handler - USHORT nLoadVersion; // Versionsnummer der geladenen Datei + sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler + sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei FASTBOOL bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; FASTBOOL bInfoChanged; FASTBOOL bPagNumsDirty; FASTBOOL bMPgNumsDirty; - FASTBOOL bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig. + FASTBOOL bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. FASTBOOL bSavePortable; // Metafiles portabel speichern FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen FASTBOOL bReadOnly; @@ -234,12 +234,12 @@ protected: FASTBOOL bSwapGraphics; FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects - UINT16 nStreamCompressMode; // Komprimiert schreiben? - UINT16 nStreamNumberFormat; - UINT16 nDefaultTabulator; - UINT32 nMaxUndoCount; + sal_uInt16 nStreamCompressMode; // Komprimiert schreiben? + sal_uInt16 nStreamNumberFormat; + sal_uInt16 nDefaultTabulator; + sal_uInt32 nMaxUndoCount; FASTBOOL bSaveNative; - BOOL bStarDrawPreviewMode; + sal_Bool bStarDrawPreviewMode; ////////////////////////////////////////////////////////////////////////////// @@ -266,19 +266,19 @@ public: bool IsAllowShapePropertyChangeListener() const; void SetAllowShapePropertyChangeListener( bool bAllow ); - UINT16 nStarDrawPreviewMasterPageNum; + sal_uInt16 nStarDrawPreviewMasterPageNum; // Reserven fuer kompatible Erweiterungen //-/ SfxItemPool* pUndoItemPool; SotStorage* pModelStorage; SvxForbiddenCharactersTable* mpForbiddenCharactersTable; - ULONG nSwapGraphicsMode; + sal_uIntPtr nSwapGraphicsMode; SdrOutlinerCache* mpOutlinerCache; SdrModelImpl* mpImpl; - UINT16 mnCharCompressType; - UINT16 mnHandoutPageCount; - UINT16 nReserveUInt6; - UINT16 nReserveUInt7; + sal_uInt16 mnCharCompressType; + sal_uInt16 mnHandoutPageCount; + sal_uInt16 nReserveUInt6; + sal_uInt16 nReserveUInt7; FASTBOOL mbModelLocked; FASTBOOL mbKernAsianPunctuation; FASTBOOL mbAddExtLeading; @@ -299,8 +299,8 @@ public: public: const SvNumberFormatter& GetNumberFormatter() const; - UINT16 getHandoutPageCount() const { return mnHandoutPageCount; } - void setHandoutPageCount( UINT16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; } + sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; } + void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; } protected: @@ -314,7 +314,7 @@ private: //#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); - SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE ); + SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False ); SVX_DLLPRIVATE void ImpReformatAllTextObjects(); SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122# SVX_DLLPRIVATE void ImpCreateTables(); @@ -353,7 +353,7 @@ public: // Hier kann man erfragen, ob das Model gerade eingrstreamt wird FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken - // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird + // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. // Wenn diese Methode NULL liefert, wird zum Swappen eine temporaere // Datei angelegt. @@ -385,7 +385,7 @@ public: const SdrTextObj* GetFormattingTextObj() const; // Die TextDefaults (Font,Hoehe,Farbe) in ein Set putten void SetTextDefaults() const; - static void SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt ); + static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ); // ReferenzDevice fuer die EditEngine void SetRefDevice(OutputDevice* pDev); @@ -393,11 +393,11 @@ public: // Wenn ein neuer MapMode am RefDevice gesetzt wird o.ae. void RefDeviceChanged(); // noch nicht implementiert // Default-Schrifthoehe in logischen Einheiten - void SetDefaultFontHeight(ULONG nVal); - ULONG GetDefaultFontHeight() const { return nDefTextHgt; } + void SetDefaultFontHeight(sal_uIntPtr nVal); + sal_uIntPtr GetDefaultFontHeight() const { return nDefTextHgt; } // Default-Tabulatorweite fuer die EditEngine - void SetDefaultTabulator(USHORT nVal); - USHORT GetDefaultTabulator() const { return nDefaultTabulator; } + void SetDefaultTabulator(sal_uInt16 nVal); + sal_uInt16 GetDefaultTabulator() const { return nDefaultTabulator; } // Der DefaultStyleSheet wird jedem Zeichenobjekt verbraten das in diesem // Model eingefuegt wird und kein StyleSheet gesetzt hat. @@ -452,20 +452,20 @@ public: FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=FALSE, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=FALSE) const; - void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=FALSE) const; + void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=sal_False) const; + void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=sal_False) const; // RecalcPageNums wird idR. nur von der Page gerufen. FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; }; FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; }; void RecalcPageNums(FASTBOOL bMaster); // Nach dem Insert gehoert die Page dem SdrModel. - virtual void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); - virtual void DeletePage(USHORT nPgNum); + virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + virtual void DeletePage(sal_uInt16 nPgNum); // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert) - virtual SdrPage* RemovePage(USHORT nPgNum); - virtual void MovePage(USHORT nPgNum, USHORT nNewPos); + virtual SdrPage* RemovePage(sal_uInt16 nPgNum); + virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); const SdrPage* GetPage(sal_uInt16 nPgNum) const; SdrPage* GetPage(sal_uInt16 nPgNum); sal_uInt16 GetPageCount() const; @@ -473,11 +473,11 @@ public: virtual void PageListChanged(); // Masterpages - virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF); - virtual void DeleteMasterPage(USHORT nPgNum); + virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + virtual void DeleteMasterPage(sal_uInt16 nPgNum); // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert) - virtual SdrPage* RemoveMasterPage(USHORT nPgNum); - virtual void MoveMasterPage(USHORT nPgNum, USHORT nNewPos); + virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); + virtual void MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const; SdrPage* GetMasterPage(sal_uInt16 nPgNum); sal_uInt16 GetMasterPageCount() const; @@ -494,29 +494,29 @@ public: // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt. FASTBOOL IsPageNotValid() const { return bPageNotValid; } - void SetPageNotValid(FASTBOOL bJa=TRUE) { bPageNotValid=bJa; } + void SetPageNotValid(FASTBOOL bJa=sal_True) { bPageNotValid=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte + // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. FASTBOOL IsSavePortable() const { return bSavePortable; } - void SetSavePortable(FASTBOOL bJa=TRUE) { bSavePortable=bJa; } + void SetSavePortable(FASTBOOL bJa=sal_True) { bSavePortable=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden + // Schaltet man dieses Flag auf sal_True, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. FASTBOOL IsSaveCompressed() const { return bSaveCompressed; } - void SetSaveCompressed(FASTBOOL bJa=TRUE) { bSaveCompressed=bJa; } + void SetSaveCompressed(FASTBOOL bJa=sal_True) { bSaveCompressed=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden + // Schaltet man dieses Flag auf sal_True, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. FASTBOOL IsSaveNative() const { return bSaveNative; } - void SetSaveNative(FASTBOOL bJa=TRUE) { bSaveNative=bJa; } + void SetSaveNative(FASTBOOL bJa=sal_True) { bSaveNative=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden die Grafiken + // Schaltet man dieses Flag auf sal_True, so werden die Grafiken // von Grafikobjekten: // - beim Laden eines Dokuments nicht sofort mitgeladen, // sondern erst wenn sie gebraucht (z.B. angezeigt) werden. @@ -526,9 +526,9 @@ public: // GetDocumentStream() ueberladen werden. // Default=FALSE. Flag ist nicht persistent. FASTBOOL IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(FASTBOOL bJa=TRUE); - void SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; } - ULONG GetSwapGraphicsMode() const { return nSwapGraphicsMode; } + void SetSwapGraphics(FASTBOOL bJa=sal_True); + void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; } + sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; } FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; } void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; } @@ -541,9 +541,9 @@ public: // (Speicher sparen). // Default=Cache eingeschaltet. Flag ist nicht persistent. FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; } - void SetBitmapCaching(FASTBOOL bJa=TRUE) { bNoBitmapCaching=!bJa; } + void SetBitmapCaching(FASTBOOL bJa=sal_True) { bNoBitmapCaching=!bJa; } - // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch + // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } @@ -553,7 +553,7 @@ public: // Wird nur von den Possibility-Methoden der View ausgewerdet. // Direkte Manipulationen am Model, ... berueksichtigen dieses Flag nicht. // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files - // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag + // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). virtual FASTBOOL IsReadOnly() const; virtual void SetReadOnly(FASTBOOL bYes); @@ -563,26 +563,26 @@ public: // rSourceModel ist anschliessend u.U. weitgehend leer. // nFirstPageNum,nLastPageNum: Die aus rSourceModel zu uebernehmenden Seiten // nDestPos..................: Einfuegeposition - // bMergeMasterPages.........: TRUE =benoetigte MasterPages werden aus + // bMergeMasterPages.........: sal_True =benoetigte MasterPages werden aus // rSourceModel ebenfalls uebernommen - // FALSE=Die MasterPageDescriptoren der Seiten + // sal_False=Die MasterPageDescriptoren der Seiten // aus rSourceModel werden auf die // vorhandenen MasterPages gemappt. // bUndo.....................: Fuer das Merging wird eine UndoAction generiert. // Undo ist nur fuer das ZielModel, nicht fuer // rSourceModel. - // bTreadSourceAsConst.......: TRUE=Das SourceModel wird nicht veraendert,. + // bTreadSourceAsConst.......: sal_True=Das SourceModel wird nicht veraendert,. // d.h die Seiten werden kopiert. virtual void Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF, - USHORT nDestPos=0xFFFF, - FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE, - FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE); + sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, + sal_uInt16 nDestPos=0xFFFF, + FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False, + FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False); - // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy); - void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, - FASTBOOL bUndo=TRUE, FASTBOOL bMoveNoCopy=FALSE); + // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy); + void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, + FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions // beliebig tief zu klammern. Als Kommentar der @@ -598,7 +598,7 @@ public: void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf void EndUndo(); // Undo-Klammerung zu void AddUndo(SdrUndoAction* pUndo); - USHORT GetUndoBracketLevel() const { return nUndoLevel; } + sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; } const SdrUndoGroup* GetAktUndoGroup() const { return pAktUndoGroup; } // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: void SetUndoComment(const String& rComment); @@ -607,15 +607,15 @@ public: // Das Undo-Managment findet nur statt, wenn kein NotifyUndoAction-Handler // gesetzt ist. // Default ist 16. Minimaler MaxUndoActionCount ist 1! - void SetMaxUndoActionCount(ULONG nAnz); - ULONG GetMaxUndoActionCount() const { return nMaxUndoCount; } + void SetMaxUndoActionCount(sal_uIntPtr nAnz); + sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; } void ClearUndoBuffer(); // UndoAction(0) ist die aktuelle (also die zuletzt eingegangene) - ULONG GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; } - const SfxUndoAction* GetUndoAction(ULONG nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); } + sal_uIntPtr GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; } + const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); } // RedoAction(0) ist die aktuelle (also die des letzten Undo) - ULONG GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } - const SfxUndoAction* GetRedoAction(ULONG nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } + sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } + const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } FASTBOOL Undo(); FASTBOOL Redo(); @@ -632,6 +632,7 @@ public: /** application can set it's own undo manager, BegUndo, EndUndo and AddUndoAction calls are routet to this interface if given */ void SetSdrUndoManager( SfxUndoManager* pUndoManager ); + SfxUndoManager* GetSdrUndoManager() const; /** applications can set their own undo factory to overide creation of undo actions. The SdrModel will become owner of the given SdrUndoFactory @@ -645,7 +646,7 @@ public: // Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen // wird und ungefaehre Auskunft ueber den Fortschreitungszustand der // Funktion gibt. Der Handler muss folgendes Aussehen haben: - // void __EXPORT class::IOProgressHdl(const USHORT& nPercent); + // void __EXPORT class::IOProgressHdl(const sal_uInt16& nPercent); // Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte // mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99. // Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei @@ -678,13 +679,13 @@ public: // durch. Geprueft wird insbesondere die Verkettung von Verschachtelten // Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page* // der Objects, SubLists und Pages. Bei korrekter Struktur liefert die - // Methode TRUE, andernfalls FALSE. + // Methode sal_True, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) FASTBOOL CheckConsistence() const; - void SetStarDrawPreviewMode(BOOL bPreview); - BOOL IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } + void SetStarDrawPreviewMode(sal_Bool bPreview); + sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } SotStorage* GetModelStorage() const { return pModelStorage; } void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; } @@ -694,14 +695,14 @@ public: // these functions are used by the api to disable repaints during a // set of api calls. - BOOL isLocked() const { return (BOOL)mbModelLocked; } - void setLock( BOOL bLock ); + sal_Bool isLocked() const { return (sal_Bool)mbModelLocked; } + void setLock( sal_Bool bLock ); void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars ); vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; - void SetCharCompressType( UINT16 nType ); - UINT16 GetCharCompressType() const { return mnCharCompressType; } + void SetCharCompressType( sal_uInt16 nType ); + sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } void SetKernAsianPunctuation( sal_Bool bEnabled ); sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; } @@ -711,9 +712,9 @@ public: void ReformatAllTextObjects(); - FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; - SdrOutliner* createOutliner( USHORT nOutlinerMode ); + SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); sal_Bool IsWriter() const { return !bMyPool; } diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index f961177bfd..b5651206f9 100644 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -134,9 +134,9 @@ protected: Rectangle aMarkedPointsRect; Rectangle aMarkedGluePointsRect; - USHORT nFrameHandlesLimit; - ULONG mnInsPointNum; // Nummer des InsPoint - ULONG nMarkableObjCount; + sal_uInt16 nFrameHandlesLimit; + sal_uIntPtr mnInsPointNum; // Nummer des InsPoint + sal_uIntPtr nMarkableObjCount; SdrDragMode eDragMode; // Persistent SdrViewEditMode eEditMode; // Persistent @@ -169,7 +169,7 @@ protected: virtual void SetMarkRects(); // Rects an den PageViews virtual void CheckMarked(); // MarkList nach Del und Lock Layer durchsuchen... virtual void AddDragModeHdl(SdrDragMode eMode); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); @@ -178,18 +178,18 @@ protected: void ForceUndirtyMrkPnt() const { if (bMrkPntDirty) UndirtyMrkPnt(); } //HMHvoid ImpShowMarkHdl(bool bNoRefHdl); - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; - BOOL ImpIsFrameHandles() const; - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0, USHORT nOpt=0) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; + sal_Bool ImpIsFrameHandles() const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; // Macht aus einer Winkelangabe in 1/100deg einen String inkl. Grad-Zeichen - BOOL ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); - BOOL MarkGluePoints(const Rectangle* pRect, BOOL bUnmark); + sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark); - void SetMoveOutside(BOOL bOn); - BOOL IsMoveOutside() const; + void SetMoveOutside(sal_Bool bOn); + sal_Bool IsMoveOutside() const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -197,7 +197,7 @@ protected: virtual ~SdrMarkView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -206,9 +206,9 @@ public: virtual void ClearPageView(); virtual void HideSdrPage(); - virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; - // Liefert TRUE wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen + // Liefert sal_True wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen // selektiert werden (solange wie der Rahmen aufgezogen wird). sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } @@ -224,35 +224,35 @@ public: // Das Interface wird hier evtl noch geaendert wg. Ortho-Drag void SetDragMode(SdrDragMode eMode); SdrDragMode GetDragMode() const { return eDragMode; } - BOOL ChkDragMode(SdrDragMode eMode) const; - void SetFrameHandles(BOOL bOn); - BOOL IsFrameHandles() const { return bForceFrameHandles; } + sal_Bool ChkDragMode(SdrDragMode eMode) const; + void SetFrameHandles(sal_Bool bOn); + sal_Bool IsFrameHandles() const { return bForceFrameHandles; } // Limit, ab wann implizit auf FrameHandles umgeschaltet wird. default=50. - void SetFrameHandlesLimit(USHORT nAnz) { nFrameHandlesLimit=nAnz; } - USHORT GetFrameHandlesLimit() const { return nFrameHandlesLimit; } + void SetFrameHandlesLimit(sal_uInt16 nAnz) { nFrameHandlesLimit=nAnz; } + sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; } void SetEditMode(SdrViewEditMode eMode); SdrViewEditMode GetEditMode() const { return eEditMode; } - void SetEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } - BOOL IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } - void SetCreateMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } - BOOL IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } - void SetGluePointEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } - BOOL IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; } + void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } + sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } + void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } + sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } + void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } + sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; } - void SetDesignMode(BOOL bOn=TRUE); - BOOL IsDesignMode() const { return bDesignMode; } + void SetDesignMode(sal_Bool bOn=sal_True); + sal_Bool IsDesignMode() const { return bDesignMode; } - void SetFrameDragSingles(BOOL bOn=TRUE) { SetFrameHandles(bOn); } - BOOL IsFrameDragSingles() const { return IsFrameHandles(); } + void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); } + sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); } // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special). SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const; - BOOL HasMarkableObj() const; - ULONG GetMarkableObjCount() const; + sal_Bool HasMarkableObj() const; + sal_uIntPtr GetMarkableObjCount() const; //HMHvoid ShowMarkHdl(bool bNoRefHdl = false); //HMHvoid HideMarkHdl(bool bNoRefHdl = false); //HMHBOOL IsMarkHdlShown() const { return bHdlShown; } @@ -268,11 +268,11 @@ protected: public: // all available const methods for read access to selection const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); } - ULONG TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } - SdrPageView* GetSdrPageViewOfMarkedByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } - SdrMark* GetSdrMarkByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum); } - SdrObject* GetMarkedObjectByIndex(ULONG nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } - ULONG GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } + sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } + SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } + SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); } + SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } + sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); } String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } @@ -296,47 +296,47 @@ public: void showMarkHandles(); bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; } - BOOL IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } - BOOL IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; + sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } + sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD (ni) - SdrHdl* PickHandle(const Point& rPnt, ULONG nOptions=0, SdrHdl* pHdl0=NULL) const; + SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const; // Pick: Unterstuetzte Optionen fuer nOptions sind: // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED // SDRSEARCH_WHOLEPAGE - virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const; - virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const; - // BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } - BOOL MarkObj(const Point& rPnt, short nTol=-2, BOOL bToggle=FALSE, BOOL bDeep=FALSE); + virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const; + virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } + sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False); // Pick: Unterstuetzte Optionen fuer nOptions sind SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST - BOOL PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum=NULL, ULONG nOptions=0) const; + sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const; // Sucht sich das Oberste der markierten Objekte (O1) und sucht von dort // aus in Richtung nach Unten dann das erste nichtmarkierte Objekt (O2). // Bei Erfolg wird die Markierung von O1 entfernt, an O2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextObj(BOOL bPrev=FALSE); + sal_Bool MarkNextObj(sal_Bool bPrev=sal_False); // Sucht sich das Oberste der markierten Objekte (O1) das von rPnt/nTol // getroffen wird und sucht von dort aus in Richtung nach Unten dann das // erste nichtmarkierte Objekt (O2). Bei Erfolg wird die Markierung von - // O1 entfernt, an O2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextObj(const Point& rPnt, short nTol=-2, BOOL bPrev=FALSE); + // O1 entfernt, an O2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False); // Alle Objekte innerhalb eines rechteckigen Bereichs markieren // Markiert werden nur Objekte, die vollstaendig eingeschlossen sind. - BOOL MarkObj(const Rectangle& rRect, BOOL bUnmark=FALSE); - void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE); + sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False); + void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False); void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten // Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss. - BOOL IsObjMarked(SdrObject* pObj) const; + sal_Bool IsObjMarked(SdrObject* pObj) const; // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); } @@ -344,8 +344,8 @@ public: // Der Wert ist als Kantenlaenge zu betrachten. Gerade Werte werden // auf Ungerade aufgerundet: 3->3, 4->5, 5->5, 6->7, 7->7, ... // Defaultwert ist 7, Mindestwert 3 Pixel. - USHORT GetMarkHdlSizePixel() const; - void SetMarkHdlSizePixel(USHORT nSiz); + sal_uInt16 GetMarkHdlSizePixel() const; + void SetMarkHdlSizePixel(sal_uInt16 nSiz); // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung // und die Groesse des Bereichs der markierten Objekte so angepasst, dass @@ -353,53 +353,53 @@ public: // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben. // Defaultwert ist 3, Mindestwert 3 Pixel. - BOOL IsSolidMarkHdl() const { return aHdl.IsFineHdl(); } - void SetSolidMarkHdl(BOOL bOn); + sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); } + void SetSolidMarkHdl(sal_Bool bOn); - virtual BOOL HasMarkablePoints() const; - virtual ULONG GetMarkablePointCount() const; - virtual BOOL HasMarkedPoints() const; - virtual ULONG GetMarkedPointCount() const; + virtual sal_Bool HasMarkablePoints() const; + virtual sal_uIntPtr GetMarkablePointCount() const; + virtual sal_Bool HasMarkedPoints() const; + virtual sal_uIntPtr GetMarkedPointCount() const; // Nicht alle Punkte lassen sich markieren: - virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); /** should only be used from outside svx for special ui elements */ - BOOL MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark); + sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten) - BOOL MarkPoints(const Rectangle& rRect, BOOL bUnmark=FALSE) { return MarkPoints(&rRect,bUnmark); } - BOOL UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); } - BOOL UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); } - BOOL IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } - BOOL MarkAllPoints() { return MarkPoints(NULL,FALSE); } - BOOL UnmarkAllPoints() { return MarkPoints(NULL,TRUE); } - BOOL UnMarkAllPoints() { return MarkPoints(NULL,TRUE); } + sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); } + sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } + sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } + sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } + sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); } + sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); } + sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); } // Sucht sich den ersten markierten Punkt (P1) und sucht von dort // aus in den ersten nichtmarkierte Punkt (P2). // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextPoint(BOOL bPrev=FALSE); + sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False); // Sucht sich den ersten markierten Punkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von - // P1 entfernt, an P2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextPoint(const Point& rPnt, BOOL bPrev=FALSE); + // P1 entfernt, an P2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False); // Die Nummer des passenden Handles raussuchen. Nicht gefunden // liefert CONTAINER_ENTRY_NOTFOUND. - ULONG GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); } - SdrHdl* GetHdl(ULONG nHdlNum) const { return aHdl.GetHdl(nHdlNum); } + sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); } + SdrHdl* GetHdl(sal_uIntPtr nHdlNum) const { return aHdl.GetHdl(nHdlNum); } const SdrHdlList& GetHdlList() const { return aHdl; } // Selektionsrahmen fuer Punktmarkierung aufziehen. - // Wird nur gestartet, wenn HasMarkablePoints() TRUE liefert. - // BOOL BegMarkPoints(const Point& rPnt, OutputDevice* pOut); + // Wird nur gestartet, wenn HasMarkablePoints() sal_True liefert. + // sal_Bool BegMarkPoints(const Point& rPnt, OutputDevice* pOut); sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False); void MovMarkPoints(const Point& rPnt); sal_Bool EndMarkPoints(); @@ -407,21 +407,21 @@ public: sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); } // Zusatzhandles dauerhaft sichtbar schalten - void SetPlusHandlesAlwaysVisible(BOOL bOn); - BOOL IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } + void SetPlusHandlesAlwaysVisible(sal_Bool bOn); + sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } // Handles sichrbar waerend TextEdit (in doppelter Groesse)? // Persistent, default=FALSE - void SetMarkHdlWhenTextEdit(BOOL bOn) { bMarkHdlWhenTextEdit=bOn; } - BOOL IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } + void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; } + sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } - BOOL HasMarkableGluePoints() const; - ULONG GetMarkableGluePointCount() const; - BOOL HasMarkedGluePoints() const; - ULONG GetMarkedGluePointCount() const; + sal_Bool HasMarkableGluePoints() const; + sal_uIntPtr GetMarkableGluePointCount() const; + sal_Bool HasMarkedGluePoints() const; + sal_uIntPtr GetMarkedGluePointCount() const; // Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject - // (dem er zugehoert) sowie einem USHORT nId (da jedes SdrObject je + // (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je // mehrere Klebepunkte haben kann. Hier an der View kommt zudem noch // eine SdrPageView, die stets korrekt gesetzt sein sollte. // Alternativ kann ein Klebepunkt durch ein SdrHdl bezeichnet werden. @@ -432,52 +432,52 @@ public: // Handleliste erneut berechnet. Alle vorher gemerkten SdrHdl* sind // damit ungueltig, ebenso die Punkt-Id's! // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD - BOOL PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions=0) const; - BOOL MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV, BOOL bUnmark=FALSE); - BOOL UnmarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,TRUE); } - BOOL IsGluePointMarked(const SdrObject* pObj, USHORT nId) const; - BOOL UnmarkGluePoint(const SdrHdl& rHdl); + sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False); + sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); } + sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; + sal_Bool UnmarkGluePoint(const SdrHdl& rHdl); // Hdl eines markierten GluePoints holen. Nicht markierte // GluePoints haben keine Handles - SdrHdl* GetGluePointHdl(const SdrObject* pObj, USHORT nId) const; - BOOL IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } + SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const; + sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten) - BOOL MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,FALSE); } - BOOL UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,TRUE); } - BOOL MarkAllGluePoints() { return MarkGluePoints(NULL,FALSE); } - BOOL UnmarkAllGluePoints() { return MarkGluePoints(NULL,TRUE); } + sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); } + sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); } + sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); } + sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); } // Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort // aus in den ersten nichtmarkierte Klebepunkt (P2). // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextGluePoint(BOOL bPrev=FALSE); + sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False); // Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung - // von P1 entfernt, an P2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextGluePoint(const Point& rPnt, BOOL bPrev=FALSE); + // von P1 entfernt, an P2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False); // Selektionsrahmen fuer Klebepunktmarkierung aufziehen. - // Wird nur gestartet, wenn HasMarkableGluePoints() TRUE liefert. - // Der GlueEditMode TRUE wird nicht abgefragt. - // BOOL BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); + // Wird nur gestartet, wenn HasMarkableGluePoints() sal_True liefert. + // Der GlueEditMode sal_True wird nicht abgefragt. + // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False); void MovMarkGluePoints(const Point& rPnt); sal_Bool EndMarkGluePoints(); void BrkMarkGluePoints(); sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); } - // bRestraintPaint=FALSE bewirkt, dass die Handles nicht sofort wieder gemalt werden. + // bRestraintPaint=sal_False bewirkt, dass die Handles nicht sofort wieder gemalt werden. // AdjustMarkHdl wird eh' nur gerufen, wenn was geaendert wurde; was idR ein Invalidate // zur Folge hat. Am Ende von des Redraw werden die Handles automatisch gezeichnet. - // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb TRUE! - void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=TRUE); + // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb sal_True! + void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=sal_True); const Rectangle& GetMarkedObjRect() const; // SnapRects der Objekte, ohne Strichstaerke Rectangle GetMarkedObjBoundRect() const; // inkl. Strichstaerke, ueberstehende Fetzen, ... @@ -497,9 +497,9 @@ public: // liegen alle Memberobjekte der Gruppe im direkten Zugriff. Alle anderen // Objekte koennen waerendessen nicht bearbeitet werden (bis zum naechsten // LeaveGroup()). Bei einer seitenuebergreifenden Markierung wird jede Page - // separat abgearbeitet. Die Methode liefert TRUE, wenn wenigstens eine + // separat abgearbeitet. Die Methode liefert sal_True, wenn wenigstens eine // Gruppe betreten wurde. - BOOL EnterMarkedGroup(); + sal_Bool EnterMarkedGroup(); // Den Mittelpunkt des letzten Crook-Dragging abholen. Den kann man // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen. diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 572212c2fb..bedd3e987d 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -174,7 +174,7 @@ public: }; sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual void SetModel(SdrModel* pNewModel); @@ -199,7 +199,7 @@ public: virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr ); @@ -212,9 +212,9 @@ public: virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448# virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); virtual FASTBOOL IsAutoGrowHeight() const; virtual FASTBOOL IsAutoGrowWidth() const; virtual void SetVerticalWriting( sal_Bool bVertical ); @@ -222,8 +222,8 @@ public: virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void operator=(const SdrObject& rObj); virtual void TakeObjNameSingul(String& rName) const; @@ -236,7 +236,7 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void SetPage( SdrPage* pNewPage ); diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx index 4ca52d79e8..2f554de791 100644 --- a/svx/inc/svx/svdoattr.hxx +++ b/svx/inc/svx/svdoattr.hxx @@ -74,10 +74,10 @@ public: TYPEINFO(); // Feststellen, ob bFilledObj && Fuellung!=FillNone - BOOL HasFill() const; + sal_Bool HasFill() const; // Feststellen, ob Linie!=LineNone - BOOL HasLine() const; + sal_Bool HasLine() const; virtual const Rectangle& GetSnapRect() const; diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index ae3bea80b4..c2cdd72844 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -182,7 +182,7 @@ public: OutputDevice* pOut; const SetOfByte* pVisiLayer; const SdrPageView* pPageView; - USHORT nTol; + sal_uInt16 nTol; FASTBOOL bDown; public: @@ -191,7 +191,7 @@ public: pVisiLayer(NULL), pPageView(NULL), nTol(0), - bDown(FALSE) + bDown(sal_False) {} }; @@ -208,9 +208,9 @@ public: class SVX_DLLPUBLIC SdrObjUserData { protected: - UINT32 nInventor; - UINT16 nIdentifier; - UINT16 nVersion; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; + sal_uInt16 nVersion; private: SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // nicht implementiert @@ -220,7 +220,7 @@ private: public: TYPEINFO(); - SdrObjUserData(UINT32 nInv, UINT16 nId, UINT16 nVer) + SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) : nInventor(nInv), nIdentifier(nId), nVersion(nVer) @@ -233,8 +233,8 @@ public: virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } + sal_uInt32 GetInventor() const { return nInventor; } + sal_uInt16 GetId() const { return nIdentifier; } virtual FASTBOOL HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; @@ -259,11 +259,11 @@ public: ~SdrObjUserDataList() { Clear(); } void Clear(); - USHORT GetUserDataCount() const { return USHORT(aList.Count()); } - SdrObjUserData* GetUserData(USHORT nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } - void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF) { aList.Insert(pData,nPos); } - SdrObjUserData* RemoveUserData(USHORT nNum) { return (SdrObjUserData*)aList.Remove(nNum);} - void DeleteUserData(USHORT nNum) { delete RemoveUserData(nNum); } + sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); } + SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } + void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); } + SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);} + void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); } }; //************************************************************ @@ -279,10 +279,10 @@ public: Rectangle aBoundRect; Point aAnchor; SdrGluePointList* pGPL; - BOOL bMovProt; - BOOL bSizProt; - BOOL bNoPrint; - BOOL bClosedObj; + sal_Bool bMovProt; + sal_Bool bSizProt; + sal_Bool bNoPrint; + sal_Bool bClosedObj; bool mbVisible; SdrLayerID mnLayerID; @@ -303,7 +303,7 @@ class SdrObjPlusData friend class SdrObject; public: - SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc. + SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc. SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern AutoTimer* pAutoTimer; @@ -334,49 +334,49 @@ public: class SdrObjTransformInfoRec { public: - unsigned bSelectAllowed : 1; // FALSE=Obj kann nicht selektiert werden - unsigned bMoveAllowed : 1; // FALSE=Obj kann nicht verschoben werden - unsigned bResizeFreeAllowed : 1; // FALSE=Obj kann nicht frei resized werden - unsigned bResizePropAllowed : 1; // FALSE=Obj kann nichtmal proportional resized werden - unsigned bRotateFreeAllowed : 1; // FALSE=Obj kann nicht frei gedreht werden - unsigned bRotate90Allowed : 1; // FALSE=Obj kann nichtmal im 90deg Raster gedreht werden - unsigned bMirrorFreeAllowed : 1; // FALSE=Obj kann nicht frei gespiegelt werden - unsigned bMirror45Allowed : 1; // FALSE=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden - unsigned bMirror90Allowed : 1; // FALSE=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden - unsigned bTransparenceAllowed : 1; // FALSE=Obj does not have an interactive transparence control - unsigned bGradientAllowed : 1; // FALSE=Obj dooes not have an interactive gradient control - unsigned bShearAllowed : 1; // FALSE=Obj kann nicht verzerrt werden + unsigned bSelectAllowed : 1; // sal_False=Obj kann nicht selektiert werden + unsigned bMoveAllowed : 1; // sal_False=Obj kann nicht verschoben werden + unsigned bResizeFreeAllowed : 1; // sal_False=Obj kann nicht frei resized werden + unsigned bResizePropAllowed : 1; // sal_False=Obj kann nichtmal proportional resized werden + unsigned bRotateFreeAllowed : 1; // sal_False=Obj kann nicht frei gedreht werden + unsigned bRotate90Allowed : 1; // sal_False=Obj kann nichtmal im 90deg Raster gedreht werden + unsigned bMirrorFreeAllowed : 1; // sal_False=Obj kann nicht frei gespiegelt werden + unsigned bMirror45Allowed : 1; // sal_False=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden + unsigned bMirror90Allowed : 1; // sal_False=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden + unsigned bTransparenceAllowed : 1; // sal_False=Obj does not have an interactive transparence control + unsigned bGradientAllowed : 1; // sal_False=Obj dooes not have an interactive gradient control + unsigned bShearAllowed : 1; // sal_False=Obj kann nicht verzerrt werden unsigned bEdgeRadiusAllowed : 1; - unsigned bNoOrthoDesired : 1; // TRUE bei Rect; ... FALSE bei BMP,MTF; - unsigned bNoContortion : 1; // FALSE=Kein verzerren (bei Crook) moeglich (nur TRUE bei PathObj und Gruppierten PathObjs) - unsigned bCanConvToPath : 1; // FALSE=Keine Konvertierung in PathObj moeglich - unsigned bCanConvToPoly : 1; // FALSE=Keine Konvertierung in PolyObj moeglich - unsigned bCanConvToContour : 1; // FALSE=no conversion down to whole contour possible - unsigned bCanConvToPathLineToArea : 1; // FALSE=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea - unsigned bCanConvToPolyLineToArea : 1; // FALSE=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea + unsigned bNoOrthoDesired : 1; // sal_True bei Rect; ... sal_False bei BMP,MTF; + unsigned bNoContortion : 1; // sal_False=Kein verzerren (bei Crook) moeglich (nur sal_True bei PathObj und Gruppierten PathObjs) + unsigned bCanConvToPath : 1; // sal_False=Keine Konvertierung in PathObj moeglich + unsigned bCanConvToPoly : 1; // sal_False=Keine Konvertierung in PolyObj moeglich + unsigned bCanConvToContour : 1; // sal_False=no conversion down to whole contour possible + unsigned bCanConvToPathLineToArea : 1; // sal_False=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea + unsigned bCanConvToPolyLineToArea : 1; // sal_False=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea public: SdrObjTransformInfoRec() - : bSelectAllowed(TRUE), - bMoveAllowed(TRUE), - bResizeFreeAllowed(TRUE), - bResizePropAllowed(TRUE), - bRotateFreeAllowed(TRUE), - bRotate90Allowed(TRUE), - bMirrorFreeAllowed(TRUE), - bMirror45Allowed(TRUE), - bMirror90Allowed(TRUE), - bTransparenceAllowed(TRUE), - bGradientAllowed(TRUE), - bShearAllowed(TRUE), - bEdgeRadiusAllowed(TRUE), - bNoOrthoDesired(TRUE), - bNoContortion(TRUE), - bCanConvToPath(TRUE), - bCanConvToPoly(TRUE), - bCanConvToContour(FALSE), - bCanConvToPathLineToArea(TRUE), - bCanConvToPolyLineToArea(TRUE) + : bSelectAllowed(sal_True), + bMoveAllowed(sal_True), + bResizeFreeAllowed(sal_True), + bResizePropAllowed(sal_True), + bRotateFreeAllowed(sal_True), + bRotate90Allowed(sal_True), + bMirrorFreeAllowed(sal_True), + bMirror45Allowed(sal_True), + bMirror90Allowed(sal_True), + bTransparenceAllowed(sal_True), + bGradientAllowed(sal_True), + bShearAllowed(sal_True), + bEdgeRadiusAllowed(sal_True), + bNoOrthoDesired(sal_True), + bNoContortion(sal_True), + bCanConvToPath(sal_True), + bCanConvToPoly(sal_True), + bCanConvToContour(sal_False), + bCanConvToPathLineToArea(sal_True), + bCanConvToPolyLineToArea(sal_True) {} }; @@ -466,7 +466,7 @@ protected: unsigned bVirtObj : 1; unsigned bSnapRectDirty : 1; unsigned bNetLock : 1; // ni - unsigned bInserted : 1; // nur wenn TRUE gibt's RepaintBroadcast & SetModify + unsigned bInserted : 1; // nur wenn sal_True gibt's RepaintBroadcast & SetModify unsigned bGrouped : 1; // Member eines GroupObjektes? // Die folgende Flags werden gestreamt @@ -474,7 +474,7 @@ protected: unsigned bSizProt : 1; // If true, the size is protected unsigned bNoPrint : 1; // If true, the object is not printed. unsigned mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint - // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein + // Wenn bEmptyPresObj sal_True ist, handelt es sich um ein // Praesentationsobjekt, dem noch kein Inhalt zugewiesen // wurde. Default ist das Flag auf FALSE. Die Verwaltung // uebernimmt die Applikation. Im Zuweisungsoperator sowie @@ -482,10 +482,10 @@ protected: // Das Flag ist persistent. unsigned bEmptyPresObj : 1; // Leeres Praesentationsobjekt (Draw) - // TRUE=Objekt ist als Objekt der MasterPage nicht sichtbar + // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar unsigned bNotVisibleAsMaster : 1; - // TRUE=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ... + // sal_True=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ... unsigned bClosedObj : 1; unsigned bIsEdge : 1; @@ -518,14 +518,14 @@ protected: Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // Fuer GetDragComment - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const; void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } - String GetWinkStr(long nWink, FASTBOOL bNoDegChar=FALSE) const; - String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=FALSE) const; + String GetWinkStr(long nWink, FASTBOOL bNoDegChar=sal_False) const; + String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=sal_False) const; - // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. + // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect // i.d.R. gleich mit um die Neuberechnung zu sparen. public: @@ -577,8 +577,8 @@ public: virtual void AddReference(SdrVirtObj& rVrtObj); virtual void DelReference(SdrVirtObj& rVrtObj); - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; // Layer interface @@ -626,15 +626,15 @@ public: // Wird die Reihenfolge der Objekte in der Liste veraendert, so wird ein // Dirty-Flag gesetzt (an der Page). Beim naechsten SdrObject::GetOrdNum() // werden die Ordnungsnummer aller Objekte der Liste neu bestimmt. - UINT32 GetOrdNum() const; + sal_uInt32 GetOrdNum() const; // Diese Methode sollte nur verwendet werden, wenn man ganz genau weiss, // was man macht: - UINT32 GetOrdNumDirect() const { return nOrdNum; } + sal_uInt32 GetOrdNumDirect() const { return nOrdNum; } // Das Setzen der Ordnungsnummer sollte nur vom Model bzw. von der Page // geschehen. - void SetOrdNum(UINT32 nNum) { nOrdNum=nNum; } + void SetOrdNum(sal_uInt32 nNum) { nOrdNum=nNum; } /** Return the position in the navigation order for the called object. Note that this method may update the navigation position of the @@ -683,7 +683,7 @@ public: // Tooling for painting a single object to a OutputDevice. This will be needed as long // as not all painting is changed to use DrawContact objects. sal_Bool SingleObjectPainter(OutputDevice& rOut) const; - BOOL LineGeometryUsageIsNecessary() const; + sal_Bool LineGeometryUsageIsNecessary() const; // Clone() soll eine komplette Kopie des Objektes erzeugen. virtual SdrObject* Clone() const; @@ -710,7 +710,7 @@ public: // Polygon wird das wohl ein einfacher Selektionshandle sein, bei einer // Bezierkurve dagegen koennen das schon bis zu 3 Handles werden (inkl Gewichte). // GetHdl() und GetPlusHdl() muessen Handleinstanzen mit new erzeugen! - // Ein Objekt, das bei HasSpacialDrag() TRUE liefert muss diese Methoden + // Ein Objekt, das bei HasSpacialDrag() sal_True liefert muss diese Methoden // zur Verfuegung stellen (inkl. FillHdlList). virtual sal_uInt32 GetHdlCount() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; @@ -724,8 +724,8 @@ public: // Stuetzstellen bei Splines, Gewichte bei Bezierkurven und Pointer von // Labelobjekten muss vom Objekt selbst gehandled werden. Um das Model // Statusfrei zu halten werden die Statusdaten an der View gehalten und dem - // Objekt dann uebergeben. EndDrag liefrt im Normalfall TRUE fuer Erfolg. - // FALSE kann zurueckgegeben werden, wenn das Dragging das Objekt nicht + // Objekt dann uebergeben. EndDrag liefrt im Normalfall sal_True fuer Erfolg. + // sal_False kann zurueckgegeben werden, wenn das Dragging das Objekt nicht // veraendert hat, wobei dir evtl. Tatsache das die Maus nicht bewegt wurde // bereits von der View abgefangen wird. virtual bool hasSpecialDrag() const; @@ -749,16 +749,16 @@ public: // BegCreate()-Methode gerufen. Bei jedem MausMode wird dann MovCreate // gerufen. BrkCreate() bedeutet, dass der User die interaktive Objekt- // erzeugung abgebrochen hat. EndCreate() wird gerufen beim MouseUp-Event. - // Liefert EndCreate() ein TRUE, so ist die Objekterzeugung abgeschlossen; + // Liefert EndCreate() ein sal_True, so ist die Objekterzeugung abgeschlossen; // das Objekt wird in die entsprechende Liste eingefuegt. Andernfalls - // (EndCreate()==FALSE) gehe ich davon aus, dass weitere Punkte zur + // (EndCreate()==sal_False) gehe ich davon aus, dass weitere Punkte zur // Objekterzeugung notwendig sind (Polygon,...). Der Parameter eCmd // enthaelt die Anzahl der Mausklicks (so die App diese durchreicht). // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). - // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen. + // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen. virtual FASTBOOL BegCreate(SdrDragStat& rStat); - virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); @@ -821,7 +821,7 @@ public: // Drehwinkel und Shear virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte, // Kreismittelpunkt, ...) @@ -922,10 +922,10 @@ public: // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern // i.d.R. 0=oben, 1=rechts, 2=unten, 3=links - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; // i.d.R. 0=linksoben, 1=rechtsoben, 2=rechtsunten, 3=linksunten - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; // Liste aller Klebepunkte. Kann NULL sein. virtual const SdrGluePointList* GetGluePointList() const; @@ -970,9 +970,9 @@ public: // Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden // Methoden ueberladen werden. // Z.B. Ein RectObj mit Strichstaerke 10, SOLID_PEN in Polygon wandeln: - // Im Modus bLineToArea=FALSE soll ein PolyObj mit 4 Stuetzstellen, + // Im Modus bLineToArea=sal_False soll ein PolyObj mit 4 Stuetzstellen, // Strichstaerke 10 und SOLiD_PEN erzeugt werden. - // Im Modus bLineToArea=TRUE dagegen soll das generierte Obj immer ein + // Im Modus bLineToArea=sal_True dagegen soll das generierte Obj immer ein // LinienAttribut NULL_PEN haben, und die Linie (auch Linienmuster) selbst // durch Polygonflaechen emuliert werden, die dadurch anschliessend vom // Anwender manipuliert werden koennen. Das RectObj kann sich somit also @@ -984,21 +984,21 @@ public: // Der Returnwert ist jeweils ein SdrObject*, da als Rueckgabe zur Not // auch Gruppenobjekte erlaubt sind (z.B. fuer SdrTextObj). // Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein, - // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind. + // dass beide Modi (bLineToArea=sal_True/sal_False) identisch sind. // Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL). - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; - SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; + SdrObject* ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const; // convert this path object to contour object; bForceLineDash converts even // when there is no filled new polygon created from line-to-polygon conversion, // specially used for XLINE_DASH and 3D conversion - SdrObject* ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const; - SdrObject* ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const; + SdrObject* ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const; + SdrObject* ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const; // TRUE: Referenz auf ein Obj sal_Bool IsVirtualObj() const { return bVirtObj; } - // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben. + // sal_True=Obj kann warsch. gefuellt werden; sal_False=Obj kann warsch. Linienenden haben. // ungueltig, wenn es sich um ein GroupObj handelt. sal_Bool IsClosedObj() const { return bClosedObj; } @@ -1006,8 +1006,8 @@ public: sal_Bool Is3DObj() const { return bIs3DObj; } sal_Bool IsUnoObj() const { return bIsUnoObj; } sal_Bool IsMasterCachable() const { return !bNotMasterCachable; } - sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=TRUE; return r; } - void ShareUnlock() { bNetLock=FALSE; } + sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=sal_True; return r; } + void ShareUnlock() { bNetLock=sal_False; } sal_Bool IsShareLock() const { return bNetLock; } void SetMarkProtect(sal_Bool bProt) { bMarkProt=bProt; } sal_Bool IsMarkProtect() const { return bMarkProt; } @@ -1035,16 +1035,16 @@ public: sal_Bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange; } // applikationsspeziefische Daten - USHORT GetUserDataCount() const; - SdrObjUserData* GetUserData(USHORT nNum) const; + sal_uInt16 GetUserDataCount() const; + SdrObjUserData* GetUserData(sal_uInt16 nNum) const; // Insert uebernimmt den auf dem Heap angelegten Record in den Besitz // des Zeichenobjekts - void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF); + void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF); // Delete entfernt den Record aus der Liste und ruft // ein delete (FreeMem+Dtor). - void DeleteUserData(USHORT nNum); + void DeleteUserData(sal_uInt16 nNum); // ItemPool fuer dieses Objekt wechseln void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); @@ -1108,7 +1108,7 @@ public: // to use (0,0) as upper left and will be scaled to the given size in the matrix. virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); - sal_Bool IsTransparent( BOOL bCheckForAlphaChannel = FALSE ) const; + sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const; // #116168# // Give info if object is in destruction @@ -1155,8 +1155,8 @@ private: class SVX_DLLPUBLIC SdrObjFactory { public: - UINT32 nInventor; - UINT16 nIdentifier; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; // fuer MakeNewObj(): SdrPage* pPage; @@ -1168,14 +1168,14 @@ public: SdrObjUserData* pNewData; private: - SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); - SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1); + SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); + SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1); public: - static SdrObject* MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); + static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); static void InsertMakeObjectHdl(const Link& rLink); static void RemoveMakeObjectHdl(const Link& rLink); - static SdrObjUserData* MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj); + static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj); static void InsertMakeUserDataHdl(const Link& rLink); static void RemoveMakeUserDataHdl(const Link& rLink); }; diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index dd1e33c1ec..decb8248be 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -92,15 +92,15 @@ public: virtual ~SdrCaptionObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator=(const SdrObject& rObj); // for calc: special shadow only for text box - void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = TRUE; } + void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; } sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; } // for calc: fixed note tail position. - void SetFixedTail() { mbFixedTail = TRUE; } + void SetFixedTail() { mbFixedTail = sal_True; } virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -149,7 +149,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; const Point& GetTailPos() const; void SetTailPos(const Point& rPos); diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index c7ff437385..9c8f9d94f9 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -81,7 +81,7 @@ private: SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren - // Liefert TRUE, wenn das Painten ein XPolygon erfordert. + // Liefert sal_True, wenn das Painten ein XPolygon erfordert. SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); @@ -103,7 +103,7 @@ public: virtual ~SdrCircObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void TakeObjNameSingul(String& rName) const; @@ -137,7 +137,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; protected: virtual SdrObjGeoData* NewGeoData() const; diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index 57ad25b0bf..2da6bdbbd7 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -58,13 +58,13 @@ protected: SdrObject* pObj; // Referenziertes Objekt long nXDist; // Hor. Objektabstand wenn bXDistOvr=TRUE long nYDist; // Vert. Objektabstand wenn bYDistOvr=TRUE - USHORT nConId; // Konnektornummer + sal_uInt16 nConId; // Konnektornummer // bitfield - unsigned bBestConn : 1; // TRUE= es wird der guenstigste Konnektor gesucht - unsigned bBestVertex : 1; // TRUE= es wird der guenstigste Scheitelpunkt zum konnekten gesucht - unsigned bXDistOvr : 1; // TRUE= Hor. Objektabstand wurde gedragt (Overwrite) - unsigned bYDistOvr : 1; // TRUE= Vert. Objektabstand wurde gedragt (Overwrite) + unsigned bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht + unsigned bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht + unsigned bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite) + unsigned bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite) unsigned bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon unsigned bAutoCorner : 1; // AutoConnector am Eckpunkt nCon @@ -75,14 +75,14 @@ public: void ResetVars(); FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const; - inline void SetBestConnection( BOOL rB ) { bBestConn = rB; }; - inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; }; - inline void SetAutoVertex( BOOL rB ) { bAutoVertex = rB; }; - inline void SetConnectorId( USHORT nId ) { nConId = nId; }; + inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; + inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; + inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; }; + inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; - inline BOOL IsBestConnection() const { return bBestConn; }; - inline BOOL IsBestVertex() const { return bBestVertex; }; - inline BOOL IsAutoVertex() const { return bAutoVertex; }; + inline sal_Bool IsBestConnection() const { return bBestConn; }; + inline sal_Bool IsBestVertex() const { return bBestVertex; }; + inline sal_Bool IsAutoVertex() const { return bAutoVertex; }; inline sal_uInt16 GetConnectorId() const { return nConId; }; inline SdrObject* GetObject() const { return pObj; } }; @@ -108,9 +108,9 @@ public: // Nachfolgende Werte werden von ImpCalcEdgeTrack gesetzt long nAngle1; // Austrittswinkel am Obj1 long nAngle2; // Austrittswinkel am Obj2 - USHORT nObj1Lines; // 1..3 - USHORT nObj2Lines; // 1..3 - USHORT nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns + sal_uInt16 nObj1Lines; // 1..3 + sal_uInt16 nObj2Lines; // 1..3 + sal_uInt16 nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns char cOrthoForm; // Form des Ortho-Verbindes, z.B. 'Z','U',I','L','S',... public: @@ -125,7 +125,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } - USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; @@ -141,7 +141,7 @@ public: SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs SdrObjConnection aCon2; // Verbindungszustand des Linienendes XPolygon* pEdgeTrack; - sal_Bool bEdgeTrackDirty;// TRUE=Verbindungsverlauf muss neu berechnet werden. + sal_Bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden. sal_Bool bEdgeTrackUserDefined; SdrEdgeInfoRec aEdgeInfo; @@ -175,7 +175,7 @@ protected: SdrEdgeInfoRec aEdgeInfo; // bitfield - unsigned bEdgeTrackDirty : 1; // TRUE=Verbindungsverlauf muss neu berechnet werden. + unsigned bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden. unsigned bEdgeTrackUserDefined : 1; // #109007# @@ -207,9 +207,9 @@ protected: XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, - ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const; + sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); - USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; + sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs @@ -225,19 +225,19 @@ public: SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; virtual FASTBOOL IsNode() const; - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); virtual FASTBOOL IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; } + void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; } void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); void DisconnectFromNode(FASTBOOL bTail1); SdrObject* GetConnectedNode(FASTBOOL bTail1) const; @@ -280,7 +280,7 @@ public: virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -300,8 +300,8 @@ public: void Reformat(); // helper methods for the StarOffice api - Point GetTailPoint( BOOL bTail ) const; - void SetTailPoint( BOOL bTail, const Point& rPt ); + Point GetTailPoint( sal_Bool bTail ) const; + void SetTailPoint( sal_Bool bTail, const Point& rPt ); void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 ); sal_Int32 getGluePointIndex( sal_Bool bTail ); @@ -320,24 +320,24 @@ public: // // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet: // -// USHORT EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 +// sal_uInt16 EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 // Verlauffreiheitswinkel. // Der Winkel, in dem die Verbindungslinie verlaufen darf. // -// USHORT EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000 +// sal_uInt16 EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000 // Objektaustrittswinkel. // Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf. // -// BOOL EdgeEscAsRay Default FALSE -// TRUE= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus. +// sal_Bool EdgeEscAsRay Default FALSE +// sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus. // Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor. // -// BOOL EdgeEscUseObjAngle Default FALSE +// sal_Bool EdgeEscUseObjAngle Default FALSE // Objektdrehwinkelberuecksichtigung. -// TRUE= Bei der Bestimmung des Objektaustrittswinkels wird der +// sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der // Drehwinkel des Objekts als Offset beruecksichtigt. // -// ULONG EdgeFlowDefDist Default 0, min 0, max ? +// sal_uIntPtr EdgeFlowDefDist Default 0, min 0, max ? // Das ist der Default-Mindestabstand der bei der Berechnung der // Verbindungslinie zu den angedockten Objekten in logischen Einheiten. // Dieser Abstand wird innerhalb des Objektes "ueberschrieben", sobald diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index e18e879b2d..c29862b694 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -140,7 +140,7 @@ public: void SetGraphic(const Graphic& rGrf); const Graphic& GetGraphic() const; - Graphic GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; + Graphic GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; GraphicType GetGraphicType() const; @@ -161,7 +161,7 @@ public: void SetGraphicLink(const String& rFileName, const String& rFilterName); void ReleaseGraphicLink(); - sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); } + sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); } void SetFileName(const String& rFileName); const String& GetFileName() const { return aFileName; } @@ -172,7 +172,7 @@ public: void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -201,7 +201,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index bd99b55d86..42da7004ed 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -64,7 +64,7 @@ public: virtual ~SdrObjGroup(); virtual void SetBoundRectDirty(); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual SdrLayerID GetLayer() const; virtual void NbcSetLayer(SdrLayerID nLayer); @@ -93,7 +93,7 @@ public: virtual FASTBOOL BegCreate(SdrDragStat& rStat); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -118,7 +118,7 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; }; #endif //_SVDOGRP_HXX diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index f46c6147a8..7fd6bf81f9 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -85,7 +85,7 @@ protected: void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const; void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; - void SetTextDirty() { bTextDirty=TRUE; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } } + void SetTextDirty() { bTextDirty=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } } void UndirtyText() const; virtual SdrObjGeoData* NewGeoData() const; @@ -99,7 +99,7 @@ public: virtual ~SdrMeasureObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void operator=(const SdrObject& rObj); @@ -140,19 +140,19 @@ public: virtual Point GetPoint(sal_uInt32 i) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index 914100f1f4..e4db994be7 100644 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -56,7 +56,7 @@ public: virtual FASTBOOL HasTextEdit() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 9312adde08..3e0ad0bad6 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -68,8 +68,8 @@ protected: String aProgName; // wg. Kompatibilitaet erstmal am SdrTextObj - BOOL bFrame : 1; - BOOL bInDestruction : 1; + sal_Bool bFrame : 1; + sal_Bool bInDestruction : 1; mutable bool m_bTypeAsked; mutable bool m_bChart; @@ -85,10 +85,10 @@ protected: public: TYPEINFO(); - SdrOle2Obj(FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=FALSE); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=FALSE); + SdrOle2Obj(FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=sal_False); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef @@ -140,7 +140,7 @@ public: virtual SdrObject* getFullDragClone() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -155,7 +155,7 @@ public: static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); - BOOL Unload(); + sal_Bool Unload(); void Connect(); void Disconnect(); void ObjectLoaded(); diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx index 5b8d2661f7..ddec0a2baa 100644 --- a/svx/inc/svx/svdopage.hxx +++ b/svx/inc/svx/svdopage.hxx @@ -62,7 +62,7 @@ public: // #i96598# virtual void SetBoundRectDirty(); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual void operator=(const SdrObject& rObj); diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 471f5208f6..74772bcc92 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -93,7 +93,7 @@ public: virtual ~SdrPathObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void operator=(const SdrObject& rObj); @@ -154,7 +154,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; // Bezierpolygon holen/setzen const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; } diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index b817b8e98f..833fd148ef 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -62,7 +62,7 @@ protected: XPolygon* mpXPoly; protected: - // Liefert TRUE, wenn das Painten ein Polygon erfordert. + // Liefert sal_True, wenn das Painten ein Polygon erfordert. FASTBOOL PaintNeedsXPoly(long nEckRad) const; protected: @@ -87,12 +87,12 @@ public: // Konstruktion eines Textrahmens SdrRectObj(SdrObjKind eNewTextKind); SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual ~SdrRectObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void TakeObjNameSingul(String& rName) const; @@ -125,10 +125,10 @@ public: virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); }; diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 5a84101265..016e3dc3bd 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -201,8 +201,8 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; @@ -218,11 +218,11 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void SetChanged(); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; virtual void operator=(const SdrObject& rObj); @@ -265,7 +265,7 @@ public: virtual void EndTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 0592401aaa..e6d41ac428 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -178,8 +178,8 @@ private: protected: // Das aRect ist gleichzeig auch das Rect vom RectObj und CircObj. - // Bei bTextFrame=TRUE wird der Text in dieses Rect hineinformatiert. - // Bei bTextFrame=FALSE wird der Text am Mittelpunkt des Rect zentriert. + // Bei bTextFrame=sal_True wird der Text in dieses Rect hineinformatiert. + // Bei bTextFrame=sal_False wird der Text am Mittelpunkt des Rect zentriert. Rectangle aRect; // Der GeoStat enthaelt den Drehwinkel und einen Shearwinkel @@ -206,7 +206,7 @@ protected: // OBJ_TEXTEXT Textfortsetzungsrahmen // OBJ_TITLETEXT TitleText fuer StarDraw-Praesentation // OBJ_OUTLINETEXT OutlineText fuer StarDraw-Praesentation - // eTextKind hat nur Bedeutung, wenn bTextFrame=TRUE, da es sich sonst + // eTextKind hat nur Bedeutung, wenn bTextFrame=sal_True, da es sich sonst // um ein beschriftetes Grafikobjekt handelt. SdrObjKind eTextKind; @@ -223,36 +223,36 @@ public: protected: // Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame= - // TRUE wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen - // ist durch ein SdrRectObj mit bTextFrame=TRUE realisiert. - BOOL bTextFrame : 1; - BOOL bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten - BOOL bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) - BOOL bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) - BOOL bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) - BOOL bTextSizeDirty : 1; + // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen + // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert. + sal_Bool bTextFrame : 1; + sal_Bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten + sal_Bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) + sal_Bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) + sal_Bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) + sal_Bool bTextSizeDirty : 1; // #101684# - BOOL mbInEditMode : 1; // Is this text obejct in edit mode? + sal_Bool mbInEditMode : 1; // Is this text obejct in edit mode? // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom // der App beim Create gesetzt. // Wenn das Objekt dann spaeter in der Breite resized wird, wird - // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird - // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend + // AutoGrowWidth abgeschaltet (Hart auf sal_False attributiert). Das Flag wird + // dann ebenfalls auf sal_False gesetzt, sodass sich das Objekt anschliessend // wie ein normales Textobjekt verhaelt. // Resize in der Breite kann sein: // - Interaktives Resize in Einfach- oder Mehrfachselektion // - Positions+Groesse Dialog - BOOL bDisableAutoWidthOnDragging : 1; + sal_Bool bDisableAutoWidthOnDragging : 1; // #111096# // Allow text suppression - BOOL mbTextHidden : 1; + sal_Bool mbTextHidden : 1; // #111096# // Flag for allowing text animation. Default is sal_true. - BOOL mbTextAnimationAllowed : 1; + sal_Bool mbTextAnimationAllowed : 1; SdrOutliner& ImpGetDrawOutliner() const; @@ -283,10 +283,10 @@ protected: void ImpCheckShear(); Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; void ImpSetTextEditParams() const; - void SetTextSizeDirty() { bTextSizeDirty=TRUE; } + void SetTextSizeDirty() { bTextSizeDirty=sal_True; } // rAnchorRect ist InOut-Parameter! - void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const; + void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const; virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; @@ -308,15 +308,15 @@ protected: SdrTextObj(SdrObjKind eNewTextKind); SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual ~SdrTextObj(); public: TYPEINFO(); // #101684# - BOOL IsInEditMode() const { return mbInEditMode; } + sal_Bool IsInEditMode() const { return mbInEditMode; } // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden. // Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet. @@ -331,12 +331,12 @@ public: void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } - FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=FALSE); + FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=sal_False); FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const; - virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); - virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact); FASTBOOL IsTextFrame() const { return bTextFrame; } FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } @@ -368,8 +368,8 @@ public: FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); - void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat); - void SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat); + void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); + void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); // FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt! virtual const Size& GetTextSize() const; @@ -377,8 +377,8 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } @@ -421,7 +421,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; // Wird zur Bestimmung des Textankerbereichs benoetigt virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; @@ -435,7 +435,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -466,7 +466,7 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; void StartTextAnimation(OutputDevice* pOutDev, const Point& rOffset, long nExtraData=0L); void StopTextAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L); @@ -480,10 +480,10 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index e8b2eaf3bc..64d68e5181 100644 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj String aUnoControlModelTypeName; String aUnoControlTypeName; - BOOL bOwnUnoControlModel; + sal_Bool bOwnUnoControlModel; protected: ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden @@ -76,17 +76,17 @@ private: public: TYPEINFO(); - SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE); + SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True); SdrUnoObj(const String& rModelName, const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, - BOOL bOwnsModel = TRUE); + sal_Bool bOwnsModel = sal_True); virtual ~SdrUnoObj(); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator = (const SdrObject& rObj); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index 817a94dab1..a34b7b4350 100644 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -43,7 +43,7 @@ protected: const SdrPage* mpVisualizedPage; public: - SdrOutliner( SfxItemPool* pItemPool, USHORT nMode ); + SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ); virtual ~SdrOutliner() ; void SetTextObj( const SdrTextObj* pObj ); @@ -53,7 +53,7 @@ public: void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; } const SdrPage* getVisualizedPage() const { return mpVisualizedPage; } - virtual String CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor); + virtual String CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor); }; #endif //_SVDOUTL_HXX diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index 8568b284e5..f3708854b4 100644 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -70,8 +70,8 @@ public: virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual SdrObjList* GetSubList() const; virtual const Rectangle& GetCurrentBoundRect() const; @@ -131,7 +131,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual long GetRotateAngle() const; - virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index c65c5eb5a6..4443c65542 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -113,7 +113,7 @@ public: // !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!! // #110094# This should not be needed (!) - void SetObjOrdNumsDirty() { bObjOrdNumsDirty=TRUE; } + void SetObjOrdNumsDirty() { bObjOrdNumsDirty=sal_True; } // pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert! void operator=(const SdrObjList& rSrcList); void CopyObjects(const SdrObjList& rSrcList); @@ -132,23 +132,23 @@ public: // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } - virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND + virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); - virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND + virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); // aus Liste entfernen ohne delete - virtual SdrObject* NbcRemoveObject(ULONG nObjNum); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum); + virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum); // Vorhandenes Objekt durch ein anderes ersetzen. // Wie Remove&Insert jedoch performanter, da die Ordnungsnummern // nicht Dirty gesetzt werden muessen. - virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum); - virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum); + virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum); + virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum); // Die Z-Order eines Objekts veraendern - virtual SdrObject* NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum); - virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum); + virtual SdrObject* NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum); + virtual SdrObject* SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum); virtual void SetRectsDirty(); @@ -165,14 +165,14 @@ public: // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void BurnInStyleSheetAttributes(); - ULONG GetObjCount() const; - SdrObject* GetObj(ULONG nNum) const; + sal_uIntPtr GetObjCount() const; + SdrObject* GetObj(sal_uIntPtr nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt virtual FASTBOOL IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... - ULONG CountAllObjects() const; + sal_uIntPtr CountAllObjects() const; // Alle aufgelagerten Teile (z.B. Grafiken) der Liste in den // Speicher laden. @@ -199,7 +199,7 @@ public: operation is performed recursively, such that the content of the given object contains no groups afterwards. */ - virtual void UnGroupObj( ULONG nObjNum ); + virtual void UnGroupObj( sal_uIntPtr nObjNum ); /** Return whether there is an explicit, user defined, object navigation order. When there is one this method returns <TRUE/> and the @@ -342,17 +342,17 @@ private: SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList); // never implemented SVX_DLLPRIVATE void operator=(const SdrPageGridFrameList& rSrcList); // never implemented protected: - SdrPageGridFrame* GetObject(USHORT i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); } + SdrPageGridFrame* GetObject(sal_uInt16 i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); } public: SdrPageGridFrameList(): aList(1024,4,4) {} ~SdrPageGridFrameList() { Clear(); } void Clear(); - USHORT GetCount() const { return USHORT(aList.Count()); } - void Insert(const SdrPageGridFrame& rGF, USHORT nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); } - void Delete(USHORT nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); } - void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } - SdrPageGridFrame& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrPageGridFrame& operator[](USHORT nPos) const { return *GetObject(nPos); } + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } + void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); } + void Delete(sal_uInt16 nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); } + void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } + SdrPageGridFrame& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -430,12 +430,12 @@ public: // and thus has to set mxUnoPage friend class ChXChartDocument; - INT32 nWdt; // Seitengroesse - INT32 nHgt; // Seitengroesse - INT32 nBordLft; // Seitenrand links - INT32 nBordUpp; // Seitenrand oben - INT32 nBordRgt; // Seitenrand rechts - INT32 nBordLwr; // Seitenrand unten + sal_Int32 nWdt; // Seitengroesse + sal_Int32 nHgt; // Seitengroesse + sal_Int32 nBordLft; // Seitenrand links + sal_Int32 nBordUpp; // Seitenrand oben + sal_Int32 nBordRgt; // Seitenrand rechts + sal_Int32 nBordLwr; // Seitenrand unten // this is a weak reference to a possible living api wrapper for this page ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage; @@ -455,7 +455,7 @@ protected: ::sdr::MasterPageDescriptor* mpMasterPageDescriptor; SetOfByte aPrefVisiLayers; - USHORT nPageNum; + sal_uInt16 nPageNum; // bitfield unsigned mbMaster : 1; // flag if this is a MasterPage @@ -496,17 +496,17 @@ public: virtual Size GetSize() const; virtual void SetOrientation(Orientation eOri); virtual Orientation GetOrientation() const; - virtual INT32 GetWdt() const; - virtual INT32 GetHgt() const; - virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr); - virtual void SetLftBorder(INT32 nBorder); - virtual void SetUppBorder(INT32 nBorder); - virtual void SetRgtBorder(INT32 nBorder); - virtual void SetLwrBorder(INT32 nBorder); - virtual INT32 GetLftBorder() const; - virtual INT32 GetUppBorder() const; - virtual INT32 GetRgtBorder() const; - virtual INT32 GetLwrBorder() const; + virtual sal_Int32 GetWdt() const; + virtual sal_Int32 GetHgt() const; + virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); + virtual void SetLftBorder(sal_Int32 nBorder); + virtual void SetUppBorder(sal_Int32 nBorder); + virtual void SetRgtBorder(sal_Int32 nBorder); + virtual void SetLwrBorder(sal_Int32 nBorder); + virtual sal_Int32 GetLftBorder() const; + virtual sal_Int32 GetUppBorder() const; + virtual sal_Int32 GetRgtBorder() const; + virtual sal_Int32 GetLwrBorder() const; virtual void SetModel(SdrModel* pNewModel); @@ -532,11 +532,11 @@ public: // GetBitmap und GetMetafile sind noch nicht implementiert. // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der // Page erzeugen. - Bitmap GetBitmap(FASTBOOL bTrimBorders=TRUE) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } - Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE) const; + Bitmap GetBitmap(FASTBOOL bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } + Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True) const; // Metafile aus den Objekten der Page erzeugen - GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=TRUE) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } - GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE); + GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } + GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True); virtual String GetLayoutName() const; @@ -559,7 +559,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 3efadcda2c..a92306046a 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -128,7 +128,7 @@ private: SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow); protected: - void ImpInvalidateHelpLineArea(USHORT nNum) const; + void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; protected: void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa); @@ -179,7 +179,7 @@ public: void InvalidateAllWin(); // rRect bezieht sich auf die Page - void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=FALSE); + void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False); // PrePaint call forwarded from app windows void PrePaint(); @@ -249,13 +249,13 @@ public: const SdrHelpLineList& GetHelpLines() const { return aHelpLines; } void SetHelpLines(const SdrHelpLineList& rHLL); - //void SetHelpLinePos(USHORT nNum, const Point& rNewPos); - void SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine); - void DeleteHelpLine(USHORT nNum); - void InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum=0xFFFF); - void MoveHelpLine(USHORT nNum, USHORT nNewNum) { aHelpLines.Move(nNum,nNewNum); } + //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos); + void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine); + void DeleteHelpLine(sal_uInt16 nNum); + void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF); + void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); } - // Liefert TRUE, wenn Layer des Obj sichtbar und nicht gesperrt. + // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt. // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein, // gesperrt sein darf keiner. sal_Bool IsObjMarkable(SdrObject* pObj) const; @@ -273,7 +273,7 @@ public: void LeaveAllGroup(); // Feststellen, wie weit hinabgestiegen wurde (0=Root(Page)) - USHORT GetEnteredLevel() const; + sal_uInt16 GetEnteredLevel() const; // Name der aktuellen Objektgruppe String GetActualGroupName() const; diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index efc0df0262..1d5a5b6782 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -162,12 +162,12 @@ protected: SdrAnimationMode eAnimationMode; - USHORT nHitTolPix; - USHORT nMinMovPix; - USHORT nHitTolLog; - USHORT nMinMovLog; - ULONG nMasterCacheMode; - ULONG nGraphicManagerDrawMode; + sal_uInt16 nHitTolPix; + sal_uInt16 nMinMovPix; + sal_uInt16 nHitTolLog; + sal_uInt16 nMinMovLog; + sal_uIntPtr nMasterCacheMode; + sal_uIntPtr nGraphicManagerDrawMode; // hold an incarnation of Drawinglayer configuration options SvtOptionsDrawinglayer maDrawinglayerOpt; @@ -188,9 +188,9 @@ protected: unsigned bSwapAsynchron : 1; unsigned bPrintPreview : 1; - // BOOL fuer die Verwaltung des anzuzeigenden Status - // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber - // beispielsweise beim Chart auf FALSE gesetzt, da dort + // sal_Bool fuer die Verwaltung des anzuzeigenden Status + // Gruppe Betreten/Verlassen. Default ist sal_True, wird aber + // beispielsweise beim Chart auf sal_False gesetzt, da dort // die Ghosted-Effekte zur Darstellug unerwuenscht sind. unsigned bVisualizeEnteredGroup : 1; unsigned bAnimationPause : 1; @@ -254,8 +254,8 @@ private: DECL_LINK(ImpComeBackHdl,Timer*); protected: - USHORT ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; - USHORT ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const; + sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; + sal_uInt16 ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const; // Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt): void FlushComeBackTimer() const; @@ -263,12 +263,12 @@ protected: void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } } void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } } void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } } - BOOL ImpIsGlueVisible2() const { return bGlueVisible2; } - BOOL ImpIsGlueVisible3() const { return bGlueVisible3; } - BOOL ImpIsGlueVisible4() const { return bGlueVisible4; } + sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; } + sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; } + sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; } public: - BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } + sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); @@ -296,7 +296,7 @@ public: // virtual void Clear(); // PageViews loeschen, Markierungen weg, ... SdrModel* GetModel() const { return pMod; } - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -314,18 +314,18 @@ public: // jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen // Pixelwerten logische Werte berechnen kann. void SetActualWin(const OutputDevice* pWin); - void SetMinMoveDistancePixel(USHORT nVal) { nMinMovPix=nVal; TheresNewMapMode(); } - USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; } - void SetHitTolerancePixel(USHORT nVal) { nHitTolPix=nVal; TheresNewMapMode(); } - USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; } + void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); } + sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; } + void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); } + sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; } // data read access on logic HitTolerance and MinMoveTolerance - USHORT getHitTolLog() const { return nHitTolLog; } - USHORT getMinMovLog() const { return nMinMovLog; } + sal_uInt16 getHitTolLog() const { return nHitTolLog; } + sal_uInt16 getMinMovLog() const { return nMinMovLog; } // Flag zur Visualisierung von Gruppen abfragen/testen - BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } - void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; } + sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } + void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; } // Am DragStatus laesst sich beispielsweise erfragen, welche // entfernung bereits gedraggd wurde, etc. @@ -341,8 +341,8 @@ public: virtual void HideSdrPage(); // Iterieren ueber alle angemeldeten PageViews -// USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); } -// SdrPageView* GetPageViewByIndex(USHORT nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); } +// sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); } +// SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); } SdrPageView* GetSdrPageView() const { return mpPageView; } // Pageview einer bestimmten Seite ermitteln @@ -360,17 +360,17 @@ public: virtual void AddWindowToPaintView(OutputDevice* pNewWin); virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); - void SetLayerVisible(const String& rName, BOOL bShow=TRUE); + void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True); bool IsLayerVisible(const String& rName) const; - void SetAllLayersVisible(BOOL bShow=TRUE); + void SetAllLayersVisible(sal_Bool bShow=sal_True); - void SetLayerLocked(const String& rName, BOOL bLock=TRUE); + void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True); bool IsLayerLocked(const String& rName) const; - void SetAllLayersLocked(BOOL bLock=TRUE); + void SetAllLayersLocked(sal_Bool bLock=sal_True); - void SetLayerPrintable(const String& rName, BOOL bPrn=TRUE); + void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True); bool IsLayerPrintable(const String& rName) const; - void SetAllLayersPrintable(BOOL bPrn=TRUE); + void SetAllLayersPrintable(sal_Bool bPrn=sal_True); // PrePaint call forwarded from app windows void PrePaint(); @@ -412,14 +412,14 @@ protected: void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; public: - BOOL IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht - BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht - BOOL IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht - BOOL IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht - BOOL IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter - BOOL IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht - BOOL IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter - BOOL IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht + sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht + sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht + sal_Bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht + sal_Bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht + sal_Bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter + sal_Bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht + sal_Bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter + sal_Bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht Color GetGridColor() const; void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); } void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); } @@ -450,7 +450,7 @@ public: const Size& GetGridFine() const { return aGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix=FALSE); + void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False); // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss // man diese beiden folgenden Methoden ueberladen und entsprechend anders @@ -474,13 +474,13 @@ public: // DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese // Attribute direkt nach dem Erzeugen erstmal zugewiesen. - void SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll); + void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; } - void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; } - void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll); - void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; + void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; // Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische // Verwendung. Alle Positionsangaben in logischen View-Koordinaten. @@ -494,32 +494,32 @@ public: sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); } // use this mode as mode to draw all internal GraphicManager objects with - ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } - void SetGraphicManagerDrawMode( ULONG nMode ) { nGraphicManagerDrawMode = nMode; } + sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } + void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; } // SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht // beim Paint sofort nachladen, sondern dort das Nachladen anstossen. // Nach Abschluss des Nachladens wird das Objekt dann angezeigt. // Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist. // Default=FALSE. Flag ist nicht persistent. - BOOL IsSwapAsynchron() const { return bSwapAsynchron; } - void SetSwapAsynchron(BOOL bJa=TRUE) { bSwapAsynchron=bJa; } - virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - - virtual BOOL MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return FALSE; } - BOOL Cut(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } - BOOL Yank(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } - BOOL Paste(Window* /*pWin*/=NULL, ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } + sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; } + void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; } + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + + virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; } + sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } + sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } + sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); virtual void MakeVisible(const Rectangle& rRect, Window& rWin); @@ -529,8 +529,8 @@ public: // Animation aktivieren/deaktivieren fuer ::Paint // wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt // Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt - BOOL IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } - void SetAnimationEnabled( BOOL bEnable=TRUE ); + sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } + void SetAnimationEnabled( sal_Bool bEnable=sal_True ); // set/unset pause state for animations bool IsAnimationPause() const { return bAnimationPause; } @@ -543,10 +543,10 @@ public: void SetAnimationMode( const SdrAnimationMode eMode ); SdrAnimationMode GetAnimationMode() const { return eAnimationMode; } - // bei bShow=FALSE wird der Browser destruiert + // bei bShow=sal_False wird der Browser destruiert #ifdef DBG_UTIL - void ShowItemBrowser(BOOL bShow=TRUE); - BOOL IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } + void ShowItemBrowser(sal_Bool bShow=sal_True); + sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } Window* GetItemBrowser() const { return (Window*)pItemBrowser; } #endif @@ -555,7 +555,7 @@ public: void VisAreaChanged(const OutputDevice* pOut=NULL); void VisAreaChanged(const SdrPageWindow& rWindow); - BOOL IsPrintPreview() const { return bPrintPreview; } + sal_Bool IsPrintPreview() const { return bPrintPreview; } void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; } const svtools::ColorConfig& getColorConfig() const; diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index 7e5b68174c..70b4ee612b 100644 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -52,8 +52,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit friend class SdrEditView; protected: - BOOL bSetMarkedPointsSmoothPossible : 1; - BOOL bSetMarkedSegmentsKindPossible : 1; + sal_Bool bSetMarkedPointsSmoothPossible : 1; + sal_Bool bSetMarkedSegmentsKindPossible : 1; SdrPathSmoothKind eMarkedPointsSmooth; SdrPathSegmentKind eMarkedSegmentsKind; @@ -75,18 +75,18 @@ protected: virtual ~SdrPolyEditView(); public: - BOOL IsSetMarkedPointsSmoothPossible() const; + sal_Bool IsSetMarkedPointsSmoothPossible() const; SdrPathSmoothKind GetMarkedPointsSmooth() const; void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein. - BOOL IsSetMarkedSegmentsKindPossible() const; + sal_Bool IsSetMarkedSegmentsKindPossible() const; SdrPathSegmentKind GetMarkedSegmentsKind() const; void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); // Moeglicherweise ist das Obj hinterher geloescht: void DeleteMarkedPoints(); - BOOL IsDeleteMarkedPointsPossible() const; + sal_Bool IsDeleteMarkedPointsPossible() const; void MoveMarkedPoints(const Size& rSiz, bool bCopy=false); void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); @@ -99,7 +99,7 @@ public: // Alle markierten Polylines werden zu Polygonen, alle offenen // Bezierkurven zu geschlossenen. void ShutMarkedObjects(); - void CloseMarkedObjects(BOOL bToggle=FALSE, BOOL bOpen=FALSE); // , long nOpenDistance=0); + void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0); bool IsOpenCloseMarkedObjectsPossible() const; SdrObjClosedKind GetMarkedObjectsClosedState() const; diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx index 25803c0c55..c98718cb4f 100644 --- a/svx/inc/svx/svdsnpv.hxx +++ b/svx/inc/svx/svdsnpv.hxx @@ -78,7 +78,7 @@ protected: Fraction aSnapWdtX; Fraction aSnapWdtY; - USHORT nMagnSizPix; + sal_uInt16 nMagnSizPix; long nSnapAngle; long nEliminatePolyPointLimitAngle; @@ -103,7 +103,7 @@ protected: unsigned bMoveOnlyDragging : 1; // Objekte nur verschieben bei Resize/Rotate/... unsigned bSlantButShear : 1; // Slant anstelle von Shear anwenden unsigned bCrookNoContortion : 1; // Objekte bei Crook nicht verzerren - unsigned bHlplFixed : 1; // TRUE=Hilfslinien fixiert, also nicht verschiebbar + unsigned bHlplFixed : 1; // sal_True=Hilfslinien fixiert, also nicht verschiebbar unsigned bEliminatePolyPoints : 1; private: @@ -115,7 +115,7 @@ protected: virtual ~SdrSnapView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -128,8 +128,8 @@ public: void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } } const Size& GetSnapMagnetic() const { return aMagnSiz; } - void SetSnapMagneticPixel(USHORT nPix) { nMagnSizPix=nPix; } - USHORT GetSnapMagneticPixel() const { return nMagnSizPix; } + void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; } + sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; } // RecalcLogicSnapMagnetic muss bei jedem Wechsel des OutputDevices // sowie bei jedem Wechsel des MapModes gerufen werden! @@ -139,48 +139,48 @@ public: // Auf die View bezogene Koordinaten! // Rueckgabewerte sind SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED, // SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED - USHORT SnapPos(Point& rPnt, const SdrPageView* pPV) const; + sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const; Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const; - USHORT SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const; + sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const; void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; // Alle Fangeinstellungen sind Persistent. - BOOL IsSnapEnabled() const { return bSnapEnab; } - BOOL IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter - BOOL IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender - BOOL IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien - BOOL IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten - BOOL IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten - BOOL IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte - void SetSnapEnabled(BOOL bOn) { bSnapEnab=bOn; } - void SetGridSnap(BOOL bOn) { bGridSnap=bOn; } - void SetBordSnap(BOOL bOn) { bBordSnap=bOn; } - void SetHlplSnap(BOOL bOn) { bHlplSnap=bOn; } - void SetOFrmSnap(BOOL bOn) { bOFrmSnap=bOn; } - void SetOPntSnap(BOOL bOn) { bOPntSnap=bOn; } - void SetOConSnap(BOOL bOn) { bOConSnap=bOn; } + sal_Bool IsSnapEnabled() const { return bSnapEnab; } + sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter + sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender + sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien + sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten + sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten + sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte + void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; } + void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; } + void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; } + void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; } + void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; } + void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; } + void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; } // Normalerweise werden beim Move-Dragging von Zeichenobjekten alle // 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit, // wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor): // Persistent, Default=FALSE. - void SetMoveSnapOnlyTopLeft(BOOL bOn) { bMoveSnapOnlyTopLeft=bOn; } - BOOL IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } + void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; } + sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } // Hilfslinien fixiert (nicht verschiebbar) // Persistent, Default=FALSE. - BOOL IsHlplFixed() const { return bHlplFixed; } - void SetHlplFixed(BOOL bOn) { bHlplFixed=bOn; } + sal_Bool IsHlplFixed() const { return bHlplFixed; } + void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; } - BOOL IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte - BOOL IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte - BOOL IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte - BOOL IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte + sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte + sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte + sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte + sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte - void SetMoveMFrmSnap(BOOL bOn) { bMoveMFrmSnap=bOn; } - void SetMoveOFrmSnap(BOOL bOn) { bMoveOFrmSnap=bOn; } - void SetMoveOPntSnap(BOOL bOn) { bMoveOPntSnap=bOn; } - void SetMoveOConSnap(BOOL bOn) { bMoveOConSnap=bOn; } + void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; } + void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; } + void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; } + void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; } // #114409#-1 Migrate PageOrigin sal_Bool BegSetPageOrg(const Point& rPnt); @@ -189,12 +189,12 @@ public: void BrkSetPageOrg(); sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); } - // HitTest. Bei TRUE steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV + // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV // die zugehoerige PageView. - sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const; + sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const; // Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden. - sal_Bool BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV); + sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); // Interaktives einfuegen einer neuen Hilfslinie sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); Pointer GetDraggedHelpLinePointer() const; @@ -208,7 +208,7 @@ public: // SnapAngle ist fuer Winkel im Kreis, RotateDragging, ... // Der Winkelfang wird unterdrueckt, wenn er mit - // durch SetAngleSnapEnabled(FALSE) ausgeschaltet ist. + // durch SetAngleSnapEnabled(sal_False) ausgeschaltet ist. // Der Winkelfang ist unabhaengig vom Koordinatenfang // und somit von der Einstellung IsSnapEnabled() // Es sollten nur Werte angegeben werden fuer die gilt: @@ -218,8 +218,8 @@ public: // - Shear (Dragging) // - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging) // Persistent. - void SetAngleSnapEnabled(BOOL bOn) { bAngleSnapEnab=bOn; } - BOOL IsAngleSnapEnabled() const { return bAngleSnapEnab; } + void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; } + sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; } void SetSnapAngle(long nWink) { nSnapAngle=nWink; } long GetSnapAngle() const { return nSnapAngle; } @@ -243,8 +243,8 @@ public: // - Linie behaelt beim Draggen ihren Winkel bei und wird nur (ni) // verlaengert bzw. verkuerzt. // Defaultmaessig ist Ortho ausgeschaltet. Persistent. - void SetOrtho(BOOL bOn) { bOrtho=bOn; } // unvollstaendig - BOOL IsOrtho() const { return bOrtho; } + void SetOrtho(sal_Bool bOn) { bOrtho=bOn; } // unvollstaendig + sal_Bool IsOrtho() const { return bOrtho; } // BigOrtho hat nur Relevanz wenn Ortho eingeschaltet ist. // Beispiel: Ein Rechteck wird mit eingeschaltetem Ortho (also ein Quadrat) @@ -256,23 +256,23 @@ public: // tetem BigOrtho bekaeme man dagegen ein Quadrat der Kantenlaenge 80. // Gleiches gilt auch fuer Resize. // Defaultmaessig ist BigOrtho eingeschaltet. Persistent. - void SetBigOrtho(BOOL bOn) { bBigOrtho=bOn; } - BOOL IsBigOrtho() const { return bBigOrtho; } + void SetBigOrtho(sal_Bool bOn) { bBigOrtho=bOn; } + sal_Bool IsBigOrtho() const { return bBigOrtho; } - // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook + // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook // nur das Zentrum der markierten Objekte transformiert. Groesse, Form // und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen // aendern sich. Persistent. Default=FALSE. (ni) - void SetMoveOnlyDragging(BOOL bOn) { bMoveOnlyDragging=bOn; } - BOOL IsMoveOnlyDragging() const { return bMoveOnlyDragging; } + void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; } + sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; } // Slant anstelle von Shear anwenden. Persistent. Default=FALSE. - void SetSlantButShear(BOOL bOn) { bSlantButShear=bOn; } - BOOL IsSlantButShear() const { return bSlantButShear; } + void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; } + sal_Bool IsSlantButShear() const { return bSlantButShear; } // Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni) - void SetCrookNoContortion(BOOL bOn) { bCrookNoContortion=bOn; } - BOOL IsCrookNoContortion() const { return bCrookNoContortion; } + void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; } + sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; } // Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni) void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; } @@ -281,8 +281,8 @@ public: // Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser // geloescht, wenn seine beiden angrenzenden Linien eh' fast eine // durchgehende Linie sind. - void SetEliminatePolyPoints(BOOL bOn) { bEliminatePolyPoints=bOn; } - BOOL IsEliminatePolyPoints() const { return bEliminatePolyPoints; } + void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; } + sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; } void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; } long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx index 9fac9b3082..a0a0b35c47 100644 --- a/svx/inc/svx/svdtext.hxx +++ b/svx/inc/svx/svdtext.hxx @@ -54,7 +54,7 @@ public: virtual ~SdrText(); virtual void SetModel(SdrModel* pNewModel); - virtual void ForceOutlinerParaObject( USHORT nOutlMode ); + virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode ); virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ); virtual OutlinerParaObject* GetOutlinerParaObject() const; diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index c6c2271917..6758bdeabd 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -68,7 +68,7 @@ inline void MovePoly(PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(), void MoveXPoly(XPolygon& rPoly, const Size& S); void MoveXPoly(XPolyPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=FALSE); +SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact, FASTBOOL bNoJustify=sal_False); inline void ResizePoint(Point& rPnt, const Point& rRef, Fraction xFact, Fraction yFact); void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); @@ -90,11 +90,11 @@ void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2); -inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); -void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=FALSE); +inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); +SVX_DLLPUBLIC void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); +void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); +void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); +void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear=sal_False); // rPnt.X bzw rPnt.Y wird auf rCenter.X bzw. rCenter.Y gesetzt! // anschliessend muss rPnt nur noch um rCenter gedreht werden. @@ -180,7 +180,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad SVX_DLLPUBLIC long GetAngle(const Point& rPnt); long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99 SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf 0.00..359.99 -USHORT GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen +sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen // Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2 // Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert. long GetLen(const Point& rPnt); @@ -305,14 +305,14 @@ private: SVX_DLLPRIVATE void Undirty(); SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); } public: - SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } - SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } - void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=FALSE; bDirty=TRUE; } - void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=TRUE; bDirty=TRUE; } - void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } + SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } + SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } + void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; } + void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=sal_True; bDirty=sal_True; } + void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } void TakeStr(long nVal, XubString& rStr) const; static void TakeUnitStr(MapUnit eUnit, XubString& rStr); static void TakeUnitStr(FieldUnit eUnit, XubString& rStr); diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx index 5f7842ca64..1d5687662b 100644 --- a/svx/inc/svx/svdtypes.hxx +++ b/svx/inc/svx/svdtypes.hxx @@ -40,10 +40,10 @@ // @@@@ @@@@@ @@ @@ @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -const UINT32 SdrInventor=UINT32('S')*0x00000001+ - UINT32('V')*0x00000100+ - UINT32('D')*0x00010000+ - UINT32('r')*0x01000000; +const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+ + sal_uInt32('V')*0x00000100+ + sal_uInt32('D')*0x00010000+ + sal_uInt32('r')*0x01000000; // Kommandos fuer EndCreate() enum SdrCreateCmd {SDRCREATE_NEXTPOINT, // Naechster Polygonpunkt, Kreissegment: Naechste Koordinate @@ -90,10 +90,10 @@ enum SdrConvertType {SDRCONVERT_POLY, // reines Polygon erzeugen // dann diesen Wert: #define SDRLAYER_NOTFOUND 0xFF // Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet -// zuwerfen, bekommt dann jedoch immer FALSE, bzw. tut die Methode nix. +// zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix. //////////////////////////////////////////////////////////////////////////////////////////////////// // Typdeklaration fuer Layer-IDs -typedef BYTE SdrLayerID; +typedef sal_uInt8 SdrLayerID; //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5017f1e127..5691e4beeb 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -74,7 +74,7 @@ protected: public: TYPEINFO(); - virtual BOOL CanRepeat(SfxRepeatTarget& rView) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const; virtual void Repeat(SfxRepeatTarget& rView); virtual String GetRepeatComment(SfxRepeatTarget& rView) const; @@ -111,8 +111,8 @@ public: virtual ~SdrUndoGroup(); void Clear(); - ULONG GetActionCount() const { return aBuf.Count(); } - SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } + sal_uIntPtr GetActionCount() const { return aBuf.Count(); } + SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } void AddAction(SdrUndoAction* pAct); void push_front( SdrUndoAction* pAct ); @@ -145,9 +145,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat=FALSE) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat = FALSE ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -186,7 +186,7 @@ protected: SdrUndoGroup* pUndoGroup; public: - SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=FALSE, FASTBOOL bSaveText=FALSE); + SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False); virtual ~SdrUndoAttrObj(); void SetRepeatAttr(const SfxItemSet& rSet); virtual void Undo(); @@ -270,7 +270,7 @@ protected: SdrObjList* pObjList; SdrView* pView; // um bei ObjDel, Undo die SdrPageView* pPageView; // Selektion widerherstellen zu koennen - UINT32 nOrdNum; + sal_uInt32 nOrdNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE @@ -295,7 +295,7 @@ protected: class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: - SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -314,7 +314,7 @@ public: class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: - SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -332,8 +332,8 @@ public: class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: - SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) - : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); } + SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) + : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); virtual void Redo(); @@ -356,7 +356,7 @@ public: class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: - SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -382,7 +382,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj protected: SdrObjList* pObjList; - UINT32 nOrdNum; + sal_uInt32 nOrdNum; SdrObject* pNewObj; public: @@ -410,7 +410,7 @@ public: class SdrUndoCopyObj : public SdrUndoNewObj { public: - SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE) + SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} virtual String GetComment() const; @@ -423,11 +423,11 @@ public: class SdrUndoObjOrdNum : public SdrUndoObj { protected: - UINT32 nOldOrdNum; - UINT32 nNewOrdNum; + sal_uInt32 nOldOrdNum; + sal_uInt32 nNewOrdNum; public: - SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1); + SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); virtual void Undo(); virtual void Redo(); @@ -461,7 +461,7 @@ protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; FASTBOOL bNewTextAvailable; - BOOL bEmptyPresObj; + sal_Bool bEmptyPresObj; sal_Int32 mnText; public: @@ -534,11 +534,11 @@ class SdrUndoLayer : public SdrUndoAction protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; - USHORT nNum; + sal_uInt16 nNum; FASTBOOL bItsMine; protected: - SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); + SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); virtual ~SdrUndoLayer(); }; @@ -552,7 +552,7 @@ protected: class SdrUndoNewLayer : public SdrUndoLayer { public: - SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {} virtual void Undo(); @@ -571,8 +571,8 @@ public: class SdrUndoDelLayer : public SdrUndoLayer { public: - SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) - : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; } + SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; } virtual void Undo(); virtual void Redo(); @@ -589,10 +589,10 @@ public: class SdrUndoMoveLayer : public SdrUndoLayer { - USHORT nNeuPos; + sal_uInt16 nNeuPos; public: - SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1) + SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} virtual void Undo(); @@ -626,14 +626,14 @@ protected: SdrPage& mrPage; protected: - void ImpInsertPage(USHORT nNum); - void ImpRemovePage(USHORT nNum); - void ImpMovePage(USHORT nOldNum, USHORT nNewNum); + void ImpInsertPage(sal_uInt16 nNum); + void ImpRemovePage(sal_uInt16 nNum); + void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum); protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, FASTBOOL bRepeat=FALSE) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const; }; //************************************************************ @@ -647,7 +647,7 @@ protected: class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage { protected: - USHORT nPageNum; + sal_uInt16 nPageNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE @@ -736,11 +736,11 @@ public: class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage { protected: - USHORT nOldPageNum; - USHORT nNewPageNum; + sal_uInt16 nOldPageNum; + sal_uInt16 nNewPageNum; public: - SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1) + SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) : SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {} virtual void Undo(); diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index 60c557f8b0..4f2cddcdb7 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -122,11 +122,11 @@ struct SVX_DLLPUBLIC SdrViewEvent SdrHdlKind eHdlKind; SdrCreateCmd eEndCreateCmd; // auch fuer EndInsPoint - UINT16 nMouseClicks; - UINT16 nMouseMode; - UINT16 nMouseCode; - UINT16 nHlplIdx; - UINT16 nGlueId; + sal_uInt16 nMouseClicks; + sal_uInt16 nMouseMode; + sal_uInt16 nMouseCode; + sal_uInt16 nHlplIdx; + sal_uInt16 nGlueId; unsigned bMouseDown : 1; unsigned bMouseUp : 1; @@ -148,7 +148,7 @@ public: ~SdrViewEvent(); // nEventKind ist SDRMOUSEBUTTONDOWN, SDRMOUSEMOVE oder SDRMOUSEBUTTONUP - void SetMouseEvent(const MouseEvent& rMEvt, USHORT nEventKind); + void SetMouseEvent(const MouseEvent& rMEvt, sal_uInt16 nEventKind); }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -210,44 +210,44 @@ public: // pSdrView->DoMouseEvent(aVEvt); // SetPointer(GetPreferedPointer(...)) // CaptureMouse(...) - void EnableExtendedMouseEventDispatcher(BOOL bOn) { bNoExtendedMouseDispatcher = !bOn; } - BOOL IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } + void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; } + sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } - void EnableExtendedKeyInputDispatcher(BOOL bOn) { bNoExtendedKeyDispatcher=!bOn; } - BOOL IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } + void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; } + sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } - void EnableExtendedCommandEventDispatcher(BOOL bOn) { bNoExtendedCommandDispatcher=!bOn; } - BOOL IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } + void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; } + sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } - void EnableTextEditOnObjectsWithoutTextIfTextTool(BOOL bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } - BOOL IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } + void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } + sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } void SetMasterPagePaintCaching(sal_Bool bOn); sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; SfxStyleSheet* GetStyleSheet() const; // unvollstaendige Implementation: // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann. // Bei NULL wird das 1. angemeldete Win verwendet. - Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier=0, BOOL bLeftDown=FALSE) const; - SdrHitKind PickAnything(const MouseEvent& rMEvt, USHORT nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; + Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const; + SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const; - BOOL DoMouseEvent(const SdrViewEvent& rVEvt); + sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt); virtual SdrViewContext GetContext() const; // Die Methoden beruecksichtigen den jeweiligen Kontex: @@ -256,27 +256,27 @@ public: // - Klebepunkt-Editmode // - TextEdit // - ... to be continued - BOOL IsMarkPossible() const; + sal_Bool IsMarkPossible() const; void MarkAll(); void UnmarkAll(); - BOOL IsAllMarked() const; - BOOL IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit! - BOOL MarkNext(BOOL bPrev=FALSE); - BOOL MarkNext(const Point& rPnt, BOOL bPrev=FALSE); + sal_Bool IsAllMarked() const; + sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit! + sal_Bool MarkNext(sal_Bool bPrev=sal_False); + sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False); const Rectangle& GetMarkedRect() const; void SetMarkedRect(const Rectangle& rRect); virtual void DeleteMarked(); - BOOL IsDeleteMarkedPossible() const; - BOOL IsDeletePossible() const { return IsDeleteMarkedPossible(); } + sal_Bool IsDeleteMarkedPossible() const; + sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); } // Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View- // Kontext) durch Aufziehen eines Selektionsrahmens. // bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift) // bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb // des aufgezogenen Rahmens liegen werden deselektiert. - BOOL BegMark(const Point& rPnt, BOOL bAddMark=FALSE, BOOL bUnmark=FALSE); + sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False); // Folgende Actions sind moeglich: // - ObjectCreating @@ -311,28 +311,28 @@ public: // ~~~~~~~~~~~~~~~~~~~~ // Einfache Events: // ~~~~~~~~~~~~~~~~ -// BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); -// BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); -// BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); -// BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); -// BOOL Command(const CommandEvent& rCEvt, Window* pWin); +// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); +// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); // // Exchange (Clipboard derzeit noch ohne SdrPrivateData): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// BOOL Cut(ULONG nFormat=SDR_ANYFORMAT); -// BOOL Yank(ULONG nFormat=SDR_ANYFORMAT); -// BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT); +// sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // // SfxItems: // ~~~~~~~~~ -// BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; -// BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); +// sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; +// sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); // SfxStyleSheet* GetStyleSheet() const; -// BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); +// sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // // Sonstiges: // ~~~~~~~~~~ -// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nTol=0) const; +// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // String GetStatusText(); // ///////////////////////////////////////////////////////////////////////////////////////////////// */ diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index f93d72e68c..7bba8c0e72 100644 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -56,12 +56,12 @@ class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView protected: void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst); - void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions); - BOOL ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; + void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions); + sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; Point GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL); // liefert True, wenn rPt geaendert wurde - BOOL ImpLimitToWorkArea(Point& rPt) const; + sal_Bool ImpLimitToWorkArea(Point& rPt) const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -75,11 +75,11 @@ public: // Alle markierten Objekte in ein Metafile stecken. Z.Zt. noch etwas // buggee (Offset..., Fremdgrafikobjekte (SdrGrafObj), Virtuelle // Objektkopien (SdrVirtObj) mit Ankerpos<>(0,0)). - virtual GDIMetaFile GetMarkedObjMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const; + virtual GDIMetaFile GetMarkedObjMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const; // Alle markierten Objekte auf eine Bitmap malen. Diese hat die Farbtiefe // und Aufloesung des Bildschirms. - virtual Bitmap GetMarkedObjBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const; + virtual Bitmap GetMarkedObjBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const; // Alle markierten Objekte in ein neues Model kopieren. Dieses neue Model // hat dann genau eine Page. Das Flag PageNotValid an diesem Model ist @@ -93,8 +93,8 @@ public: // der Default-Layer zugewiesen (Layer 0, (dokumentglobaler Standardlayer). virtual SdrModel* GetMarkedObjModel() const; - GDIMetaFile GetAllMarkedMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); } - Bitmap GetAllMarkedBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); } + GDIMetaFile GetAllMarkedMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); } + Bitmap GetAllMarkedBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); } Graphic GetAllMarkedGraphic() const; SdrModel* GetAllMarkedModel() const { return GetMarkedObjModel(); } @@ -117,7 +117,7 @@ public: Point GetViewCenter(const OutputDevice* pOut=NULL) const; // Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert. - // Wird der Parameter bAddMark auf TRUE gesetzt, so werden die neuen + // Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen // DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert". // Dieser Fall ist fuer Drag&Drop mit mehreren Items gedacht. // Die Methoden mit Point-Parameter fuegen neue Objekte zentriert an @@ -126,37 +126,37 @@ public: // eingefuegt. Die Positionierung (rPos bzw. Zentrierung) bezieht sich // dann nichtmehr auf die View sondern auf die Page. // Hinweis: SdrObjList ist Basisklasse von SdrPage. - // Die Methoden liefern TRUE, wenn die Objekte erfolgreich erzeugt und - // eingefuegt wurden. Bei pLst=FALSE und kein TextEdit aktiv kann man + // Die Methoden liefern sal_True, wenn die Objekte erfolgreich erzeugt und + // eingefuegt wurden. Bei pLst=sal_False und kein TextEdit aktiv kann man // sich dann auch darauf verlassen, dass diese an der View markiert sind. // Andernfalls erfolgt die Markierung nur, wenn pLst z.Zt. auch an der // View angezeigt wird. // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und // SDRINSERT_ADDMARK (siehe svdedtv.hxx). - BOOL Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); } - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + sal_Bool Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); } + virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); // Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's // Clipboard angenommen werden kann. - BOOL IsExchangeFormatSupported(ULONG nFormat) const; + sal_Bool IsExchangeFormatSupported(sal_uIntPtr nFormat) const; - BOOL Cut( ULONG nFormat = SDR_ANYFORMAT ); - void CutMarked( ULONG nFormat=SDR_ANYFORMAT ); + sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + void CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT ); - BOOL Yank( ULONG nFormat = SDR_ANYFORMAT ); - void YankMarked( ULONG nFormat=SDR_ANYFORMAT ); + sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + void YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT ); - BOOL Paste( Window* pWin = NULL, ULONG nFormat = SDR_ANYFORMAT ); - BOOL PasteClipboard( OutputDevice* pOut = NULL, ULONG nFormat = SDR_ANYFORMAT, UINT32 nOptions = 0 ); + sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); }; #endif //_SVDXCGV_HXX diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 7f4b4710f8..5c9b7666f3 100644 --- a/svx/inc/svx/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx @@ -56,14 +56,14 @@ enum SimDepthType struct SimColor { - BYTE cBlue; - BYTE cGreen; - BYTE cRed; + sal_uInt8 cBlue; + sal_uInt8 cGreen; + sal_uInt8 cRed; }; // ------------------------------------------------------------------------ -inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 ) +inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 ) { return ( ( rCol1.cRed == rCol2.cRed ) && ( rCol1.cGreen == rCol2.cGreen ) && @@ -76,7 +76,7 @@ inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 ) struct SimPalette { - ULONG nColors; + sal_uIntPtr nColors; SimColor aColorArray[ 256 ]; }; @@ -102,39 +102,39 @@ private: SimPalette* pPal2; SimPalette* pPal3; SimPalette* pPal4; - ULONG nWidth1; - ULONG nWidth2; - ULONG nWidth3; - ULONG nWidth4; - ULONG nHeight1; - ULONG nHeight2; - ULONG nHeight3; - ULONG nHeight4; - ULONG nAlignedWidth1; - ULONG nAlignedWidth2; - ULONG nAlignedWidth3; - ULONG nAlignedWidth4; - ULONG nWhichOrg; + sal_uIntPtr nWidth1; + sal_uIntPtr nWidth2; + sal_uIntPtr nWidth3; + sal_uIntPtr nWidth4; + sal_uIntPtr nHeight1; + sal_uIntPtr nHeight2; + sal_uIntPtr nHeight3; + sal_uIntPtr nHeight4; + sal_uIntPtr nAlignedWidth1; + sal_uIntPtr nAlignedWidth2; + sal_uIntPtr nAlignedWidth3; + sal_uIntPtr nAlignedWidth4; + sal_uIntPtr nWhichOrg; SimDepthType eOrgDepth; SimDepthType eUndoDepth; SimDepthType eRedoDepth; - BOOL bIsUndo; - BOOL bIsRedo; - BOOL bCreateUndo; - BOOL bValid; - BOOL bDitherAll; - - HPBYTE BitmapToArray24( const Bitmap& rBitmap, ULONG* pWidth, - ULONG* pHeight, ULONG* pAlignedWidth, + sal_Bool bIsUndo; + sal_Bool bIsRedo; + sal_Bool bCreateUndo; + sal_Bool bValid; + sal_Bool bDitherAll; + + HPBYTE BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth, + sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth, SfxViewFrame *pFrame = NULL ); - BOOL Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap, - const ULONG nWidth, const ULONG nHeight, - const ULONG nColorCount = 256, - ULONG nLast = 0, SfxProgress* pProgress = NULL ); + sal_Bool Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap, + const sal_uIntPtr nWidth, const sal_uIntPtr nHeight, + const sal_uIntPtr nColorCount = 256, + sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); Bitmap CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL ); - HPBYTE CreateArray24( ULONG nWidth, ULONG nHeight ); + HPBYTE CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight ); void DeleteArray( HPBYTE pArray ); SvImageBase(const SvImageBase& rSvImageBase); @@ -144,23 +144,23 @@ public: SvImageBase(); SvImageBase( const Bitmap& rBitmap, - const ULONG nColorCount = 256, - ULONG nLast = 0, SfxProgress* pProgress = NULL ); + const sal_uIntPtr nColorCount = 256, + sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); ~SvImageBase(); - BOOL IsValid() { return bValid; } + sal_Bool IsValid() { return bValid; } - ULONG GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; } - ULONG GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; } + sal_uIntPtr GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; } + sal_uIntPtr GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; } - ULONG GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; } - ULONG GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; } + sal_uIntPtr GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; } + sal_uIntPtr GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; } - ULONG GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; } - ULONG GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; } + sal_uIntPtr GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; } + sal_uIntPtr GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; } - ULONG GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } - ULONG GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } + sal_uIntPtr GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } + sal_uIntPtr GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } // Farbtiefe des Ausgangsbildes ermitteln und setzen SimDepthType GetDepth() const { return eOrgDepth; } @@ -174,10 +174,10 @@ public: void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; } // Vor- und Ruecklauf der Bildverarbeitung - BOOL BeginProcessing( BOOL bUndo = TRUE ); + sal_Bool BeginProcessing( sal_Bool bUndo = sal_True ); void EndProcessing(); - BOOL BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE); + sal_Bool BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True); void EndProcessingExt() { EndProcessing(); } // Zeiger auf Arrays zur Verfuegung stellen @@ -185,12 +185,12 @@ public: HPBYTE GetDestPointer() { return pDestArray; } // DIB-Erzeugung fuer Anzeige - BOOL CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0, + sal_Bool CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); // Undo-Verwaltung - BOOL DoUndo( SfxProgress* pProgress = NULL ); - BOOL DoRedo( SfxProgress* pProgress = NULL ); + sal_Bool DoUndo( SfxProgress* pProgress = NULL ); + sal_Bool DoRedo( SfxProgress* pProgress = NULL ); // DIB-Rueckgabe fuer Anzeige const Bitmap& GetOutBitmap() const; @@ -207,6 +207,6 @@ public: // - DitherBitmap - // ---------------- -BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE ); +sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False ); #endif // _SVIMBASE_HXX diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index 81bb8a93b3..020599b3bf 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -70,14 +70,14 @@ public: class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem { public: - Svx3DDoubleSidedItem(BOOL bVal = 0); + Svx3DDoubleSidedItem(sal_Bool bVal = 0); }; // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: - Svx3DReducedLineGeometryItem(BOOL bVal = 0); + Svx3DReducedLineGeometryItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -87,14 +87,14 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DNormalsInvertItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DNormalsInvertItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item { @@ -102,8 +102,8 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -112,14 +112,14 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DShadow3DItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DShadow3DItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0); }; class Svx3DMaterialColorItem : public SvxColorItem { @@ -147,8 +147,8 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -157,14 +157,14 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DTextureFilterItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DTextureFilterItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0); }; // Svx3D _3DSCENE_ Items @@ -173,8 +173,8 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -190,7 +190,7 @@ public: class Svx3DTwoSidedLightingItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem { @@ -240,42 +240,42 @@ public: class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem { public: - Svx3DLightOnOff1Item(BOOL bVal = 1); + Svx3DLightOnOff1Item(sal_Bool bVal = 1); }; class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem { public: - Svx3DLightOnOff2Item(BOOL bVal = 0); + Svx3DLightOnOff2Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem { public: - Svx3DLightOnOff3Item(BOOL bVal = 0); + Svx3DLightOnOff3Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem { public: - Svx3DLightOnOff4Item(BOOL bVal = 0); + Svx3DLightOnOff4Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem { public: - Svx3DLightOnOff5Item(BOOL bVal = 0); + Svx3DLightOnOff5Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem { public: - Svx3DLightOnOff6Item(BOOL bVal = 0); + Svx3DLightOnOff6Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem { public: - Svx3DLightOnOff7Item(BOOL bVal = 0); + Svx3DLightOnOff7Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem { public: - Svx3DLightOnOff8Item(BOOL bVal = 0); + Svx3DLightOnOff8Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem { @@ -328,8 +328,8 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -337,7 +337,7 @@ public: // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed class Svx3DSmoothNormalsItem : public SfxBoolItem { public: - Svx3DSmoothNormalsItem(BOOL bVal = 1); + Svx3DSmoothNormalsItem(sal_Bool bVal = 1); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -345,7 +345,7 @@ public: // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem : public SfxBoolItem { public: - Svx3DSmoothLidsItem(BOOL bVal = 0); + Svx3DSmoothLidsItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -353,7 +353,7 @@ public: // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem : public SfxBoolItem { public: - Svx3DCharacterModeItem(BOOL bVal = 0); + Svx3DCharacterModeItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -361,7 +361,7 @@ public: // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: - Svx3DCloseFrontItem(BOOL bVal = 1); + Svx3DCloseFrontItem(sal_Bool bVal = 1); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -369,7 +369,7 @@ public: // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: - Svx3DCloseBackItem(BOOL bVal = 1); + Svx3DCloseBackItem(sal_Bool bVal = 1); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index a041bdbbe2..20e997ceb5 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -50,7 +50,7 @@ namespace linguistic2{ }}}} class SvxSpellWrapper; //add for SvxSpellCheckDialog typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); -typedef USHORT* (*DialogGetRanges)(); +typedef sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; class INetURLObject; @@ -84,8 +84,8 @@ class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDi class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog { public: - virtual void SetLimits( USHORT nMin, USHORT nMax ) = 0; - virtual void HideButton( USHORT nBtnId )= 0; + virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0; + virtual void HideButton( sal_uInt16 nBtnId )= 0; virtual const SfxItemSet* GetOutputItemSet() const = 0 ; }; @@ -125,7 +125,7 @@ public: class AbstractGalleryIdDialog :public VclAbstractDialog //add for GalleryIdDialog { public: - virtual ULONG GetId() const =0; + virtual sal_uIntPtr GetId() const =0; }; class AbstractURLDlg :public VclAbstractDialog //add for URLDlg @@ -141,17 +141,17 @@ public: class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog //add for SvxHlinkDlgMarkWnd { public: - virtual BOOL MoveTo ( Point aNewPos )const = 0; - virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const = 0; + virtual sal_Bool MoveTo ( Point aNewPos )const = 0; + virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const = 0; virtual void RefreshTree ( String aStrURL ) = 0; virtual void SelectEntry ( String aStrMark ) = 0; - virtual USHORT SetError( USHORT nError) = 0; + virtual sal_uInt16 SetError( sal_uInt16 nError) = 0; // in class Window virtual void SetSizePixel( const Size& rNewSize ) = 0; virtual Size GetSizePixel() const = 0; - virtual void Hide( USHORT nFlags = 0 ) = 0; - virtual BOOL IsVisible() const = 0; - virtual void Invalidate( USHORT nFlags = 0 ) = 0; + virtual void Hide( sal_uInt16 nFlags = 0 ) = 0; + virtual sal_Bool IsVisible() const = 0; + virtual void Invalidate( sal_uInt16 nFlags = 0 ) = 0; }; class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog //for SvxSearchFormatDialog @@ -165,16 +165,16 @@ public: class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog //add for SvxSearchSimilarityDialog { public: - virtual USHORT GetOther() =0 ; - virtual USHORT GetShorter() =0 ; - virtual USHORT GetLonger() =0 ; - virtual BOOL IsRelaxed() =0 ; + virtual sal_uInt16 GetOther() =0 ; + virtual sal_uInt16 GetShorter() =0 ; + virtual sal_uInt16 GetLonger() =0 ; + virtual sal_Bool IsRelaxed() =0 ; }; class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog //add for SvxJSearchOptionsDialog { public: - virtual INT32 GetTransliterationFlags() const = 0; + virtual sal_Int32 GetTransliterationFlags() const = 0; }; class AbstractFmInputRecordNoDialog :public VclAbstractDialog //add for FmInputRecordNoDialog @@ -223,7 +223,7 @@ public: class AbstractSvxMessDialog :public VclAbstractDialog //add for SvxMessDialog { public: - virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ) = 0; + virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0; }; class AbstractSvxMultiPathDialog :public VclAbstractDialog //add for SvxMultiPathDialog @@ -292,14 +292,14 @@ public: virtual const SfxItemSet* GetOutputItemSet() const = 0; virtual void SetPrevHdl( const Link& rLink ) = 0; virtual void SetNextHdl( const Link& rLink ) = 0; - virtual void EnableTravel(BOOL bNext, BOOL bPrev) = 0; + virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) = 0; virtual String GetNote() = 0; virtual void SetNote(const String& rTxt) = 0; virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) = 0; virtual void DontChangeAuthor() = 0; virtual void HideAuthor() = 0; - virtual void SetReadonlyPostIt(BOOL bDisable) = 0; - virtual BOOL IsOkEnabled() const = 0; + virtual void SetReadonlyPostIt(sal_Bool bDisable) = 0; + virtual sal_Bool IsOkEnabled() const = 0; virtual Window * GetWindow() = 0; }; @@ -346,7 +346,7 @@ public: virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 + sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, @@ -385,19 +385,19 @@ public: sal_uInt32 nResId) = 0; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog SearchAttrItemList& rLst, - const USHORT* pWhRanges)=0; + const sal_uInt16* pWhRanges)=0; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog - BOOL bRelax, - USHORT nOther, - USHORT nShorter, - USHORT nLonger ) = 0; + sal_Bool bRelax, + sal_uInt16 nOther, + sal_uInt16 nShorter, + sal_uInt16 nLonger ) = 0; virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg const SfxItemSet& rCoreSet, - BOOL bEnableSelector = FALSE) = 0; + sal_Bool bEnableSelector = sal_False) = 0; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog const SfxItemSet* pAttr, const SdrView* pView, - USHORT nAnchorTypes = 0) = 0; + sal_uInt16 nAnchorTypes = 0) = 0; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog const SfxItemSet* pAttr, const SdrView* pSdrView, @@ -406,7 +406,7 @@ public: )=0; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, const SfxItemSet& rOptionsSet, - INT32 nInitialFlags )=0; + sal_Int32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, @@ -426,8 +426,8 @@ public: const String& rText, const String& rDesc, Image* pImg = NULL ) = 0; //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog SfxBindings* pBindings, sal_uInt32 nResId)=0; @@ -441,14 +441,14 @@ public: RECT_POINT eLightSource, sal_uInt32 nResId )=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, - USHORT nCount, + sal_uInt16 nCount, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0; + sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0; + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, @@ -456,7 +456,7 @@ public: virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, - BOOL bHasObj = TRUE )=0; + sal_Bool bHasObj = sal_True )=0; virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog const SfxItemSet& rAttr, @@ -470,16 +470,16 @@ public: )=0; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0; + sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False )=0; virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage - virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog + virtual DialogGetRanges GetDialogGetRangesFunc( sal_uInt16 nId ) = 0; //add for SvxPostItDialog virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - BOOL bShowSlots, + sal_Bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; diff --git a/svx/inc/svx/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 120beaad6c..3eaffafd54 100644 --- a/svx/inc/svx/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx @@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem public: TYPEINFO(); SvxGraphicItem(); - SvxGraphicItem( USHORT nWhich ,const Graphic& rGraphic); + SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic); SvxGraphicItem( const SvxGraphicItem& ); diff --git a/svx/inc/svx/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index fabd1b10c5..5b568ffa55 100644 --- a/svx/inc/svx/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx @@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window short nWrap; short nAnchor; - BOOL bTrans; + sal_Bool bTrans; Point aRelPos; @@ -83,7 +83,7 @@ public: SvxSwFrameExample(Window* pParent, const ResId& rResID); ~SvxSwFrameExample(); - inline void SetWrap(USHORT nW) { nWrap = nW; } + inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } inline void SetHAlign(short nH) { nHAlign = nH; } inline void SetHoriRel(short nR) { nHRel = nR; } @@ -91,7 +91,7 @@ public: inline void SetVAlign(short nV) { nVAlign = nV; } inline void SetVertRel(short nR) { nVRel = nR; } - inline void SetTransparent(BOOL bT) { bTrans = bT; } + inline void SetTransparent(sal_Bool bT) { bTrans = bT; } inline void SetAnchor(short nA) { nAnchor = nA; } void SetRelPos(const Point& rP); diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index 28221d57ba..245ac5826d 100644 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -36,12 +36,12 @@ //------------------------------------ // class SdrCaptionFixedAngleItem -// TRUE=Winkel durch SdrCaptionAngleItem vorgegeben -// FALSE=Freier Winkel +// sal_True=Winkel durch SdrCaptionAngleItem vorgegeben +// sal_False=Freier Winkel //------------------------------------ class SdrCaptionFixedAngleItem: public SdrOnOffItem { public: - SdrCaptionFixedAngleItem(BOOL bFix=TRUE): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} + SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {} }; diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index a42215af07..a60cd47c76 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -41,26 +41,26 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: TYPEINFO(); - SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< USHORT >(eDir)) {} + SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {} SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 3; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 3; } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; //------------------------------------ // class SdrCaptionEscIsRelItem -// TRUE=Linienaustrittsposition relativ -// FALSE=Linienaustrittsposition absolut +// sal_True=Linienaustrittsposition relativ +// sal_False=Linienaustrittsposition absolut //------------------------------------ class SdrCaptionEscIsRelItem: public SdrYesNoItem { public: - SdrCaptionEscIsRelItem(BOOL bRel=TRUE): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} + SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {} }; diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index a4ff9f309a..e985ca4feb 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -38,17 +38,17 @@ enum SdrCircKind {SDRCIRC_FULL, class SdrCircKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< USHORT >(eKind)) {} + SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx index 48b943219d..9a0d3ee267 100644 --- a/svx/inc/svx/sxcllitm.hxx +++ b/svx/inc/svx/sxcllitm.hxx @@ -51,7 +51,7 @@ public: //------------------------------------ class SdrCaptionFitLineLenItem: public SdrYesNoItem { public: - SdrCaptionFitLineLenItem(BOOL bBestFit=TRUE): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} + SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {} }; diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index fbfef44d2b..8f859efacf 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -39,13 +39,13 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: TYPEINFO(); - SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< USHORT >(eStyle)) {} + SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index cb62886899..7db9fa1baa 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -43,15 +43,15 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< USHORT >(eStyle)) {} + SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx index 8140c88fb2..ab66cbef29 100644 --- a/svx/inc/svx/sxelditm.hxx +++ b/svx/inc/svx/sxelditm.hxx @@ -33,7 +33,7 @@ class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item { public: - SdrEdgeLineDeltaAnzItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {} + SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {} SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn) {} }; @@ -41,24 +41,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { public: SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { public: SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { public: SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx index edac60d579..86b5d97a71 100644 --- a/svx/inc/svx/sxenditm.hxx +++ b/svx/inc/svx/sxenditm.hxx @@ -35,32 +35,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 017a4d42cc..2305cd37ed 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -38,13 +38,13 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: TYPEINFO_VISIBILITY( SVX_DLLPUBLIC ); - SdrFractionItem(USHORT nId=0): SfxPoolItem(nId) {} - SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} - SdrFractionItem(USHORT nId, SvStream& rIn); + SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} + SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} + SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual int operator==(const SfxPoolItem&) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const; - virtual SvStream& Store(SvStream&, USHORT nItemVers) const; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index c13d950ae6..ae2ffc80f4 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -37,7 +37,7 @@ //------------------------------ class SdrLayerIdItem: public SfxUInt16Item { public: - SdrLayerIdItem(USHORT nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} + SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} SdrLayerIdItem(SvStream& rIn): SfxUInt16Item(SDRATTR_LAYERID,rIn) {} SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } }; diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 6ff09ccc57..c21dcafd85 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -38,17 +38,17 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< USHORT >(eKind)) {} + SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 2; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx index ccaec77c43..818d2f17ed 100644 --- a/svx/inc/svx/sxmtaitm.hxx +++ b/svx/inc/svx/sxmtaitm.hxx @@ -33,7 +33,7 @@ // Den Text automatisch zurechtdrehen (Automatisches UpsideDown). // TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht -// den Text bei TRUE nochmal. +// den Text bei sal_True nochmal. class SdrMeasureTextAutoAngleItem: public SdrYesNoItem { public: SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx index 90c4dc29d3..2bede046da 100644 --- a/svx/inc/svx/sxmtfitm.hxx +++ b/svx/inc/svx/sxmtfitm.hxx @@ -51,7 +51,7 @@ public: // The decimal places used for the measure value class SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: - SdrMeasureDecimalPlacesItem(INT16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} + SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {} }; diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 411efd4acb..accfc25d9e 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -40,17 +40,17 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< USHORT >(ePos)) {} + SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; @@ -60,17 +60,17 @@ public: class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< USHORT >(ePos)) {} + SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 57dc5f70c4..0ce9143b9b 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -37,17 +37,17 @@ class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {} + SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {} SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 14; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index e984f38bb2..1598211085 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -34,11 +34,11 @@ class SdrScaleItem: public SdrFractionItem { public: TYPEINFO(); - SdrScaleItem(USHORT nId=0): SdrFractionItem(nId,Fraction(1,1)) {} - SdrScaleItem(USHORT nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} - SdrScaleItem(USHORT nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} + SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} + SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} + SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; }; diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 79b31cac28..ea498a74e5 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -62,7 +62,7 @@ enum PageType // define ---------------------------------------------------------------- -typedef USHORT ChangeType; // auch in tab_line.hxx (mitpflegen !!!) +typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!) #define CT_NONE ( (ChangeType) 0x0000 ) #define CT_MODIFIED ( (ChangeType) 0x0001 ) diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index eacd2dc739..bdc385063d 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -45,7 +45,7 @@ class SvxBrushItem; // define ---------------------------------------------------------------- -typedef USHORT ChangeType; // auch in tab_area.hxx (mitpflegen !!!) +typedef sal_uInt16 ChangeType; // auch in tab_area.hxx (mitpflegen !!!) #define CT_NONE ( (ChangeType) 0x0000 ) #define CT_MODIFIED ( (ChangeType) 0x0001 ) diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index ff2301f52a..a0e4efd5a7 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -186,12 +186,12 @@ class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxStyleToolBoxControl(); virtual Window* CreateItemWindow( Window *pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); DECL_LINK( VisibilityNotification, void* ); @@ -213,11 +213,11 @@ private: SfxStyleControllerItem_Impl* pBoundItems [MAX_FAMILIES]; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES]; SfxTemplateItem* pFamilyState[MAX_FAMILIES]; - USHORT nActFamily; // Id in der ToolBox = Position - 1 - USHORT nActFilter; // FilterIdx - USHORT nAppFilter; // Filter, den die App gesetzt hat + sal_uInt16 nActFamily; // Id in der ToolBox = Position - 1 + sal_uInt16 nActFilter; // FilterIdx + sal_uInt16 nAppFilter; // Filter, den die App gesetzt hat String aCurSel; - BOOL bListening; + sal_Bool bListening; Impl* pImpl; SVX_DLLPRIVATE void Update(); @@ -226,7 +226,7 @@ private: friend class SfxStyleControllerItem_Impl; - SVX_DLLPRIVATE void SetFamilyState ( USHORT nIdx, const SfxTemplateItem* pItem ); + SVX_DLLPRIVATE void SetFamilyState ( sal_uInt16 nIdx, const SfxTemplateItem* pItem ); SVX_DLLPRIVATE SfxStyleFamily GetActFamily (); }; @@ -239,9 +239,9 @@ class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontNameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual void StateChanged ( USHORT nSID, SfxItemState eState, + virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow ( Window *pParent ); }; @@ -264,7 +264,7 @@ class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontHeightToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontHeightToolBoxControl(); // new controller API @@ -289,10 +289,10 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -316,14 +316,14 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontColorExtToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontColorExtToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); }; @@ -339,10 +339,10 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl ::svx::ToolboxButtonColorUpdater* pBtnUpdater; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -359,11 +359,11 @@ class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -379,11 +379,11 @@ class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -399,12 +399,12 @@ class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl ::svx::ToolboxButtonColorUpdater* pBtnUpdater; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameLineColorToolBoxControl( USHORT nSlotId, - USHORT nId, + SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ); ~SvxFrameLineColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -420,13 +420,13 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxReloadControllerItem( USHORT nSlotId, - USHORT nId, + SvxReloadControllerItem( sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ); ~SvxReloadControllerItem(); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -437,10 +437,10 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxSimpleUndoRedoController(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index bc674472aa..ce727a19d3 100644 --- a/svx/inc/svx/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -44,7 +44,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlAlign() {} private: rtl::OUString m_aSubTbName; diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index 4c38a3aa76..7d341f5a2b 100644 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -56,10 +56,10 @@ namespace svx class SVX_DLLPUBLIC ToolboxButtonColorUpdater { public: - ToolboxButtonColorUpdater( USHORT nSlotId, - USHORT nTbxBtnId, + ToolboxButtonColorUpdater( sal_uInt16 nSlotId, + sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, - USHORT nMode = 0 ); + sal_uInt16 nMode = 0 ); ~ToolboxButtonColorUpdater(); void Update( const Color& rColor ); @@ -68,14 +68,14 @@ namespace svx void DrawChar(VirtualDevice&, const Color&); private: - USHORT mnDrawMode; - USHORT mnBtnId; - USHORT mnSlotId; + sal_uInt16 mnDrawMode; + sal_uInt16 mnBtnId; + sal_uInt16 mnSlotId; ToolBox* mpTbx; Color maCurColor; Rectangle maUpdRect; Size maBmpSize; - BOOL mbWasHiContrastMode; + sal_Bool mbWasHiContrastMode; }; //........................................................................ diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index eee93e3d7b..596709208b 100644 --- a/svx/inc/svx/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -47,13 +47,13 @@ protected: using SfxToolBoxControl::Select; public: - SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlDraw() {} SFX_DECL_TOOLBOX_CONTROL(); - virtual void Select( BOOL bMod1 = FALSE ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; }; diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 4265b9af44..fb40dff5b0 100644 --- a/svx/inc/svx/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -40,15 +40,15 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl { public: using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); SFX_DECL_TOOLBOX_CONTROL(); - SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlCustomShapes() {} //interface XSubToolbarController: diff --git a/svx/inc/svx/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index d4aceb2c32..dc00d89577 100644 --- a/svx/inc/svx/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx @@ -49,17 +49,17 @@ protected: using SfxPopupWindow::StateChanged; public: - SvxPopupWindowTbxMgr( USHORT nId, + SvxPopupWindowTbxMgr( sal_uInt16 nId, SfxToolBoxControl* pTbxCtl, ResId aRIdWin, ResId aRIdTbx ); - SvxPopupWindowTbxMgr( USHORT nId, + SvxPopupWindowTbxMgr( sal_uInt16 nId, WindowAlign eAlign, ResId aRIdWin, ResId aRIdTbx ); ~SvxPopupWindowTbxMgr(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); virtual SfxPopupWindow* Clone() const; virtual void PopupModeEnd(); @@ -67,7 +67,7 @@ public: void StartSelection(); // toolbox click or execute may chage the default selection in the tools toolbox - virtual void UserEvent( ULONG nEvent, void* pEventData ); + virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ); }; diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx index a37cf0aad7..d58223980f 100644 --- a/svx/inc/svx/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx @@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox private: const SvxTextEncodingTable* m_pEncTable; - SVX_DLLPRIVATE USHORT EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; + SVX_DLLPRIVATE sal_uInt16 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; public: SvxTextEncodingBox( Window* pParent, const ResId& rResId ); @@ -64,7 +64,7 @@ public: RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to <TRUE/> whenever the box is used in import dialogs. */ void FillFromTextEncodingTable( - sal_Bool bExcludeImportSubsets = FALSE, + sal_Bool bExcludeImportSubsets = sal_False, sal_uInt32 nExcludeInfoFlags = 0, sal_uInt32 nButIncludeInfoFlags = 0 ); @@ -85,7 +85,7 @@ public: RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to <TRUE/> whenever the box is used in import dialogs. */ void FillFromDbTextEncodingMap( - sal_Bool bExcludeImportSubsets = FALSE, + sal_Bool bExcludeImportSubsets = sal_False, sal_uInt32 nExcludeInfoFlags = 0, sal_uInt32 nButIncludeInfoFlags = 0 ); @@ -99,22 +99,22 @@ public: { return m_pEncTable; } void InsertTextEncoding( const rtl_TextEncoding nEnc, - USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 nPos = LISTBOX_APPEND ); void InsertTextEncoding( const rtl_TextEncoding nEnc, const String& rEntry, - USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 nPos = LISTBOX_APPEND ); void RemoveTextEncoding( const rtl_TextEncoding nEnc ); void SelectTextEncoding( const rtl_TextEncoding nEnc, - BOOL bSelect = TRUE ); + sal_Bool bSelect = sal_True ); rtl_TextEncoding GetSelectTextEncoding() const; const String& GetSelectTextString() const; - BOOL IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const; + sal_Bool IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const; }; #endif diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 06a1a7a284..b825b3ce49 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -43,15 +43,15 @@ class SfxItemPool; struct UHashMapEntry { ::rtl::OUString aIdentifier; - UINT32 nId; + sal_uInt32 nId; - UHashMapEntry(const sal_Char * value, sal_Int32 length, UINT32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { } + UHashMapEntry(const sal_Char * value, sal_Int32 length, sal_uInt32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { } }; DECLARE_LIST( UHashMapEntryList, UHashMapEntry* ) #define HASHARRAYSIZE 0x10 -#define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0) +#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0) class UHashMap { @@ -62,7 +62,7 @@ public: UHashMap( UHashMapEntry* pMap ); ~UHashMap() {}; - UINT32 getId( const ::rtl::OUString& rCompareString ); + sal_uInt32 getId( const ::rtl::OUString& rCompareString ); }; /*********************************************************************** @@ -103,12 +103,12 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider { SfxItemPropertyMapEntry* aMapArr[SVXMAP_END]; SvxItemPropertySet* aSetArr[SVXMAP_END]; -// void Sort(USHORT nId); +// void Sort(sal_uInt16 nId); public: SvxUnoPropertyMapProvider(); ~SvxUnoPropertyMapProvider(); - const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId); - const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool); + const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId); + const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool); }; /*********************************************************************** diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 01fcb99dec..c03450c2d5 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -193,7 +193,7 @@ public: const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; } - ::com::sun::star::uno::Any GetBitmap( BOOL bMetaFile = FALSE ) const throw (); + ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw (); static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw (); ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 2607ccd438..4492fea9ca 100644 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -83,13 +83,15 @@ public: // static sal_Bool hasLevels( const SdrObject* pObject ); // the SvxViewForwarder interface - virtual BOOL IsValid() const; + virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point&, const MapMode& ) const; virtual Point PixelToLogic( const Point&, const MapMode& ) const; void ChangeModel( SdrModel* pNewModel ); + void UpdateOutliner(); + private: SVX_DLLPRIVATE SvxTextEditSource( SvxTextEditSourceImpl* pImpl ); diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 2fa88fe614..4b7753c8d3 100644 --- a/svx/inc/svx/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx @@ -37,10 +37,10 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked public: - SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxVertCTLTextTbxCtrl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} @@ -52,7 +52,7 @@ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; /* -----------------------------12.09.2002 11:50------------------------------ @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; #endif diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx index f30c3be8b9..b03f81d50e 100644 --- a/svx/inc/svx/view3d.hxx +++ b/svx/inc/svx/view3d.hxx @@ -74,17 +74,17 @@ protected: // Migrate selections Impl3DMirrorConstructOverlay* mpMirrorOverlay; - BOOL bDoubleSided; + sal_Bool bDoubleSided; void InitView(); - void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); - void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); + void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); + void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj); void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj); void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ); - void ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, BOOL& rGroupSelected) const; + void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const; void BreakSingle3DObj(E3dObject* pObj); public: @@ -97,7 +97,7 @@ public: // Zugriff auf die Default-Attribute E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); + virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); virtual void CheckPossibilities(); // Event setzen/rausruecken @@ -111,21 +111,21 @@ public: // Bei Paste muss - falls in eine Scene eingefuegt wird - die // Objekte der Szene eingefuegt werden, die Szene selbst aber nicht using SdrView::Paste; - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) - BOOL ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); + sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); - BOOL HasMarkedScene(); + sal_Bool HasMarkedScene(); E3dScene* GetMarkedScene(); - BOOL IsConvertTo3DObjPossible() const; - void ConvertMarkedObjTo3D(BOOL bExtrude=TRUE, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0)); + sal_Bool IsConvertTo3DObjPossible() const; + void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0)); // Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer // bestimmten Tiefensortierung anzulegen void DoDepthArrange(E3dScene* pScene, double fDepth); - void ConvertMarkedToPolyObj(BOOL bLineToArea); + void ConvertMarkedToPolyObj(sal_Bool bLineToArea); E3dScene* SetCurrent3DObj(E3dObject* p3DObj); void Start3DCreation(); @@ -133,7 +133,7 @@ public: sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } virtual void MovAction(const Point& rPnt); - void End3DCreation(BOOL bUseDefaultValuesForMirrorAxes=FALSE); + void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False); void ResetCreationActive(); double GetDefaultCamPosZ(); @@ -256,22 +256,22 @@ public: long GetVDefaultSegments() const { return nVDefaultSegments; } void SetVDefaultSegments(long nSegs) { nVDefaultSegments = nSegs; } - BOOL IsBreak3DObjPossible() const; + sal_Bool IsBreak3DObjPossible() const; void Break3DObj(); - BOOL DoubleSided () const + sal_Bool DoubleSided () const { return bDoubleSided; } - BOOL &DoubleSided () + sal_Bool &DoubleSided () { return bDoubleSided; } void MergeScenes(); - SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE); + SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const; + void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False); }; #endif // _E3D_VIEW3D_HXX diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 6484c4cac0..50d44e1ad7 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item public: TYPEINFO(); - SvxViewLayoutItem( USHORT nColumns = 0, bool bBookMode = false, USHORT nWhich = SID_ATTR_VIEWLAYOUT ); + SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); ~SvxViewLayoutItem(); @@ -52,10 +52,10 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; //------------------------------------------------------------------------ diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx index 734a56827e..26543fd5c9 100644 --- a/svx/inc/svx/viewpt3d.hxx +++ b/svx/inc/svx/viewpt3d.hxx @@ -78,7 +78,7 @@ class SVX_DLLPUBLIC Viewport3D basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten; // wird mit der Transformation berechnet - BOOL bTfValid; // Flag, ob Transformation gueltig ist + sal_Bool bTfValid; // Flag, ob Transformation gueltig ist double fWRatio; // Device/View-Seitenverhaeltnisse double fHRatio; @@ -105,11 +105,11 @@ class SVX_DLLPUBLIC Viewport3D double GetFarClipDist() const { return fFarClipDist; } void SetProjection(ProjectionType ePrj) - { eProjection = ePrj; bTfValid = FALSE; } + { eProjection = ePrj; bTfValid = sal_False; } ProjectionType GetProjection() const { return(eProjection); } void SetAspectMapping(AspectMapType eAsp) - { eAspectMapping = eAsp; bTfValid = FALSE; } + { eAspectMapping = eAsp; bTfValid = sal_False; } AspectMapType GetAspectMapping() { return eAspectMapping; } void SetViewWindow(double fX, double fY, double fW, double fH); diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 187a0678d4..e2a287c54f 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -50,22 +50,22 @@ protected: XBitmapType eType; XBitmapStyle eStyle; GraphicObject aGraphicObject; - USHORT* pPixelArray; + sal_uInt16* pPixelArray; Size aArraySize; Color aPixelColor; Color aBckgrColor; - BOOL bGraphicDirty; + sal_Bool bGraphicDirty; public: XOBitmap(); XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE ); XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE ); #if defined HP9000 || defined SINIX - XOBitmap( const USHORT* pArray, const Color& aPixelColor, + XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor, const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize, XBitmapStyle eStyle = XBITMAP_TILE ); #else - XOBitmap( const USHORT* pArray, const Color& aPixelColor, + XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor, const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ), XBitmapStyle eStyle = XBITMAP_TILE ); #endif @@ -78,20 +78,20 @@ public: void Bitmap2Array(); void Array2Bitmap(); - void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = FALSE; } - void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; } + void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = sal_False; } + void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; } void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; } void SetBitmapStyle( XBitmapStyle eNewStyle ) { eStyle = eNewStyle; } - void SetPixelArray( const USHORT* pArray ); - void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = TRUE; } - void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = TRUE; } - void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = TRUE; } + void SetPixelArray( const sal_uInt16* pArray ); + void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = sal_True; } + void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = sal_True; } + void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = sal_True; } XBitmapType GetBitmapType() const { return eType; } XBitmapStyle GetBitmapStyle() const { return eStyle; } const GraphicObject& GetGraphicObject() const; Bitmap GetBitmap() const; - USHORT* GetPixelArray() const { return pPixelArray; } + sal_uInt16* GetPixelArray() const { return pPixelArray; } Color GetPixelColor() const { return aPixelColor; } Color GetBackgroundColor() const { return aBckgrColor; } }; diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index f0426d0210..d58055c821 100644 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -50,16 +50,16 @@ public: XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap ); XFillBitmapItem( SfxItemPool* pPool ); XFillBitmapItem( const XFillBitmapItem& rItem ); - XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 ); + XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -69,7 +69,7 @@ public: const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue void SetBitmapValue( const XOBitmap& rNew ) { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx index e419ac8413..f2eb1f073e 100644 --- a/svx/inc/svx/xcolit.hxx +++ b/svx/inc/svx/xcolit.hxx @@ -45,19 +45,19 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex public: TYPEINFO(); XColorItem() {} - XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor); + XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor); - XColorItem(USHORT nWhich, SvStream& rIn); + XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor); + XColorItem(sal_uInt16 nWhich, SvStream& rIn); XColorItem(const XColorItem& rItem); virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; const Color& GetColorValue(const XColorTable* pTable = 0) const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx index bacc17de97..534b8cfa17 100644 --- a/svx/inc/svx/xdash.hxx +++ b/svx/inc/svx/xdash.hxx @@ -41,32 +41,32 @@ class SVX_DLLPUBLIC XDash { protected: XDashStyle eDash; - USHORT nDots; - ULONG nDotLen; - USHORT nDashes; - ULONG nDashLen; - ULONG nDistance; + sal_uInt16 nDots; + sal_uIntPtr nDotLen; + sal_uInt16 nDashes; + sal_uIntPtr nDashLen; + sal_uIntPtr nDistance; public: XDash(XDashStyle eDash = XDASH_RECT, - USHORT nDots = 1, ULONG nDotLen = 20, - USHORT nDashes = 1, ULONG nDashLen = 20, ULONG nDistance = 20); + sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20, + sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20); bool operator==(const XDash& rDash) const; void SetDashStyle(XDashStyle eNewStyle) { eDash = eNewStyle; } - void SetDots(USHORT nNewDots) { nDots = nNewDots; } - void SetDotLen(ULONG nNewDotLen) { nDotLen = nNewDotLen; } - void SetDashes(USHORT nNewDashes) { nDashes = nNewDashes; } - void SetDashLen(ULONG nNewDashLen) { nDashLen = nNewDashLen; } - void SetDistance(ULONG nNewDistance) { nDistance = nNewDistance; } + void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; } + void SetDotLen(sal_uIntPtr nNewDotLen) { nDotLen = nNewDotLen; } + void SetDashes(sal_uInt16 nNewDashes) { nDashes = nNewDashes; } + void SetDashLen(sal_uIntPtr nNewDashLen) { nDashLen = nNewDashLen; } + void SetDistance(sal_uIntPtr nNewDistance) { nDistance = nNewDistance; } XDashStyle GetDashStyle() const { return eDash; } - USHORT GetDots() const { return nDots; } - ULONG GetDotLen() const { return nDotLen; } - USHORT GetDashes() const { return nDashes; } - ULONG GetDashLen() const { return nDashLen; } - ULONG GetDistance() const { return nDistance; } + sal_uInt16 GetDots() const { return nDots; } + sal_uIntPtr GetDotLen() const { return nDotLen; } + sal_uInt16 GetDashes() const { return nDashes; } + sal_uIntPtr GetDashLen() const { return nDashLen; } + sal_uIntPtr GetDistance() const { return nDistance; } // XDash is translated into an array of doubles which describe the lengths of the // dashes, dots and empty passages. It returns the complete length of the full DashDot diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index 85d00f5094..f65dfb6de7 100644 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -36,7 +36,8 @@ |* \************************************************************************/ -#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 153, 204, 255 ) // blue 8 +#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 0xCF, 0xE7, 0xE5 ) +#define COL_DEFAULT_SHAPE_STROKE RGB_COLORDATA( 128, 128, 128 ) #define XATTR_START 1000 diff --git a/svx/inc/svx/xexch.hxx b/svx/inc/svx/xexch.hxx index bb18e46231..3482ac8f5d 100644 --- a/svx/inc/svx/xexch.hxx +++ b/svx/inc/svx/xexch.hxx @@ -60,7 +60,7 @@ public: SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData ); SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData ); - static ULONG RegisterClipboardFormatName(); + static sal_uLong RegisterClipboardFormatName(); XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem; } }; diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index b32a691034..5eb467ad91 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -46,16 +46,16 @@ public: XFillStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 7e65ff6bc4..5eb30cec76 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -47,8 +47,8 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; }; #endif diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index e6c817dfa5..dba3768667 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem public: TYPEINFO(); - XFillBackgroundItem( BOOL bFill = FALSE ); + XFillBackgroundItem( sal_Bool bFill = sal_False ); SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index b352dfe4cf..a9c0f7e8f4 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -45,14 +45,14 @@ public: SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - SVX_DLLPRIVATE virtual USHORT GetValueCount() const; + SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index 4ec7fd9e59..dd63065e39 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpSizeLogItem( BOOL bLog = TRUE ); + XFillBmpSizeLogItem( sal_Bool bLog = sal_True ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 459819e227..a2e88702fb 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -45,7 +45,7 @@ public: SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -72,7 +72,7 @@ public: SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 69b44b5738..f1ab56b090 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpTileItem( BOOL bTile = TRUE ); + XFillBmpTileItem( sal_Bool bTile = sal_True ); XFillBmpTileItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index b41d11ece9..fe363421d7 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 ); + XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 ); + XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index 01af18d79f..960c723350 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpStretchItem( BOOL bStretch = TRUE ); + XFillBmpStretchItem( sal_Bool bStretch = sal_True ); XFillBmpStretchItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index d205ae439b..c5a974ad4c 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpTileOffsetXItem( USHORT nOffX = 0 ); + XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpTileOffsetYItem( USHORT nOffX = 0 ); + XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index 4f8ee4b9d5..73b53a18fa 100644 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -43,15 +43,15 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem public: TYPEINFO(); XFillColorItem() {} - XFillColorItem(INT32 nIndex, const Color& rTheColor); + XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const String& rName, const Color& rTheColor); XFillColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index a8b016418b..2e5dbca56b 100644 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -41,31 +41,31 @@ private: long nDummy1; long nDummy2; - BOOL bEnabled; + sal_Bool bEnabled; public: TYPEINFO(); XFillFloatTransparenceItem(); - XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE ); - XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE ); - XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE ); + XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True ); + XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True ); + XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True ); XFillFloatTransparenceItem(SfxItemPool* pPool ); XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const; - BOOL IsEnabled() const { return bEnabled; } - void SetEnabled( BOOL bEnable ) { bEnabled = bEnable; } + sal_Bool IsEnabled() const { return bEnabled; } + void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; } - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index 42543a6df2..77cadcf890 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -44,21 +44,21 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex public: TYPEINFO(); XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} - XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient); + XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); XFillGradientItem(const UniString& rName, const XGradient& rTheGradient); XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient); XFillGradientItem(SfxItemPool* pPool ); XFillGradientItem(const XFillGradientItem& rItem); - XFillGradientItem(SvStream& rIn, USHORT nVer = 0); + XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -66,7 +66,7 @@ public: const XGradient& GetGradientValue(const XGradientTable* pTable = 0) const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index 955184cc42..0bad7fe7d3 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex public: TYPEINFO(); XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {} - XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch); + XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch); XFillHatchItem(const String& rName, const XHatch& rTheHatch); XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch); XFillHatchItem(SfxItemPool* pPool ); @@ -53,11 +53,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -68,7 +68,7 @@ public: const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index b23a236b23..ce1d776782 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item { public: TYPEINFO(); - XFillTransparenceItem(USHORT nFillTransparence = 0); + XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index 45c9821eca..007bea7384 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -44,12 +44,12 @@ public: XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 03942d3345..f864a391a2 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -44,7 +44,7 @@ public: XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index b6d514f64b..af4c701300 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextMirrorItem(BOOL bMirror = FALSE); + XFormTextMirrorItem(sal_Bool bMirror = sal_False); XFormTextMirrorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx index 9643eda921..212d9abcf3 100644 --- a/svx/inc/svx/xftouit.hxx +++ b/svx/inc/svx/xftouit.hxx @@ -40,10 +40,10 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextOutlineItem(BOOL bOutline = FALSE); + XFormTextOutlineItem(sal_Bool bOutline = sal_False); XFormTextOutlineItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx index ade90a7122..8db9d792a9 100644 --- a/svx/inc/svx/xftsfit.hxx +++ b/svx/inc/svx/xftsfit.hxx @@ -43,12 +43,12 @@ public: XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE); XFormTextStdFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx index 0ebca5673c..7fed973e99 100644 --- a/svx/inc/svx/xftshcit.hxx +++ b/svx/inc/svx/xftshcit.hxx @@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem public: TYPEINFO(); XFormTextShadowColorItem() {} - XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor); + XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor); XFormTextShadowColorItem(const String& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 532a996b27..ea396d41aa 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -44,12 +44,12 @@ public: XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index 2e1245a2d4..233e231171 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -40,10 +40,10 @@ class XFormTextShadowTranspItem: public SfxUInt16Item { public: TYPEINFO(); - XFormTextShadowTranspItem(USHORT nShdwTransparence = 0); + XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index aae03c6eb5..ae803d387c 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -44,7 +44,7 @@ public: XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; /************************************************************************* @@ -60,7 +60,7 @@ public: XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index d9eb6cb847..c902ba59b7 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -44,7 +44,7 @@ public: XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx index 2f6b9d49f1..b11a64b406 100644 --- a/svx/inc/svx/xgrad.hxx +++ b/svx/inc/svx/xgrad.hxx @@ -43,20 +43,20 @@ protected: Color aStartColor; Color aEndColor; long nAngle; - USHORT nBorder; - USHORT nOfsX; - USHORT nOfsY; - USHORT nIntensStart; - USHORT nIntensEnd; - USHORT nStepCount; + sal_uInt16 nBorder; + sal_uInt16 nOfsX; + sal_uInt16 nOfsY; + sal_uInt16 nIntensStart; + sal_uInt16 nIntensEnd; + sal_uInt16 nStepCount; public: XGradient(); XGradient( const Color& rStart, const Color& rEnd, XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0, - USHORT nXOfs = 50, USHORT nYOfs = 50, USHORT nBorder = 0, - USHORT nStartIntens = 100, USHORT nEndIntens = 100, - USHORT nSteps = 0 ); + sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0, + sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100, + sal_uInt16 nSteps = 0 ); bool operator==(const XGradient& rGradient) const; @@ -64,23 +64,23 @@ public: void SetStartColor(const Color& rColor) { aStartColor = rColor; } void SetEndColor(const Color& rColor) { aEndColor = rColor; } void SetAngle(long nNewAngle) { nAngle = nNewAngle; } - void SetBorder(USHORT nNewBorder) { nBorder = nNewBorder; } - void SetXOffset(USHORT nNewOffset) { nOfsX = nNewOffset; } - void SetYOffset(USHORT nNewOffset) { nOfsY = nNewOffset; } - void SetStartIntens(USHORT nNewIntens) { nIntensStart = nNewIntens; } - void SetEndIntens(USHORT nNewIntens) { nIntensEnd = nNewIntens; } - void SetSteps(USHORT nSteps) { nStepCount = nSteps; } + void SetBorder(sal_uInt16 nNewBorder) { nBorder = nNewBorder; } + void SetXOffset(sal_uInt16 nNewOffset) { nOfsX = nNewOffset; } + void SetYOffset(sal_uInt16 nNewOffset) { nOfsY = nNewOffset; } + void SetStartIntens(sal_uInt16 nNewIntens) { nIntensStart = nNewIntens; } + void SetEndIntens(sal_uInt16 nNewIntens) { nIntensEnd = nNewIntens; } + void SetSteps(sal_uInt16 nSteps) { nStepCount = nSteps; } XGradientStyle GetGradientStyle() const { return eStyle; } Color GetStartColor() const { return aStartColor; } Color GetEndColor() const { return aEndColor; } long GetAngle() const { return nAngle; } - USHORT GetBorder() const { return nBorder; } - USHORT GetXOffset() const { return nOfsX; } - USHORT GetYOffset() const { return nOfsY; } - USHORT GetStartIntens() const { return nIntensStart; } - USHORT GetEndIntens() const { return nIntensEnd; } - USHORT GetSteps() const { return nStepCount; } + sal_uInt16 GetBorder() const { return nBorder; } + sal_uInt16 GetXOffset() const { return nOfsX; } + sal_uInt16 GetYOffset() const { return nOfsY; } + sal_uInt16 GetStartIntens() const { return nIntensStart; } + sal_uInt16 GetEndIntens() const { return nIntensEnd; } + sal_uInt16 GetSteps() const { return nStepCount; } }; #endif diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index e002e3eafe..4478908116 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item { public: TYPEINFO(); - XGradientStepCountItem( USHORT nStepCount = 0 ); + XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index 9b7de6297c..28ef8b0bcc 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -44,14 +44,14 @@ class SfxItemPool; class NameOrIndex; class XPropertyList; -typedef BOOL (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); +typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); //------------------- // class NameOrIndex //------------------- class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem { - INT32 nPalIndex; + sal_Int32 nPalIndex; protected: void Detach() { nPalIndex = -1; } @@ -59,30 +59,30 @@ protected: public: TYPEINFO(); NameOrIndex() { nPalIndex = -1; } - NameOrIndex(USHORT nWhich, INT32 nIndex); - NameOrIndex(USHORT nWhich, + NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex); + NameOrIndex(sal_uInt16 nWhich, const String& rName= String()); - NameOrIndex(USHORT nWhich, SvStream& rIn); + NameOrIndex(sal_uInt16 nWhich, SvStream& rIn); NameOrIndex(const NameOrIndex& rNameOrIndex); ~NameOrIndex() {}; virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; String GetName() const { return GetValue(); } void SetName(const String& rName) { SetValue(rName); } - INT32 GetIndex() const { return nPalIndex; } - void SetIndex(INT32 nIndex) { nPalIndex = nIndex; } - BOOL IsIndex() const { return (nPalIndex >= 0); } + sal_Int32 GetIndex() const { return nPalIndex; } + void SetIndex(sal_Int32 nIndex) { nPalIndex = nIndex; } + sal_Bool IsIndex() const { return (nPalIndex >= 0); } /** this static checks if the given NameOrIndex item has a unique name for its value. The returned String is a unique name for an item with this value in both given pools. Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ - static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults = NULL ); + static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults = NULL ); }; #endif diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 1937035566..34fe5bb1da 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -42,16 +42,16 @@ public: XLineStyleItem(XLineStyle = XLINE_SOLID); XLineStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XLineStyle GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 90ea7c4b50..8e163dda70 100644 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -43,17 +43,17 @@ public: XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND ); XLineJointItem( SvStream& rIn ); - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index ba6a248286..9b15ebe797 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -48,8 +48,8 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; }; #endif diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index 0467a2fea6..6a1b7f3317 100644 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -39,15 +39,15 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem public: TYPEINFO(); XLineColorItem() {} - XLineColorItem(INT32 nIndex, const Color& rTheColor); + XLineColorItem(sal_Int32 nIndex, const Color& rTheColor); XLineColorItem(const String& rName, const Color& rTheColor); XLineColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index c476a7848c..6450d53984 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -47,7 +47,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex public: TYPEINFO(); XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {} - XLineDashItem(INT32 nIndex, const XDash& rTheDash); + XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash); XLineDashItem(const String& rName, const XDash& rTheDash); XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash); XLineDashItem(SfxItemPool* pPool ); @@ -56,11 +56,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -72,7 +72,7 @@ public: const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 988705b026..c0e40852b4 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineEndCenterItem(BOOL bEndCenter = FALSE); + XLineEndCenterItem(sal_Bool bEndCenter = sal_False); XLineEndCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index df85abc4c6..f366b223a6 100644 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex public: TYPEINFO(); - XLineEndItem(INT32 nIndex = -1); + XLineEndItem(sal_Int32 nIndex = -1); XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineEndItem(SfxItemPool* pPool ); @@ -52,11 +52,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 0651824e0e..8a86d1ccc5 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -44,10 +44,10 @@ public: XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index ffbdfe0ab0..d640fed0a6 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineStartCenterItem(BOOL bStartCenter = FALSE); + XLineStartCenterItem(sal_Bool bStartCenter = sal_False); XLineStartCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index 0572ec9c38..20161a2e81 100644 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex public: TYPEINFO(); - XLineStartItem(INT32 nIndex = -1); + XLineStartItem(sal_Int32 nIndex = -1); XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineStartItem(SfxItemPool* pPool ); @@ -52,11 +52,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index 02ff94f48c..3609454423 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -43,10 +43,10 @@ public: XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 377f4dcfcb..da924e9ea2 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item { public: TYPEINFO(); - XLineTransparenceItem(USHORT nLineTransparence = 0); + XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index f4f24a2f56..1c80a97111 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -41,10 +41,10 @@ public: XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index 7df268a39c..909e01a872 100644 --- a/svx/inc/svx/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -85,7 +85,7 @@ private: SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName ); SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, - BOOL bTruncate ); + sal_Bool bTruncate ); SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const; SVX_DLLPRIVATE Graphic ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName ); @@ -99,7 +99,7 @@ protected: ~SvXMLGraphicHelper(); void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect ); + sal_Bool bDirect ); virtual void SAL_CALL disposing(); @@ -108,7 +108,7 @@ public: static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect = TRUE ); + sal_Bool bDirect = sal_True ); static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode ); static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ); @@ -136,7 +136,7 @@ namespace svx You should call dispose after you no longer need this component. - uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == TRUE in + uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); @@ -152,7 +152,7 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio To write the Pictures stream, you have to call dispose at this component. Make sure you call dipose before you commit the parent storage. - uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == TRUE in + uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index cadcc55fc5..4cbfa39b2e 100644 --- a/svx/inc/svx/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx @@ -46,10 +46,10 @@ private: public: SFX_DECL_STATUSBAR_CONTROL(); - XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ); + XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~XmlSecStatusBarControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); static long GetDefItemWidth( StatusBar& _rStatusBar ); diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index 21ab95e2f6..5875335964 100644 --- a/svx/inc/svx/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx @@ -67,24 +67,24 @@ public: static BitmapEx CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev, const MapMode& rMapMode, const Size& rLogSize, const Point& rPoint, const Size& rSize ); - static Graphic MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags ); - static Animation MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr ); - static USHORT WriteGraphic( const Graphic& rGraphic, String& rFileName, - const String& rFilterName, const ULONG nFlags = 0L, + static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ); + static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ); + static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName, + const String& rFilterName, const sal_uIntPtr nFlags = 0L, const Size* pMtfSize_100TH_MM = NULL ); static void DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt, const Size& rSize, const BitmapEx& rBmpEx ); static void DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize, const Rectangle& rTileRect, const BitmapEx& rBmpEx ); - static USHORT ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, - GraphicFilter& rFilter, const USHORT nFormat, + static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, + GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); - static Bitmap DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ); + static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); - static Polygon GetCountour( const Bitmap& rBmp, const ULONG nContourFlags, - const BYTE cEdgeDetectThreshold = 50, + static Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags, + const sal_uInt8 cEdgeDetectThreshold = 50, const Rectangle* pWorkRect = NULL ); }; @@ -92,6 +92,6 @@ public: // - DitherBitmap - // ---------------- -SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap ); +SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap ); #endif // _XOUTBMP_HXX diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index a8ccd34713..e65eb0e9ad 100644 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -75,59 +75,59 @@ protected: void CheckReference(); // Hilfsfunktionen fuer Bezierkonvertierung - void SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT); + void SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT); void GenBezArc(const Point& rCenter, long nRx, long nRy, - long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd, - USHORT nQuad, USHORT nFirst); - BOOL CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2); + long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, + sal_uInt16 nQuad, sal_uInt16 nFirst); + sal_Bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2); public: - XPolygon( USHORT nSize=16, USHORT nResize=16 ); + XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 ); XPolygon( const XPolygon& rXPoly ); XPolygon( const Polygon& rPoly ); XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, - USHORT nStartAngle = 0, USHORT nEndAngle = 3600, - BOOL bClose = TRUE ); + sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, + sal_Bool bClose = sal_True ); ~XPolygon(); - void SetSize( USHORT nSize ); - USHORT GetSize() const; + void SetSize( sal_uInt16 nSize ); + sal_uInt16 GetSize() const; - void SetPointCount( USHORT nPoints ); - USHORT GetPointCount() const; + void SetPointCount( sal_uInt16 nPoints ); + sal_uInt16 GetPointCount() const; - void Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags ); - void Insert( USHORT nPos, const XPolygon& rXPoly ); - void Insert( USHORT nPos, const Polygon& rPoly ); - void Remove( USHORT nPos, USHORT nCount ); + void Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ); + void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); + void Insert( sal_uInt16 nPos, const Polygon& rPoly ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); void Move( long nHorzMove, long nVertMove ); Rectangle GetBoundRect() const; - const Point& operator[]( USHORT nPos ) const; - Point& operator[]( USHORT nPos ); + const Point& operator[]( sal_uInt16 nPos ) const; + Point& operator[]( sal_uInt16 nPos ); XPolygon& operator=( const XPolygon& rXPoly ); - BOOL operator==( const XPolygon& rXPoly ) const; - BOOL operator!=( const XPolygon& rXPoly ) const; + sal_Bool operator==( const XPolygon& rXPoly ) const; + sal_Bool operator!=( const XPolygon& rXPoly ) const; - XPolyFlags GetFlags( USHORT nPos ) const; - void SetFlags( USHORT nPos, XPolyFlags eFlags ); - BOOL IsControl(USHORT nPos) const; - BOOL IsSmooth(USHORT nPos) const; + XPolyFlags GetFlags( sal_uInt16 nPos ) const; + void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ); + sal_Bool IsControl(sal_uInt16 nPos) const; + sal_Bool IsSmooth(sal_uInt16 nPos) const; // Abstand zwischen zwei Punkten - double CalcDistance(USHORT nP1, USHORT nP2); + double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2); // Bezierkonvertierungen - void CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt); - void CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext); - void PointsToBezier(USHORT nFirst); + void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt); + void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext); + void PointsToBezier(sal_uInt16 nFirst); // Transformationen void Translate(const Point& rTrans); void Rotate(const Point& rCenter, double fSin, double fCos); - void Rotate(const Point& rCenter, USHORT nAngle); + void Rotate(const Point& rCenter, sal_uInt16 nAngle); void Scale(double fSx, double fSy); void SlantX(long nYRef, double fSin, double fCos); void SlantY(long nXRef, double fSin, double fCos); @@ -160,7 +160,7 @@ protected: void CheckReference(); public: - XPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ); + XPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ); XPolyPolygon( const XPolygon& rXPoly ); XPolyPolygon( const XPolyPolygon& rXPolyPoly ); XPolyPolygon( const PolyPolygon& rPolyPoly); @@ -168,31 +168,31 @@ public: ~XPolyPolygon(); void Insert( const XPolygon& rXPoly, - USHORT nPos = XPOLYPOLY_APPEND ); + sal_uInt16 nPos = XPOLYPOLY_APPEND ); void Insert( const XPolyPolygon& rXPoly, - USHORT nPos=XPOLYPOLY_APPEND ); - XPolygon Remove( USHORT nPos ); - XPolygon Replace( const XPolygon& rXPoly, USHORT nPos ); - const XPolygon& GetObject( USHORT nPos ) const; + sal_uInt16 nPos=XPOLYPOLY_APPEND ); + XPolygon Remove( sal_uInt16 nPos ); + XPolygon Replace( const XPolygon& rXPoly, sal_uInt16 nPos ); + const XPolygon& GetObject( sal_uInt16 nPos ) const; void Clear(); - USHORT Count() const; + sal_uInt16 Count() const; void Move( long nHorzMove, long nVertMove ); Rectangle GetBoundRect() const; - const XPolygon& operator[]( USHORT nPos ) const + const XPolygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); } - XPolygon& operator[]( USHORT nPos ); + XPolygon& operator[]( sal_uInt16 nPos ); XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly ); - BOOL operator==( const XPolyPolygon& rXPolyPoly ) const; - BOOL operator!=( const XPolyPolygon& rXPolyPoly ) const; + sal_Bool operator==( const XPolyPolygon& rXPolyPoly ) const; + sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const; // Transformationen void Translate(const Point& rTrans); void Rotate(const Point& rCenter, double fSin, double fCos); - void Rotate(const Point& rCenter, USHORT nAngle); + void Rotate(const Point& rCenter, sal_uInt16 nAngle); void Scale(double fSx, double fSy); void SlantX(long nYRef, double fSin, double fCos); void SlantY(long nXRef, double fSin, double fCos); diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index ef65257c2c..ff3a2669be 100644 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -38,19 +38,19 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem public: TYPEINFO(); SVX_DLLPRIVATE XSecondaryFillColorItem() {} - SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor); + SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XSecondaryFillColorItem(const String& rName, const Color& rTheColor); SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; }; diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 444d2cf984..2978ada83e 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -216,14 +216,14 @@ protected: Table aTable; Table* pBmpTable; - BOOL bTableDirty; - BOOL bBitmapsDirty; - BOOL bOwnPool; + sal_Bool bTableDirty; + sal_Bool bBitmapsDirty; + sal_Bool bOwnPool; XPropertyTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); XPropertyTable( SvStream& rIn ); void Clear(); @@ -232,10 +232,10 @@ public: long Count() const; - BOOL Insert(long nIndex, XPropertyEntry* pEntry); + sal_Bool Insert(long nIndex, XPropertyEntry* pEntry); XPropertyEntry* Replace(long nIndex, XPropertyEntry* pEntry); - XPropertyEntry* Remove(long nIndex, USHORT nDummy); - XPropertyEntry* Get( long nIndex, USHORT nDummy ) const; + XPropertyEntry* Remove(long nIndex, sal_uInt16 nDummy); + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); Bitmap* GetBitmap( long nIndex ) const; @@ -244,15 +244,15 @@ public: void SetName( const String& rString ); const String& GetPath() const { return aPath; } void SetPath( const String& rString ) { aPath = rString; } - BOOL IsDirty() const { return bTableDirty && bBitmapsDirty; } - void SetDirty( BOOL bDirty = TRUE ) + sal_Bool IsDirty() const { return bTableDirty && bBitmapsDirty; } + void SetDirty( sal_Bool bDirty = sal_True ) { bTableDirty = bDirty; bBitmapsDirty = bDirty; } - virtual BOOL Load() = 0; - virtual BOOL Save() = 0; - virtual BOOL Create() = 0; - virtual BOOL CreateBitmapsForUI() = 0; - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0; + virtual sal_Bool Load() = 0; + virtual sal_Bool Save() = 0; + virtual sal_Bool Create() = 0; + virtual sal_Bool CreateBitmapsForUI() = 0; + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; }; // -------------------- @@ -269,14 +269,14 @@ protected: List aList; List* pBmpList; - BOOL bListDirty; - BOOL bBitmapsDirty; - BOOL bOwnPool; + sal_Bool bListDirty; + sal_Bool bBitmapsDirty; + sal_Bool bOwnPool; XPropertyList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); XPropertyList( SvStream& rIn ); void Clear(); @@ -287,8 +287,8 @@ public: void Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND ); XPropertyEntry* Replace( XPropertyEntry* pEntry, long nIndex ); - XPropertyEntry* Remove( long nIndex, USHORT nDummy ); - XPropertyEntry* Get( long nIndex, USHORT nDummy ) const; + XPropertyEntry* Remove( long nIndex, sal_uInt16 nDummy ); + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); Bitmap* GetBitmap( long nIndex ) const; @@ -297,15 +297,15 @@ public: void SetName( const String& rString ); const String& GetPath() const { return aPath; } void SetPath( const String& rString ) { aPath = rString; } - BOOL IsDirty() const { return bListDirty && bBitmapsDirty; } - void SetDirty( BOOL bDirty = TRUE ) + sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; } + void SetDirty( sal_Bool bDirty = sal_True ) { bListDirty = bDirty; bBitmapsDirty = bDirty; } - virtual BOOL Load() = 0; - virtual BOOL Save() = 0; - virtual BOOL Create() = 0; - virtual BOOL CreateBitmapsForUI() = 0; - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0; + virtual sal_Bool Load() = 0; + virtual sal_Bool Save() = 0; + virtual sal_Bool Create() = 0; + virtual sal_Bool CreateBitmapsForUI() = 0; + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; }; // ------------------ @@ -317,8 +317,8 @@ class SVX_DLLPUBLIC XColorTable : public XPropertyTable public: XColorTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XColorTable(); using XPropertyTable::Replace; @@ -328,11 +328,11 @@ public: using XPropertyTable::Get; XColorEntry* GetColor(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); static XColorTable* GetStdColorTable(); }; @@ -346,8 +346,8 @@ class XColorList : public XPropertyList public: XColorList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XColorList(); using XPropertyList::Replace; @@ -357,11 +357,11 @@ public: using XPropertyList::Get; XColorEntry* GetColor(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // -------------------- @@ -373,8 +373,8 @@ class XLineEndTable : public XPropertyTable public: XLineEndTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XLineEndTable(); using XPropertyTable::Replace; @@ -384,11 +384,11 @@ public: using XPropertyTable::Get; XLineEndEntry* GetLineEnd(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -415,11 +415,11 @@ public: using XPropertyList::Get; XLineEndEntry* GetLineEnd(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // -------------------- @@ -431,8 +431,8 @@ class XDashTable : public XPropertyTable public: XDashTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XDashTable(); using XPropertyTable::Replace; @@ -442,11 +442,11 @@ public: using XPropertyTable::Get; XDashEntry* GetDash(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -473,11 +473,11 @@ public: using XPropertyList::Get; XDashEntry* GetDash(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // -------------------- @@ -489,8 +489,8 @@ class XHatchTable : public XPropertyTable public: XHatchTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XHatchTable(); using XPropertyTable::Replace; @@ -500,11 +500,11 @@ public: using XPropertyTable::Get; XHatchEntry* GetHatch(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -531,11 +531,11 @@ public: using XPropertyList::Get; XHatchEntry* GetHatch(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // --------------------- @@ -547,8 +547,8 @@ class XGradientTable : public XPropertyTable public: XGradientTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XGradientTable(); using XPropertyTable::Replace; @@ -558,11 +558,11 @@ public: using XPropertyTable::Get; XGradientEntry* GetGradient(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -589,11 +589,11 @@ public: using XPropertyList::Get; XGradientEntry* GetGradient(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // --------------------- @@ -605,8 +605,8 @@ class XBitmapTable : public XPropertyTable public: XBitmapTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XBitmapTable(); using XPropertyTable::Replace; @@ -616,11 +616,11 @@ public: using XPropertyTable::Get; XBitmapEntry* GetBitmap(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -632,8 +632,8 @@ class SVX_DLLPUBLIC XBitmapList : public XPropertyList public: XBitmapList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XBitmapList(); using XPropertyList::Replace; @@ -643,11 +643,11 @@ public: using XPropertyList::Get; XBitmapEntry* GetBitmap(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; #endif // _XTABLE_HXX diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index e7c981633c..1c11c976e7 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -45,12 +45,12 @@ public: XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; /************************************************************************* @@ -63,10 +63,10 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextHideFormItem(BOOL bHide = FALSE); + XFormTextHideFormItem(sal_Bool bHide = sal_False); XFormTextHideFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index 2d2ce9408c..e16fe1b14d 100644 --- a/svx/inc/svx/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx @@ -1,8 +1,8 @@ #ifndef _SVX_ZOOM_DEF_HXX #define _SVX_ZOOM_DEF_HXX -#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) -#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) -#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) +#define ZOOMBTN_OPTIMAL ((sal_uInt16)0x0001) +#define ZOOMBTN_PAGEWIDTH ((sal_uInt16)0x0002) +#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004) #endif diff --git a/svx/inc/svx/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index b3386b207b..8db90519f3 100644 --- a/svx/inc/svx/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx @@ -37,20 +37,20 @@ class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl { private: - USHORT nZoom; - USHORT nValueSet; + sal_uInt16 nZoom; + sal_uInt16 nValueSet; public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxZoomStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); }; diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 3405b5eda4..b8cf0b9836 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -48,20 +48,20 @@ enum SvxZoomType class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item { - USHORT nValueSet; // erlaubte Werte (siehe #defines unten) + sal_uInt16 nValueSet; // erlaubte Werte (siehe #defines unten) SvxZoomType eType; public: TYPEINFO(); SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT, - USHORT nVal = 0, USHORT nWhich = SID_ATTR_ZOOM ); + sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM ); SvxZoomItem( const SvxZoomItem& ); ~SvxZoomItem(); - void SetValueSet( USHORT nValues ) { nValueSet = nValues; } - USHORT GetValueSet() const { return nValueSet; } - FASTBOOL IsValueAllowed( USHORT nValue ) const + void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; } + sal_uInt16 GetValueSet() const { return nValueSet; } + FASTBOOL IsValueAllowed( sal_uInt16 nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } @@ -69,11 +69,11 @@ public: { eType = eNewType; } virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; //------------------------------------------------------------------------ diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx index 23415597d7..4c761027cb 100644 --- a/svx/inc/svx/zoomsliderctrl.hxx +++ b/svx/inc/svx/zoomsliderctrl.hxx @@ -42,20 +42,20 @@ private: struct SvxZoomSliderControl_Impl; SvxZoomSliderControl_Impl* mpImpl; - USHORT Offset2Zoom( long nOffset ) const; - long Zoom2Offset( USHORT nZoom ) const; + sal_uInt16 Offset2Zoom( long nOffset ) const; + long Zoom2Offset( sal_uInt16 nZoom ) const; public: SFX_DECL_STATUSBAR_CONTROL(); - SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ); + SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~SvxZoomSliderControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); - virtual BOOL MouseButtonDown( const MouseEvent & ); - virtual BOOL MouseMove( const MouseEvent & rEvt ); + virtual sal_Bool MouseButtonDown( const MouseEvent & ); + virtual sal_Bool MouseMove( const MouseEvent & rEvt ); }; #endif diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index 725f61a31f..8859efaceb 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -39,28 +39,28 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { com::sun::star::uno::Sequence < sal_Int32 > maValues; - USHORT mnMinZoom; - USHORT mnMaxZoom; + sal_uInt16 mnMinZoom; + sal_uInt16 mnMaxZoom; public: TYPEINFO(); - SvxZoomSliderItem( USHORT nCurrentZoom = 100, USHORT nMinZoom = 20, USHORT nMaxZoom = 600, USHORT nWhich = SID_ATTR_ZOOMSLIDER ); + SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const; - USHORT GetMinZoom() const {return mnMinZoom;} - USHORT GetMaxZoom() const {return mnMaxZoom;} + sal_uInt16 GetMinZoom() const {return mnMinZoom;} + sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; //------------------------------------------------------------------------ diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 12cff7ecd1..425e275223 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -139,8 +139,8 @@ private: FindTextFieldControl* m_pFindTextFieldControl; - USHORT m_nDownSearchId; // item position of findbar - USHORT m_nUpSearchId; // item position of findbar + sal_uInt16 m_nDownSearchId; // item position of findbar + sal_uInt16 m_nUpSearchId; // item position of findbar }; diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index 3650a698f9..76f12685d9 100644 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -44,15 +44,15 @@ class ImpXPolygon { public: Point* pPointAry; - BYTE* pFlagAry; + sal_uInt8* pFlagAry; Point* pOldPointAry; - BOOL bDeleteOldPoints; - USHORT nSize; - USHORT nResize; - USHORT nPoints; - USHORT nRefCount; + sal_Bool bDeleteOldPoints; + sal_uInt16 nSize; + sal_uInt16 nResize; + sal_uInt16 nPoints; + sal_uInt16 nRefCount; - ImpXPolygon( USHORT nInitSize = 16, USHORT nResize=16 ); + ImpXPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize=16 ); ImpXPolygon( const ImpXPolygon& rImpXPoly ); ~ImpXPolygon(); @@ -64,13 +64,13 @@ public: if ( bDeleteOldPoints ) { delete[] (char*)pOldPointAry; - bDeleteOldPoints = FALSE; + bDeleteOldPoints = sal_False; } } - void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE ); - void InsertSpace( USHORT nPos, USHORT nCount ); - void Remove( USHORT nPos, USHORT nCount ); + void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True ); + void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); }; @@ -89,9 +89,9 @@ class ImpXPolyPolygon { public: XPolygonList aXPolyList; - USHORT nRefCount; + sal_uInt16 nRefCount; - ImpXPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ) : + ImpXPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) : aXPolyList( 1024, nInitSize, nResize ) { nRefCount = 1; } ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ); |