diff options
Diffstat (limited to 'sd/source/ui/inc')
114 files changed, 977 insertions, 977 deletions
diff --git a/sd/source/ui/inc/3dchld.hxx b/sd/source/ui/inc/3dchld.hxx index d90d52704b0d..b5258f06eba6 100644..100755 --- a/sd/source/ui/inc/3dchld.hxx +++ b/sd/source/ui/inc/3dchld.hxx @@ -41,7 +41,7 @@ class Sd3DChildWindow : public SfxChildWindow { public: - Sd3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + Sd3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Sd3DChildWindow); }; diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index a398d31ffbda..f40d735c5e64 100644..100755 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -73,7 +73,7 @@ namespace accessibility virtual SfxBroadcaster& GetBroadcaster() const; // the view forwarder - virtual BOOL IsValid() const; + virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx index f98d345c2019..3ac193b05d20 100644..100755 --- a/sd/source/ui/inc/AccessibleSlideView.hxx +++ b/sd/source/ui/inc/AccessibleSlideView.hxx @@ -192,7 +192,7 @@ public: void SetPageVisible( sal_uInt16 nPage, sal_Bool bVisible ); void Reset(); - void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); + void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage ); private: diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index 5c8fba1e6b2d..7817f2d0c4d9 100755 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -65,7 +65,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual BOOL IsValid (void) const; + virtual sal_Bool IsValid (void) const; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -123,7 +123,7 @@ public: protected: SdrPaintView* mpView; - USHORT mnWindowId; + sal_uInt16 mnWindowId; OutputDevice& mrDevice; private: diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index c3718220a172..dedb54d10365 100644..100755 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -42,7 +42,7 @@ class AnimationChildWindow public: AnimationChildWindow( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index ee5ee7b1db0a..7a7ff35ac721 100644..100755 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -61,8 +61,8 @@ public: ::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, - ULONG nSumActionCount, - ULONG nObjCount); + sal_uLong nSumActionCount, + sal_uLong nObjCount); virtual ~BreakDlg(); short Execute(); @@ -79,7 +79,7 @@ private: CancelButton aBtnCancel; DrawView* pDrView; - BOOL bCancel; + sal_Bool bCancel; Timer aTimer; SvdProgressInfo *pProgrInfo; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index da0b6ade7327..bd1dea9535ed 100755 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -266,7 +266,7 @@ protected: @param nHandle The handle of the proberty. @return - <TRUE/> if the value is converted successfully. + <sal_True/> if the value is converted successfully. @throws IllegalArgumentException */ virtual sal_Bool SAL_CALL convertFastPropertyValue( diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4ad4b0d09392..444c02102c76 100755 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -69,37 +69,37 @@ public: DrawDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( const sal_uInt64 nModelCreationFlags, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( SdDrawDocument* pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_IMPRESS); virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( BOOL bMDI ); - virtual void Deactivate( BOOL bMDI ); - virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - virtual BOOL ConvertFrom( SfxMedium &rMedium ); - virtual BOOL Save(); - virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium ); - virtual BOOL ConvertTo( SfxMedium &rMedium ); - virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual void Activate( sal_Bool bMDI ); + virtual void Deactivate( sal_Bool bMDI ); + virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); + virtual sal_Bool ConvertFrom( SfxMedium &rMedium ); + virtual sal_Bool Save(); + virtual sal_Bool SaveAsOwnFormat( SfxMedium& rMedium ); + virtual sal_Bool ConvertTo( SfxMedium &rMedium ); + virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); virtual sal_Bool Load( SfxMedium &rMedium ); virtual sal_Bool LoadFrom( SfxMedium& rMedium ); virtual sal_Bool SaveAs( SfxMedium &rMedium ); - virtual Rectangle GetVisArea(USHORT nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); + virtual Rectangle GetVisArea(sal_uInt16 nAspect) const; + virtual void Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT); virtual SfxUndoManager* GetUndoManager(); virtual Printer* GetDocumentPrinter(); virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); @@ -107,7 +107,7 @@ public: virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; virtual Size GetFirstPageSize(); virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; - virtual void SetModified( BOOL = TRUE ); + virtual void SetModified( sal_Bool = sal_True ); using SotObject::GetInterface; using SfxObjectShell::GetVisArea; @@ -121,11 +121,11 @@ public: SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } - SfxPrinter* GetPrinter(BOOL bCreate); + SfxPrinter* GetPrinter(sal_Bool bCreate); void SetPrinter(SfxPrinter *pNewPrinter); void UpdateFontList(); - BOOL IsInDestruction() const { return mbInDestruction; } + sal_Bool IsInDestruction() const { return mbInDestruction; } void CancelSearching(); @@ -136,9 +136,9 @@ public: void Disconnect(sd::ViewShell* pViewSh); void UpdateTablePointers(); - BOOL GotoBookmark(const String& rBookmark); + sal_Bool GotoBookmark(const String& rBookmark); - Bitmap GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel); + Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel); /** checks, if the given name is a valid new name for a slide @@ -151,17 +151,17 @@ public: @param rName the new name that is to be set for a slide. This string may be set to an empty string (see below). - @return TRUE, if the new name is unique. Note that if the user entered + @return sal_True, if the new name is unique. Note that if the user entered a default name of a not-yet-existing slide (e.g. 'Slide 17'), - TRUE is returned, but rName is set to an empty string. + sal_True is returned, but rName is set to an empty string. */ - BOOL CheckPageName(::Window* pWin, String& rName ); + sal_Bool CheckPageName(::Window* pWin, String& rName ); - void SetSlotFilter(BOOL bEnable = FALSE, USHORT nCount = 0, const USHORT* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } + void SetSlotFilter(sal_Bool bEnable = sal_False, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - UINT16 GetStyleFamily() const { return mnStyleFamily; } - void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } + sal_uInt16 GetStyleFamily() const { return mnStyleFamily; } + void SetStyleFamily( sal_uInt16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ @@ -215,18 +215,18 @@ protected: FontList* mpFontList; ::sd::FunctionReference mxDocShellFunction; DocumentType meDocType; - UINT16 mnStyleFamily; - const USHORT* mpFilterSIDs; - USHORT mnFilterCount; - BOOL mbFilterEnable; - BOOL mbSdDataObj; - BOOL mbInDestruction; - BOOL mbOwnPrinter; - BOOL mbNewDocument; + sal_uInt16 mnStyleFamily; + const sal_uInt16* mpFilterSIDs; + sal_uInt16 mnFilterCount; + sal_Bool mbFilterEnable; + sal_Bool mbSdDataObj; + sal_Bool mbInDestruction; + sal_Bool mbOwnPrinter; + sal_Bool mbNewDocument; bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); - virtual void InPlaceActivate( BOOL bActive ); + virtual void InPlaceActivate( sal_Bool bActive ); }; #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1110c3ee130c..a087dc8dc847 100755 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -132,7 +132,7 @@ public: void HidePage(); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -159,12 +159,12 @@ public: void SelectionHasChanged(); void ModelHasChanged(); - virtual void Activate(BOOL bIsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool bIsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void ExecCtrl(SfxRequest& rReq); void GetCtrlState(SfxItemSet& rSet); @@ -229,13 +229,13 @@ public: const Ruler& rRuler, const MouseEvent& rMEvt); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); PageKind GetPageKind() { return mePageKind; } Point GetMousePos() { return maMousePos; } - BOOL IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( BOOL bIn ) { mbMousePosFreezed = bIn; } + sal_Bool IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } virtual SdPage* GetActualPage() { return mpActualPage; } @@ -245,20 +245,20 @@ public: void ResetActualPage(); void ResetActualLayer(); - BOOL SwitchPage(USHORT nPage); - BOOL IsSwitchPageAllowed() const; + sal_Bool SwitchPage(sal_uInt16 nPage); + sal_Bool IsSwitchPageAllowed() const; - BOOL GotoBookmark(const String& rBookmark); + sal_Bool GotoBookmark(const String& rBookmark); void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); virtual ErrCode DoVerb(long nVerb); - virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); - void SetZoomOnPage( BOOL bZoom = TRUE ) { mbZoomOnPage = bZoom; } - BOOL IsZoomOnPage() { return mbZoomOnPage; } + void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } + sal_Bool IsZoomOnPage() { return mbZoomOnPage; } void CheckLineTo (SfxRequest& rReq); void FuTemp01(SfxRequest& rReq); void FuTemp02(SfxRequest& rReq); @@ -270,9 +270,9 @@ public: void LockInput(); void UnlockInput(); - BOOL IsInputLocked() const { return mnLockCount > 0UL; } + sal_Bool IsInputLocked() const { return mnLockCount > 0UL; } - USHORT GetCurPageId() { return( maTabControl.GetCurPageId() ); } + sal_uInt16 GetCurPageId() { return( maTabControl.GetCurPageId() ); } /** Show controls of the UI or hide them, depending on the given flag. Do not call this method directly. Call the method at ViewShellBase @@ -284,12 +284,12 @@ public: bool IsLayerModeActive (void) const; - USHORT* GetSlotArray() const { return mpSlotArray; } + sal_uInt16* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -353,7 +353,7 @@ public: <p>Implemented in <code>drviews8.cxx</code>.</p> */ - bool RenameSlide( USHORT nPageId, const String & rName ); + bool RenameSlide( sal_uInt16 nPageId, const String & rName ); /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const String& rLayerName, const String& rLayerTitle, const String& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); @@ -363,7 +363,7 @@ public: DrawView* GetDrawView() const { return mpDrawView; } /** Relocation to a new parent window is not supported for DrawViewShell - objects so this method always returns <FALSE/>. + objects so this method always returns <sal_False/>. */ virtual bool RelocateToParentWindow (::Window* pParentWindow); @@ -372,18 +372,18 @@ protected: SdPage* mpActualPage; Rectangle maMarkRect; Point maMousePos; - BOOL mbMousePosFreezed; + sal_Bool mbMousePosFreezed; TabControl maTabControl; EditMode meEditMode; PageKind mePageKind; - BOOL mbZoomOnPage; - BOOL mbIsRulerDrag; - ULONG mnLockCount; + sal_Bool mbZoomOnPage; + sal_Bool mbIsRulerDrag; + sal_uLong mnLockCount; Timer maCloseTimer; - BOOL mbReadOnly; - USHORT* mpSlotArray; + sal_Bool mbReadOnly; + sal_uInt16* mpSlotArray; - static BOOL mbPipette; + static sal_Bool mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( CloseHdl, Timer* pTimer ); @@ -394,7 +394,7 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -403,13 +403,13 @@ protected: virtual Size GetOptimalSizePixel() const; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, - BOOL bSize, BOOL bMargin, BOOL bScaleAll ); + sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); - USHORT GetIdBySubId( USHORT nSId ); - void MapSlot( USHORT nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, BOOL bPermanent = TRUE ); - USHORT GetMappedSlot( USHORT nSId ); - USHORT GetArrayId( USHORT nSId ); + sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); + void MapSlot( sal_uInt16 nSId ); + void UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent = sal_True ); + sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); + sal_uInt16 GetArrayId( sal_uInt16 nSId ); void GetMenuStateSel(SfxItemSet& rSet); @@ -449,7 +449,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; - BOOL mbPastePossible; + sal_Bool mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); @@ -459,11 +459,11 @@ private: b) the given flag bCloseFrame is true. @param bCloseFrame Be carefull with this flag when stopping a full screen show. - When called from the destructor the flag has to be <FALSE/> or + When called from the destructor the flag has to be <sal_False/> or otherwise we run into a loop of calls to destructors of the view and the frame. - When called from other places the flag should be <TRUE/> so that - not an empty frame remains. When called with <TRUE/> it is the + When called from other places the flag should be <sal_True/> so that + not an empty frame remains. When called with <sal_True/> it is the responsibility of the caller to avoid an illegal reentrant call. */ @@ -484,7 +484,7 @@ private: */ void ShowSnapLineContextMenu ( SdrPageView& rPageView, - const USHORT nSnapLineIndex, + const sal_uInt16 nSnapLineIndex, const Point& rMouseLocation); using ViewShell::Notify; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 70e34e20dfa7..2f0933b03cb4 100644..100755 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -77,17 +77,17 @@ public: { maPrintableLayers = rPrintableLayers; } const SetOfByte& GetPrintableLayers() { return maPrintableLayers; } - void SetRuler(const BOOL bRulerOn) + void SetRuler(const sal_Bool bRulerOn) { mbRuler = bRulerOn; } - BOOL HasRuler() const { return mbRuler; } + sal_Bool HasRuler() const { return mbRuler; } - void SetNoColors(const BOOL bNoCol) + void SetNoColors(const sal_Bool bNoCol) { mbNoColors = bNoCol; } - BOOL IsNoColors() const { return mbNoColors; } + sal_Bool IsNoColors() const { return mbNoColors; } - void SetNoAttribs(const BOOL bNoAttr) + void SetNoAttribs(const sal_Bool bNoAttr) { mbNoAttribs = bNoAttr; } - BOOL IsNoAttribs() const { return mbNoAttribs; } + sal_Bool IsNoAttribs() const { return mbNoAttribs; } void SetVisArea(const Rectangle& rVisArea) { maVisArea = rVisArea; } @@ -103,15 +103,15 @@ public: /** can be used to get the page kind that was selected on last save of this document */ PageKind GetPageKindOnLoad() const { return mePageKindOnLoad; } - SD_DLLPUBLIC void SetSelectedPage (USHORT nPage); - USHORT GetSelectedPage () const; + SD_DLLPUBLIC void SetSelectedPage (sal_uInt16 nPage); + sal_uInt16 GetSelectedPage () const; /** is used in FrameView::ReadUserDataSequence() only to store the page that was selected while last saving this document */ - void SetSelectedPageOnLoad (USHORT nPage) { mnSelectedPageOnLoad = nPage; } + void SetSelectedPageOnLoad (sal_uInt16 nPage) { mnSelectedPageOnLoad = nPage; } /** can be used to get the page that was selected on last save of this document */ - USHORT GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } + sal_uInt16 GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } SD_DLLPUBLIC void SetViewShEditMode(EditMode eMode, PageKind eKind); EditMode GetViewShEditMode (PageKind eKind); @@ -126,22 +126,22 @@ public: */ EditMode GetViewShEditModeOnLoad (void) const; - void SetLayerMode(BOOL bMode) + void SetLayerMode(sal_Bool bMode) { mbLayerMode = bMode; } - BOOL IsLayerMode() const { return mbLayerMode; } + sal_Bool IsLayerMode() const { return mbLayerMode; } - void SetQuickEdit(BOOL bQEdit) + void SetQuickEdit(sal_Bool bQEdit) { mbQuickEdit = bQEdit; } - BOOL IsQuickEdit() const { return mbQuickEdit; } + sal_Bool IsQuickEdit() const { return mbQuickEdit; } - void SetBigHandles( BOOL bOn = TRUE ) { mbBigHandles = bOn; } - BOOL IsBigHandles() const { return mbBigHandles; } + void SetBigHandles( sal_Bool bOn = sal_True ) { mbBigHandles = bOn; } + sal_Bool IsBigHandles() const { return mbBigHandles; } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { mbDoubleClickTextEdit = bOn; } - BOOL IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; } + sal_Bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( BOOL bOn = TRUE ) { mbClickChangeRotation = bOn; } - BOOL IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( sal_Bool bOn = sal_True ) { mbClickChangeRotation = bOn; } + sal_Bool IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -163,18 +163,18 @@ public: ViewShell::ShellType GetViewShellTypeOnLoad (void) const; - void SetPresentationViewShellId(USHORT nId) + void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } - USHORT GetPresentationViewShellId() const { return mnPresViewShellId; } + sal_uInt16 GetPresentationViewShellId() const { return mnPresViewShellId; } - void SetSlotId(USHORT nId) { mnSlotId = nId; } - USHORT GetSlotId() const { return mnSlotId; } + void SetSlotId(sal_uInt16 nId) { mnSlotId = nId; } + sal_uInt16 GetSlotId() const { return mnSlotId; } - void SetSlidesPerRow(USHORT nSlides) { mnSlidesPerRow = nSlides; } - USHORT GetSlidesPerRow() const { return mnSlidesPerRow; } + void SetSlidesPerRow(sal_uInt16 nSlides) { mnSlidesPerRow = nSlides; } + sal_uInt16 GetSlidesPerRow() const { return mnSlidesPerRow; } - void SetDrawMode(ULONG nNewDrawMode) { mnDrawMode = nNewDrawMode; }; - ULONG GetDrawMode() const { return mnDrawMode; }; + void SetDrawMode(sal_uLong nNewDrawMode) { mnDrawMode = nNewDrawMode; }; + sal_uLong GetDrawMode() const { return mnDrawMode; }; void SetTabCtrlPercent( double nPercent ) { mnTabCtrlPercent = nPercent; } double GetTabCtrlPercent() const { return mnTabCtrlPercent; } @@ -186,38 +186,38 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); private: - USHORT mnRefCount; + sal_uInt16 mnRefCount; VirtualDevice* mpVDev; - BOOL mbRuler; + sal_Bool mbRuler; SetOfByte maVisibleLayers; SetOfByte maLockedLayers; SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - BOOL mbNoColors; // Gliederungsmodus - BOOL mbNoAttribs; // Gliederungsmodus + sal_Bool mbNoColors; // Gliederungsmodus + sal_Bool mbNoAttribs; // Gliederungsmodus Rectangle maVisArea; // Sichtbarer Bereich PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) - USHORT mnSelectedPage; // Selektierte Seite + sal_uInt16 mnSelectedPage; // Selektierte Seite PageKind mePageKindOnLoad; - USHORT mnSelectedPageOnLoad; + sal_uInt16 mnSelectedPageOnLoad; EditMode meStandardEditMode; // Editmode im Zeichenmodus (Page/MasterPage) EditMode meNotesEditMode; // Editmode im Notizen-Modus (Page/MasterPage) EditMode meHandoutEditMode; // Editmode im Handzettel-Modus (Page/MasterPage) EditMode meEditModeOnLoad; - BOOL mbLayerMode; // Layer an/aus - BOOL mbQuickEdit; // QuickEdit an/aus - BOOL mbBigHandles; // Grosse Handles - BOOL mbDoubleClickTextEdit; // Textmodus nach Doppelklick - BOOL mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus - USHORT mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde - USHORT mnSlotId; // SlotId, welche initial ausgefuehrt wird - USHORT mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch - ULONG mnDrawMode; // Drawmode fuer das normale Fenster + sal_Bool mbLayerMode; // Layer an/aus + sal_Bool mbQuickEdit; // QuickEdit an/aus + sal_Bool mbBigHandles; // Grosse Handles + sal_Bool mbDoubleClickTextEdit; // Textmodus nach Doppelklick + sal_Bool mbClickChangeRotation; // Einfachklick wechselt Selektions-/Rotationsmodus + sal_uInt16 mnPresViewShellId; // ViewShell aus der die Pres. gestartet wurde + sal_uInt16 mnSlotId; // SlotId, welche initial ausgefuehrt wird + sal_uInt16 mnSlidesPerRow; // Dias pro Reihe auf dem Diatisch + sal_uLong mnDrawMode; // Drawmode fuer das normale Fenster double mnTabCtrlPercent; - /** Remember whether the navigator shows all shapes (<TRUE/>) or only - the names ones (<FALSE/>). Not persistent. + /** Remember whether the navigator shows all shapes (<sal_True/>) or only + the names ones (<sal_False/>). Not persistent. */ bool mbIsNavigatorShowingAllShapes; diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7b506c515185..a95f020cd85b 100644..100755 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -56,12 +56,12 @@ public: GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_DRAW); GraphicDocShell ( const sal_uInt64 nModelCreationFlags, - BOOL bSdDataObj=FALSE, + sal_Bool bSdDataObj=sal_False, DocumentType=DOCUMENT_TYPE_DRAW); virtual ~GraphicDocShell (void); diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index 5a3c0cf4eb4d..14c6a45801a6 100644..100755 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -57,7 +57,7 @@ public: protected: ::sd::View* mpView; ViewShell* mpViewSh; - USHORT nMappedSlotFilter; + sal_uInt16 nMappedSlotFilter; }; diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx index 826902a09152..945630ee37d1 100644..100755 --- a/sd/source/ui/inc/LayerDialogChildWindow.hxx +++ b/sd/source/ui/inc/LayerDialogChildWindow.hxx @@ -41,7 +41,7 @@ class LayerDialogChildWindow public: LayerDialogChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); virtual ~LayerDialogChildWindow (void); diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx index 3c0b00025307..b1233b7249bc 100755 --- a/sd/source/ui/inc/LayerDialogContent.hxx +++ b/sd/source/ui/inc/LayerDialogContent.hxx @@ -51,7 +51,7 @@ public: virtual ~LayerDialogContent (void); protected: - virtual BOOL Close (void); + virtual sal_Bool Close (void); virtual void Resize (void); private: diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index a649a6f772a2..8a8c0bd0f534 100644..100755 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -47,7 +47,7 @@ class NavigatorChildWindow public: NavigatorChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/NotesChildWindow.hxx b/sd/source/ui/inc/NotesChildWindow.hxx index 0d25c6cf3273..b69f67eee7e1 100644..100755 --- a/sd/source/ui/inc/NotesChildWindow.hxx +++ b/sd/source/ui/inc/NotesChildWindow.hxx @@ -43,7 +43,7 @@ class NotesChildWindow : public SfxChildWindow { public: - NotesChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + NotesChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); virtual ~NotesChildWindow (void); SFX_DECL_CHILDWINDOW (NotesChildWindow); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index 4d10c9a0cc7a..253bd796c9ff 100644..100755 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -54,14 +54,14 @@ public: const SfxItemSet* GetOutputItemSet() const; protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); private: using SfxTabDialog::GetOutputItemSet; SfxItemSet aInputSet; SfxItemSet *pOutputSet; - BOOL bTitle; + sal_Bool bTitle; ::sd::View *pSdView; }; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 78481294bf94..e6a4bbb15a98 100755 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -121,14 +121,14 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - ULONG GetPaperWidth() const { return 2*21000; } // DIN A4 Breite + sal_uLong GetPaperWidth() const { return 2*21000; } // DIN A4 Breite - BOOL PrepareClose(BOOL bUI = TRUE); + sal_Bool PrepareClose(sal_Bool bUI = sal_True); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); -// virtual BOOL HasMarkedObjUnused() const; +// virtual sal_Bool HasMarkedObjUnused() const; void FillOutliner(); void SetLinks(); void ResetLinks() const; @@ -141,20 +141,20 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); // #97766# Re-implement GetScriptType for this view to get correct results virtual sal_uInt16 GetScriptType() const; - /** After this method has been called with <TRUE/> following changes of + /** After this method has been called with <sal_True/> following changes of the current page are ignored in that the corresponding text is not selected. This is used to supress unwanted side effects between selection and @@ -171,7 +171,7 @@ public: /** creates and inserts an empty slide for the given paragraph. */ SdPage* InsertSlideForParagraph( Paragraph* pPara ); - void UpdateParagraph( USHORT nPara ); + void UpdateParagraph( sal_uInt16 nPara ); protected: virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ); @@ -199,10 +199,10 @@ private: List* mpOldParaOrder; List* mpSelectedParas; - USHORT mnPagesToProcess; // fuer die Fortschrittsanzeige - USHORT mnPagesProcessed; + sal_uInt16 mnPagesToProcess; // fuer die Fortschrittsanzeige + sal_uInt16 mnPagesProcessed; - BOOL mbFirstPaint; + sal_Bool mbFirstPaint; SfxProgress* mpProgress; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index dce55f5d33f7..d411771b5e56 100755 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -80,7 +80,7 @@ public: */ virtual void ArrangeGUIElements (void); - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); virtual long VirtHScrollHdl(ScrollBar* pHScroll); virtual long VirtVScrollHdl(ScrollBar* pVHScroll); @@ -88,8 +88,8 @@ public: virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); - virtual void Activate( BOOL IsMDIActivate ); - virtual void Deactivate( BOOL IsMDIActivate ); + virtual void Activate( sal_Bool IsMDIActivate ); + virtual void Deactivate( sal_Bool IsMDIActivate ); virtual SdPage* GetActualPage(); @@ -112,8 +112,8 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual String GetSelectionText( BOOL bCompleteWords = FALSE ); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; void Execute(SfxRequest& rReq); @@ -121,10 +121,10 @@ public: virtual void WriteFrameViewData(); virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); - ULONG Read(SvStream& rInput, const String& rBaseURL, USHORT eFormat); + sal_uLong Read(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -145,7 +145,7 @@ public: /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); @@ -167,7 +167,7 @@ private: OutlineView* pOlView; SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - BOOL bPastePossible; + sal_Bool bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 320f5c6878d9..2c338fbaed6b 100644..100755 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -59,7 +59,7 @@ public: @param pViewShellWeak Some information has to be taken from the view shell. @param bDirectionIsForward - This flag defines the iteration direction. When <TRUE/> then + This flag defines the iteration direction. When <sal_True/> then the direction is forwards otherwise it is backwards. */ IteratorImplBase (SdDrawDocument* pDocument, @@ -99,7 +99,7 @@ public: @param rIterator The iterator to compare to. @return - When both iterators ar equal <TRUE/> is returned, <FALSE/> otherwise. + When both iterators ar equal <sal_True/> is returned, <sal_False/> otherwise. */ virtual bool operator== (const IteratorImplBase& rIterator) const; /** This method is used by the equality operator. Additionaly to the @@ -110,7 +110,7 @@ public: @param aType The type of the iterator. @return - Returns <TRUE/> when both iterators point to the same object. + Returns <sal_True/> when both iterators point to the same object. */ virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; /** Reverse the direction of iteration. The current object stays the same. @@ -169,7 +169,7 @@ private: @param aType The type of the iterator. @return - Returns <TRUE/> when both iterators point to the same object. + Returns <sal_True/> when both iterators point to the same object. */ virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 9ba0a1f03720..6324a0256e12 100755 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -39,11 +39,11 @@ class PaneChildWindow public: PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const USHORT nDockWinTitleResId, - const USHORT nTitleBarResId, + const sal_uInt16 nDockWinTitleResId, + const sal_uInt16 nTitleBarResId, SfxChildAlignment eAlignment); virtual ~PaneChildWindow (void); }; @@ -55,7 +55,7 @@ class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(LeftPaneImpressChildWindow); }; @@ -67,7 +67,7 @@ class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (::Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(LeftPaneDrawChildWindow); }; @@ -84,7 +84,7 @@ class ToolPanelChildWindow :public PaneChildWindow public: ToolPanelChildWindow( ::Window* i_pParentWindow, - USHORT i_nId, + sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 366026fe2e06..75687665593f 100644..100755 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -60,13 +60,13 @@ public: virtual void Resize (void); protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); private: Rectangle maOldVisArea; - virtual void Activate (BOOL bIsMDIActivate); + virtual void Activate (sal_Bool bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index b157d686b044..652819242a09 100755 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -54,7 +54,7 @@ public: @param pTemplate May be NULL. @param bPaintFrame - When <TRUE/> (the default) then a frame is painted around the + When <sal_True/> (the default) then a frame is painted around the preview. This makes the actual preview smaller. */ PreviewRenderer ( @@ -76,12 +76,12 @@ public: this text is painted in an empty rectangle of the requested size instead. @param bObeyHighContrastMode - When <FALSE/> then the high contrast mode of the application is + When <sal_False/> then the high contrast mode of the application is ignored and the preview is rendered in normal mode. When - <TRUE/> and high contrast mode is active then the preview is + <sal_True/> and high contrast mode is active then the preview is rendered in high contrast mode. @param bDisplayPresentationObjects - When <FALSE/> then the PresObj place holders are not displayed + When <sal_False/> then the PresObj place holders are not displayed in the returned preview. */ Image RenderPage ( @@ -101,12 +101,12 @@ public: this text is painted in an empty rectangle of the requested size instead. @param bObeyHighContrastMode - When <FALSE/> then the high contrast mode of the application is + When <sal_False/> then the high contrast mode of the application is ignored and the preview is rendered in normal mode. When - <TRUE/> and high contrast mode is active then the preview is + <sal_True/> and high contrast mode is active then the preview is rendered in high contrast mode. @param bDisplayPresentationObjects - When <FALSE/> then the PresObj place holders are not displayed + When <sal_False/> then the PresObj place holders are not displayed in the returned preview. */ Image RenderPage ( diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 2c044f9ab176..8b319ca7f16f 100644..100755 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -53,14 +53,14 @@ public: DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, - USHORT nRulerFlags, + sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); virtual ~Ruler (void); void SetNullOffset(const Point& rOffset); - BOOL IsHorizontal() const { return bHorz; } + sal_Bool IsHorizontal() const { return bHorz; } using ::Ruler::SetNullOffset; protected: @@ -68,7 +68,7 @@ protected: ::sd::Window* pSdWin; DrawViewShell* pDrViewShell; RulerCtrlItem* pCtrlItem; - BOOL bHorz; + sal_Bool bHorz; virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void MouseButtonUp(const MouseEvent& rMEvt); diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 257695e0fc91..a94ae3364906 100755 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -88,7 +88,7 @@ public: virtual ~SlideSorter (void); /** Return whether the called SlideSorter object is valid and calling - its Get(Model,View,Controller) methods is safe. When <FALSE/> is + its Get(Model,View,Controller) methods is safe. When <sal_False/> is called then no other methods should be called. Calling this method should be necessary only during startup and shutdown (when that can be detected). @@ -242,7 +242,7 @@ private: ::boost::shared_ptr<ScrollBar> mpVerticalScrollBar; ::boost::shared_ptr<ScrollBarBox> mpScrollBarBox; - /** Set this flag to <TRUE/> to force a layout before the next paint. + /** Set this flag to <sal_True/> to force a layout before the next paint. */ bool mbLayoutPending; diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hxx b/sd/source/ui/inc/SlideSorterChildWindow.hxx index 9f0f56a1b99d..06c06f2aab56 100644..100755 --- a/sd/source/ui/inc/SlideSorterChildWindow.hxx +++ b/sd/source/ui/inc/SlideSorterChildWindow.hxx @@ -43,7 +43,7 @@ class SlideSorterChildWindow public: SlideSorterChildWindow ( ::Window*, - USHORT, + sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 2b03cd636d0f..3bbbedccec6f 100755 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -118,7 +118,7 @@ public: */ virtual void ArrangeGUIElements (void); - virtual void Activate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); //===== Drag and Drop ===================================================== @@ -131,14 +131,14 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); typedef ::std::vector<SdPage*> PageSelection; diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 17f7f17e3a9a..70427f5b79ce 100755 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -70,35 +70,35 @@ public: SlideViewShell* pSlideVShell); virtual ~SlideView (void); - void Select( USHORT nSdPageNum, BOOL bSelect ); - void SelectAllSlides( BOOL bSelect ); + void Select( sal_uInt16 nSdPageNum, sal_Bool bSelect ); + void SelectAllSlides( sal_Bool bSelect ); void MoveFocus( SlideViewFocusMove eMove ); - USHORT GetFocusPage() const; - BOOL HasFocus() const; + sal_uInt16 GetFocusPage() const; + sal_Bool HasFocus() const; - USHORT ChangePagesPerRow( USHORT nNum ); - USHORT GetPagesPerRow() const { return nPagesPerRow; } + sal_uInt16 ChangePagesPerRow( sal_uInt16 nNum ); + sal_uInt16 GetPagesPerRow() const { return nPagesPerRow; } virtual void InvalidateOneWin( ::Window& rWin ); virtual void InvalidateOneWin( ::Window& rWin, const Rectangle& rRect ); - void SetAllowInvalidate( BOOL bFlag ); - BOOL IsInvalidateAllowed() const; + void SetAllowInvalidate( sal_Bool bFlag ); + sal_Bool IsInvalidateAllowed() const; void Paint(const Rectangle& rRect, OutputDevice* pOut); - void DrawSelectionRect(USHORT nPage); + void DrawSelectionRect(sal_uInt16 nPage); - Point CalcPagePos( USHORT nPageNo ) const; - Rectangle GetPageArea( USHORT nPageNo ) const; - ULONG GetPageGap() const; - Rectangle GetFadeIconArea( USHORT nPageNo ) const; + Point CalcPagePos( sal_uInt16 nPageNo ) const; + Rectangle GetPageArea( sal_uInt16 nPageNo ) const; + sal_uLong GetPageGap() const; + Rectangle GetFadeIconArea( sal_uInt16 nPageNo ) const; SdPage* GetHitPage( const Point& rPos ) const; SdPage* GetFadePage( const Point& rPos ) const; SdPage* GetNearestPage( const Point& rPos ) const; void DeleteMarked(); - void MoveMarked( USHORT nTargetPage ); + void MoveMarked( sal_uInt16 nTargetPage ); void AddToCache( SdPage* pPage, const Bitmap& rBitmap, long nZoom ); const GraphicObject* GetFromCache( SdPage* pPage, long& rZoom, long nZoomTolerance ) const; @@ -114,12 +114,12 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); void UpdateAllPages(); @@ -129,14 +129,14 @@ private: SlideViewShell* pSlideViewShell; BitmapCache* pCache; VirtualDevice* mpVDev; - USHORT nAllowInvalidateSmph; - USHORT nPagesPerRow; - USHORT nFocusPage; - BOOL bInPaint; - BOOL bInDelayedPaint; + sal_uInt16 nAllowInvalidateSmph; + sal_uInt16 nPagesPerRow; + sal_uInt16 nFocusPage; + sal_Bool bInPaint; + sal_Bool bInDelayedPaint; DECL_LINK( PaintDelayed, Timer * ); - void CreateSlideTransferable (::Window* pWindow, BOOL bDrag); + void CreateSlideTransferable (::Window* pWindow, sal_Bool bDrag); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx index 7cb9d27bde18..8b0dbf347098 100755 --- a/sd/source/ui/inc/SlideViewShell.hxx +++ b/sd/source/ui/inc/SlideViewShell.hxx @@ -88,7 +88,7 @@ public: virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); } virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); } - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); @@ -106,7 +106,7 @@ public: void GetMenuState(SfxItemSet &rSet); void GetAttrState(SfxItemSet &rSet); - void SetPagesPerRow( USHORT nPagesPerRow ); + void SetPagesPerRow( sal_uInt16 nPagesPerRow ); void ExecStatusBar(SfxRequest& rReq); void GetStatusBarState(SfxItemSet& rSet); @@ -121,7 +121,7 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual BOOL HasSelection( BOOL bText = TRUE ) const; + virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; /** Draw the rectangle arround the specified slide that indicates whether the slide is selected or not. When not selected the rectangle is @@ -133,8 +133,8 @@ public: @param nPage When the page number is invalid then the call is ignored. */ - void DrawSelectionRect( USHORT nPage ); - void DrawFocusRect( USHORT nPage ); + void DrawSelectionRect( sal_uInt16 nPage ); + void DrawFocusRect( sal_uInt16 nPage ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -145,12 +145,12 @@ public: void SelectionHasChanged(); void PageLayoutHasChanged(); - void FocusHasChanged( USHORT nOldFocusPage, USHORT nNewFocusPage ); - void PageVisibilityHasChanged( USHORT nPage, BOOL bVisible ); + void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage ); + void PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible ); /** On activation the preview is turned off. */ - virtual void Activate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); protected: virtual Size GetOptimalSizePixel() const; @@ -162,12 +162,12 @@ private: SlideView* pSlideView; Point aDisplayPos; Size aDisplaySize; - USHORT nCurFocusPage; + sal_uInt16 nCurFocusPage; bool bSetInitialZoomFactor; bool bInitializeWinPos; void Construct(SdDrawDocument* pDoc); - void ImplDrawFocusRect( USHORT nPage, BOOL bVisible ); + void ImplDrawFocusRect( sal_uInt16 nPage, sal_Bool bVisible ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 4e08dd99b063..21d0a9882b94 100755 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -45,7 +45,7 @@ class SpellDialogChildWindow public: SpellDialogChildWindow ( ::Window* pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (void); @@ -77,7 +77,7 @@ private: */ Outliner* mpSdOutliner; - /** When this flag is <TRUE/> then eventually we have to destroy + /** When this flag is <sal_True/> then eventually we have to destroy the outliner in mpSdOutliner. */ bool mbOwnOutliner; diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 48de6910dece..7334a6e89362 100644..100755 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -64,7 +64,7 @@ public: protected: DrawViewShell* pDrViewSh; - BOOL bInternalMove; + sal_Bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 1c5f0cfe6f11..1b46ccf16e0f 100644..100755 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -85,7 +85,7 @@ public: and collect the supported ones in a tree structure. This structure is returned by GetFolderList(). 2. The new way implements the AsynchronousTask interface. Call - RunNextStep() as long HasNextStep() returns <TRUE/>. After every step + RunNextStep() as long HasNextStep() returns <sal_True/>. After every step GetLastAddedEntry() returns the template that was scanned (and has a supported format) last. When a step does not add a new template then the value of the previous step is returned. diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx index 9a0f6b65b259..8484260e15ad 100644..100755 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ b/sd/source/ui/inc/UpdateLockManager.hxx @@ -74,7 +74,7 @@ public: /** Return whether the ViewShellBase object is locked. When locking is disabled, i.e. Disable() has been called before, then this method - always returns <FALSE/>. + always returns <sal_False/>. */ bool IsLocked (void) const; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f78051bdd719..766f0c072b63 100755 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -87,8 +87,8 @@ public: void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const; - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); virtual void MarkListHasChanged(); virtual void ModelHasChanged(); virtual void SelectAll(); @@ -96,21 +96,21 @@ public: virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj); - virtual BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); + virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> @@ -123,7 +123,7 @@ public: ::com::sun::star::datatransfer::XTransferable> CreateSelectionDataObject (::sd::View*, ::Window& rWindow); - void UpdateSelectionClipboard( BOOL bForceDeselect ); + void UpdateSelectionClipboard( sal_Bool bForceDeselect ); inline DrawDocShell* GetDocSh (void) const; inline SdDrawDocument* GetDoc (void) const; @@ -137,9 +137,9 @@ public: bool RestoreDefaultText( SdrTextObj* pTextObj ); - BOOL InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, BOOL bDrag, - ULONG nFormat = 0, USHORT nPage = SDRPAGE_NOTFOUND, USHORT nLayer = SDRLAYER_NOTFOUND ); + sal_Bool InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, + sal_uLong nFormat = 0, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is present, then is is inserted as a single graphic. @@ -154,25 +154,25 @@ public: SdrMediaObj* InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize ); - bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, ULONG nPasteOptions ); + bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions ); - BOOL IsPresObjSelected(BOOL bOnPage=TRUE, BOOL bOnMasterPage=TRUE, BOOL bCheckPresObjListOnly=FALSE, BOOL bCheckLayoutOnly=FALSE) const; + sal_Bool IsPresObjSelected(sal_Bool bOnPage=sal_True, sal_Bool bOnMasterPage=sal_True, sal_Bool bCheckPresObjListOnly=sal_False, sal_Bool bCheckLayoutOnly=sal_False) const; void SetMarkedOriginalSize(); - void LockRedraw(BOOL bLock); + void LockRedraw(sal_Bool bLock); - BOOL IsMorphingAllowed() const; - BOOL IsVectorizeAllowed() const; + sal_Bool IsMorphingAllowed() const; + sal_Bool IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; - BOOL GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT nType ); + sal_Bool GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType ); virtual void onAccessibilityOptionsChanged(); virtual SdrModel* GetMarkedObjModel() const; - 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); using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ @@ -185,14 +185,14 @@ public: void updateHandles(); virtual SdrViewContext GetContext() const; - virtual BOOL HasMarkablePoints() const; - virtual ULONG GetMarkablePointCount() const; - virtual BOOL HasMarkedPoints() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_Bool HasMarkablePoints() const; + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_Bool HasMarkedPoints() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const ::Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); using SdrMarkView::MarkPoints; void SetPossibilitiesDirty() { bPossibilitiesDirty = true; } @@ -219,13 +219,13 @@ protected: SdrMarkList* mpDragSrcMarkList; SdrObject* mpDropMarkerObj; SdrDropMarkerOverlay* mpDropMarker; - USHORT mnDragSrcPgNum; + sal_uInt16 mnDragSrcPgNum; Point maDropPos; ::std::vector< String > maDropFileVector; sal_Int8 mnAction; Timer maDropErrorTimer; Timer maDropInsertFileTimer; - USHORT mnLockRedrawSmph; + sal_uInt16 mnLockRedrawSmph; List* mpLockedRedraws; bool mbIsDropAllowed; diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 216c4e8c1dbe..00f68f6a4218 100644..100755 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -70,7 +70,7 @@ protected: /** Return an index of a page after which the pages of the transferable are to be inserted into the target document. */ - virtual USHORT DetermineInsertPosition ( + virtual sal_uInt16 DetermineInsertPosition ( const SdTransferable& rTransferable); /** Insert the slides in the given transferable behind the last selected @@ -83,9 +83,9 @@ protected: @return Returns the number of inserted slides. */ - virtual USHORT InsertSlides ( + virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition); + sal_uInt16 nInsertPosition); }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index e6e6b401cb57..1f78d1fd5634 100755 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -121,8 +121,8 @@ public: static const int MAX_VSPLIT_CNT = 1; static const int MIN_SCROLLBAR_SIZE = 50; - static const ULONG OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; - static const ULONG OUTPUT_DRAWMODE_GRAYSCALE + static const sal_uLong OUTPUT_DRAWMODE_COLOR = DRAWMODE_DEFAULT; + static const sal_uLong OUTPUT_DRAWMODE_GRAYSCALE = DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT; @@ -201,12 +201,12 @@ public: // Mouse- & Key-Events virtual void PrePaint(); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual BOOL KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual BOOL RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + virtual sal_Bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); virtual long Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); @@ -214,10 +214,10 @@ public: virtual void Draw(OutputDevice &rDev, const Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); - virtual void SetDefTabHRuler( UINT16 nDefTab ); + virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); - BOOL HasRuler (void); - void SetRuler(BOOL bRuler); + sal_Bool HasRuler (void); + void SetRuler(sal_Bool bRuler); /** Set internal values of all scroll bars that determine thumb size and position. The external values like size and position of the scroll @@ -229,13 +229,13 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); void InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, BOOL bUpdate = FALSE); + const Point& rWinPos, sal_Bool bUpdate = sal_False); void InvalidateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. */ - virtual void UpdatePreview (SdPage* pPage, BOOL bInit = FALSE); + virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); void DrawMarkRect(const Rectangle& rRect) const; @@ -255,7 +255,7 @@ public: virtual void WriteUserData(String& rString); virtual void ReadUserData(const String& rString); - virtual BOOL ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); /** @returns current or selected page or 0. This method @@ -273,7 +273,7 @@ public: FunctionReference GetOldFunction() const { return mxOldFunction; } bool HasOldFunction() const { return mxOldFunction.is(); } FunctionReference GetCurrentFunction() const { return mxCurrentFunction; } - bool HasCurrentFunction( USHORT nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); } + bool HasCurrentFunction( sal_uInt16 nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); } bool HasCurrentFunction() { return mxCurrentFunction.is(); } void SetCurrentFunction(const FunctionReference& xFunction); @@ -282,26 +282,26 @@ public: void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, long nUpper, long nLower, - BOOL bScaleAll, Orientation eOrient, USHORT nPaperBin, - BOOL bBackgroundFullSize ); + sal_Bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, + sal_Bool bBackgroundFullSize ); - void SetStartShowWithDialog( BOOL bIn = TRUE ) { mbStartShowWithDialog = bIn; } - BOOL IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( sal_Bool bIn = sal_True ) { mbStartShowWithDialog = bIn; } + sal_Bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } - USHORT GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } - void SetPrintedHandoutPageNum (USHORT nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } + sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } + void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } - USHORT GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } - void SetPrintedHandoutPageCount (USHORT nPageCount) {mnPrintedHandoutPageCount=nPageCount; } + sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } + void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } - virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE ); + virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); void GetMenuState(SfxItemSet& rSet); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, USHORT nPage, USHORT nLayer ); + ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); @@ -335,11 +335,11 @@ public: /** Return the border that is drawn arround the actual document view. The border contains typically rulers and scroll bars. @param bOuterResize - When this flag is <TRUE/> then the border is used for an + When this flag is <sal_True/> then the border is used for an OuterResizePixel(), i.e. there is a given window size and the border elements are placed inside so that the document view has the given window size minus the border. - When the flag is <FALSE/> then the border is used for an + When the flag is <sal_False/> then the border is used for an InnerResizePixel(), i.e. the document view has a given size and the border is placed outside. In this scenario the parent window has the size of the document view plus the border. @@ -385,7 +385,7 @@ public: ViewShellBase& GetViewShellBase (void) const; - /** Return <TRUE/> when the called view shell is the main sub shell of + /** Return <sal_True/> when the called view shell is the main sub shell of its ViewShellBase object, i.e. is display in the center pane. This convenience function is equivalent to comparing the this pointer to the result of ViewShellBase::GetViewShell(PT_CENTER). @@ -394,7 +394,7 @@ public: /** Set or reset the flag that indicates whether the called shell is the one displayed in the center pane. By default this flag is set to - <FALSE/>. For the main view shell it thus has to be set to <TRUE/>. + <sal_False/>. For the main view shell it thus has to be set to <sal_True/>. */ void SetIsMainViewShell (bool bIsMainViewShell); @@ -430,7 +430,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - BOOL IsPageFlipMode(void) const; + sal_Bool IsPageFlipMode(void) const; /** Set the given window as new parent window. This is not possible for all views, so the return value tells the caller if the relocation @@ -509,13 +509,13 @@ protected: Size maViewSize; Size maScrBarWH; - BOOL mbCenterAllowed; // wird an Fenster weitergegeben + sal_Bool mbCenterAllowed; // wird an Fenster weitergegeben - BOOL mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet - USHORT mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. - USHORT mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. + sal_Bool mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet + sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. + sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - //af BOOL bPrintDirectSelected; // Print only selected objects in direct print + //af sal_Bool bPrintDirectSelected; // Print only selected objects in direct print //afString sPageRange; // pagerange if selected objects in direct print /** Area covered by all windows, i.e. the area of the parent window @@ -537,8 +537,8 @@ protected: virtual SfxUndoManager* ImpGetUndoManager (void) const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; - void ImpSidUndo(BOOL bDrawViewShell, SfxRequest& rReq); - void ImpSidRedo(BOOL bDrawViewShell, SfxRequest& rReq); + void ImpSidUndo(sal_Bool bDrawViewShell, SfxRequest& rReq); + void ImpSidRedo(sal_Bool bDrawViewShell, SfxRequest& rReq); DECL_LINK( HScrollHdl, ScrollBar * ); DECL_LINK( VScrollHdl, ScrollBar * ); @@ -548,7 +548,7 @@ protected: virtual long VirtVScrollHdl(ScrollBar* pVScroll); // virtuelle Funktionen fuer Lineal-Handling - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, BOOL bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -557,8 +557,8 @@ protected: // abgeleiteter Klassen (z.B. ein TabBar) zurueckgeben virtual long GetHCtrlWidth(); - virtual void Activate(BOOL IsMDIActivate); - virtual void Deactivate(BOOL IsMDIActivate); + virtual void Activate(sal_Bool IsMDIActivate); + virtual void Deactivate(sal_Bool IsMDIActivate); virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 38f7223f1d83..cd89d85249bd 100755 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -136,12 +136,12 @@ public: virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (BOOL bCreate = FALSE); + virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False); /// Forwarded to the print manager. - virtual USHORT SetPrinter ( + virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false); /// Forwarded to the print manager. virtual PrintDialog* CreatePrintDialog (::Window *pParent); @@ -152,13 +152,13 @@ public: const SfxItemSet &rOptions); /// Forwarded to the print manager. - virtual USHORT Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pDialog); + virtual sal_uInt16 Print (SfxProgress& rProgress, sal_Bool bIsAPI, PrintDialog* pDialog); /// Forwarded to the print manager. virtual ErrCode DoPrint ( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, - BOOL bSilent, BOOL bIsAPI ); + sal_Bool bSilent, sal_Bool bIsAPI ); virtual void PreparePrint (PrintDialog* pPrintDialog); @@ -179,18 +179,18 @@ public: virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual void Activate (BOOL IsMDIActivate); - virtual void Deactivate (BOOL IsMDIActivate); + virtual void Activate (sal_Bool IsMDIActivate); + virtual void Deactivate (sal_Bool IsMDIActivate); virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY); - virtual USHORT PrepareClose (BOOL bUI = TRUE, BOOL bForBrowsing = FALSE); - virtual void WriteUserData (String&, BOOL bBrowse = FALSE); - virtual void ReadUserData (const String&, BOOL bBrowse = FALSE); + virtual sal_uInt16 PrepareClose (sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False); + virtual void WriteUserData (String&, sal_Bool bBrowse = sal_False); + virtual void ReadUserData (const String&, sal_Bool bBrowse = sal_False); virtual SdrView* GetDrawView (void) const; virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize); - /** When <TRUE/> is given, then the mouse shape is set to hour glass (or + /** When <sal_True/> is given, then the mouse shape is set to hour glass (or whatever the busy shape looks like on the system.) */ void SetBusyState (bool bBusy); diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index f4f07b5549dd..1b2451cad88a 100755 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -78,11 +78,11 @@ public: static ::boost::shared_ptr<ToolBarManagerLock> Create ( const ::boost::shared_ptr<ToolBarManager>& rpManager); /** Release the lock. When the UI is captured - (Application::IsUICaptured() returns <TRUE/>) then the lock is + (Application::IsUICaptured() returns <sal_True/>) then the lock is released later asynchronously. @param bForce - When this flag is <TRUE/> then the lock is released even - when IsUICaptured() returns <TRUE/>. + When this flag is <sal_True/> then the lock is released even + when IsUICaptured() returns <sal_True/>. */ void Release (bool bForce = false); DECL_LINK(TimeoutCallback,Timer*); diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index d674e7d07eff..3619849fe022 100755 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -118,7 +118,7 @@ public: @param pFormShell The form shell. @param bAbove - When <TRUE/> then the form shell will be placed directly above + When <sal_True/> then the form shell will be placed directly above pViewShell on the SFX shell stack. Otherwise the form shell is placed directly below the view shell. */ diff --git a/sd/source/ui/inc/ViewTabControl.hxx b/sd/source/ui/inc/ViewTabControl.hxx index 4009edfd04d4..91ae38effa35 100644..100755 --- a/sd/source/ui/inc/ViewTabControl.hxx +++ b/sd/source/ui/inc/ViewTabControl.hxx @@ -64,7 +64,7 @@ public: protected: DrawViewShell* pDrViewSh; - BOOL bInternalMove; + sal_Bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 8dd522d8212d..279b149c9219 100755 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -114,7 +114,7 @@ public: factor. <p>This calculation is performed only when the - <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> + <member>bMinZoomAutoCalc</member> is set (to <sal_True/>).</p> */ void CalcMinZoom (void); void SetMinZoom (long int nMin); @@ -139,7 +139,7 @@ public: larger than the view or the value of aWinPos in this direction is -1 then the window is centered in this direction. */ - void UpdateMapOrigin (BOOL bInvalidate = TRUE); + void UpdateMapOrigin (sal_Bool bInvalidate = sal_True); void UpdateMapMode (void); @@ -170,11 +170,11 @@ protected: Point maWinPos; Point maViewOrigin; Size maViewSize; - USHORT mnMinZoom; - USHORT mnMaxZoom; + sal_uInt16 mnMinZoom; + sal_uInt16 mnMaxZoom; /** This flag tells whether to re-calculate the minimal zoom factor depening on the current zoom factor. According to task #105436# its - default value is now FALSE. + default value is now sal_False. */ bool mbMinZoomAutoCalc; bool mbCalcMinZoomByMinSide; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 7a7a34362c48..030f0a3eb845 100755 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -110,7 +110,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void FillInfo( SfxChildWinInfo& ) const; @@ -150,8 +150,8 @@ private: Size aFltWinSize; Size aDisplaySize; Size aBmpSize; - BOOL bMovie; - BOOL bAllObjects; + sal_Bool bMovie; + sal_Bool bAllObjects; SfxBindings* pBindings; AnimationControllerItem* pControllerItem; @@ -170,9 +170,9 @@ private: DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); - void UpdateControl( ULONG nPos, BOOL bDisableCtrls = FALSE ); + void UpdateControl( sal_uLong nPos, sal_Bool bDisableCtrls = sal_False ); void ResetAttrs(); - void WaitInEffect( ULONG nMilliSeconds, ULONG nTime, + void WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pStbMgr ) const; Fraction GetScale(); }; @@ -187,10 +187,10 @@ class AnimationControllerItem : public SfxControllerItem { public: - AnimationControllerItem( USHORT, AnimationWindow*, SfxBindings* ); + AnimationControllerItem( sal_uInt16, AnimationWindow*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: AnimationWindow* pAnimationWin; diff --git a/sd/source/ui/inc/bmcache.hxx b/sd/source/ui/inc/bmcache.hxx index c04f7d2ed2c4..7d845694fb6e 100755 --- a/sd/source/ui/inc/bmcache.hxx +++ b/sd/source/ui/inc/bmcache.hxx @@ -36,12 +36,12 @@ class GraphicObject; class BitmapCache { - ULONG nMaxSize; - ULONG nCurSize; + sal_uLong nMaxSize; + sal_uLong nCurSize; List aEntries; public: - BitmapCache(ULONG nMaxSizeKB) + BitmapCache(sal_uLong nMaxSizeKB) : nMaxSize(nMaxSizeKB), nCurSize(0) {} virtual ~BitmapCache(); diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index e0c6262d603a..b194f23fec63 100644..100755 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -45,7 +45,7 @@ private: XHatchList* mpHatchingList; XBitmapList* mpBitmapList; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual const SfxItemSet* GetRefreshedSet(); public: diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 020232ddced3..764baccefd54 100644..100755 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -59,7 +59,7 @@ private: SdDrawDocument& rDoc; List* pCustomShowList; SdCustomShow* pCustomShow; - BOOL bModified; + sal_Bool bModified; void CheckState(); @@ -70,8 +70,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); ~SdCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } - BOOL IsCustomShow() const; + sal_Bool IsModified() const { return( bModified ); } + sal_Bool IsCustomShow() const; }; @@ -94,7 +94,7 @@ private: SdDrawDocument& rDoc; SdCustomShow*& rpCustomShow; - BOOL bModified; + sal_Bool bModified; String aOldName; void CheckState(); @@ -109,7 +109,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); ~SdDefineCustomShowDlg(); - BOOL IsModified() const { return( bModified ); } + sal_Bool IsModified() const { return( bModified ); } }; #endif // _SD_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index a5da8b4a10fc..182990a89690 100644..100755 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -64,13 +64,13 @@ public: class SdTbxCtlDiaPages : public SfxToolBoxControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlDiaPages( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxCtlDiaPages(); }; diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index a427157c997c..3ac15dc6ef1d 100644..100755 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -48,7 +48,7 @@ private: const SfxItemSet& rOutAttrs; const SfxObjectShell& rDocShell; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); public: diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 523b86cf66a8..c4d70ba6d127 100755 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -58,19 +58,19 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, BOOL bAutoPilot); + AssistentDlg(Window* pParent, sal_Bool bAutoPilot); ~AssistentDlg(); DECL_LINK( FinishHdl, OKButton * ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; - BOOL IsSummary() const; + sal_Bool IsSummary() const; StartType GetStartType() const; String GetDocPath() const; - BOOL GetStartWithFlag() const; + sal_Bool GetStartWithFlag() const; - BOOL IsDocEmpty() const; + sal_Bool IsDocEmpty() const; String GetPassword(); }; diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 1b462f284386..3b12652b0ea2 100644..100755 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -38,7 +38,7 @@ class XGradientList; class XHatchList; class XBitmapList; -typedef USHORT ChangeType; +typedef sal_uInt16 ChangeType; /************************************************************************* |* @@ -58,10 +58,10 @@ private: XBitmapList* mpBitmapList; public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, BOOL bAreaPage = TRUE ); + SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); ~SdPageDlg() {}; - virtual void PageCreated(USHORT nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); }; #endif // _SD_DLGPAGE_HXX diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 6362d1e476a2..4ff9e92adcb5 100755 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -93,7 +93,7 @@ public: void HideRadioGroup(); void HideDeleteBtn() { aBtnDelete.Hide(); } - void SetInputFields(BOOL bEnableX, BOOL bEnableY); + void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); }; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 76b8fe06f318..de0b2e38fd78 100755 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -49,7 +49,7 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - BOOL bInEffect; + sal_Bool bInEffect; Link aClickHdl; SfxObjectShell* mpObj; sal_uInt16 mnShowPage; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index f2b621814c49..e4b5eb00cfbb 100644..100755 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -60,14 +60,14 @@ public: virtual void MarkListHasChanged(); void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE); + virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(BOOL bBlock); + void BlockPageOrderChangedHint(sal_Bool bBlock); - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr = FALSE); - virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); + virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); virtual void HideSdrPage(); // SdrPageView* pPV); @@ -85,7 +85,7 @@ private: DrawViewShell* mpDrawViewShell; VirtualDevice* mpVDev; - USHORT mnPOCHSmph; // zum blockieren des PageOrderChangedHint + sal_uInt16 mnPOCHSmph; // zum blockieren des PageOrderChangedHint }; } // end of namespace sd diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 57a6c838feab..3d5f25ebd8a0 100644..100755 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -81,9 +81,9 @@ public: This broadcaster is typically the same as the one used by the ConfigurationController. @param bBroadcastRequestEvents - When this is <TRUE/> then modifications to the configuration + When this is <sal_True/> then modifications to the configuration trigger the broadcasting of "ResourceActivationRequestEvent" and - "ResourceDeactivationRequestEvent". When this flag is <FALSE/> + "ResourceDeactivationRequestEvent". When this flag is <sal_False/> then events with type "ResourceActivationEvent" and "ResourceDeactivationEvent" are broadcasted. */ diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 6ecdeaf31e7e..d26e4140c474 100755 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -172,7 +172,7 @@ public: /** Test whether the called FrameworkHelper object is valid. @return - When the object has already been disposed then <FALSE/> is returned. + When the object has already been disposed then <sal_False/> is returned. */ bool IsValid (void); @@ -226,9 +226,9 @@ public: @param rsTaskPanelURL The panel that is to be activated. @param bEnsureTaskPaneIsVisible - When this is <TRUE/> then the task pane is activated when not + When this is <sal_True/> then the task pane is activated when not yet active. - When this flag is <FALSE/> then the requested panel + When this flag is <sal_False/> then the requested panel is activated only when the task pane is already active. When it is not active then this call is silently ignored. */ @@ -239,7 +239,7 @@ public: /** Process a slot call that requests a view shell change. */ void HandleModeChangeSlot ( - ULONG nSlotId, + sal_uLong nSlotId, SfxRequest& rRequest); /** Run the given callback when the specified event is notified by the @@ -376,7 +376,7 @@ private: @param rsEventType Run rCallback only on this event. @param rFilter - This filter has to return <TRUE/> in order for rCallback to be + This filter has to return <sal_True/> in order for rCallback to be called. @param rCallback The callback functor to be called. diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index f12f0ca118f0..9a76cc196926 100644..100755 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -137,7 +137,7 @@ public: throw (::com::sun::star::uno::RuntimeException); /** For the typical pane it makes no sense to be dislayed without a - view. Therefore this default implementation returns always <TRUE/>. + view. Therefore this default implementation returns always <sal_True/>. */ virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index e8124e895ee6..eb91c1e5b22c 100755 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -215,7 +215,7 @@ private: present independently of psFirstAnchorURL. @param eMode This specifies whether the called resource has to be directly - bound to the given anchor in order to return <TRUE/> or whether + bound to the given anchor in order to return <sal_True/> or whether it can be bound indirectly, too. */ bool IsBoundToAnchor ( @@ -229,7 +229,7 @@ private: A possibly empty list of anchor URLs. @param eMode This specifies whether the called resource has to be directly - bound to the given anchor in order to return <TRUE/> or whether + bound to the given anchor in order to return <sal_True/> or whether it can be bound indirectly, too. */ bool IsBoundToAnchor ( diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index cb1f17d4131d..d5b47fd2bc28 100644..100755 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -47,10 +47,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 24cf0d46e85f..6d333d96c0b3 100644..100755 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -43,10 +43,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 0bf18a20a5da..f5597a7d9053 100644..100755 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -50,18 +50,18 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); - void SetEditMode(USHORT nMode); - USHORT GetEditMode() { return nEditMode; } + void SetEditMode(sal_uInt16 nMode); + sal_uInt16 GetEditMode() { return nEditMode; } // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); @@ -74,7 +74,7 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); - USHORT nEditMode; + sal_uInt16 nEditMode; ::com::sun::star::uno::Any maTargets; // used for creating a path for custom animations }; diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index da96a4d1ddfd..064461ff201a 100644..100755 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -54,10 +54,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 3c2846c47037..b3b24cce37ed 100644..100755 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -54,10 +54,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 390060a16e3c..e9fde8168233 100755 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -53,15 +53,15 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - virtual void SelectionHasChanged() { bSelectionChanged = TRUE; } + virtual void SelectionHasChanged() { bSelectionChanged = sal_True; } // SJ: setting stylesheet, the use of a filled or unfilled style // is determined by the member nSlotId : diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index be7e83065bc0..4b55f6f150c9 100644..100755 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -49,10 +49,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -71,8 +71,8 @@ protected: String aOldLayer; private: - UINT32 nInventor; - UINT16 nIdentifier; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 23f68eda327b..8a36ad16fcb4 100755 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -50,11 +50,11 @@ class FuDraw public: TYPEINFO(); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void ScrollStart(); virtual void ScrollEnd(); @@ -66,10 +66,10 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - BOOL SetPointer(SdrObject* pObj, const Point& rPos); - BOOL SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); + sal_Bool SetPointer(SdrObject* pObj, const Point& rPos); + sal_Bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); - void SetPermanent(BOOL bSet) { bPermanent = bSet; } + void SetPermanent(sal_Bool bSet) { bPermanent = bSet; } /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -90,10 +90,10 @@ protected: Pointer aNewPointer; Pointer aOldPointer; - BOOL bMBDown; - BOOL bDragHelpLine; - USHORT nHelpLine; - BOOL bPermanent; + sal_Bool bMBDown; + sal_Bool bDragHelpLine; + sal_uInt16 nHelpLine; + sal_Bool bPermanent; }; diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 9ef00c2b7335..31719deccaaf 100644..100755 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -52,9 +52,9 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index badf58a1d631..3fcf51729bce 100644..100755 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -48,11 +48,11 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); virtual void ReceiveRequest(SfxRequest& rReq); virtual void Activate(); // Function aktivieren diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 3e2524c98a2f..4d2f19f5fb65 100644..100755 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -45,23 +45,23 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); virtual void Activate(); virtual void Deactivate(); static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); - static bool CanCopyThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ); + static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); void DoExecute( SfxRequest& rReq ); - bool HasContentForThisType( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; void Paste( bool, bool ); void implcancel(); diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 6f8f9365ed1d..6bffd12f693c 100644..100755 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -44,12 +44,12 @@ class FuHangulHanjaConversion : public FuPoor static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - void StartConversion( INT16 nSourceLanguage, INT16 nTargetLanguage, - const Font *pTargetFont, INT32 nOptions, BOOL bIsInteractive ); + void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, + const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); void StartChineseConversion(); - void ConvertStyles( INT16 nTargetLanguage, const Font *pTargetFont ); + void ConvertStyles( sal_Int16 nTargetLanguage, const Font *pTargetFont ); Outliner* GetOutliner() const { return pSdOutliner; } @@ -57,7 +57,7 @@ class FuHangulHanjaConversion : public FuPoor ~FuHangulHanjaConversion(); Outliner* pSdOutliner; - BOOL bOwnOutliner; + sal_Bool bOwnOutliner; private: FuHangulHanjaConversion ( diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index b9f5589c5d2f..51964de71c54 100644..100755 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -60,9 +60,9 @@ private: String aFile; // gewaehlter Dateiname void InsTextOrRTFinOlMode(SfxMedium* pMedium); - BOOL InsSDDinOlMode(SfxMedium* pMedium); + sal_Bool InsSDDinOlMode(SfxMedium* pMedium); void InsTextOrRTFinDrMode(SfxMedium* pMedium); - BOOL InsSDDinDrMode(SfxMedium* pMedium); + sal_Bool InsSDDinDrMode(SfxMedium* pMedium); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 754fc81b1c92..53c84487d266 100644..100755 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -61,7 +61,7 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - void ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade, + void ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolyStart, diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 0a97767cedba..2ff04c77f922 100644..100755 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -52,10 +52,10 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void DoCut(); virtual void DoCopy(); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 92299387849a..6b1674654ff1 100755 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -54,7 +54,7 @@ class FuOutline public: TYPEINFO(); - virtual BOOL Command(const CommandEvent& rCEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); virtual void ScrollStart(); virtual void ScrollEnd(); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 2650e99767b5..38469208b44e 100755 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -78,16 +78,16 @@ public: virtual void DoCopy(); virtual void DoPaste(); - // Mouse- & Key-Events; Returnwert=TRUE: Event wurde bearbeitet - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& ); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); + // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& ); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); // #95491# moved from inline to *.cxx - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); @@ -102,10 +102,10 @@ public: // #97016# II virtual void SelectionHasChanged(); - USHORT GetSlotID() const { return( nSlotId ); } - USHORT GetSlotValue() const { return( nSlotValue ); } + sal_uInt16 GetSlotID() const { return( nSlotId ); } + sal_uInt16 GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(BOOL bNoScroll = TRUE) + void SetNoScrollUntilInside(sal_Bool bNoScroll = sal_True) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); @@ -171,8 +171,8 @@ protected: DrawDocShell* mpDocSh; SdDrawDocument* mpDoc; - USHORT nSlotId; - USHORT nSlotValue; + sal_uInt16 nSlotId; + sal_uInt16 nSlotValue; Dialog* pDialog; @@ -182,19 +182,19 @@ protected: Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragHdl, Timer * ); - BOOL bIsInDragMode; + sal_Bool bIsInDragMode; Point aMDPos; // Position von MouseButtonDown // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das // Fenster hinein gedragt wurde - BOOL bNoScrollUntilInside; + sal_Bool bNoScrollUntilInside; // Timer um das scrolling zu verzoegern, wenn aus dem fenster // herausgedraggt wird (ca. 1 sec.) Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll - BOOL bScrollable; - BOOL bDelayActive; - BOOL bFirstMouseMove; + sal_Bool bScrollable; + sal_Bool bDelayActive; + sal_Bool bFirstMouseMove; // #95491# member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index fdba497f262c..661280e4652c 100644..100755 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -53,7 +53,7 @@ protected: virtual ~FuSearch (void); ::sd::Outliner* pSdOutliner; - BOOL bOwnOutliner; + sal_Bool bOwnOutliner; private: FuSearch ( diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index c1e43c2467e9..e0d4c72ef28c 100644..100755 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -49,20 +49,20 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren virtual void SelectionHasChanged(); - void SetEditMode(USHORT nMode); - USHORT GetEditMode() { return nEditMode; } + void SetEditMode(sal_uInt16 nMode); + sal_uInt16 GetEditMode() { return nEditMode; } - BOOL AnimateObj(SdrObject* pObj, const Point& rPos); + sal_Bool AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -81,13 +81,13 @@ protected: virtual ~FuSelection(); - BOOL bTempRotation; - BOOL bSelectionChanged; - BOOL bHideAndAnimate; + sal_Bool bTempRotation; + sal_Bool bSelectionChanged; + sal_Bool bHideAndAnimate; SdrHdl* pHdl; - BOOL bSuppressChangesOfSelection; - BOOL bMirrorSide0; - USHORT nEditMode; + sal_Bool bSuppressChangesOfSelection; + sal_Bool bMirrorSide0; + sal_uInt16 nEditMode; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; private: diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx index a6de8d720411..e97ceddd548b 100644..100755 --- a/sd/source/ui/inc/fuslid.hxx +++ b/sd/source/ui/inc/fuslid.hxx @@ -53,9 +53,9 @@ public: static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void ScrollStart(); virtual void ScrollEnd(); diff --git a/sd/source/ui/inc/fuslsel.hxx b/sd/source/ui/inc/fuslsel.hxx index 2890f3faf98a..16cf5257ee2c 100644..100755 --- a/sd/source/ui/inc/fuslsel.hxx +++ b/sd/source/ui/inc/fuslsel.hxx @@ -42,8 +42,8 @@ class Window; struct FSS_IsShowingEffectInfo { - BOOL bIsShowingEffect; // TRUE while we show a fade effect one the slide view - BOOL bDisposed; // TRUE if the FuSlideSelection was deleted during fade effect + sal_Bool bIsShowingEffect; // sal_True while we show a fade effect one the slide view + sal_Bool bDisposed; // sal_True if the FuSlideSelection was deleted during fade effect }; @@ -57,10 +57,10 @@ public: virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); virtual void Activate(); // Function aktivieren @@ -69,7 +69,7 @@ public: virtual void ScrollStart(); virtual void ScrollEnd(); - BOOL IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } + sal_Bool IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -89,27 +89,27 @@ protected: virtual ~FuSlideSelection (void); private: - BOOL bSubstShown; - BOOL bPageHit; + sal_Bool bSubstShown; + sal_Bool bPageHit; List aSubstList; // Liste mit Ertsatzdarstellungen Point aDragPos; // hier wird die Seite angefasst - BOOL bDragSelection; + sal_Bool bDragSelection; Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks Rectangle aDragSelRect; Point aPosOfInsertMarker; FSS_IsShowingEffectInfo* pIsShowingEffectInfo; - void DrawInsertMarker(BOOL bShow); + void DrawInsertMarker(sal_Bool bShow); Point CalcPosOfInsertMarker(const Point& rPoint); - USHORT GetTargetPage(const Point& rPoint) const; + sal_uInt16 GetTargetPage(const Point& rPoint) const; void CreateSubst(); void DeleteSubst(); void DrawSubst() const; void ChangeSubstPos(const Point& rVector); void DrawDragSelectionRect() const; - void ShowEffect(USHORT nPageNo); + void ShowEffect(sal_uInt16 nPageNo); DECL_LINK( DragSlideHdl, Timer* ); }; diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 052f4099ef21..6784dbb175f7 100644..100755 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -57,20 +57,20 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); - virtual BOOL Command(const CommandEvent& rCEvt); - virtual BOOL RequestHelp(const HelpEvent& rHEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); virtual void ReceiveRequest(SfxRequest& rReq); virtual void DoubleClick(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - void SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag); - BOOL DeleteDefaultText(); + void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag); + sal_Bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } DECL_LINK(SpellError, void* ); @@ -99,7 +99,7 @@ protected: SdrObjectWeakRef mxTextObj; Link aOldLink; - BOOL bFirstObjCreated; + sal_Bool bFirstObjCreated; SfxRequest& rRequest; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 31d465646a96..b2436639336b 100644..100755 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -35,7 +35,7 @@ namespace sd { -extern USHORT SidArrayZoom[]; +extern sal_uInt16 SidArrayZoom[]; class FuZoom : public FuPoor @@ -46,9 +46,9 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -60,8 +60,8 @@ protected: Point aBeginPos; Point aEndPos; Rectangle aZoomRect; - BOOL bVisible; - BOOL bStartDrag; + sal_Bool bVisible; + sal_Bool bStartDrag; Pointer aPtr; private: diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 8f8b0609304a..f2fbe1ab307a 100644..100755 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -59,16 +59,16 @@ public: class SdTbxCtlGlueEscDir: public SfxToolBoxControl { private: - UINT16 GetEscDirPos( UINT16 nEscDir ); + sal_uInt16 GetEscDirPos( sal_uInt16 nEscDir ); public: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); SFX_DECL_TOOLBOX_CONTROL(); - SdTbxCtlGlueEscDir( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxCtlGlueEscDir( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxCtlGlueEscDir() {} }; diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 6feab297f0e4..d2aacd9d992e 100644..100755 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -53,7 +53,7 @@ public: SdInsertPasteDlg( Window* pWindow ); ~SdInsertPasteDlg(); - BOOL IsInsertBefore() const; + sal_Bool IsInsertBefore() const; }; #endif // _SD_INS_PASTE_HXX_ diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 3f8046462df7..3229d29a3c90 100644..100755 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -62,9 +62,9 @@ public: const String& rFileName ); ~SdInsertPagesObjsDlg(); - List* GetList( USHORT nType ); - BOOL IsLink(); - BOOL IsRemoveUnnessesaryMasterPages() const; + List* GetList( sal_uInt16 nType ); + sal_Bool IsLink(); + sal_Bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index a7b5908367fc..f75635ad2755 100644..100755 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -56,10 +56,10 @@ private: OKButton maPBOK; CancelButton maPBCancel; - BOOL mbOldHeader; - BOOL mbOldFooter; - BOOL mbOldDate; - BOOL mbOldPageNumber; + sal_Bool mbOldHeader; + sal_Bool mbOldFooter; + sal_Bool mbOldDate; + sal_Bool mbOldPageNumber; void applyChanges(); void remove( PresObjKind eKind ); diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index ca431d1d74b9..85f18f4c8787 100755 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -55,9 +55,9 @@ public: virtual ~MorphDlg (void); void SaveSettings() const; - USHORT GetFadeSteps() const { return (USHORT) aMtfSteps.GetValue(); } - BOOL IsAttributeFade() const { return aCbxAttributes.IsChecked(); } - BOOL IsOrientationFade() const { return aCbxOrientation.IsChecked(); } + sal_uInt16 GetFadeSteps() const { return (sal_uInt16) aMtfSteps.GetValue(); } + sal_Bool IsAttributeFade() const { return aCbxAttributes.IsChecked(); } + sal_Bool IsOrientationFade() const { return aCbxOrientation.IsChecked(); } private: FixedLine aGrpPreset; diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index aa5feddd4c23..ccbbe1dfad3b 100644..100755 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -73,16 +73,16 @@ class NavDocInfo public: NavDocInfo() { mpDocShell = NULL; } - BOOL HasName() { return( (BOOL) bName ); } - BOOL IsActive() { return( (BOOL) bActive ); } + sal_Bool HasName() { return( (sal_Bool) bName ); } + sal_Bool IsActive() { return( (sal_Bool) bActive ); } - void SetName( BOOL bOn = TRUE ) { bName = bOn; } - void SetActive( BOOL bOn = TRUE ) { bActive = bOn; } + void SetName( sal_Bool bOn = sal_True ) { bName = bOn; } + void SetActive( sal_Bool bOn = sal_True ) { bActive = bOn; } private: friend class SdNavigatorWin; - BOOL bName : 1; - BOOL bActive : 1; + sal_Bool bName : 1; + sal_Bool bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -104,7 +104,7 @@ public: void InitTreeLB( const SdDrawDocument* pDoc ); void RefreshDocumentLB( const String* pDocName = NULL ); - BOOL InsertFile(const String& rFileName); + sal_Bool InsertFile(const String& rFileName); NavigatorDragType GetNavigatorDragType(); void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } @@ -127,7 +127,7 @@ private: Size maSize; Size maMinSize; // Size maFltWinSize; - BOOL mbDocImported; + sal_Bool mbDocImported; String maDropFileName; NavigatorDragType meDragType; List* mpDocList; @@ -143,7 +143,7 @@ private: */ bool mbShowAllShapes; - USHORT GetDragTypeSdResId( NavigatorDragType eDT, BOOL bImage = FALSE ); + sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage = sal_False ); NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); @@ -173,10 +173,10 @@ private: class SdNavigatorControllerItem : public SfxControllerItem { public: - SdNavigatorControllerItem( USHORT, SdNavigatorWin*, SfxBindings* ); + SdNavigatorControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: @@ -194,10 +194,10 @@ private: class SdPageNameControllerItem : public SfxControllerItem { public: - SdPageNameControllerItem( USHORT, SdNavigatorWin*, SfxBindings* ); + SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings* ); protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); private: diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx index 5a2644bd186a..4cba8494261a 100644..100755 --- a/sd/source/ui/inc/optdlg.hxx +++ b/sd/source/ui/inc/optdlg.hxx @@ -46,8 +46,8 @@ public: protected: - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); -// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); +// virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nPageId ); }; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 13088dfc64cb..0a71ae5d5e6f 100755 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -103,9 +103,9 @@ private: ::rtl::OUString maSubTree; SdOptionsItem* mpCfgItem; - USHORT mnConfigId; - BOOL mbInit : 1; - BOOL mbEnableModify : 1; + sal_uInt16 mnConfigId; + sal_Bool mbInit : 1; + sal_Bool mbEnableModify : 1; SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; @@ -117,19 +117,19 @@ protected: protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const = 0; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const = 0; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: - SdOptionsGeneric( USHORT nConfigId, const ::rtl::OUString& rSubTree ); + SdOptionsGeneric( sal_uInt16 nConfigId, const ::rtl::OUString& rSubTree ); virtual ~SdOptionsGeneric(); const ::rtl::OUString& GetSubTree() const { return maSubTree; } - USHORT GetConfigId() const { return mnConfigId; } + sal_uInt16 GetConfigId() const { return mnConfigId; } - void EnableModify( BOOL bModify ) { mbEnableModify = bModify; } + void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } void Store(); @@ -145,41 +145,41 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - BOOL bRuler : 1; // Layout/Display/Ruler - BOOL bMoveOutline : 1; // Layout/Display/Contur - BOOL bDragStripes : 1; // Layout/Display/Guide - BOOL bHandlesBezier : 1; // Layout/Display/Bezier - BOOL bHelplines : 1; // Layout/Display/Helpline - UINT16 nMetric; // Layout/Other/MeasureUnit - UINT16 nDefTab; // Layout/Other/TabStop + sal_Bool bRuler : 1; // Layout/Display/Ruler + sal_Bool bMoveOutline : 1; // Layout/Display/Contur + sal_Bool bDragStripes : 1; // Layout/Display/Guide + sal_Bool bHandlesBezier : 1; // Layout/Display/Bezier + sal_Bool bHelplines : 1; // Layout/Display/Helpline + sal_uInt16 nMetric; // Layout/Other/MeasureUnit + sal_uInt16 nDefTab; // Layout/Other/TabStop protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsLayout() {} - BOOL operator==( const SdOptionsLayout& rOpt ) const; - - BOOL IsRulerVisible() const { Init(); return (BOOL) bRuler; } - BOOL IsMoveOutline() const { Init(); return (BOOL) bMoveOutline; } - BOOL IsDragStripes() const { Init(); return (BOOL) bDragStripes; } - BOOL IsHandlesBezier() const { Init(); return (BOOL) bHandlesBezier; } - BOOL IsHelplines() const { Init(); return (BOOL) bHelplines; } - UINT16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (UINT16)SfxModule::GetCurrentFieldUnit() : nMetric ); } - UINT16 GetDefTab() const { Init(); return nDefTab; } - - void SetRulerVisible( BOOL bOn = TRUE ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( BOOL bOn = TRUE ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( BOOL bOn = TRUE ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( BOOL bOn = TRUE ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( BOOL bOn = TRUE ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } - void SetMetric( UINT16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } - void SetDefTab( UINT16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } + sal_Bool operator==( const SdOptionsLayout& rOpt ) const; + + sal_Bool IsRulerVisible() const { Init(); return (sal_Bool) bRuler; } + sal_Bool IsMoveOutline() const { Init(); return (sal_Bool) bMoveOutline; } + sal_Bool IsDragStripes() const { Init(); return (sal_Bool) bDragStripes; } + sal_Bool IsHandlesBezier() const { Init(); return (sal_Bool) bHandlesBezier; } + sal_Bool IsHelplines() const { Init(); return (sal_Bool) bHelplines; } + sal_uInt16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (sal_uInt16)SfxModule::GetCurrentFieldUnit() : nMetric ); } + sal_uInt16 GetDefTab() const { Init(); return nDefTab; } + + void SetRulerVisible( sal_Bool bOn = sal_True ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( sal_Bool bOn = sal_True ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( sal_Bool bOn = sal_True ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( sal_Bool bOn = sal_True ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( sal_Bool bOn = sal_True ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetMetric( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } + void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; // ----------------------------------------------------------------------------- @@ -188,8 +188,8 @@ class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem { public: - SdOptionsLayoutItem( USHORT nWhich); - SdOptionsLayoutItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsLayoutItem( sal_uInt16 nWhich); + SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -210,16 +210,16 @@ class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric private: protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsContents() {} - BOOL operator==( const SdOptionsContents& rOpt ) const; + sal_Bool operator==( const SdOptionsContents& rOpt ) const; }; // ----------------------------------------------------------------------------- @@ -228,7 +228,7 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem { public: - SdOptionsContentsItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -249,29 +249,29 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric private: // #97016# - ULONG nDefaultObjectSizeWidth; - ULONG nDefaultObjectSizeHeight; - - BOOL bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot - BOOL bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable - BOOL bMoveOnlyDragging : 1; // Currently, not in use !!! - BOOL bCrookNoContortion : 1; // Misc/NoDistort - BOOL bQuickEdit : 1; // Misc/TextObject/QuickEditing - BOOL bMasterPageCache : 1; // Misc/BackgroundCache - BOOL bDragWithCopy : 1; // Misc/CopyWhileMoving - BOOL bPickThrough : 1; // Misc/TextObject/Selectable - BOOL bBigHandles : 1; // Misc/BigHandles - BOOL bDoubleClickTextEdit : 1; // Misc/DclickTextedit - BOOL bClickChangeRotation : 1; // Misc/RotateClick - BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage - BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes - BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles - BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs + sal_uLong nDefaultObjectSizeWidth; + sal_uLong nDefaultObjectSizeHeight; + + sal_Bool bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot + sal_Bool bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable + sal_Bool bMoveOnlyDragging : 1; // Currently, not in use !!! + sal_Bool bCrookNoContortion : 1; // Misc/NoDistort + sal_Bool bQuickEdit : 1; // Misc/TextObject/QuickEditing + sal_Bool bMasterPageCache : 1; // Misc/BackgroundCache + sal_Bool bDragWithCopy : 1; // Misc/CopyWhileMoving + sal_Bool bPickThrough : 1; // Misc/TextObject/Selectable + sal_Bool bBigHandles : 1; // Misc/BigHandles + sal_Bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit + sal_Bool bClickChangeRotation : 1; // Misc/RotateClick + sal_Bool bStartWithActualPage : 1; // Misc/Start/CurrentPage + sal_Bool bSolidDragging : 1; // Misc/ModifyWithAttributes + sal_Bool bSolidMarkHdl : 1; // /Misc/SimpleHandles + sal_Bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs // #90356# - BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + sal_Bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder - BOOL bShowComments : 1; // Misc/ShowComments + sal_Bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + sal_Bool bShowComments : 1; // Misc/ShowComments sal_Bool bPreviewNewEffects; sal_Bool bPreviewChangedEffects; @@ -284,50 +284,50 @@ private: for the printer independent virtual device the can be retrieved from the modules. */ - USHORT mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout + sal_uInt16 mnPrinterIndependentLayout; // Misc/Compatibility/PrinterIndependentLayout // Misc protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsMisc() {} - BOOL operator==( const SdOptionsMisc& rOpt ) const; - - BOOL IsStartWithTemplate() const { Init(); return (BOOL) bStartWithTemplate; } - BOOL IsMarkedHitMovesAlways() const { Init(); return (BOOL) bMarkedHitMovesAlways; } - BOOL IsMoveOnlyDragging() const { Init(); return (BOOL) bMoveOnlyDragging; } - BOOL IsCrookNoContortion() const { Init(); return (BOOL) bCrookNoContortion; } - BOOL IsQuickEdit() const { Init(); return (BOOL) bQuickEdit; } - BOOL IsMasterPagePaintCaching() const { Init(); return (BOOL) bMasterPageCache; } - BOOL IsDragWithCopy() const { Init(); return (BOOL) bDragWithCopy; } - BOOL IsPickThrough() const { Init(); return (BOOL) bPickThrough; } - BOOL IsBigHandles() const { Init(); return (BOOL) bBigHandles; } - BOOL IsDoubleClickTextEdit() const { Init(); return (BOOL) bDoubleClickTextEdit; } - BOOL IsClickChangeRotation() const { Init(); return (BOOL) bClickChangeRotation; } - BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; } - BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; } - BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; } - BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; + sal_Bool operator==( const SdOptionsMisc& rOpt ) const; + + sal_Bool IsStartWithTemplate() const { Init(); return (sal_Bool) bStartWithTemplate; } + sal_Bool IsMarkedHitMovesAlways() const { Init(); return (sal_Bool) bMarkedHitMovesAlways; } + sal_Bool IsMoveOnlyDragging() const { Init(); return (sal_Bool) bMoveOnlyDragging; } + sal_Bool IsCrookNoContortion() const { Init(); return (sal_Bool) bCrookNoContortion; } + sal_Bool IsQuickEdit() const { Init(); return (sal_Bool) bQuickEdit; } + sal_Bool IsMasterPagePaintCaching() const { Init(); return (sal_Bool) bMasterPageCache; } + sal_Bool IsDragWithCopy() const { Init(); return (sal_Bool) bDragWithCopy; } + sal_Bool IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; } + sal_Bool IsBigHandles() const { Init(); return (sal_Bool) bBigHandles; } + sal_Bool IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; } + sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; } + sal_Bool IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; } + sal_Bool IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; } + sal_Bool IsSolidMarkHdl() const { Init(); return (sal_Bool) bSolidMarkHdl; } + sal_Bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; /** Return the currently selected printer independent layout mode. @return Returns 1 for printer independent layout enabled and 0 when it is disabled. Other values are reserved for future use. */ - USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; + sal_uInt16 GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; // #90356# - BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } - BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } + sal_Bool IsShowUndoDeleteWarning() const { Init(); return (sal_Bool) bShowUndoDeleteWarning; } + sal_Bool IsSlideshowRespectZOrder() const { Init(); return (sal_Bool) bSlideshowRespectZOrder; } // #97016# - ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } - ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } + sal_uLong GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } + sal_uLong GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } @@ -336,41 +336,41 @@ public: sal_Int32 GetDisplay() const { Init(); return mnDisplay; } void SetDisplay( sal_Int32 nDisplay = 0 ) { if( mnDisplay != nDisplay ) { OptionsChanged(); mnDisplay = nDisplay; } } - void SetStartWithTemplate( BOOL bOn = TRUE ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( BOOL bOn = TRUE ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( BOOL bOn = TRUE ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( BOOL bOn = TRUE ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( BOOL bOn = TRUE ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( BOOL bOn = TRUE ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( BOOL bOn = TRUE ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( BOOL bOn = TRUE ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetBigHandles( BOOL bOn = TRUE ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } - void SetDoubleClickTextEdit( BOOL bOn = TRUE ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( BOOL bOn = TRUE ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetStartWithActualPage( BOOL bOn = TRUE ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } - void SetSummationOfParagraphs( BOOL bOn = TRUE ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + void SetStartWithTemplate( sal_Bool bOn = sal_True ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( sal_Bool bOn = sal_True ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( sal_Bool bOn = sal_True ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( sal_Bool bOn = sal_True ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( sal_Bool bOn = sal_True ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( sal_Bool bOn = sal_True ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( sal_Bool bOn = sal_True ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( sal_Bool bOn = sal_True ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetBigHandles( sal_Bool bOn = sal_True ) { if( bBigHandles != bOn ) { OptionsChanged(); bBigHandles = bOn; } } + void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( sal_Bool bOn = sal_True ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetStartWithActualPage( sal_Bool bOn = sal_True ) { if( bStartWithActualPage != bOn ) { OptionsChanged(); bStartWithActualPage = bOn; } } + void SetSummationOfParagraphs( sal_Bool bOn = sal_True ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } /** Set the printer independent layout mode. @param nOn The default value is to switch printer independent layout on, hence the parameters name. Use 0 for turning it off. Other values are reserved for future use. */ - void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } + void SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } + void SetSolidDragging( sal_Bool bOn = sal_True ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetSolidMarkHdl( sal_Bool bOn = sal_True ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } // #90356# - void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetShowUndoDeleteWarning( sal_Bool bOn = sal_True ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( sal_Bool bOn = sal_True ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } // #97016# - void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } - void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } + void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } + void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } - BOOL IsShowComments() const { Init(); return bShowComments; } - void SetShowComments( BOOL bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } + sal_Bool IsShowComments() const { Init(); return bShowComments; } + void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } }; // ----------------------------------------------------------------------------- @@ -379,8 +379,8 @@ class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem { public: - SdOptionsMiscItem( USHORT nWhich); - SdOptionsMiscItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsMiscItem( sal_uInt16 nWhich); + SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -401,51 +401,51 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - BOOL bSnapHelplines : 1; // Snap/Object/SnapLine - BOOL bSnapBorder : 1; // Snap/Object/PageMargin - BOOL bSnapFrame : 1; // Snap/Object/ObjectFrame - BOOL bSnapPoints : 1; // Snap/Object/ObjectPoint - BOOL bOrtho : 1; // Snap/Position/CreatingMoving - BOOL bBigOrtho : 1; // Snap/Position/ExtendEdges - BOOL bRotate : 1; // Snap/Position/Rotating - INT16 nSnapArea; // Snap/Object/Range - INT16 nAngle; // Snap/Position/RotatingValue - INT16 nBezAngle; // Snap/Position/PointReduction + sal_Bool bSnapHelplines : 1; // Snap/Object/SnapLine + sal_Bool bSnapBorder : 1; // Snap/Object/PageMargin + sal_Bool bSnapFrame : 1; // Snap/Object/ObjectFrame + sal_Bool bSnapPoints : 1; // Snap/Object/ObjectPoint + sal_Bool bOrtho : 1; // Snap/Position/CreatingMoving + sal_Bool bBigOrtho : 1; // Snap/Position/ExtendEdges + sal_Bool bRotate : 1; // Snap/Position/Rotating + sal_Int16 nSnapArea; // Snap/Object/Range + sal_Int16 nAngle; // Snap/Position/RotatingValue + sal_Int16 nBezAngle; // Snap/Position/PointReduction protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsSnap() {} - BOOL operator==( const SdOptionsSnap& rOpt ) const; - - BOOL IsSnapHelplines() const { Init(); return (BOOL) bSnapHelplines; } - BOOL IsSnapBorder() const { Init(); return (BOOL) bSnapBorder; } - BOOL IsSnapFrame() const { Init(); return (BOOL) bSnapFrame; } - BOOL IsSnapPoints() const { Init(); return (BOOL) bSnapPoints; } - BOOL IsOrtho() const { Init(); return (BOOL) bOrtho; } - BOOL IsBigOrtho() const { Init(); return (BOOL) bBigOrtho; } - BOOL IsRotate() const { Init(); return (BOOL) bRotate; } - INT16 GetSnapArea() const { Init(); return nSnapArea; } - INT16 GetAngle() const { Init(); return nAngle; } - INT16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } - - void SetSnapHelplines( BOOL bOn = TRUE ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } - void SetSnapBorder( BOOL bOn = TRUE ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } - void SetSnapFrame( BOOL bOn = TRUE ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } - void SetSnapPoints( BOOL bOn = TRUE ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } - void SetOrtho( BOOL bOn = TRUE ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } - void SetBigOrtho( BOOL bOn = TRUE ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } - void SetRotate( BOOL bOn = TRUE ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } - void SetSnapArea( INT16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } - void SetAngle( INT16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } - void SetEliminatePolyPointLimitAngle( INT16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } + sal_Bool operator==( const SdOptionsSnap& rOpt ) const; + + sal_Bool IsSnapHelplines() const { Init(); return (sal_Bool) bSnapHelplines; } + sal_Bool IsSnapBorder() const { Init(); return (sal_Bool) bSnapBorder; } + sal_Bool IsSnapFrame() const { Init(); return (sal_Bool) bSnapFrame; } + sal_Bool IsSnapPoints() const { Init(); return (sal_Bool) bSnapPoints; } + sal_Bool IsOrtho() const { Init(); return (sal_Bool) bOrtho; } + sal_Bool IsBigOrtho() const { Init(); return (sal_Bool) bBigOrtho; } + sal_Bool IsRotate() const { Init(); return (sal_Bool) bRotate; } + sal_Int16 GetSnapArea() const { Init(); return nSnapArea; } + sal_Int16 GetAngle() const { Init(); return nAngle; } + sal_Int16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } + + void SetSnapHelplines( sal_Bool bOn = sal_True ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } + void SetSnapBorder( sal_Bool bOn = sal_True ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } + void SetSnapFrame( sal_Bool bOn = sal_True ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } + void SetSnapPoints( sal_Bool bOn = sal_True ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } + void SetOrtho( sal_Bool bOn = sal_True ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } + void SetBigOrtho( sal_Bool bOn = sal_True ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } + void SetRotate( sal_Bool bOn = sal_True ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } + void SetSnapArea( sal_Int16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } + void SetAngle( sal_Int16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } + void SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } }; // ----------------------------------------------------------------------------- @@ -454,8 +454,8 @@ class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem { public: - SdOptionsSnapItem( USHORT nWhich); - SdOptionsSnapItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsSnapItem( sal_uInt16 nWhich); + SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -475,24 +475,24 @@ class SdOptionsZoom : public SdOptionsGeneric { private: - INT32 nX; // Zoom/ScaleX - INT32 nY; // Zoom/ScaleY + sal_Int32 nX; // Zoom/ScaleX + sal_Int32 nY; // Zoom/ScaleY protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsZoom() {} - BOOL operator==( const SdOptionsZoom& rOpt ) const; + sal_Bool operator==( const SdOptionsZoom& rOpt ) const; - void GetScale( INT32& rX, INT32& rY ) const { Init(); rX = nX; rY = nY; } - void SetScale( INT32 nInX, INT32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } + void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } + void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; // ----------------------------------------------------------------------------- @@ -505,39 +505,39 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsGrid(); void SetDefaults(); - BOOL operator==( const SdOptionsGrid& rOpt ) const; - - UINT32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } - UINT32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } - UINT32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } - UINT32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } - UINT32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } - UINT32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } - BOOL IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } - BOOL IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } - BOOL IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - BOOL IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } - - void SetFldDrawX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } - void SetFldDivisionX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } - void SetFldDrawY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } - void SetFldDivisionY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } - void SetFldSnapX( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } - void SetFldSnapY( UINT32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } - void SetUseGridSnap( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } - void SetSynchronize( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } - void SetGridVisible( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } - void SetEqualGrid( BOOL bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } + sal_Bool operator==( const SdOptionsGrid& rOpt ) const; + + sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } + sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } + sal_uInt32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); } + sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } + sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } + sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } + sal_Bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } + sal_Bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } + sal_Bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } + sal_Bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } + + void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } + void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } + void SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } } + void SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } } + void SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } } + void SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } } + void SetUseGridSnap( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } } + void SetSynchronize( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } } + void SetGridVisible( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } } + void SetEqualGrid( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } } }; // ----------------------------------------------- @@ -546,7 +546,7 @@ class SdOptionsGridItem : public SvxGridItem { public: - SdOptionsGridItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsGridItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); void SetOptions( SdOptions* pOpts ) const; }; @@ -559,84 +559,84 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - BOOL bDraw : 1; // Print/Content/Drawing - BOOL bNotes : 1; // Print/Content/Note - BOOL bHandout : 1; // Print/Content/Handout - BOOL bOutline : 1; // Print/Content/Outline - BOOL bDate : 1; // Print/Other/Date - BOOL bTime : 1; // Print/Other/Time - BOOL bPagename : 1; // Print/Other/PageName - BOOL bHiddenPages : 1; // Print/Other/HiddenPage - BOOL bPagesize : 1; // Print/Page/PageSize - BOOL bPagetile : 1; // Print/Page/PageTile - BOOL bWarningPrinter : 1; // These flags you get - BOOL bWarningSize : 1; // from the common options, - BOOL bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) - BOOL bBooklet : 1; // Print/Page/Booklet - BOOL bFront : 1; // Print/Page/BookletFront - BOOL bBack : 1; // Print/Page/BookletFront - BOOL bCutPage : 1; // NOT persistent !!! - BOOL bPaperbin : 1; // Print/Other/FromPrinterSetup - BOOL mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal - UINT16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) - UINT16 nQuality; // Print/Other/Quality + sal_Bool bDraw : 1; // Print/Content/Drawing + sal_Bool bNotes : 1; // Print/Content/Note + sal_Bool bHandout : 1; // Print/Content/Handout + sal_Bool bOutline : 1; // Print/Content/Outline + sal_Bool bDate : 1; // Print/Other/Date + sal_Bool bTime : 1; // Print/Other/Time + sal_Bool bPagename : 1; // Print/Other/PageName + sal_Bool bHiddenPages : 1; // Print/Other/HiddenPage + sal_Bool bPagesize : 1; // Print/Page/PageSize + sal_Bool bPagetile : 1; // Print/Page/PageTile + sal_Bool bWarningPrinter : 1; // These flags you get + sal_Bool bWarningSize : 1; // from the common options, + sal_Bool bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) + sal_Bool bBooklet : 1; // Print/Page/Booklet + sal_Bool bFront : 1; // Print/Page/BookletFront + sal_Bool bBack : 1; // Print/Page/BookletFront + sal_Bool bCutPage : 1; // NOT persistent !!! + sal_Bool bPaperbin : 1; // Print/Other/FromPrinterSetup + sal_Bool mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal + sal_uInt16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) + sal_uInt16 nQuality; // Print/Other/Quality protected: - virtual void GetPropNameArray( const char**& ppNames, ULONG& rCount ) const; - virtual BOOL ReadData( const ::com::sun::star::uno::Any* pValues ); - virtual BOOL WriteData( ::com::sun::star::uno::Any* pValues ) const; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const; + virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ); + SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ); virtual ~SdOptionsPrint() {} - BOOL operator==( const SdOptionsPrint& rOpt ) const; - - BOOL IsDraw() const { Init(); return (BOOL) bDraw; } - BOOL IsNotes() const { Init(); return (BOOL) bNotes; } - BOOL IsHandout() const { Init(); return (BOOL) bHandout; } - BOOL IsOutline() const { Init(); return (BOOL) bOutline; } - BOOL IsDate() const { Init(); return (BOOL) bDate; } - BOOL IsTime() const { Init(); return (BOOL) bTime; } - BOOL IsPagename() const { Init(); return (BOOL) bPagename; } - BOOL IsHiddenPages() const { Init(); return (BOOL) bHiddenPages; } - BOOL IsPagesize() const { Init(); return (BOOL) bPagesize; } - BOOL IsPagetile() const { Init(); return (BOOL) bPagetile; } - BOOL IsWarningPrinter() const { Init(); return (BOOL) bWarningPrinter; } - BOOL IsWarningSize() const { Init(); return (BOOL) bWarningSize; } - BOOL IsWarningOrientation() const { Init(); return (BOOL) bWarningOrientation; } - BOOL IsBooklet() const { Init(); return (BOOL) bBooklet; } - BOOL IsFrontPage() const { Init(); return (BOOL) bFront; } - BOOL IsBackPage() const { Init(); return (BOOL) bBack; } - BOOL IsCutPage() const { Init(); return (BOOL) bCutPage; } - BOOL IsPaperbin() const { Init(); return (BOOL) bPaperbin; } - UINT16 GetOutputQuality() const { Init(); return nQuality; } - BOOL IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } - UINT16 GetHandoutPages() const { Init(); return mnHandoutPages; } - - void SetDraw( BOOL bOn = TRUE ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( BOOL bOn = TRUE ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( BOOL bOn = TRUE ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( BOOL bOn = TRUE ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( BOOL bOn = TRUE ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( BOOL bOn = TRUE ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( BOOL bOn = TRUE ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( BOOL bOn = TRUE ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( BOOL bOn = TRUE ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( BOOL bOn = TRUE ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( BOOL bOn = TRUE ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( BOOL bOn = TRUE ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( BOOL bOn = TRUE ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( BOOL bOn = TRUE ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( BOOL bOn = TRUE ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( BOOL bOn = TRUE ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( BOOL bOn = TRUE ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( BOOL bOn = TRUE ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } - void SetOutputQuality( UINT16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( BOOL bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } - void SetHandoutPages( UINT16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } + sal_Bool operator==( const SdOptionsPrint& rOpt ) const; + + sal_Bool IsDraw() const { Init(); return (sal_Bool) bDraw; } + sal_Bool IsNotes() const { Init(); return (sal_Bool) bNotes; } + sal_Bool IsHandout() const { Init(); return (sal_Bool) bHandout; } + sal_Bool IsOutline() const { Init(); return (sal_Bool) bOutline; } + sal_Bool IsDate() const { Init(); return (sal_Bool) bDate; } + sal_Bool IsTime() const { Init(); return (sal_Bool) bTime; } + sal_Bool IsPagename() const { Init(); return (sal_Bool) bPagename; } + sal_Bool IsHiddenPages() const { Init(); return (sal_Bool) bHiddenPages; } + sal_Bool IsPagesize() const { Init(); return (sal_Bool) bPagesize; } + sal_Bool IsPagetile() const { Init(); return (sal_Bool) bPagetile; } + sal_Bool IsWarningPrinter() const { Init(); return (sal_Bool) bWarningPrinter; } + sal_Bool IsWarningSize() const { Init(); return (sal_Bool) bWarningSize; } + sal_Bool IsWarningOrientation() const { Init(); return (sal_Bool) bWarningOrientation; } + sal_Bool IsBooklet() const { Init(); return (sal_Bool) bBooklet; } + sal_Bool IsFrontPage() const { Init(); return (sal_Bool) bFront; } + sal_Bool IsBackPage() const { Init(); return (sal_Bool) bBack; } + sal_Bool IsCutPage() const { Init(); return (sal_Bool) bCutPage; } + sal_Bool IsPaperbin() const { Init(); return (sal_Bool) bPaperbin; } + sal_uInt16 GetOutputQuality() const { Init(); return nQuality; } + sal_Bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + sal_uInt16 GetHandoutPages() const { Init(); return mnHandoutPages; } + + void SetDraw( sal_Bool bOn = sal_True ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( sal_Bool bOn = sal_True ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( sal_Bool bOn = sal_True ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( sal_Bool bOn = sal_True ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( sal_Bool bOn = sal_True ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( sal_Bool bOn = sal_True ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( sal_Bool bOn = sal_True ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( sal_Bool bOn = sal_True ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( sal_Bool bOn = sal_True ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( sal_Bool bOn = sal_True ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( sal_Bool bOn = sal_True ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( sal_Bool bOn = sal_True ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( sal_Bool bOn = sal_True ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( sal_Bool bOn = sal_True ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( sal_Bool bOn = sal_True ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( sal_Bool bOn = sal_True ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( sal_Bool bOn = sal_True ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( sal_Bool bOn = sal_True ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetOutputQuality( sal_uInt16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } + void SetHandoutHorizontal( sal_Bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; // ----------------------------------------------------------------------------- @@ -645,8 +645,8 @@ class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem { public: - SdOptionsPrintItem( USHORT nWhich); - SdOptionsPrintItem( USHORT nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + SdOptionsPrintItem( sal_uInt16 nWhich); + SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -670,10 +670,10 @@ class SdOptions : public SdOptionsLayout, public SdOptionsContents, { public: - SdOptions( USHORT nConfigId ); + SdOptions( sal_uInt16 nConfigId ); virtual ~SdOptions(); - void StoreConfig( ULONG nOptionRange = SD_OPTIONS_ALL ); + void StoreConfig( sal_uLong nOptionRange = SD_OPTIONS_ALL ); }; #endif // _SD_OPTSITEM_HXX diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 33a7df247c7e..5e8479ce4562 100644..100755 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -65,9 +65,9 @@ private: XDashList* pDashList; XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPos; ChangeType nColorTableState; ChangeType nBitmapListState; @@ -78,14 +78,14 @@ private: PresentationObjects ePO; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); // fuers Maping mit dem neuen SvxNumBulletItem SfxItemSet aInputSet; SfxItemSet* pOutSet; const SfxItemSet* pOrgSet; - USHORT GetOutlineLevel() const; + sal_uInt16 GetOutlineLevel() const; using SfxTabDialog::GetOutputItemSet; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index da9bc20c02d6..9ee90a522ac7 100755 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -95,7 +95,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void SetDrawMode(); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index dbdddfd5d112..2f14066021ed 100644..100755 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -184,8 +184,8 @@ private: Assistent aAssistentFunc; - BOOL m_bImpress; - BOOL m_bButtonsDirty; + sal_Bool m_bImpress; + sal_Bool m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -198,10 +198,10 @@ private: void UpdatePage(); List* m_pDesignList; - BOOL m_bDesignListDirty; + sal_Bool m_bDesignListDirty; SdPublishingDesign* m_pDesign; - BOOL Load(); - BOOL Save(); + sal_Bool Load(); + sal_Bool Save(); void GetDesign( SdPublishingDesign* pDesign ); void SetDesign( SdPublishingDesign* pDesign ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1aea2d34156e..c74fd94f5fc9 100755 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -68,7 +68,7 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - static BOOL SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static sal_Bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird public: @@ -122,7 +122,7 @@ public: Pointer to the page for which to check whether it belongs to the show. @return - Returns <FALSE/> if there is no custom show or if the current + Returns <sal_False/> if there is no custom show or if the current show does not contain the specified page at least once. */ bool PageBelongsToCurrentShow (const SdPage* pPage) const; @@ -138,8 +138,8 @@ protected: Image maImgGraphic; Image maImgOleH; Image maImgGraphicH; - BOOL mbLinkableSelected; - BOOL mbDragEnabled; + sal_Bool mbLinkableSelected; + sal_Bool mbDragEnabled; String maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks ::sd::DrawDocShell* mpDropDocSh; @@ -159,10 +159,10 @@ protected: void OnDragFinished( sal_uInt8 nDropAction ); /** Return the name of the object. When the object has no user supplied - name and the bCreate flag is <TRUE/> then a name is created + name and the bCreate flag is <sal_True/> then a name is created automatically. Additionally the mbShowAllShapes flag is taken into account when there is no user supplied name. When this flag is - <FALSE/> then no name is created. + <sal_False/> then no name is created. @param pObject When this is NULL then an empty string is returned, regardless of the value of bCreate. @@ -181,11 +181,11 @@ protected: reorders both the involved shapes in their page as well as the associated list box entries. */ - virtual BOOL NotifyMoving( + virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, - ULONG& rNewChildPos); + sal_uLong& rNewChildPos); using Window::GetDropTarget; virtual SvLBoxEntry* GetDropTarget (const Point& rLocation); @@ -201,21 +201,21 @@ public: void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } - void Fill( const SdDrawDocument*, BOOL bAllPages, const String& rDocName ); + void Fill( const SdDrawDocument*, sal_Bool bAllPages, const String& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const String& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes (void) const; - BOOL IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - BOOL HasSelectedChilds( const String& rName ); - BOOL SelectEntry( const String& rName ); + sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + sal_Bool HasSelectedChilds( const String& rName ); + sal_Bool SelectEntry( const String& rName ); String GetSelectEntry(); - List* GetSelectEntryList( USHORT nDepth ); + List* GetSelectEntryList( sal_uInt16 nDepth ); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } - BOOL IsLinkableSelected() const { return mbLinkableSelected; } + sal_Bool IsLinkableSelected() const { return mbLinkableSelected; } - static BOOL IsInDrag(); + static sal_Bool IsInDrag(); using SvLBox::ExecuteDrop; using SvTreeListBox::SelectEntry; @@ -228,7 +228,7 @@ private: */ bool mbShowAllPages; - /** Return <TRUE/> when the current transferable may be dropped at the + /** Return <sal_True/> when the current transferable may be dropped at the given list box entry. */ bool IsDropAllowed (SvLBoxEntry* pEntry); diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index f02977234475..5bc8da7c0ec3 100755 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -42,13 +42,13 @@ public: aCtn(16, 16, 16) {} virtual ~SdUndoGroup(); - virtual BOOL Merge( SfxUndoAction* pNextAction ); + virtual sal_Bool Merge( SfxUndoAction* pNextAction ); virtual void Undo(); virtual void Redo(); void AddAction(SdUndoAction* pAction); - ULONG Count() const { return aCtn.Count(); } + sal_uLong Count() const { return aCtn.Count(); } }; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index d79e5d653ab4..f29b1d28936a 100644..100755 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -53,7 +53,7 @@ class SdTransferable : public TransferableHelper, public SfxListener { public: - SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, BOOL bInitOnGetData ); + SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ); ~SdTransferable(); void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } @@ -70,14 +70,14 @@ public: void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } const Point& GetStartPos() const { return maStartPos; } - void SetInternalMove( BOOL bSet ) { mbInternalMove = bSet; } - BOOL IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( sal_Bool bSet ) { mbInternalMove = bSet; } + sal_Bool IsInternalMove() const { return mbInternalMove; } - BOOL HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const List& rPageBookmarks, BOOL bPersistent ); - BOOL IsPageTransferable() const { return mbPageTransferable; } - BOOL HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } + void SetPageBookmarks( const List& rPageBookmarks, sal_Bool bPersistent ); + sal_Bool IsPageTransferable() const { return mbPageTransferable; } + sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } const List& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } @@ -117,12 +117,12 @@ private: ImageMap* mpImageMap; Rectangle maVisArea; Point maStartPos; - BOOL mbInternalMove : 1; - BOOL mbOwnDocument : 1; - BOOL mbOwnView : 1; - BOOL mbLateInit : 1; - BOOL mbPageTransferable : 1; - BOOL mbPageTransferablePersistent : 1; + sal_Bool mbInternalMove : 1; + sal_Bool mbOwnDocument : 1; + sal_Bool mbOwnView : 1; + sal_Bool mbLateInit : 1; + sal_Bool mbPageTransferable : 1; + sal_Bool mbPageTransferablePersistent : 1; bool mbIsUnoObj : 1; // not available diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 15544c2b5221..f24de66f144d 100755 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -76,11 +76,11 @@ public: ::sd::View& getView() const { return mrView; } protected: - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void select(); @@ -139,13 +139,13 @@ public: bool getContext( SdrViewContext& rContext ) const; // support point editing - BOOL HasMarkablePoints() const; - ULONG GetMarkablePointCount() const; - BOOL HasMarkedPoints() const; - ULONG GetMarkedPointCount() const; - BOOL IsPointMarkable(const SdrHdl& rHdl) const; - BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); - BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + sal_Bool HasMarkablePoints() const; + sal_uLong GetMarkablePointCount() const; + sal_Bool HasMarkedPoints() const; + sal_uLong GetMarkedPointCount() const; + sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); + sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); void CheckPossibilities(); diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx index 782e4ed0fb4a..9df19b96501e 100644..100755 --- a/sd/source/ui/inc/sprite.hxx +++ b/sd/source/ui/inc/sprite.hxx @@ -50,7 +50,7 @@ public: Sprite( List* pListOfBmpEx ); ~Sprite(); - BOOL StartMoving( OutputDevice* pOut, + sal_Bool StartMoving( OutputDevice* pOut, OutputDevice* pBottomLayer = NULL, BitmapEx* pTopLayer = NULL, MetaFile** ppTopMtf = NULL, @@ -75,10 +75,10 @@ protected: Marker* pObjStartMarker; Marker* pObjEndMarker; List* pListOfBmpEx; - ULONG nLastTime; - BOOL bClipRegion; + sal_uLong nLastTime; + sal_Bool bClipRegion; - BOOL ImplPrepareMoveTo(); + sal_Bool ImplPrepareMoveTo(); void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); }; diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index b96231dd3969..3637ee3565fc 100644..100755 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -60,15 +60,15 @@ private: XDashList* pDashList; XLineEndList* pLineEndList; - USHORT nPageType; - USHORT nDlgType; - USHORT nPos; + sal_uInt16 nPageType; + sal_uInt16 nDlgType; + sal_uInt16 nPos; ChangeType nColorTableState; ChangeType nBitmapListState; ChangeType nGradientListState; ChangeType nHatchingListState; - virtual void PageCreated( USHORT nId, SfxTabPage &rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ); virtual const SfxItemSet* GetRefreshedSet(); public: diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index c4df3cfe4dc6..b49d414d7def 100755 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -126,9 +126,9 @@ public: @param bIncludeHidden This flag tells the method whether to include the controls that are not visible in the search for the previous control. When it - is <FALSE/> the hidden controls are skipped. + is <sal_False/> the hidden controls are skipped. @param bCycle - When this flag is <TRUE/> then the search for the previous + When this flag is <sal_True/> then the search for the previous control wraps arround when reaching the first control. @return Returns the index to the previous control or (sal_uInt32)-1 when @@ -148,9 +148,9 @@ public: @param bIncludeHidden This flag tells the method whether to include the controls that are not visible in the search for the next control. When it is - <FALSE/> the hidden controls are skipped. + <sal_False/> the hidden controls are skipped. @param bCycle - When this flag is <TRUE/> then the search for the next control + When this flag is <sal_True/> then the search for the next control wraps arround when reaching the last control. @return Returns the index to the next control or (sal_uInt32)-1 when diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index a1a430c49328..719bc65430ea 100755 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -85,7 +85,7 @@ public: */ virtual sal_Int32 GetMinimumWidth (void); - /** The default implementaion always returns <FALSE/> + /** The default implementaion always returns <sal_False/> */ virtual bool IsResizable (void); @@ -102,22 +102,22 @@ public: virtual void RequestResize (void); /** The default implementation shows the window (when it exists) when - bExpansionState is <TRUE/>. It hides the window otherwise. + bExpansionState is <sal_True/>. It hides the window otherwise. @return - Returns <TRUE/> when the expansion state changes. When an + Returns <sal_True/> when the expansion state changes. When an expansion state is requested that is already in place then - <FALSE/> is returned. + <sal_False/> is returned. */ virtual bool Expand (bool bExpansionState); /** The default implementation returns whether the window is showing. - When there is no window then it returns <FALSE/>. + When there is no window then it returns <sal_False/>. */ virtual bool IsExpanded (void) const; /** Return whether the node can be expanded or collapsed. The default - implementation always returns <TRUE/> when there is window and - <FALSE/> otherwise. If <FALSE/> is returned + implementation always returns <sal_True/> when there is window and + <sal_False/> otherwise. If <sal_False/> is returned then Expand() may be called but it will not change the expansion state. */ diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 995117516529..47bce0ff528c 100755 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -110,7 +110,7 @@ private: /** Return whether this TitleBar object has an expansion indicator bitmap. It is safe to call GetExpansionIndicator() when this method - returns <FALSE/> but unnecessary. + returns <sal_False/> but unnecessary. */ bool HasExpansionIndicator (void) const; @@ -152,7 +152,7 @@ private: void PaintText (const Rectangle& rTextBox); - USHORT GetTextStyle (void); + sal_uInt16 GetTextStyle (void); const static int snIndentationWidth; diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index cb7cd3b2159c..550cb54d888b 100755 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -96,7 +96,7 @@ public: TitleBar* GetTitleBar (void); /** Return the control child. When a control factory has been given and - the control has not yet been created and the given flag is <TRUE/> + the control has not yet been created and the given flag is <sal_True/> then the control is created. */ TreeNode* GetControl (void); @@ -109,13 +109,13 @@ public: higher level expand command. You may want to use ExpandViaContainer() instead. @param bExpanded - When <TRUE/> then the control is expanded, otherwise it is + When <sal_True/> then the control is expanded, otherwise it is collapsed. */ virtual bool Expand (bool bExpanded = true); - /** Return whether the control is currently expanded (<TRUE/>) or - not (<FALSE/>). + /** Return whether the control is currently expanded (<sal_True/>) or + not (<sal_False/>). */ virtual bool IsExpanded (void) const; diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index fb9d31aa04a1..3ad67a0e7daa 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -126,7 +126,7 @@ public: */ virtual bool RelocateToParentWindow (::Window* pParentWindow); - /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck + /// returns <sal_True/> if and only if the given window is the panel anchor window of our ToolPanelDeck bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; /** creates an XUIElement for the given standard panel @@ -145,7 +145,7 @@ private: /** The id of the menu in the menu bar/tool box of the parent docking window. */ - USHORT mnMenuId; + sal_uInt16 mnMenuId; /** Create a popup menu. it contains two sections, one for docking or un-docking the tool panel, one for toggling the @@ -158,7 +158,7 @@ private: /** Initialize the task pane view shell if that has not yet been done - before. If mbIsInitialized is already set to <TRUE/> then this + before. If mbIsInitialized is already set to <sal_True/> then this method returns immediately. */ void Initialize (void); diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index e8c3b93a7fa2..b59290883328 100644..100755 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -47,7 +47,7 @@ private: DECL_LINK( TbxSelectHdl, ToolBox * ); public: - SdPopupWindowTbx( USHORT nId, WindowAlign eAlign, + SdPopupWindowTbx( sal_uInt16 nId, WindowAlign eAlign, SdResId aRIdWin, SdResId aRIdTbx, SfxBindings& rBindings ); ~SdPopupWindowTbx(); @@ -71,17 +71,17 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - BOOL IsCheckable( USHORT nSId ); + sal_Bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); - SdTbxControl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SdTbxControl() {} 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 ); }; diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index 6a85b0f7b4fb..ab0aac07dabe 100644..100755 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -33,10 +33,10 @@ class SdTemplateControl : public SfxStatusBarControl { public: - SdTemplateControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SdTemplateControl(); - 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 ); SFX_DECL_STATUSBAR_CONTROL(); diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index f3135d3fcce7..28835560531c 100644..100755 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -43,8 +43,8 @@ public: */ virtual void RunNextStep (void) = 0; - /** Return <TRUE/> when there is at least one more step to execute. - When the task has been executed completely then <FALSE/> is + /** Return <sal_True/> when there is at least one more step to execute. + When the task has been executed completely then <sal_False/> is returned. */ virtual bool HasNextStep (void) = 0; diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 008e99639849..b0619ea4b2d7 100644..100755 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -57,7 +57,7 @@ public: given id or an error occured. Should not happen under normal circumstances. */ - Image GetIcon (USHORT nResourceId); + Image GetIcon (sal_uInt16 nResourceId); private: class Implementation; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 33ec3ccd9993..bb3e4d4beb50 100644..100755 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -40,7 +40,7 @@ class AsynchronousTask; nMillisecondsBetweenSteps milliseconds as much steps are executed as fit into a nMaxTimePerStep millisecond intervall. - When a task is executed completely, i.e. HasNextStep() returns <FALSE/>, + When a task is executed completely, i.e. HasNextStep() returns <sal_False/>, the TimerBasedTaskExecution destroys itself. This, of course, works only if the creating instance does not hold a shared_ptr to that object. */ diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 2ee8bbe6771a..d4b746762def 100755 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -95,7 +95,7 @@ private: SdDrawDocument* mpDoc; XColorTable* pColTab; - BOOL bTreeUpdated; + sal_Bool bTreeUpdated; List* pCurrentActions; String aLastFile; ::std::vector< long > aVerbVector; @@ -113,9 +113,9 @@ private: void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); - String GetEditText( BOOL bURL = FALSE ); - USHORT GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); - USHORT GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); + String GetEditText( sal_Bool bURL = sal_False ); + sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); + sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); @@ -123,7 +123,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index e8e17f335a76..83d8479b29c5 100644..100755 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -60,7 +60,7 @@ public: ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); // virtual void ActivatePage( const SfxItemSet& rSet ); @@ -86,7 +86,7 @@ public: ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -145,15 +145,15 @@ private: MetricField aMtrFldInfo1; MetricField aMtrFldInfo2; - UINT32 nWidth; - UINT32 nHeight; + sal_uInt32 nWidth; + sal_uInt32 nHeight; String aInfo1; String aInfo2; SfxMapUnit ePoolUnit; - String GetScale( INT32 nX, INT32 nY ); - BOOL SetScale( const String& aScale, INT32& rX, INT32& rY ); + String GetScale( sal_Int32 nX, sal_Int32 nY ); + sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); DECL_LINK( ModifyScaleHdl, void * ); DECL_LINK( ModifyOriginalScaleHdl, void * ); @@ -174,7 +174,7 @@ public: ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual BOOL FillItemSet( SfxItemSet& ); + virtual sal_Bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); /** Hide Impress specific controls, make Draw specific controls visible diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index fc6a1770f6be..4cb695cb98f8 100644..100755 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -43,48 +43,48 @@ class SdPageFormatUndoAction : public SdUndoAction SdPage* mpPage; Size maOldSize; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnOldUpper; - INT32 mnOldLower; - BOOL mbOldScale; + sal_Int32 mnOldLeft; + sal_Int32 mnOldRight; + sal_Int32 mnOldUpper; + sal_Int32 mnOldLower; + sal_Bool mbOldScale; Orientation meOldOrientation; - USHORT mnOldPaperBin; - BOOL mbOldFullSize; + sal_uInt16 mnOldPaperBin; + sal_Bool mbOldFullSize; Size maNewSize; - INT32 mnNewLeft; - INT32 mnNewRight; - INT32 mnNewUpper; - INT32 mnNewLower; - BOOL mbNewScale; + sal_Int32 mnNewLeft; + sal_Int32 mnNewRight; + sal_Int32 mnNewUpper; + sal_Int32 mnNewLower; + sal_Bool mbNewScale; Orientation meNewOrientation; - USHORT mnNewPaperBin; - BOOL mbNewFullSize; + sal_uInt16 mnNewPaperBin; + sal_Bool mbNewFullSize; public: TYPEINFO(); SdPageFormatUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, const Size& rOldSz, - INT32 nOldLft, - INT32 nOldRgt, - INT32 nOldUpr, - INT32 nOldLwr, - BOOL bOldScl, + sal_Int32 nOldLft, + sal_Int32 nOldRgt, + sal_Int32 nOldUpr, + sal_Int32 nOldLwr, + sal_Bool bOldScl, Orientation eOldOrient, - USHORT nOPaperBin, - BOOL bOFullSize, + sal_uInt16 nOPaperBin, + sal_Bool bOFullSize, const Size& rNewSz, - INT32 nNewLft, - INT32 nNewRgt, - INT32 nNewUpr, - INT32 nNewLwr, - BOOL bNewScl, + sal_Int32 nNewLft, + sal_Int32 nNewRgt, + sal_Int32 nNewUpr, + sal_Int32 nNewLwr, + sal_Bool bNewScl, Orientation eNewOrient, - USHORT nNPaperBin, - BOOL bNFullSize + sal_uInt16 nNPaperBin, + sal_Bool bNFullSize ) : SdUndoAction(pDoc), mpPage (pThePage), @@ -122,16 +122,16 @@ class SdPageLRUndoAction : public SdUndoAction { SdPage* mpPage; - INT32 mnOldLeft; - INT32 mnOldRight; - INT32 mnNewLeft; - INT32 mnNewRight; + sal_Int32 mnOldLeft; + sal_Int32 mnOldRight; + sal_Int32 mnNewLeft; + sal_Int32 mnNewRight; public: TYPEINFO(); SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - INT32 nOldLft, INT32 nOldRgt, - INT32 nNewLft, INT32 nNewRgt ) : + sal_Int32 nOldLft, sal_Int32 nOldRgt, + sal_Int32 nNewLft, sal_Int32 nNewRgt ) : SdUndoAction(pDoc), mpPage (pThePage), mnOldLeft (nOldLft), @@ -151,16 +151,16 @@ class SdPageULUndoAction : public SdUndoAction { SdPage* mpPage; - INT32 mnOldUpper; - INT32 mnOldLower; - INT32 mnNewUpper; - INT32 mnNewLower; + sal_Int32 mnOldUpper; + sal_Int32 mnOldLower; + sal_Int32 mnNewUpper; + sal_Int32 mnNewLower; public: TYPEINFO(); SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - INT32 nOldUpr, INT32 nOldLwr, - INT32 nNewUpr, INT32 nNewLwr ) : + sal_Int32 nOldUpr, sal_Int32 nOldLwr, + sal_Int32 nNewUpr, sal_Int32 nNewLwr ) : SdUndoAction(pDoc), mpPage (pThePage), mnOldUpper (nOldUpr), diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 185dc90b24bf..ee9f975c4c06 100644..100755 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -44,10 +44,10 @@ class ModifyPageUndoAction : public SdUndoAction String maNewName; AutoLayout meOldAutoLayout; AutoLayout meNewAutoLayout; - BOOL mbOldBckgrndVisible; - BOOL mbNewBckgrndVisible; - BOOL mbOldBckgrndObjsVisible; - BOOL mbNewBckgrndObjsVisible; + sal_Bool mbOldBckgrndVisible; + sal_Bool mbNewBckgrndVisible; + sal_Bool mbOldBckgrndObjsVisible; + sal_Bool mbNewBckgrndObjsVisible; String maComment; @@ -59,8 +59,8 @@ public: SdPage* pThePage, String aTheNewName, AutoLayout eTheNewAutoLayout, - BOOL bTheNewBckgrndVisible, - BOOL bTheNewBckgrndObjsVisible); + sal_Bool bTheNewBckgrndVisible, + sal_Bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index a2a80963ad63..7ad39a7d37b1 100755 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -43,20 +43,20 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { SdrObject* pObject; - BOOL bOldActive; - BOOL bNewActive; - BOOL bOldDimPrevious; - BOOL bNewDimPrevious; - BOOL bOldDimHide; - BOOL bNewDimHide; - BOOL bOldSoundOn; - BOOL bNewSoundOn; - BOOL bOldSecondSoundOn; - BOOL bNewSecondSoundOn; - BOOL bOldPlayFull; - BOOL bNewPlayFull; - BOOL bOldSecondPlayFull; - BOOL bNewSecondPlayFull; + sal_Bool bOldActive; + sal_Bool bNewActive; + sal_Bool bOldDimPrevious; + sal_Bool bNewDimPrevious; + sal_Bool bOldDimHide; + sal_Bool bNewDimHide; + sal_Bool bOldSoundOn; + sal_Bool bNewSoundOn; + sal_Bool bOldSecondSoundOn; + sal_Bool bNewSecondSoundOn; + sal_Bool bOldPlayFull; + sal_Bool bNewPlayFull; + sal_Bool bOldSecondPlayFull; + sal_Bool bNewSecondPlayFull; ::com::sun::star::presentation::AnimationEffect eOldEffect; ::com::sun::star::presentation::AnimationEffect eNewEffect; ::com::sun::star::presentation::AnimationEffect eOldTextEffect; @@ -79,25 +79,25 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; String aOldBookmark; String aNewBookmark; - BOOL bOldInvisibleInPres; - BOOL bNewInvisibleInPres; - USHORT nOldVerb; - USHORT nNewVerb; - ULONG nOldPresOrder; - ULONG nNewPresOrder; + sal_Bool bOldInvisibleInPres; + sal_Bool bNewInvisibleInPres; + sal_uInt16 nOldVerb; + sal_uInt16 nNewVerb; + sal_uLong nOldPresOrder; + sal_uLong nNewPresOrder; - BOOL bInfoCreated; + sal_Bool bInfoCreated; public: TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, - BOOL bCreated): + sal_Bool bCreated): SdUndoAction (pTheDoc), pObject (pObj), bInfoCreated (bCreated) {} - void SetActive(BOOL bTheOldActive, BOOL bTheNewActive) + void SetActive(sal_Bool bTheOldActive, sal_Bool bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldEffect = eTheOldEffect; eNewEffect = eTheNewEffect; } @@ -105,19 +105,19 @@ public: { eOldTextEffect = eTheOldEffect; eNewTextEffect = eTheNewEffect; } void SetSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSpeed = eTheOldSpeed; eNewSpeed = eTheNewSpeed; } - void SetDim(BOOL bTheOldDim, BOOL bTheNewDim) + void SetDim(sal_Bool bTheOldDim, sal_Bool bTheNewDim) { bOldDimPrevious = bTheOldDim; bNewDimPrevious = bTheNewDim; } void SetDimColor(Color aTheOldDimColor, Color aTheNewDimColor) { aOldDimColor = aTheOldDimColor; aNewDimColor = aTheNewDimColor; } - void SetDimHide(BOOL bTheOldDimHide, BOOL bTheNewDimHide) + void SetDimHide(sal_Bool bTheOldDimHide, sal_Bool bTheNewDimHide) { bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; } - void SetSoundOn(BOOL bTheOldSoundOn, BOOL bTheNewSoundOn) + void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; } void SetSound(String aTheOldSound, String aTheNewSound) { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; } void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen) { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; } - void SetPlayFull(BOOL bTheOldPlayFull, BOOL bTheNewPlayFull) + void SetPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; } @@ -125,19 +125,19 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(String aTheOldBookmark, String aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(BOOL bTheOldInvisibleInPres, BOOL bTheNewInvisibleInPres) + void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres) { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } - void SetVerb(USHORT nTheOldVerb, USHORT nTheNewVerb) + void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } void SetSecondEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldSecondEffect = eTheOldEffect; eNewSecondEffect = eTheNewEffect; } void SetSecondSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSecondSpeed = eTheOldSpeed; eNewSecondSpeed = eTheNewSpeed; } - void SetSecondSoundOn(BOOL bTheOldSoundOn, BOOL bTheNewSoundOn) + void SetSecondSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } - void SetSecondPlayFull(BOOL bTheOldPlayFull, BOOL bTheNewPlayFull) + void SetSecondPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } - void SetPresOrder(ULONG nTheOldPresOrder, ULONG nTheNewPresOrder) + void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index d0c22946b46b..de4fce3ea988 100644..100755 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -40,7 +40,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction String aNewLayoutName; AutoLayout eOldAutoLayout; AutoLayout eNewAutoLayout; - BOOL bSetAutoLayout; // TRUE: AutoLayout aendern + sal_Bool bSetAutoLayout; // sal_True: AutoLayout aendern SdPage* pPage; String aComment; @@ -51,7 +51,7 @@ public: String aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - BOOL bSet, + sal_Bool bSet, SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 9b56267ff327..7702dafa4d80 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -61,7 +61,7 @@ public: private: ViewShellBase& mrBase; - ULONG mnUpdateTagsEvent; + sal_uLong mnUpdateTagsEvent; ViewTagVector maTagVector; }; diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 6957bfed25ce..13f3d6fe83bb 100755 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -46,12 +46,12 @@ public: void InsertZoomRect(const Rectangle& rRect); Rectangle GetNextZoomRect(); Rectangle GetPreviousZoomRect(); - BOOL IsNextPossible() const; - BOOL IsPreviousPossible() const; + sal_Bool IsNextPossible() const; + sal_Bool IsPreviousPossible() const; private: ViewShell* mpViewShell; - ULONG mnCurPos; + sal_uLong mnCurPos; }; } // end of namespace sd |