diff options
Diffstat (limited to 'sd/source/ui/inc')
140 files changed, 906 insertions, 1054 deletions
diff --git a/sd/source/ui/inc/AccessibleSlideView.hxx b/sd/source/ui/inc/AccessibleSlideView.hxx index 0c6461b025d5..4ff94d19c223 100644 --- a/sd/source/ui/inc/AccessibleSlideView.hxx +++ b/sd/source/ui/inc/AccessibleSlideView.hxx @@ -64,7 +64,7 @@ private: AccessibleSlideView* mpManager; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; - sal_uInt16 mnPage; + sal_uInt32 mnPage; sal_Bool mbVisible; sal_Bool mbValid; @@ -146,7 +146,7 @@ public: */ void Destroyed (void); - sal_uInt16 GetPageNum() const { return mnPage; } + sal_uInt32 GetPageNum() const { return mnPage; } void SetVisible( sal_Bool bVisible ); sal_Bool IsVisible() const; diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx index b6832d6bd40b..2096b8ee0ecb 100644 --- a/sd/source/ui/inc/BezierObjectBar.hxx +++ b/sd/source/ui/inc/BezierObjectBar.hxx @@ -37,7 +37,6 @@ class BezierObjectBar : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR) BezierObjectBar (ViewShell* pSdViewShell, View* pSdView); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index b6d634b92a07..7964893e6b89 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -75,7 +75,7 @@ private: CancelButton aBtnCancel; DrawView* pDrView; - sal_Bool bCancel; + bool bCancel; Timer aTimer; SvdProgressInfo *pProgrInfo; diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 9cea50be5a7c..e91cd66279a3 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -52,7 +52,7 @@ public: // man diese beiden folgenden Methoden ueberladen und entsprechend anders // reagieren. virtual void InvalidateOneWin(::Window& rWin); - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(::Window& rWin, const basegfx::B2DRange& rRange); }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index d016cb42b6d2..13c80f71a2e8 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -262,7 +262,7 @@ protected: @param nHandle The handle of the proberty. @return - <TRUE/> if the value is converted successfully. + <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 c18bb5c6130e..287ef9ebb229 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -60,24 +60,23 @@ class ViewShell; class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL) SFX_DECL_OBJECTFACTORY(); DrawDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( const sal_uInt64 nModelCreationFlags, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( SdDrawDocument* pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); virtual ~DrawDocShell(); @@ -105,7 +104,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( sal_Bool = sal_True ); + virtual void SetModified( sal_Bool = true ); using SotObject::GetInterface; using SfxObjectShell::GetVisArea; @@ -119,11 +118,11 @@ public: SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } - SfxPrinter* GetPrinter(sal_Bool bCreate); + SfxPrinter* GetPrinter(bool bCreate); void SetPrinter(SfxPrinter *pNewPrinter); void UpdateFontList(); - sal_Bool IsInDestruction() const { return mbInDestruction; } + bool IsInDestruction() const { return mbInDestruction; } void CancelSearching(); @@ -134,7 +133,7 @@ public: void Disconnect(sd::ViewShell* pViewSh); void UpdateTablePointers(); - sal_Bool GotoBookmark(const String& rBookmark); + bool GotoBookmark(const String& rBookmark); Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel); @@ -149,13 +148,13 @@ 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 sal_True, if the new name is unique. Note that if the user entered + @return 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'), - sal_True is returned, but rName is set to an empty string. + true is returned, but rName is set to an empty string. */ - sal_Bool CheckPageName(::Window* pWin, String& rName ); + bool CheckPageName(::Window* pWin, String& rName ); - void SetSlotFilter(sal_Bool bEnable = sal_False, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } + void SetSlotFilter(bool bEnable = false, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; sal_uInt16 GetStyleFamily() const { return mnStyleFamily; } @@ -216,11 +215,11 @@ protected: 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 mbFilterEnable; + bool mbSdDataObj; + bool mbInDestruction; + bool mbOwnPrinter; + bool mbNewDocument; bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 90e66012b0fe..dab4c796256a 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -70,8 +70,6 @@ class DrawViewShell public: static const int SLOTARRAY_COUNT = 24; - TYPEINFO(); - SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL) /** Create a new stackable shell that may take some information @@ -128,7 +126,7 @@ public: void HidePage(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual 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); @@ -136,7 +134,7 @@ public: virtual void Resize (void); - void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); + void ShowMousePosInfo(const basegfx::B2DRange& rRange, ::sd::Window* pWin); virtual void AddWindow(::sd::Window* pWin); virtual void RemoveWindow(::sd::Window* pWin); @@ -144,23 +142,21 @@ public: virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); virtual void SetZoom( long nZoom ); - virtual void SetZoomRect( const Rectangle& rZoomRect ); + virtual void SetZoomRange( const basegfx::B2DRange& rZoomRange ); - void InsertURLField(const String& rURL, const String& rText, const String& rTarget, - const Point* pPos); - void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, - const Point* pPos); + void InsertURLField(const String& rURL, const String& rText, const String& rTarget, const basegfx::B2DPoint* pPos); + void InsertURLButton(const String& rURL, const String& rText, const String& rTarget, const basegfx::B2DPoint* pPos); virtual void SetUIUnit(FieldUnit eUnit); void SelectionHasChanged(); - void ModelHasChanged(); + void LazyReactOnObjectChanges(); virtual void Activate(sal_Bool bIsMDIActivate); virtual void Deactivate(sal_Bool IsMDIActivate); virtual void UIActivating( SfxInPlaceClient* ); virtual void UIDeactivated( SfxInPlaceClient* ); - virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); - virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; + virtual String GetSelectionText( bool bCompleteWords = false ); + virtual bool HasSelection( bool bText = true ) const; void ExecCtrl(SfxRequest& rReq); void GetCtrlState(SfxItemSet& rSet); @@ -225,13 +221,13 @@ public: const Ruler& rRuler, const MouseEvent& rMEvt); - virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); + virtual sal_uInt16 PrepareClose( bool bUI = true, bool bForBrowsing = false ); PageKind GetPageKind() { return mePageKind; } - Point GetMousePos() { return maMousePos; } - sal_Bool IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } + basegfx::B2DPoint GetMousePos() { return maMousePos; } + bool IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } virtual SdPage* GetActualPage() { return mpActualPage; } @@ -241,20 +237,20 @@ public: void ResetActualPage(); void ResetActualLayer(); - sal_Bool SwitchPage(sal_uInt16 nPage); - sal_Bool IsSwitchPageAllowed() const; + bool SwitchPage(sal_uInt32 nPage); + bool IsSwitchPageAllowed() const; - sal_Bool GotoBookmark(const String& rBookmark); - void MakeVisible(const Rectangle& rRect, ::Window& rWin); + bool GotoBookmark(const String& rBookmark); + void MakeVisibleAtView(const basegfx::B2DRange& rRange, ::Window& rWin); virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); virtual ErrCode DoVerb(long nVerb); - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb); - void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } - sal_Bool IsZoomOnPage() { return mbZoomOnPage; } + void SetZoomOnPage( bool bZoom = true ) { mbZoomOnPage = bZoom; } + bool IsZoomOnPage() { return mbZoomOnPage; } void CheckLineTo (SfxRequest& rReq); void FuTemp01(SfxRequest& rReq); void FuTemp02(SfxRequest& rReq); @@ -266,7 +262,7 @@ public: void LockInput(); void UnlockInput(); - sal_Bool IsInputLocked() const { return mnLockCount > 0UL; } + bool IsInputLocked() const { return mnLockCount > 0UL; } sal_uInt16 GetCurPageId() { return( maTabControl.GetCurPageId() ); } @@ -283,9 +279,9 @@ public: sal_uInt16* GetSlotArray() const { return mpSlotArray; } virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt32 nPage, SdrLayerID sLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt32 nPage, SdrLayerID aLayer ); 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 ); @@ -349,7 +345,7 @@ public: <p>Implemented in <code>drviews8.cxx</code>.</p> */ - bool RenameSlide( sal_uInt16 nPageId, const String & rName ); + bool RenameSlide( sal_uInt32 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 ); @@ -359,27 +355,27 @@ 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 <false/>. */ virtual bool RelocateToParentWindow (::Window* pParentWindow); protected: DrawView* mpDrawView; SdPage* mpActualPage; - Rectangle maMarkRect; - Point maMousePos; - sal_Bool mbMousePosFreezed; + basegfx::B2DRange maMarkRange; + basegfx::B2DPoint maMousePos; + bool mbMousePosFreezed; TabControl maTabControl; EditMode meEditMode; PageKind mePageKind; - sal_Bool mbZoomOnPage; - sal_Bool mbIsRulerDrag; + bool mbZoomOnPage; + bool mbIsRulerDrag; sal_uLong mnLockCount; Timer maCloseTimer; - sal_Bool mbReadOnly; + bool mbReadOnly; sal_uInt16* mpSlotArray; - static sal_Bool mbPipette; + static bool mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( CloseHdl, Timer* pTimer ); @@ -390,7 +386,7 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -398,12 +394,12 @@ protected: virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY); virtual Size GetOptimalSizePixel() const; - void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, - sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); + void SetupPage( const basegfx::B2DVector& rSize, double fLeft, double fRight, double fTop, double fBottom, + bool bSize, bool bMargin, bool bScaleAll ); sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); void MapSlot( sal_uInt16 nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent = sal_True ); + void UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent = true ); sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); sal_uInt16 GetArrayId( sal_uInt16 nSId ); @@ -445,7 +441,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; - sal_Bool mbPastePossible; + bool mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); @@ -455,11 +451,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 <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 <true/> so that + not an empty frame remains. When called with <true/> it is the responsibility of the caller to avoid an illegal reentrant call. */ @@ -480,7 +476,7 @@ private: */ void ShowSnapLineContextMenu ( SdrPageView& rPageView, - const sal_uInt16 nSnapLineIndex, + const sal_uInt32 nSnapLineIndex, const Point& rMouseLocation); using ViewShell::Notify; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 3f5f877e69c4..45d6eb05be57 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -38,11 +38,10 @@ namespace sd { |* View fuer den MDIFrame |* \************************************************************************/ -class FrameView - : public SdrView +class FrameView : public SdrView { public: - SD_DLLPUBLIC FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView = NULL ); + SD_DLLPUBLIC FrameView(SdDrawDocument& rDrawDoc, FrameView* pFrameView = NULL ); FrameView(const FrameView& rFrameView); virtual ~FrameView(); @@ -73,17 +72,17 @@ public: { maPrintableLayers = rPrintableLayers; } const SetOfByte& GetPrintableLayers() { return maPrintableLayers; } - void SetRuler(const sal_Bool bRulerOn) + void SetRuler(const bool bRulerOn) { mbRuler = bRulerOn; } - sal_Bool HasRuler() const { return mbRuler; } + bool HasRuler() const { return mbRuler; } - void SetNoColors(const sal_Bool bNoCol) + void SetNoColors(const bool bNoCol) { mbNoColors = bNoCol; } - sal_Bool IsNoColors() const { return mbNoColors; } + bool IsNoColors() const { return mbNoColors; } - void SetNoAttribs(const sal_Bool bNoAttr) + void SetNoAttribs(const bool bNoAttr) { mbNoAttribs = bNoAttr; } - sal_Bool IsNoAttribs() const { return mbNoAttribs; } + bool IsNoAttribs() const { return mbNoAttribs; } void SetVisArea(const Rectangle& rVisArea) { maVisArea = rVisArea; } @@ -99,15 +98,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 (sal_uInt16 nPage); - sal_uInt16 GetSelectedPage () const; + SD_DLLPUBLIC void SetSelectedPage (sal_uInt32 nPage); + sal_uInt32 GetSelectedPage () const; /** is used in FrameView::ReadUserDataSequence() only to store the page that was selected while last saving this document */ - void SetSelectedPageOnLoad (sal_uInt16 nPage) { mnSelectedPageOnLoad = nPage; } + void SetSelectedPageOnLoad (sal_uInt32 nPage) { mnSelectedPageOnLoad = nPage; } /** can be used to get the page that was selected on last save of this document */ - sal_uInt16 GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } + sal_uInt32 GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; } SD_DLLPUBLIC void SetViewShEditMode(EditMode eMode, PageKind eKind); EditMode GetViewShEditMode (PageKind eKind); @@ -122,22 +121,22 @@ public: */ EditMode GetViewShEditModeOnLoad (void) const; - void SetLayerMode(sal_Bool bMode) + void SetLayerMode(bool bMode) { mbLayerMode = bMode; } - sal_Bool IsLayerMode() const { return mbLayerMode; } + bool IsLayerMode() const { return mbLayerMode; } - void SetQuickEdit(sal_Bool bQEdit) + void SetQuickEdit(bool bQEdit) { mbQuickEdit = bQEdit; } - sal_Bool IsQuickEdit() const { return mbQuickEdit; } + bool IsQuickEdit() const { return mbQuickEdit; } - void SetBigHandles( sal_Bool bOn = sal_True ) { mbBigHandles = bOn; } - sal_Bool IsBigHandles() const { return mbBigHandles; } + void SetBigHandles( bool bOn = true ) { mbBigHandles = bOn; } + bool IsBigHandles() const { return mbBigHandles; } - void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; } - sal_Bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( bool bOn = true ) { mbDoubleClickTextEdit = bOn; } + bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( sal_Bool bOn = sal_True ) { mbClickChangeRotation = bOn; } - sal_Bool IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( bool bOn = true ) { mbClickChangeRotation = bOn; } + bool IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -184,36 +183,36 @@ public: private: sal_uInt16 mnRefCount; VirtualDevice* mpVDev; - sal_Bool mbRuler; + bool mbRuler; SetOfByte maVisibleLayers; SetOfByte maLockedLayers; SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - sal_Bool mbNoColors; // Gliederungsmodus - sal_Bool mbNoAttribs; // Gliederungsmodus + bool mbNoColors; // Gliederungsmodus + bool mbNoAttribs; // Gliederungsmodus Rectangle maVisArea; // Sichtbarer Bereich PageKind mePageKind; // Seitentyp (Standard, Notizen, Handzettel) sal_uInt16 mnSelectedPage; // Selektierte Seite PageKind mePageKindOnLoad; - sal_uInt16 mnSelectedPageOnLoad; + sal_uInt32 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; - 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 + 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 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 (<true/>) or only + the names ones (<false/>). Not persistent. */ bool mbIsNavigatorShowingAllShapes; diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 92c3204bbaea..31b9d5a563f8 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -43,8 +43,6 @@ class GraphicDocShell : public DrawDocShell { public: - TYPEINFO(); - SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL) SFX_DECL_OBJECTFACTORY(); @@ -52,12 +50,12 @@ public: GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_DRAW); GraphicDocShell ( const sal_uInt64 nModelCreationFlags, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=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 dd06bdb0a75d..f8c3c7c31bfa 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -38,7 +38,6 @@ class GraphicObjectBar : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR ) GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 1a4fdefbd405..ea2ff4de39ee 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -43,8 +43,6 @@ class GraphicViewShell : public DrawViewShell { public: - TYPEINFO(); - SFX_DECL_VIEWFACTORY(GraphicViewShell); SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL) diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index c81793c0c44b..40162ca93e4b 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -36,7 +36,6 @@ class GraphicViewShellBase : public ViewShellBase { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(GraphicViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index cd45b681357e..5f4516c66be2 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -36,7 +36,6 @@ class ImpressViewShellBase : public ViewShellBase { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(ImpressViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index a34aa1e1e098..a785699af0a8 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -38,7 +38,6 @@ class MediaObjectBar : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR ) MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index a71c22f0cdef..d309b741d999 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -57,7 +57,7 @@ private: SfxItemSet aInputSet; SfxItemSet *pOutputSet; - sal_Bool bTitle; + bool bTitle; ::sd::View *pSdView; }; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 56f04efd5f11..3bcd3f2239e5 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -75,8 +75,6 @@ public: void ConnectToApplication (void); void DisconnectFromApplication (void); - TYPEINFO(); - SdrTextObj* GetTitleTextObject(SdrPage* pPage); SdrTextObj* GetOutlineTextObject(SdrPage* pPage); @@ -119,12 +117,11 @@ public: sal_uLong GetPaperWidth() const { return 2*21000; } // DIN A4 Breite - sal_Bool PrepareClose(sal_Bool bUI = sal_True); + bool PrepareClose(bool bUI = true); - 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 GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); -// virtual sal_Bool HasMarkedObjUnused() const; void FillOutliner(); void SetLinks(); void ResetLinks() const; @@ -137,20 +134,20 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_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 <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 @@ -198,7 +195,7 @@ private: sal_uInt16 mnPagesToProcess; // fuer die Fortschrittsanzeige sal_uInt16 mnPagesProcessed; - sal_Bool mbFirstPaint; + bool mbFirstPaint; SfxProgress* mpProgress; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 922869a62c97..2ab4f28101d2 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -42,8 +42,6 @@ class OutlineViewShell : public ViewShell { public: - TYPEINFO(); - SFX_DECL_VIEWFACTORY(OutlineViewShell); SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL) @@ -76,7 +74,7 @@ public: */ virtual void ArrangeGUIElements (void); - virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); + virtual sal_uInt16 PrepareClose( bool bUI = true, bool bForBrowsing = false ); virtual long VirtHScrollHdl(ScrollBar* pHScroll); virtual long VirtVScrollHdl(ScrollBar* pVHScroll); @@ -107,9 +105,9 @@ public: void FuSupport(SfxRequest &rReq); virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); - virtual String GetSelectionText( sal_Bool bCompleteWords = sal_False ); - virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; + virtual void SetZoomRange(const basegfx::B2DRange& rZoomRange); + virtual String GetSelectionText( bool bCompleteWords = false ); + virtual bool HasSelection( bool bText = true ) const; void Execute(SfxRequest& rReq); @@ -117,7 +115,7 @@ public: virtual void WriteFrameViewData(); virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); sal_uLong Read(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); @@ -141,7 +139,7 @@ public: /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); + virtual void UpdatePreview (SdPage* pPage, bool bInit = false); virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void); @@ -163,7 +161,7 @@ private: OutlineView* pOlView; SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - sal_Bool bPastePossible; + bool bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 8098d46c8514..1728738f8c22 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -36,7 +36,6 @@ class OutlineViewShellBase : public ImpressViewShellBase { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(OutlineViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index 5b7dec28c627..11e2c586be40 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -55,7 +55,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 <true/> then the direction is forwards otherwise it is backwards. */ IteratorImplBase (SdDrawDocument* pDocument, @@ -95,7 +95,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 <true/> is returned, <false/> otherwise. */ virtual bool operator== (const IteratorImplBase& rIterator) const; /** This method is used by the equality operator. Additionaly to the @@ -106,7 +106,7 @@ public: @param aType The type of the iterator. @return - Returns <TRUE/> when both iterators point to the same object. + Returns <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. @@ -141,7 +141,7 @@ class SelectionIteratorImpl { public: SelectionIteratorImpl ( - const ::std::vector< SdrObjectWeakRef >& rObjectList, + const SdrObjectVector& rObjectList, sal_Int32 nObjectIndex, SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, @@ -155,7 +155,7 @@ public: virtual bool operator== (const IteratorImplBase& rIterator) const; private: - const ::std::vector<SdrObjectWeakRef>& mrObjectList; + const SdrObjectVector& mrObjectList; sal_Int32 mnObjectIndex; /** Compare the given iterator with this object. This method handles @@ -165,7 +165,7 @@ private: @param aType The type of the iterator. @return - Returns <TRUE/> when both iterators point to the same object. + Returns <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/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 3c81021e9f48..8868e6170eb2 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -41,7 +41,6 @@ class LeftImpressPaneShell : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL) LeftImpressPaneShell (void); @@ -58,7 +57,6 @@ class LeftDrawPaneShell : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL) LeftDrawPaneShell (void); @@ -74,7 +72,6 @@ public: class ToolPanelPaneShell : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL ) ToolPanelPaneShell(); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 72b238eebf58..3ef37abed620 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -36,8 +36,6 @@ namespace sd { class PresentationViewShell : public DrawViewShell { public: - TYPEINFO(); - SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) @@ -56,13 +54,13 @@ public: virtual void Resize (void); protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); private: Rectangle maOldVisArea; - virtual void Activate (sal_Bool bIsMDIActivate); + virtual void Activate (bool bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index bd3eec5b1afe..4ece363cee06 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -36,7 +36,6 @@ class PresentationViewShellBase : public ViewShellBase { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(PresentationViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index c2508e8c1043..2e147054e8b2 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -50,7 +50,7 @@ public: @param pTemplate May be NULL. @param bPaintFrame - When <TRUE/> (the default) then a frame is painted around the + When <true/> (the default) then a frame is painted around the preview. This makes the actual preview smaller. */ PreviewRenderer ( @@ -72,9 +72,9 @@ 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 <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 + <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 @@ -97,9 +97,9 @@ 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 <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 + <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 diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 099747c6d1fe..b637b9e6159e 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -56,7 +56,7 @@ public: void SetNullOffset(const Point& rOffset); - sal_Bool IsHorizontal() const { return bHorz; } + bool IsHorizontal() const { return bHorz; } using ::Ruler::SetNullOffset; protected: @@ -64,7 +64,7 @@ protected: ::sd::Window* pSdWin; DrawViewShell* pDrViewShell; RulerCtrlItem* pCtrlItem; - sal_Bool bHorz; + 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 62c2757b73d5..83a52afcea9c 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -84,7 +84,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 <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). @@ -238,7 +238,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 <true/> to force a layout before the next paint. */ bool mbLayoutPending; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index b088c8fb1e49..2d9c5c9283ea 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -46,7 +46,6 @@ class SlideSorterViewShell friend class controller::SlotManager; public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) static ::boost::shared_ptr<SlideSorterViewShell> Create( @@ -101,7 +100,7 @@ public: factor. */ virtual void SetZoom (long int nZoom); - virtual void SetZoomRect (const Rectangle& rZoomRect); + virtual void SetZoomRange(const basegfx::B2DRange& rZoomRange); /** This is a callback method used by the active window to delegate its Paint() call to. This view shell itself delegates it to the view. @@ -119,7 +118,7 @@ public: //===== Drag and Drop ===================================================== virtual void StartDrag ( - const Point& rDragPt, + const basegfx::B2DPoint& rDragPt, ::Window* pWindow ); virtual void DragFinished ( sal_Int8 nDropAction); @@ -127,14 +126,14 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); typedef ::std::vector<SdPage*> PageSelection; diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 3598317c6159..c9908878dc38 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -36,7 +36,6 @@ class SlideSorterViewShellBase : public ImpressViewShellBase { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(SlideSorterViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/SlideView.hxx b/sd/source/ui/inc/SlideView.hxx index 5e2493c15c6e..e088d639abaf 100644 --- a/sd/source/ui/inc/SlideView.hxx +++ b/sd/source/ui/inc/SlideView.hxx @@ -58,29 +58,27 @@ class SlideView : public ::sd::View { public: - TYPEINFO(); - SlideView ( SdDrawDocument* pDoc, ::Window* pWindow, SlideViewShell* pSlideVShell); virtual ~SlideView (void); - void Select( sal_uInt16 nSdPageNum, sal_Bool bSelect ); - void SelectAllSlides( sal_Bool bSelect ); + void Select( sal_uInt16 nSdPageNum, bool bSelect ); + void SelectAllSlides( bool bSelect ); void MoveFocus( SlideViewFocusMove eMove ); sal_uInt16 GetFocusPage() const; - sal_Bool HasFocus() const; + bool HasFocus() const; 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 ); + virtual void InvalidateOneWin( ::Window& rWin, const basegfx::B2DRange& rRange ); - void SetAllowInvalidate( sal_Bool bFlag ); - sal_Bool IsInvalidateAllowed() const; + void SetAllowInvalidate( bool bFlag ); + bool IsInvalidateAllowed() const; void Paint(const Rectangle& rRect, OutputDevice* pOut); void DrawSelectionRect(sal_uInt16 nPage); @@ -110,12 +108,12 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); void UpdateAllPages(); @@ -128,11 +126,11 @@ private: sal_uInt16 nAllowInvalidateSmph; sal_uInt16 nPagesPerRow; sal_uInt16 nFocusPage; - sal_Bool bInPaint; - sal_Bool bInDelayedPaint; + bool bInPaint; + bool bInDelayedPaint; DECL_LINK( PaintDelayed, Timer * ); - void CreateSlideTransferable (::Window* pWindow, sal_Bool bDrag); + void CreateSlideTransferable (::Window* pWindow, bool bDrag); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SlideViewShell.hxx b/sd/source/ui/inc/SlideViewShell.hxx index f5e1195f5155..7b0d5ddac32e 100644 --- a/sd/source/ui/inc/SlideViewShell.hxx +++ b/sd/source/ui/inc/SlideViewShell.hxx @@ -50,8 +50,6 @@ class SlideViewShell { public: - TYPEINFO(); - SFX_DECL_VIEWFACTORY(SlideViewShell); SFX_DECL_INTERFACE(SD_IF_SDSLIDEVIEWSHELL) @@ -84,7 +82,7 @@ public: virtual void AddWindow(::sd::Window* pWin) { pSlideView->AddWindowToPaintView((OutputDevice*) pWin); } virtual void RemoveWindow(::sd::Window* pWin) { pSlideView->DeleteWindowFromPaintView((OutputDevice*) pWin); } - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual 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); @@ -115,9 +113,9 @@ public: virtual void WriteFrameViewData(); virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); + virtual void SetZoomRange(const basegfx::B2DRange& rZoomRange); - virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; + virtual bool HasSelection( bool bText = true ) const; /** Draw the rectangle arround the specified slide that indicates whether the slide is selected or not. When not selected the rectangle is @@ -142,11 +140,11 @@ public: void SelectionHasChanged(); void PageLayoutHasChanged(); void FocusHasChanged( sal_uInt16 nOldFocusPage, sal_uInt16 nNewFocusPage ); - void PageVisibilityHasChanged( sal_uInt16 nPage, sal_Bool bVisible ); + void PageVisibilityHasChanged( sal_uInt16 nPage, bool bVisible ); /** On activation the preview is turned off. */ - virtual void Activate (sal_Bool IsMDIActivate); + virtual void Activate (bool IsMDIActivate); protected: virtual Size GetOptimalSizePixel() const; @@ -163,7 +161,7 @@ private: bool bInitializeWinPos; void Construct(SdDrawDocument* pDoc); - void ImplDrawFocusRect( sal_uInt16 nPage, sal_Bool bVisible ); + void ImplDrawFocusRect( sal_uInt16 nPage, bool bVisible ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 14e29954421e..08987f055194 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -73,7 +73,7 @@ private: */ Outliner* mpSdOutliner; - /** When this flag is <TRUE/> then eventually we have to destroy + /** When this flag is <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 0183d4e06f19..0d27f5511218 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -60,7 +60,7 @@ public: protected: DrawViewShell* pDrViewSh; - sal_Bool bInternalMove; + bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 1c8ff16ec882..99553916a7df 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -81,7 +81,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 <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/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index a86512808d26..041c93d56e6c 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -41,7 +41,6 @@ class TextObjectBar : public SfxShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR) TextObjectBar ( diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx index 6e5506af0882..9f988b5a0c5f 100644 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ b/sd/source/ui/inc/UpdateLockManager.hxx @@ -70,7 +70,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 <false/>. */ bool IsLocked (void) const; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index abe3811df04a..a9f691f4896e 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -28,10 +28,6 @@ #include <tools/gen.hxx> #include <svtools/transfer.hxx> #include <svx/fmview.hxx> -#include <svx/svdmark.hxx> -//#ifndef _SVDVMARK_HXX //autogen -//#include <svx/svdvmark.hxx> -//#endif #include <svx/svdpage.hxx> #include "fupoor.hxx" @@ -73,40 +69,38 @@ struct SdViewRedrawRec class View : public FmFormView { public: - TYPEINFO(); - View ( - SdDrawDocument* pDrawDoc, + SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, ViewShell* pViewSh=NULL); virtual ~View (void); void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - 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 bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); + virtual void handleSelectionChange(); + virtual void LazyReactOnObjectChanges(); virtual void SelectAll(); virtual void DoCut(::Window* pWindow=NULL); virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj); - virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); + virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = 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, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); virtual sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - sal_uInt16 nPage = SDRPAGE_NOTFOUND, - sal_uInt16 nLayer = SDRPAGE_NOTFOUND); + sal_uInt32 nPage = SDRPAGE_NOTFOUND, + SdrLayerID aLayer = SDRLAYER_NOTFOUND); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> @@ -119,56 +113,54 @@ public: ::com::sun::star::datatransfer::XTransferable> CreateSelectionDataObject (::sd::View*, ::Window& rWindow); - void UpdateSelectionClipboard( sal_Bool bForceDeselect ); + void UpdateSelectionClipboard( bool bForceDeselect ); inline DrawDocShell* GetDocSh (void) const; inline SdDrawDocument* GetDoc (void) const; inline ViewShell* GetViewShell (void) const; - virtual sal_Bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, sal_Bool bIsNewObj = sal_False, - SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, - sal_Bool bDontDeleteOutliner = sal_False, sal_Bool bOnlyOneView = sal_False, sal_Bool bGrabFocus = sal_True); + virtual bool SdrBeginTextEdit(SdrObject* pObj, ::Window* pWin = 0, bool bIsNewObj = false, + SdrOutliner* pGivenOutliner = 0, OutlinerView* pGivenOutlinerView = 0, + bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); - virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False); + virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); bool RestoreDefaultText( SdrTextObj* pTextObj ); - 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 ); + bool InsertData( const TransferableDataHelper& rDataHelper, + const basegfx::B2DPoint& rPos, sal_Int8& rDnDAction, bool bDrag, + sal_uInt32 nFormat = 0, sal_uInt32 nPage = SDRPAGE_NOTFOUND, sal_uInt32 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. */ - bool InsertMetaFile( TransferableDataHelper& rDataHelper, - const Point& rInsertPos, - ImageMap* pImageMap, bool bOptimize ); + bool InsertMetaFile( TransferableDataHelper& rDataHelper, const basegfx::B2DPoint& rInsertPos, ImageMap* pImageMap, bool bOptimize ); SdrGrafObj* InsertGraphic( const Graphic& rGraphic, - sal_Int8& rAction, const Point& rPos, + sal_Int8& rAction, const basegfx::B2DPoint& rPos, SdrObject* pSelectedObj, ImageMap* pImageMap ); SdrMediaObj* InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction, - const Point& rPos, const Size& rSize ); + const basegfx::B2DPoint& rPos, const basegfx::B2DVector& rSize ); - bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions ); + bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uInt32 nPasteOptions ); - sal_Bool IsPresObjSelected(sal_Bool bOnPage=sal_True, sal_Bool bOnMasterPage=sal_True, sal_Bool bCheckPresObjListOnly=sal_False, sal_Bool bCheckLayoutOnly=sal_False) const; + bool IsPresObjSelected(bool bOnPage=true, bool bOnMasterPage=true, bool bCheckPresObjListOnly=false, bool bCheckLayoutOnly=false) const; void SetMarkedOriginalSize(); - void LockRedraw(sal_Bool bLock); + void LockRedraw(bool bLock); - sal_Bool IsMorphingAllowed() const; - sal_Bool IsVectorizeAllowed() const; + bool IsMorphingAllowed() const; + bool IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; - sal_Bool GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType ); + bool GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType ); virtual void onAccessibilityOptionsChanged(); virtual SdrModel* GetMarkedObjModel() const; - virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const basegfx::B2DPoint& rPos, SdrObjList* pLst = 0, sal_uInt32 nOptions = 0); using SdrExchangeView::Paste; /** returns true if we have an undo manager and there is an open list undo action */ @@ -178,28 +170,24 @@ public: SmartTagSet& getSmartTags() { return maSmartTags; } void selectSmartTag( const SmartTagReference& xTag ); - void updateHandles(); virtual SdrViewContext GetContext() const; - 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 bool HasMarkablePoints() const; + virtual sal_uInt32 GetMarkablePointCount() const; + virtual bool HasMarkedPoints() const; + virtual sal_uInt32 GetMarkedPointCount() const; + virtual bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark = false); virtual void CheckPossibilities(); - virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); + virtual void MarkPoints(const basegfx::B2DRange* pRange, bool bUnmark); using SdrMarkView::MarkPoints; - void SetPossibilitiesDirty() { bPossibilitiesDirty = true; } - void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; } - void SetMoveProtected( bool bSet ) { bMoveProtect = bSet; } - void SetResizeFreeAllowed( bool bSet ) { bResizeFreeAllowed = bSet; } - void SetResizePropAllowed( bool bSet ) { bResizePropAllowed = bSet; } - void SetResizeProtected( bool bSet ) { bResizeProtect = bSet; } - - void SetMarkedPointsSmoothPossible( bool bSet ) { bSetMarkedPointsSmoothPossible = bSet; } - void SetMarkedSegmentsKindPossible( bool bSet ) { bSetMarkedSegmentsKindPossible = bSet; } + void SetPossibilitiesDirty() { if(mbPossibilitiesDirty != true) mbPossibilitiesDirty = true; } + void SetMoveAllowedOnSelection( bool bSet ) { mbMoveAllowedOnSelection = bSet; } + void SetMoveProtected( bool bSet ) { if(mbMoveProtect != bSet) mbMoveProtect = bSet; } + void SetResizeFreeAllowed( bool bSet ) { if(mbResizeFreeAllowed != bSet) mbResizeFreeAllowed = bSet; } + void SetResizePropAllowed( bool bSet ) { if(mbResizePropAllowed != bSet) mbResizePropAllowed = bSet; } + void SetResizeProtected( bool bSet ) { if(mbResizeProtect != bSet) mbResizeProtect = bSet; } SdrObject* GetEmptyPresentationObject( PresObjKind eKind ); protected: @@ -212,11 +200,11 @@ protected: SdDrawDocument* mpDoc; DrawDocShell* mpDocSh; ViewShell* mpViewSh; - SdrMarkList* mpDragSrcMarkList; + SdrObjectVector maDragSrcMarkList; SdrObject* mpDropMarkerObj; SdrDropMarkerOverlay* mpDropMarker; - sal_uInt16 mnDragSrcPgNum; - Point maDropPos; + sal_uInt32 mnDragSrcPgNum; + basegfx::B2DPoint maDropPos; ::std::vector< String > maDropFileVector; sal_Int8 mnAction; Timer maDropErrorTimer; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 264ae75d175d..4c86357c0450 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -63,6 +63,11 @@ namespace embed { namespace css = ::com::sun::star; +#define SD_OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) +#define SD_OUTPUT_DRAWMODE_GRAYSCALE (DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_BLACKTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT) +#define SD_OUTPUT_DRAWMODE_BLACKWHITE (DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP | DRAWMODE_WHITEGRADIENT) +#define SD_OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) + namespace sd { class Client; @@ -80,9 +85,6 @@ class Window; class WindowUpdater; class ZoomList; -#undef OUTPUT_DRAWMODE_COLOR -#undef OUTPUT_DRAWMODE_CONTRAST - /** Base class of the stacked shell hierarchy. <p>Despite its name this class is not a descendant of SfxViewShell @@ -113,24 +115,6 @@ public: ST_PRESENTATION, ST_TASK_PANE }; - static const int MAX_HSPLIT_CNT = 1; - static const int MAX_VSPLIT_CNT = 1; - static const int MIN_SCROLLBAR_SIZE = 50; - - 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; - static const int OUTPUT_DRAWMODE_BLACKWHITE - = DRAWMODE_BLACKLINE | DRAWMODE_BLACKTEXT - | DRAWMODE_WHITEFILL | DRAWMODE_GRAYBITMAP - | DRAWMODE_WHITEGRADIENT; - static const int OUTPUT_DRAWMODE_CONTRAST - = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL - | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT; - - TYPEINFO(); ViewShell ( SfxViewFrame *pFrame, @@ -197,12 +181,12 @@ public: // Mouse- & Key-Events virtual void PrePaint(); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual 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 sal_Bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + virtual 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); @@ -212,8 +196,8 @@ public: virtual void SetUIUnit(FieldUnit eUnit); virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); - sal_Bool HasRuler (void); - void SetRuler(sal_Bool bRuler); + bool HasRuler (void); + void SetRuler(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 @@ -221,19 +205,18 @@ public: */ virtual void UpdateScrollBars (void); void Scroll(long nX, long nY); - void ScrollLines(long nX, long nY); + void ScrollLines(const basegfx::B2DVector& rDelta); virtual void SetZoom(long nZoom); - virtual void SetZoomRect(const Rectangle& rZoomRect); - void InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, sal_Bool bUpdate = sal_False); + virtual void SetZoomRange(const basegfx::B2DRange& rZoomRange); + void InitWindows(const basegfx::B2DPoint& rViewOrigin, const basegfx::B2DVector& rViewSize, const basegfx::B2DPoint& rWinPos, bool bUpdate = 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, sal_Bool bInit = sal_False); + virtual void UpdatePreview (SdPage* pPage, bool bInit = false); - void DrawMarkRect(const Rectangle& rRect) const; + void DrawMarkRange(const basegfx::B2DRange& rRange) const; void ExecReq( SfxRequest &rReq ); @@ -251,7 +234,7 @@ public: virtual void WriteUserData(String& rString); virtual void ReadUserData(const String& rString); - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb); /** @returns current or selected page or 0. This method @@ -276,13 +259,13 @@ public: void SetOldFunction(const FunctionReference& xFunction); void DeactivateCurrentFunction( bool bPermanent = false ); - void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, - long nLeft, long nRight, long nUpper, long nLower, - sal_Bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, - sal_Bool bBackgroundFullSize ); + void SetPageSizeAndBorder(PageKind ePageKind, const basegfx::B2DVector& rNewSize, + double fLeft, double fRight, double fTop, double fBottom, + bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, + bool bBackgroundFullSize ); - void SetStartShowWithDialog( sal_Bool bIn = sal_True ) { mbStartShowWithDialog = bIn; } - sal_Bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; } + bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } @@ -290,14 +273,14 @@ public: sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } - virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False ); + virtual sal_uInt16 PrepareClose( bool bUI = true, bool bForBrowsing = false ); void GetMenuState(SfxItemSet& rSet); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt32 nPage, SdrLayerID aLayer ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, - ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); + ::sd::Window* pTargetWindow, sal_uInt32 nPage, SdrLayerID aLayer ); 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 ); @@ -317,9 +300,9 @@ public: ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow); - void SetWinViewPos(const Point& rWinPos, bool bUpdate); - Point GetWinViewPos() const; - Point GetViewOrigin() const; + void SetWinViewPos(const basegfx::B2DPoint& rWinPos, bool bUpdate); + basegfx::B2DPoint GetWinViewPos() const; + basegfx::B2DPoint GetViewOrigin() const; /** Return the window updater of this view shell. @return @@ -331,11 +314,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 <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 <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. @@ -381,7 +364,7 @@ public: ViewShellBase& GetViewShellBase (void) const; - /** Return <TRUE/> when the called view shell is the main sub shell of + /** Return <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). @@ -390,7 +373,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/>. + <false/>. For the main view shell it thus has to be set to <true/>. */ void SetIsMainViewShell (bool bIsMainViewShell); @@ -426,7 +409,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - sal_Bool IsPageFlipMode(void) const; + 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 @@ -434,6 +417,9 @@ public: */ virtual bool RelocateToParentWindow (::Window* pParentWindow); + void AdaptDefaultsForChart( + const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > & xEmbObj ); + /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @param rRequest @@ -502,15 +488,12 @@ protected: Size maViewSize; Size maScrBarWH; - sal_Bool mbCenterAllowed; // wird an Fenster weitergegeben + bool mbCenterAllowed; // wird an Fenster weitergegeben - sal_Bool mbStartShowWithDialog; // Praesentation wurde ueber Dialog gestartet + 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 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 without the controls at the borders like rulers, scroll bars, tab bar, buttons. @@ -530,8 +513,8 @@ protected: virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; - void ImpSidUndo(sal_Bool bDrawViewShell, SfxRequest& rReq); - void ImpSidRedo(sal_Bool bDrawViewShell, SfxRequest& rReq); + void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq); + void ImpSidRedo(bool bDrawViewShell, SfxRequest& rReq); DECL_LINK( HScrollHdl, ScrollBar * ); DECL_LINK( VScrollHdl, ScrollBar * ); @@ -541,7 +524,7 @@ protected: virtual long VirtVScrollHdl(ScrollBar* pVScroll); // virtuelle Funktionen fuer Lineal-Handling - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); @@ -574,6 +557,10 @@ private: /** Create the rulers. */ void SetupRulers (void); + + /** Update VisAreaChanged by using size ouf OutDev + */ + void UpdateVisAreaChanged(); }; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 3d8ffa89a1ba..4443b1172e4e 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -69,7 +69,6 @@ class ViewShellBase : public SfxViewShell { public: - TYPEINFO(); SFX_DECL_VIEWFACTORY(ViewShellBase); SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE) @@ -132,7 +131,7 @@ public: virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void); /// Forwarded to the print manager. - virtual SfxPrinter* GetPrinter (sal_Bool bCreate = sal_False); + virtual SfxPrinter* GetPrinter (sal_Bool bCreate = false); /// Forwarded to the print manager. virtual sal_uInt16 SetPrinter ( @@ -172,7 +171,7 @@ public: 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 <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/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 8406781c89b7..a70362b37f62 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -49,8 +49,6 @@ public: HINT_COMPLEX_MODEL_CHANGE_END }; - TYPEINFO(); - ViewShellHint (HintId nHintId); HintId GetHintId (void) const; diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index 9f8671fb5557..ceceae4479d7 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -74,11 +74,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 <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 <true/> then the lock is released even + when IsUICaptured() returns <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 685e922d5362..90591074de75 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -114,7 +114,7 @@ public: @param pFormShell The form shell. @param bAbove - When <TRUE/> then the form shell will be placed directly above + When <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 bd8a7b7f93ef..ffe192397a88 100644 --- a/sd/source/ui/inc/ViewTabControl.hxx +++ b/sd/source/ui/inc/ViewTabControl.hxx @@ -60,7 +60,7 @@ public: protected: DrawViewShell* pDrViewSh; - sal_Bool bInternalMove; + bool bInternalMove; // TabBar virtual void Select(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 63108acfdff6..30c8f6937846 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -67,7 +67,7 @@ public: @param nZoom The zoom factor is given as integral percent value. */ - void SetZoomIntegral(long nZoom); + void SetZoomIntegral(double fZoom); /** This internally used method performs the actual adaption of the window's map mode to the specified zoom factor. @@ -80,7 +80,7 @@ public: forced into that interval. Therefore the returned value is a valid zoom factor. */ - long SetZoomFactor(long nZoom); + double SetZoomFactor(double fZoom); /** This method is called when the whole page shall be displayed in the window. Position and zoom factor are set so that the given @@ -88,15 +88,15 @@ public: the same time maintaining the rectangle's aspect ratio and adding a small space at all its four sides (about 3% of width and height). The map mode is adapted accordingly. - @param rZoomRect + @param rZoomRange The rectangle is expected to be given relative to the upper left corner of the window in logical coordinates (100th of mm). @return The new zoom factor is returned as integral percent value. */ - long SetZoomRect (const Rectangle& rZoomRect); + double SetZoomRange(const basegfx::B2DRange& rZoomRange); - long GetZoomForRect( const Rectangle& rZoomRect ); + double GetZoomForRange( const basegfx::B2DRange& rZoomRange ); void SetMinZoomAutoCalc (bool bAuto); @@ -110,22 +110,22 @@ public: factor. <p>This calculation is performed only when the - <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> + <member>bMinZoomAutoCalc</member> is set (to <true/>).</p> */ void CalcMinZoom (void); - void SetMinZoom (long int nMin); - long GetMinZoom (void) const; - void SetMaxZoom (long int nMax); - long GetMaxZoom (void) const; - - long GetZoom (void) const; - - Point GetWinViewPos (void) const; - Point GetViewOrigin (void) const; - Size GetViewSize (void) const; - void SetWinViewPos(const Point& rPnt); - void SetViewOrigin(const Point& rPnt); - void SetViewSize(const Size& rSize); + void SetMinZoom (double fMin); + double GetMinZoom (void) const; + void SetMaxZoom (double fMax); + double GetMaxZoom (void) const; + + double GetZoom (void) const; + + basegfx::B2DPoint GetWinViewPos (void) const; + basegfx::B2DPoint GetViewOrigin (void) const; + basegfx::B2DVector GetViewSize (void) const; + void SetWinViewPos(const basegfx::B2DPoint& rPnt); + void SetViewOrigin(const basegfx::B2DPoint& rPnt); + void SetViewSize(const basegfx::B2DVector& rSize); void SetCenterAllowed (bool bIsAllowed); /** Calculate origin of the map mode accoring to the size of the view @@ -135,15 +135,15 @@ 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 (sal_Bool bInvalidate = sal_True); + void UpdateMapOrigin (bool bInvalidate = true); void UpdateMapMode (void); double GetVisibleX(); // Interface fuer ScrollBars double GetVisibleY(); void SetVisibleXY(double fX, double fY); - double GetVisibleWidth(); - double GetVisibleHeight(); + double GetVisibleWidthRelativeToView(); + double GetVisibleHeightRelativeToView(); double GetScrlLineWidth(); double GetScrlLineHeight(); double GetScrlPageWidth(); @@ -160,22 +160,22 @@ public: you can control whether DropScroll() shall be used. */ void SetUseDropScroll (bool bUseDropScroll); - void DropScroll (const Point& rMousePos); + void DropScroll (const basegfx::B2DPoint& rMousePos); protected: ::sd::Window* mpShareWin; - Point maWinPos; - Point maViewOrigin; - Size maViewSize; - sal_uInt16 mnMinZoom; - sal_uInt16 mnMaxZoom; + basegfx::B2DPoint maWinPos; + basegfx::B2DPoint maViewOrigin; + basegfx::B2DVector maViewSize; + double mfMinZoom; + double mfMaxZoom; /** 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 sal_False. + default value is now false. */ bool mbMinZoomAutoCalc; bool mbCalcMinZoomByMinSide; bool mbCenterAllowed; - long mnTicks; + sal_uInt32 mnTicks; bool mbDraggedFrom; ViewShell* mpViewShell; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 7cdd5d6df826..d2c171ba206b 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -145,8 +145,8 @@ private: Size aFltWinSize; Size aDisplaySize; Size aBmpSize; - sal_Bool bMovie; - sal_Bool bAllObjects; + bool bMovie; + bool bAllObjects; SfxBindings* pBindings; AnimationControllerItem* pControllerItem; @@ -165,7 +165,7 @@ private: DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); - void UpdateControl( sal_uLong nPos, sal_Bool bDisableCtrls = sal_False ); + void UpdateControl( sal_uLong nPos, bool bDisableCtrls = false ); void ResetAttrs(); void WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime, SfxProgress* pStbMgr ) const; diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 36c567508e66..850984cf7e16 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -55,7 +55,7 @@ private: SdDrawDocument& rDoc; List* pCustomShowList; SdCustomShow* pCustomShow; - sal_Bool bModified; + bool bModified; void CheckState(); @@ -66,8 +66,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); ~SdCustomShowDlg(); - sal_Bool IsModified() const { return( bModified ); } - sal_Bool IsCustomShow() const; + bool IsModified() const { return( bModified ); } + bool IsCustomShow() const; }; @@ -90,7 +90,7 @@ private: SdDrawDocument& rDoc; SdCustomShow*& rpCustomShow; - sal_Bool bModified; + bool bModified; String aOldName; void CheckState(); @@ -105,7 +105,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); ~SdDefineCustomShowDlg(); - sal_Bool IsModified() const { return( bModified ); } + bool IsModified() const { return( bModified ); } }; #endif // _SD_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 0f30fd6e7f72..28baba87c8fc 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -54,19 +54,19 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, sal_Bool bAutoPilot); + AssistentDlg(Window* pParent, bool bAutoPilot); ~AssistentDlg(); DECL_LINK( FinishHdl, OKButton * ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; - sal_Bool IsSummary() const; + bool IsSummary() const; StartType GetStartType() const; String GetDocPath() const; - sal_Bool GetStartWithFlag() const; + bool GetStartWithFlag() const; - sal_Bool IsDocEmpty() const; + bool IsDocEmpty() const; String GetPassword(); }; diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 0e6408dd0a27..f5c4a80b2aac 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -54,7 +54,7 @@ private: XBitmapList* mpBitmapList; public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); + SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index dc92bd6fc910..ad5dea77a587 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -89,7 +89,7 @@ public: void HideRadioGroup(); void HideDeleteBtn() { aBtnDelete.Hide(); } - void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); + void SetInputFields(bool bEnableX, bool bEnableY); }; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index e29f2ec5d2f4..8b7e96fe4a30 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -45,10 +45,10 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - sal_Bool bInEffect; + bool bInEffect; Link aClickHdl; SfxObjectShell* mpObj; - sal_uInt16 mnShowPage; + sal_uInt32 mnShowPage; Color maDocumentColor; rtl::Reference< sd::SlideShow > mxSlideShow; @@ -67,7 +67,7 @@ protected: public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); ~SdDocPreviewWin(); - void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); + void SetObjectShell( SfxObjectShell* pObj, sal_uInt32 nShowPage = 0 ); virtual void Resize(); void startPreview(); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 7b7e704606bf..4ddc0e11281c 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -45,34 +45,33 @@ class SlideShow; class DrawView : public ::sd::View { public: - TYPEINFO(); - DrawView ( DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); virtual ~DrawView (void); - virtual void MarkListHasChanged(); + virtual void handleSelectionChange(); void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L); - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - void BlockPageOrderChangedHint(sal_Bool bBlock); + void BlockPageOrderChangedHint(bool bBlock); - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); - virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); + virtual bool IsObjMarkable(const SdrObject& rObj) const; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin); - virtual void HideSdrPage(); // SdrPageView* pPV); + virtual void MakeVisibleAtView(const basegfx::B2DRange& rRange, ::Window& rWin); + virtual void HideSdrPage(); void PresPaint(const Region& rRegion); virtual void DeleteMarked(); // from SdrView + protected: - virtual void ModelHasChanged(); + virtual void LazyReactOnObjectChanges(); private: friend class DrawViewRedirector; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 9be4198b154b..3350471ae3bb 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -77,9 +77,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 <true/> then modifications to the configuration trigger the broadcasting of "ResourceActivationRequestEvent" and - "ResourceDeactivationRequestEvent". When this flag is <FALSE/> + "ResourceDeactivationRequestEvent". When this flag is <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 9c9c642b98a2..4395692b92d2 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -168,7 +168,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 <false/> is returned. */ bool IsValid (void); @@ -372,7 +372,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 <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 7e85559f929d..167ba9585d6c 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -133,7 +133,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 <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 42c03a56aad1..4ce54e0384fa 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -211,7 +211,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 <true/> or whether it can be bound indirectly, too. */ bool IsBoundToAnchor ( @@ -225,7 +225,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 <true/> or whether it can be bound indirectly, too. */ bool IsBoundToAnchor ( diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index dbe528f9a0c3..689ea5ef33a1 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -31,8 +31,6 @@ namespace sd { class FuArea : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void Activate(); diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index 4b2a656a2824..f051ca49a7fe 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -36,8 +36,6 @@ class ViewShell; class FuBullet : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index 8e1bce657a2a..e8beeba6b86e 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -32,8 +32,6 @@ class FuChar : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index d875913b38b8..e58b09671798 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -37,22 +37,20 @@ class FuConstruct3dObject : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); private: FuConstruct3dObject ( diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index df191838f672..d1e63a52083a 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -33,22 +33,20 @@ class FuConstructArc : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); protected: FuConstructArc ( diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 8aaf7844774f..40c51717137e 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -40,16 +40,14 @@ class FuConstructBezierPolygon : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -60,7 +58,7 @@ public: sal_uInt16 GetEditMode() { return nEditMode; } // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); protected: FuConstructBezierPolygon ( diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index a8895d443796..af905a04a258 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -44,23 +44,21 @@ class FuConstructCustomShape : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren void SetAttributes( SdrObject* pObj ); // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); // #i33136# virtual bool doConstructOrthogonal() const; diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index b1353928b3fa..938ef53ca7a3 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -32,8 +32,6 @@ class FuConnectionDlg : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 8e55d6a84095..89439e565eb3 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -44,16 +44,14 @@ class FuConstructRectangle : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -62,7 +60,7 @@ public: void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); protected: FuConstructRectangle ( diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index c4707e05edd5..6a5a8faf61cd 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -44,20 +44,18 @@ class FuConstruct public: static const int MIN_FREEHAND_DISTANCE = 10; - TYPEINFO(); - virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - virtual void SelectionHasChanged() { bSelectionChanged = sal_True; } + virtual void SelectionHasChanged() { bSelectionChanged = 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 861b1180aa1b..00eb03fa57c2 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -39,22 +39,20 @@ class FuConstructUnoControl : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); protected: FuConstructUnoControl( diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index a579a9146da0..b82b6fe94041 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -32,8 +32,6 @@ class FuCopy : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index 468380222650..a4bcd22dd591 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -32,8 +32,6 @@ class FuCustomShowDlg : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 1957257ccf26..0a43cca0d0d4 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -44,13 +44,11 @@ class FuDraw : public FuPoor { public: - TYPEINFO(); - - 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 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 void ScrollStart(); virtual void ScrollEnd(); @@ -62,10 +60,10 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - sal_Bool SetPointer(SdrObject* pObj, const Point& rPos); - sal_Bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); + bool SetPointer(SdrObject* pObj, const basegfx::B2DPoint& rPos); + bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); - void SetPermanent(sal_Bool bSet) { bPermanent = bSet; } + void SetPermanent(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 @@ -86,11 +84,10 @@ protected: Pointer aNewPointer; Pointer aOldPointer; - sal_Bool bMBDown; - sal_Bool bDragHelpLine; - sal_uInt16 nHelpLine; - sal_Bool bPermanent; - + bool bMBDown; + bool bDragHelpLine; + sal_uInt32 nHelpLine; + bool bPermanent; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 30825a831532..fd2e6cc424cb 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -43,14 +43,12 @@ class FuDisplayOrder : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual 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 55cd37c29ea1..03302a068389 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -25,6 +25,7 @@ #define SD_FU_EDIT_GLUE_POINTS_HXX #include "fudraw.hxx" +#include <svx/svdview.hxx> namespace sd { @@ -38,17 +39,15 @@ class FuEditGluePoints : public FuDraw { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 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 void ReceiveRequest(SfxRequest& rReq); virtual void Activate(); // Function aktivieren @@ -62,6 +61,8 @@ protected: SdDrawDocument* pDoc, SfxRequest& rReq); virtual ~FuEditGluePoints (void); + + SdrViewEditMode meLastSdrViewEditMode; }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index e1154ab96fbf..9f34d637e2bc 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -32,8 +32,6 @@ class FuExpandPage : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 7d190f860b25..35d00d54d8e0 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -37,14 +37,12 @@ class DrawViewShell; class FuFormatPaintBrush : public FuText { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - 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 bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt); virtual void Activate(); virtual void Deactivate(); @@ -57,7 +55,7 @@ private: void DoExecute( SfxRequest& rReq ); - bool HasContentForThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; + bool HasContentForThisType(const SdrObject& rSdrObject) const; void Paste( bool, bool ); void implcancel(); diff --git a/sd/source/ui/inc/fugrid.hxx b/sd/source/ui/inc/fugrid.hxx index 825b10f1dfcb..6117f019efd4 100644 --- a/sd/source/ui/inc/fugrid.hxx +++ b/sd/source/ui/inc/fugrid.hxx @@ -32,8 +32,6 @@ class FuGrid : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void Activate(); diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 01d635d438d5..f3cb094e58d0 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -36,12 +36,10 @@ class Outliner; class FuHangulHanjaConversion : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ); + const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); void StartChineseConversion(); @@ -53,7 +51,7 @@ class FuHangulHanjaConversion : public FuPoor ~FuHangulHanjaConversion(); Outliner* pSdOutliner; - sal_Bool bOwnOutliner; + bool bOwnOutliner; private: FuHangulHanjaConversion ( diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index b09b0c66a703..fd2348ccea71 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -32,8 +32,6 @@ class FuInsertGraphic : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -54,8 +52,6 @@ class FuInsertClipboard : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -75,8 +71,6 @@ class FuInsertOLE : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -95,8 +89,6 @@ class FuInsertAVMedia : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index 0f379713d450..93c47890d104 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -36,8 +36,6 @@ class FuInsertFile : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -56,9 +54,9 @@ private: String aFile; // gewaehlter Dateiname void InsTextOrRTFinOlMode(SfxMedium* pMedium); - sal_Bool InsSDDinOlMode(SfxMedium* pMedium); + bool InsSDDinOlMode(SfxMedium* pMedium); void InsTextOrRTFinDrMode(SfxMedium* pMedium); - sal_Bool InsSDDinDrMode(SfxMedium* pMedium); + bool InsSDDinDrMode(SfxMedium* pMedium); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index 2982f112b3ba..d8f938f0ee52 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -32,8 +32,6 @@ class FuLine : public FuPoor { public: - TYPEINFO(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index 1e0f4f1f9563..5d7f7e4db43f 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -32,8 +32,6 @@ class FuLineEnd : public FuPoor { public: - TYPEINFO(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index 670c89e138ce..c1249329131e 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -32,8 +32,6 @@ class FuLink : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index 445bd47567da..2be5a42bc86e 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -32,8 +32,6 @@ class FuMeasureDlg : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 0999a3c26db1..b1fde27bb912 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -44,8 +44,6 @@ class FuMorph : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -57,7 +55,7 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - void ImpInsertPolygons(List& rPolyPolyList3D, sal_Bool bAttributeFade, + void ImpInsertPolygons(List& rPolyPolyList3D, bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2); ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolyStart, diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 26d4205442c6..7651c473dc7d 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -32,8 +32,6 @@ class FuObjectAnimationParameters : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index d7683506b357..bf0f737f804a 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -45,8 +45,6 @@ class FuOutlineBullet : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index dcb0da440dd4..f15a361cacbe 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -44,14 +44,12 @@ class FuOutlineText : public FuOutline { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual 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 9b62b219244e..74b8646de1d0 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -48,9 +48,7 @@ class FuOutline : public FuPoor { public: - TYPEINFO(); - - virtual sal_Bool Command(const CommandEvent& rCEvt); + virtual bool Command(const CommandEvent& rCEvt); virtual void ScrollStart(); virtual void ScrollEnd(); diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index db64b806754e..1903581d9d23 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -25,6 +25,7 @@ #define SD_FU_PAGE_HXX #include "fupoor.hxx" +#include <basegfx/vector/b2dvector.hxx> class SfxItemSet; class SdBackgroundObjUndoAction; @@ -37,8 +38,6 @@ class FuPage : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -63,7 +62,7 @@ private: SfxRequest& mrReq; const SfxItemSet* mpArgs; SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; - Size maSize; + basegfx::B2DVector maSize; bool mbPageBckgrdDeleted; bool mbMasterPage; bool mbDisplayBackgroundTabPage; diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index bc39a0f91331..99dd67c65e32 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -32,8 +32,6 @@ class FuParagraph : public FuPoor { public: - TYPEINFO(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index a7e9ac8bb8fd..2687071379fa 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -24,12 +24,12 @@ #ifndef SD_FU_POOR_HXX #define SD_FU_POOR_HXX -#include <tools/rtti.hxx> #include <vcl/timer.hxx> #include <tools/link.hxx> #include <tools/gen.hxx> #include <vcl/event.hxx> #include <rtl/ref.hxx> +#include <basegfx/point/b2dpoint.hxx> #ifndef _SALHELPER_SIMPLEREFERENCECOMPONENT_HXX_ #include "helper/simplereferencecomponent.hxx" @@ -39,6 +39,7 @@ class SdDrawDocument; class SfxRequest; class Dialog; class SdrObject; +namespace basegfx { class B2DRange; } namespace sd { @@ -59,8 +60,6 @@ public: static const int HITPIX = 2; // Hit-Toleranz in Pixel static const int DRGPIX = 2; // Drag MinMove in Pixel - TYPEINFO(); - virtual void DoExecute( SfxRequest& rReq ); // #95491# see member @@ -74,16 +73,16 @@ public: virtual void DoCopy(); virtual void DoPaste(); - // 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); + // 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); // #95491# moved from inline to *.cxx - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); + virtual bool Command(const CommandEvent& rCEvt); + virtual bool RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); @@ -94,20 +93,18 @@ public: virtual void ScrollEnd() {} // ForceScroll aufgerufen void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } - - // #97016# II virtual void SelectionHasChanged(); sal_uInt16 GetSlotID() const { return( nSlotId ); } sal_uInt16 GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(sal_Bool bNoScroll = sal_True) + void SetNoScrollUntilInside(bool bNoScroll = true) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -141,7 +138,7 @@ protected: DECL_LINK( DelayHdl, Timer * ); - void ImpForceQuadratic(Rectangle& rRect); + void ImpForceQuadratic(basegfx::B2DRange& rRange); /** Switch to another layer. The layer to switch to is specified by an offset relative to the active layer. With respect to the layer bar @@ -174,23 +171,23 @@ protected: Timer aScrollTimer; // fuer Autoscrolling DECL_LINK( ScrollHdl, Timer * ); - void ForceScroll(const Point& aPixPos); + void ForceScroll(const basegfx::B2DPoint& aPixPos); Timer aDragTimer; // fuer Drag&Drop DECL_LINK( DragHdl, Timer * ); - sal_Bool bIsInDragMode; - Point aMDPos; // Position von MouseButtonDown + bool bIsInDragMode; + basegfx::B2DPoint aMDPos; // Position von MouseButtonDown // Flag, um AutoScrolling zu verhindern, bis von ausserhalb in das // Fenster hinein gedragt wurde - sal_Bool bNoScrollUntilInside; + bool bNoScrollUntilInside; // Timer um das scrolling zu verzoegern, wenn aus dem fenster // herausgedraggt wird (ca. 1 sec.) Timer aDelayToScrollTimer; // fuer Verzoegerung bis scroll - sal_Bool bScrollable; - sal_Bool bDelayActive; - sal_Bool bFirstMouseMove; + bool bScrollable; + bool bDelayActive; + 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/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index aed0e88b0a69..fb3f5829fe34 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -40,8 +40,6 @@ class FuPresentationLayout : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index e5735f4e7a14..25c24a7dbb30 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -40,8 +40,6 @@ class FuPresentationObjects : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index aedd21bd1595..d2a39017b2da 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -32,8 +32,6 @@ class FuScale : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 22aa8a260fba..bd6a0f2c8edb 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -36,8 +36,6 @@ class FuSearch : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -49,7 +47,7 @@ protected: virtual ~FuSearch (void); ::sd::Outliner* pSdOutliner; - sal_Bool bOwnOutliner; + bool bOwnOutliner; private: FuSearch ( diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index ba7846008482..3106a71e1cb6 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -39,16 +39,14 @@ class FuSelection : public FuDraw { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -58,7 +56,7 @@ public: void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } - sal_Bool AnimateObj(SdrObject* pObj, const Point& rPos); + bool AnimateObj(SdrObject* pObj, const basegfx::B2DPoint& rPos); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -77,12 +75,12 @@ protected: virtual ~FuSelection(); - sal_Bool bTempRotation; - sal_Bool bSelectionChanged; - sal_Bool bHideAndAnimate; + bool bTempRotation; + bool bSelectionChanged; + bool bHideAndAnimate; SdrHdl* pHdl; - sal_Bool bSuppressChangesOfSelection; - sal_Bool bMirrorSide0; + bool bSuppressChangesOfSelection; + bool bMirrorSide0; sal_uInt16 nEditMode; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; @@ -99,7 +97,7 @@ private: The shape at the test point. When there is no shape at this position then NULL is returned. */ - SdrObject* pickObject (const Point& rTestPoint); + SdrObject* pickObject (const basegfx::B2DPoint& rTestPoint); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index da3876493da6..e19f1083bdda 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -32,8 +32,6 @@ class FuSlideShowDlg : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuslhide.hxx b/sd/source/ui/inc/fuslhide.hxx index 37d1942e2f75..f2f7b117741e 100644 --- a/sd/source/ui/inc/fuslhide.hxx +++ b/sd/source/ui/inc/fuslhide.hxx @@ -38,8 +38,6 @@ class FuSlideHide : public FuSlide { public: - TYPEINFO(); - static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuslid.hxx b/sd/source/ui/inc/fuslid.hxx index bed1efb9b830..a7ed21dac7a7 100644 --- a/sd/source/ui/inc/fuslid.hxx +++ b/sd/source/ui/inc/fuslid.hxx @@ -45,13 +45,11 @@ class FuSlide : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual 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 baadffe8fbb0..ee424f3db67d 100644 --- a/sd/source/ui/inc/fuslsel.hxx +++ b/sd/source/ui/inc/fuslsel.hxx @@ -38,8 +38,8 @@ class Window; struct FSS_IsShowingEffectInfo { - 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 + bool bIsShowingEffect; // true while we show a fade effect one the slide view + bool bDisposed; // true if the FuSlideSelection was deleted during fade effect }; @@ -47,16 +47,14 @@ class FuSlideSelection : public FuSlide { public: - TYPEINFO(); - static FunctionReference Create( SlideViewShell* pViewSh, ::sd::Window* pWin, SlideView* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); // Mouse- & Key-Events - 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 bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin); virtual void Activate(); // Function aktivieren @@ -65,7 +63,7 @@ public: virtual void ScrollStart(); virtual void ScrollEnd(); - sal_Bool IsShowingEffect() const { return pIsShowingEffectInfo && pIsShowingEffectInfo->bIsShowingEffect; } + 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 @@ -85,17 +83,17 @@ protected: virtual ~FuSlideSelection (void); private: - sal_Bool bSubstShown; - sal_Bool bPageHit; + bool bSubstShown; + bool bPageHit; List aSubstList; // Liste mit Ertsatzdarstellungen Point aDragPos; // hier wird die Seite angefasst - sal_Bool bDragSelection; + bool bDragSelection; Point aDragSelRectAnchor; // fester Punkt des Selektionsrechtecks Rectangle aDragSelRect; Point aPosOfInsertMarker; FSS_IsShowingEffectInfo* pIsShowingEffectInfo; - void DrawInsertMarker(sal_Bool bShow); + void DrawInsertMarker(bool bShow); Point CalcPosOfInsertMarker(const Point& rPoint); sal_uInt16 GetTargetPage(const Point& rPoint) const; diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index a9e9a380eab2..6b91f3e199c6 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -32,8 +32,6 @@ class FuSnapLine : public FuPoor { public: - TYPEINFO(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index a6c76635dacc..775565086e46 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -32,8 +32,6 @@ class FuSummaryPage : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index 924327faba7e..0219623a0137 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -32,8 +32,6 @@ class FuTemplate : public FuPoor { public: - TYPEINFO(); - virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 11dd97a582a1..738b37b8842c 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -48,31 +48,30 @@ class FuText : public FuConstruct { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - 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 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 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, sal_Bool bQuickDrag); - sal_Bool DeleteDefaultText(); + void SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag); + bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } DECL_LINK(SpellError, void* ); // #97016# - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const basegfx::B2DRange& rRange); /** is called when the currenct function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -95,7 +94,7 @@ protected: SdrObjectWeakRef mxTextObj; Link aOldLink; - sal_Bool bFirstObjCreated; + bool bFirstObjCreated; SfxRequest& rRequest; diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index 613a33010836..b96599a6ed03 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -32,8 +32,6 @@ class FuThesaurus : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 8849a9fc3357..d9dacdbb017e 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -35,8 +35,6 @@ class FuTransform : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index 694e202acd28..a023c3678c57 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -32,8 +32,6 @@ class FuTextAttrDlg : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index c4730340bd2e..f30760c2a23f 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -32,8 +32,6 @@ class FuVectorize : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 335eeab03fdc..786dc01006f6 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -28,6 +28,7 @@ #include <vcl/pointr.hxx> #endif #include "fupoor.hxx" +#include <basegfx/range/b2drange.hxx> namespace sd { @@ -37,14 +38,12 @@ class FuZoom : public FuPoor { public: - TYPEINFO(); - static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseMove(const MouseEvent& rMEvt); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren @@ -52,13 +51,15 @@ public: protected: virtual ~FuZoom (void); - Point aBeginPosPix; - Point aBeginPos; - Point aEndPos; - Rectangle aZoomRect; - sal_Bool bVisible; - sal_Bool bStartDrag; - Pointer aPtr; + basegfx::B2DPoint maBeginPosPixel; + basegfx::B2DPoint maBeginPos; + basegfx::B2DPoint maEndPos; + basegfx::B2DRange maZoomRange; + Pointer maPtr; + + /// bitfield + bool mbVisible : 1; + bool mbStartDrag : 1; private: FuZoom ( diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 723331341010..7e448555c48e 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -49,7 +49,7 @@ public: SdInsertPasteDlg( Window* pWindow ); ~SdInsertPasteDlg(); - sal_Bool IsInsertBefore() const; + 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 73e5d8e918e1..9c4fafff05cc 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -59,8 +59,8 @@ public: ~SdInsertPagesObjsDlg(); List* GetList( sal_uInt16 nType ); - sal_Bool IsLink(); - sal_Bool IsRemoveUnnessesaryMasterPages() const; + bool IsLink(); + bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 43d6962d7019..042a613c776d 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -52,10 +52,10 @@ private: OKButton maPBOK; CancelButton maPBCancel; - sal_Bool mbOldHeader; - sal_Bool mbOldFooter; - sal_Bool mbOldDate; - sal_Bool mbOldPageNumber; + bool mbOldHeader; + bool mbOldFooter; + bool mbOldDate; + 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 b194b561d2e4..240790d62234 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -52,8 +52,8 @@ public: void SaveSettings() const; sal_uInt16 GetFadeSteps() const { return (sal_uInt16) aMtfSteps.GetValue(); } - sal_Bool IsAttributeFade() const { return aCbxAttributes.IsChecked(); } - sal_Bool IsOrientationFade() const { return aCbxOrientation.IsChecked(); } + bool IsAttributeFade() const { return aCbxAttributes.IsChecked(); } + 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 4967b7dbdd84..8bc7d1fa5ed7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -69,16 +69,16 @@ class NavDocInfo public: NavDocInfo() { mpDocShell = NULL; } - sal_Bool HasName() { return( (sal_Bool) bName ); } - sal_Bool IsActive() { return( (sal_Bool) bActive ); } + bool HasName() { return( bName ); } + bool IsActive() { return( bActive ); } - void SetName( sal_Bool bOn = sal_True ) { bName = bOn; } - void SetActive( sal_Bool bOn = sal_True ) { bActive = bOn; } + void SetName( bool bOn = true ) { bName = bOn; } + void SetActive( bool bOn = true ) { bActive = bOn; } private: friend class SdNavigatorWin; - sal_Bool bName : 1; - sal_Bool bActive : 1; + bool bName : 1; + bool bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -100,7 +100,7 @@ public: void InitTreeLB( const SdDrawDocument* pDoc ); void RefreshDocumentLB( const String* pDocName = NULL ); - sal_Bool InsertFile(const String& rFileName); + bool InsertFile(const String& rFileName); NavigatorDragType GetNavigatorDragType(); void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; } @@ -123,7 +123,7 @@ private: Size maSize; Size maMinSize; // Size maFltWinSize; - sal_Bool mbDocImported; + bool mbDocImported; String maDropFileName; NavigatorDragType meDragType; List* mpDocList; @@ -139,7 +139,7 @@ private: */ bool mbShowAllShapes; - sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage = sal_False ); + sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 704aabc4a119..feacd51d82fa 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -100,8 +100,8 @@ private: ::rtl::OUString maSubTree; SdOptionsItem* mpCfgItem; sal_uInt16 mnConfigId; - sal_Bool mbInit : 1; - sal_Bool mbEnableModify : 1; + bool mbInit : 1; + bool mbEnableModify : 1; SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; @@ -114,8 +114,8 @@ protected: protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: @@ -125,7 +125,7 @@ public: const ::rtl::OUString& GetSubTree() const { return maSubTree; } sal_uInt16 GetConfigId() const { return mnConfigId; } - void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } + void EnableModify( bool bModify ) { mbEnableModify = bModify; } void Store(); @@ -141,39 +141,39 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - 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 + 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 sal_uInt16 nMetric; // Layout/Other/MeasureUnit sal_uInt16 nDefTab; // Layout/Other/TabStop protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsLayout() {} - sal_Bool operator==( const SdOptionsLayout& rOpt ) const; + 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; } + bool IsRulerVisible() const { Init(); return bRuler; } + bool IsMoveOutline() const { Init(); return bMoveOutline; } + bool IsDragStripes() const { Init(); return bDragStripes; } + bool IsHandlesBezier() const { Init(); return bHandlesBezier; } + bool IsHelplines() const { Init(); return 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 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( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; @@ -207,15 +207,15 @@ private: protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsContents() {} - sal_Bool operator==( const SdOptionsContents& rOpt ) const; + bool operator==( const SdOptionsContents& rOpt ) const; }; // ----------------------------------------------------------------------------- @@ -248,26 +248,26 @@ private: 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 + 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 // #90356# - sal_Bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - sal_Bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder - sal_Bool bShowComments : 1; // Misc/ShowComments + bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + bool bShowComments : 1; // Misc/ShowComments sal_Bool bPreviewNewEffects; sal_Bool bPreviewChangedEffects; @@ -289,31 +289,31 @@ private: protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsMisc() {} - 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; }; + bool operator==( const SdOptionsMisc& rOpt ) const; + + bool IsStartWithTemplate() const { Init(); return bStartWithTemplate; } + bool IsMarkedHitMovesAlways() const { Init(); return bMarkedHitMovesAlways; } + bool IsMoveOnlyDragging() const { Init(); return bMoveOnlyDragging; } + bool IsCrookNoContortion() const { Init(); return bCrookNoContortion; } + bool IsQuickEdit() const { Init(); return bQuickEdit; } + bool IsMasterPagePaintCaching() const { Init(); return bMasterPageCache; } + bool IsDragWithCopy() const { Init(); return bDragWithCopy; } + bool IsPickThrough() const { Init(); return bPickThrough; } + bool IsBigHandles() const { Init(); return bBigHandles; } + bool IsDoubleClickTextEdit() const { Init(); return bDoubleClickTextEdit; } + bool IsClickChangeRotation() const { Init(); return bClickChangeRotation; } + bool IsStartWithActualPage() const { Init(); return bStartWithActualPage; } + bool IsSolidDragging() const { Init(); return bSolidDragging; } + bool IsSolidMarkHdl() const { Init(); return bSolidMarkHdl; } + bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; /** Return the currently selected printer independent layout mode. @return @@ -322,8 +322,8 @@ public: */ sal_uInt16 GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; // #90356# - sal_Bool IsShowUndoDeleteWarning() const { Init(); return (sal_Bool) bShowUndoDeleteWarning; } - sal_Bool IsSlideshowRespectZOrder() const { Init(); return (sal_Bool) bSlideshowRespectZOrder; } + bool IsShowUndoDeleteWarning() const { Init(); return bShowUndoDeleteWarning; } + bool IsSlideshowRespectZOrder() const { Init(); return bSlideshowRespectZOrder; } // #97016# sal_uLong GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } sal_uLong GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } @@ -341,19 +341,19 @@ public: double GetPresentationPenWidth() const { Init(); return mnPenWidth; } void SetPresentationPenWidth( double nPenWidth ) { if( mnPenWidth != nPenWidth ) { OptionsChanged(); mnPenWidth = nPenWidth; } } - 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; } } + 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; } } /** Set the printer independent layout mode. @param nOn The default value is to switch printer independent layout on, @@ -361,11 +361,11 @@ public: values are reserved for future use. */ 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; } } + void SetSolidDragging( bool bOn = true ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetSolidMarkHdl( bool bOn = true ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } // #90356# - 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; } } + void SetShowUndoDeleteWarning( bool bOn = true ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( bool bOn = true ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } // #97016# void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } @@ -374,8 +374,8 @@ public: void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } - sal_Bool IsShowComments() const { Init(); return bShowComments; } - void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } + bool IsShowComments() const { Init(); return bShowComments; } + void SetShowComments( bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } }; // ----------------------------------------------------------------------------- @@ -406,13 +406,13 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - 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 + 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 sal_Int16 nSnapArea; // Snap/Object/Range sal_Int16 nAngle; // Snap/Position/RotatingValue sal_Int16 nBezAngle; // Snap/Position/PointReduction @@ -420,34 +420,34 @@ private: protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsSnap() {} - sal_Bool operator==( const SdOptionsSnap& rOpt ) const; + 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; } + bool IsSnapHelplines() const { Init(); return bSnapHelplines; } + bool IsSnapBorder() const { Init(); return bSnapBorder; } + bool IsSnapFrame() const { Init(); return bSnapFrame; } + bool IsSnapPoints() const { Init(); return bSnapPoints; } + bool IsOrtho() const { Init(); return bOrtho; } + bool IsBigOrtho() const { Init(); return bBigOrtho; } + bool IsRotate() const { Init(); return 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 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( 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; } } @@ -486,15 +486,15 @@ private: protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsZoom() {} - sal_Bool operator==( const SdOptionsZoom& rOpt ) const; + bool operator==( const SdOptionsZoom& rOpt ) const; 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; } } @@ -511,16 +511,16 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid protected: 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsGrid(); void SetDefaults(); - sal_Bool operator==( const SdOptionsGrid& rOpt ) const; + bool operator==( const SdOptionsGrid& rOpt ) const; sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } @@ -528,10 +528,10 @@ public: 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(); } + 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( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } @@ -539,10 +539,10 @@ public: 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 ); } } + 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 ); } } }; // ----------------------------------------------- @@ -553,6 +553,7 @@ class SdOptionsGridItem : public SvxGridItem public: SdOptionsGridItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; void SetOptions( SdOptions* pOpts ) const; }; @@ -564,83 +565,83 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - 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 + 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 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, 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; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ); + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const; public: - SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsPrint() {} - 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; } + bool operator==( const SdOptionsPrint& rOpt ) const; + + bool IsDraw() const { Init(); return bDraw; } + bool IsNotes() const { Init(); return bNotes; } + bool IsHandout() const { Init(); return bHandout; } + bool IsOutline() const { Init(); return bOutline; } + bool IsDate() const { Init(); return bDate; } + bool IsTime() const { Init(); return bTime; } + bool IsPagename() const { Init(); return bPagename; } + bool IsHiddenPages() const { Init(); return bHiddenPages; } + bool IsPagesize() const { Init(); return bPagesize; } + bool IsPagetile() const { Init(); return bPagetile; } + bool IsWarningPrinter() const { Init(); return bWarningPrinter; } + bool IsWarningSize() const { Init(); return bWarningSize; } + bool IsWarningOrientation() const { Init(); return bWarningOrientation; } + bool IsBooklet() const { Init(); return bBooklet; } + bool IsFrontPage() const { Init(); return bFront; } + bool IsBackPage() const { Init(); return bBack; } + bool IsCutPage() const { Init(); return bCutPage; } + bool IsPaperbin() const { Init(); return bPaperbin; } sal_uInt16 GetOutputQuality() const { Init(); return nQuality; } - sal_Bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + 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 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( sal_uInt16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( sal_Bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutHorizontal( bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 223eae67b284..cdd7522efd4b 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -180,8 +180,8 @@ private: Assistent aAssistentFunc; - sal_Bool m_bImpress; - sal_Bool m_bButtonsDirty; + bool m_bImpress; + bool m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -194,10 +194,10 @@ private: void UpdatePage(); List* m_pDesignList; - sal_Bool m_bDesignListDirty; + bool m_bDesignListDirty; SdPublishingDesign* m_pDesign; - sal_Bool Load(); - sal_Bool Save(); + bool Load(); + 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 a22e7654b11f..4f234bb00dfb 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -67,8 +67,7 @@ SV_DECL_REF(DrawDocShell) class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - - static sal_Bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird + static bool SD_DLLPRIVATE bIsInDrag; // static, falls der Navigator im ExecuteDrag geloescht wird public: @@ -121,7 +120,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 <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; @@ -137,8 +136,8 @@ protected: Image maImgGraphic; Image maImgOleH; Image maImgGraphicH; - sal_Bool mbLinkableSelected; - sal_Bool mbDragEnabled; + bool mbLinkableSelected; + bool mbDragEnabled; String maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; // Zum Laden von Bookmarks ::sd::DrawDocShell* mpDropDocSh; @@ -158,10 +157,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 <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. + <false/> then no name is created. @param pObject When this is NULL then an empty string is returned, regardless of the value of bCreate. @@ -200,21 +199,21 @@ public: void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } - void Fill( const SdDrawDocument*, sal_Bool bAllPages, const String& rDocName ); + void Fill( const SdDrawDocument*, 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; - sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - sal_Bool HasSelectedChilds( const String& rName ); - sal_Bool SelectEntry( const String& rName ); + bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + bool HasSelectedChilds( const String& rName ); + bool SelectEntry( const String& rName ); String GetSelectEntry(); List* GetSelectEntryList( sal_uInt16 nDepth ); SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); ::sd::DrawDocShell* GetDropDocSh() { return(mpDropDocSh); } - sal_Bool IsLinkableSelected() const { return mbLinkableSelected; } + bool IsLinkableSelected() const { return mbLinkableSelected; } - static sal_Bool IsInDrag(); + static bool IsInDrag(); using SvLBox::ExecuteDrop; using SvTreeListBox::SelectEntry; @@ -238,7 +237,7 @@ private: */ bool mbShowAllPages; - /** Return <TRUE/> when the current transferable may be dropped at the + /** Return <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 6f0c69679f60..58a87d1281ec 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -32,7 +32,6 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction { Container aCtn; public: - TYPEINFO(); SdUndoGroup(SdDrawDocument* pSdDrawDocument) : SdUndoAction(pSdDrawDocument), aCtn(16, 16, 16) {} diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 3fe3e09d9c0f..a5c09857bfa2 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -49,7 +49,7 @@ class SdTransferable : public TransferableHelper, public SfxListener { public: - SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ); + SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, bool bInitOnGetData ); ~SdTransferable(); void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } @@ -63,17 +63,17 @@ public: void SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc ); - void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } - const Point& GetStartPos() const { return maStartPos; } + void SetStartPos( const basegfx::B2DPoint& rStartPos ) { maStartPos = rStartPos; } + const basegfx::B2DPoint& GetStartPos() const { return maStartPos; } - void SetInternalMove( sal_Bool bSet ) { mbInternalMove = bSet; } - sal_Bool IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( bool bSet ) { mbInternalMove = bSet; } + bool IsInternalMove() const { return mbInternalMove; } - sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const List& rPageBookmarks, sal_Bool bPersistent ); - sal_Bool IsPageTransferable() const { return mbPageTransferable; } - sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } + void SetPageBookmarks( const List& rPageBookmarks, bool bPersistent ); + bool IsPageTransferable() const { return mbPageTransferable; } + bool HasPageBookmarks() const { return( mpPageDocShell && ( maPageBookmarks.Count() > 0 ) ); } const List& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } @@ -141,13 +141,13 @@ private: Graphic* mpGraphic; ImageMap* mpImageMap; Rectangle maVisArea; - Point maStartPos; - sal_Bool mbInternalMove : 1; - sal_Bool mbOwnDocument : 1; - sal_Bool mbOwnView : 1; - sal_Bool mbLateInit : 1; - sal_Bool mbPageTransferable : 1; - sal_Bool mbPageTransferablePersistent : 1; + basegfx::B2DPoint maStartPos; + bool mbInternalMove : 1; + bool mbOwnDocument : 1; + bool mbOwnView : 1; + bool mbLateInit : 1; + bool mbPageTransferable : 1; + bool mbPageTransferablePersistent : 1; bool mbIsUnoObj : 1; ::std::vector<boost::shared_ptr<UserData> > maUserData; diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index fcba374f0ccd..afc7b828ce7e 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -72,11 +72,11 @@ public: ::sd::View& getView() const { return mrView; } protected: - virtual sal_uLong GetMarkablePointCount() const; - virtual sal_uLong GetMarkedPointCount() const; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); + virtual sal_uInt32 GetMarkablePointCount() const; + virtual sal_uInt32 GetMarkedPointCount() const; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark = false); virtual void CheckPossibilities(); - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + virtual bool MarkPoints(const basegfx::B2DRange* pRange, bool bUnmark); virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void select(); @@ -135,13 +135,13 @@ public: bool getContext( SdrViewContext& rContext ) const; // support point editing - 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); + bool HasMarkablePoints() const; + sal_uInt32 GetMarkablePointCount() const; + bool HasMarkedPoints() const; + sal_uInt32 GetMarkedPointCount() const; + bool IsPointMarkable(const SdrHdl& rHdl) const; + bool MarkPoint(SdrHdl& rHdl, bool bUnmark = false); + bool MarkPoints(const basegfx::B2DRange* pRange, bool bUnmark); void CheckPossibilities(); @@ -168,13 +168,28 @@ private: class SmartHdl : public SdrHdl { public: - SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind=HDL_SMARTTAG ); - SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind=HDL_SMARTTAG ); + SmartHdl( + SdrHdlList& rHdlList, + const SdrObject* pSdrHdlObject, + const SmartTagReference& xTag, + SdrHdlKind eNewKind, // HDL_SMARTTAG + const basegfx::B2DPoint& rPnt); + + // for handle copying support in MotionPathTag::addCustomHandles + SmartHdl( + SdrHdlList& rHdlList, + const SdrObject* pSdrHdlObject, + const SmartTagReference& xTag, + sal_uInt32 nObjHandleNum, + SdrHdl& rSource); const SmartTagReference& getTag() const { return mxTag; } virtual bool isMarkable() const; + protected: + virtual ~SmartHdl(); + SmartTagReference mxTag; }; diff --git a/sd/source/ui/inc/sprite.hxx b/sd/source/ui/inc/sprite.hxx index a644f118c550..464b14eed647 100644 --- a/sd/source/ui/inc/sprite.hxx +++ b/sd/source/ui/inc/sprite.hxx @@ -46,7 +46,7 @@ public: Sprite( List* pListOfBmpEx ); ~Sprite(); - sal_Bool StartMoving( OutputDevice* pOut, + bool StartMoving( OutputDevice* pOut, OutputDevice* pBottomLayer = NULL, BitmapEx* pTopLayer = NULL, MetaFile** ppTopMtf = NULL, @@ -72,9 +72,9 @@ protected: Marker* pObjEndMarker; List* pListOfBmpEx; sal_uLong nLastTime; - sal_Bool bClipRegion; + bool bClipRegion; - sal_Bool ImplPrepareMoveTo(); + bool ImplPrepareMoveTo(); void ImplDrawSprite( OutputDevice* pOut, const Point& rPt, const Size& rSz ); }; diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index 1bb23f81b0a0..be5344c2c2a9 100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -122,9 +122,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 <false/> the hidden controls are skipped. @param bCycle - When this flag is <TRUE/> then the search for the previous + When this flag is <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 @@ -144,9 +144,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. + <false/> the hidden controls are skipped. @param bCycle - When this flag is <TRUE/> then the search for the next control + When this flag is <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/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index 5b845974f60f..881d5298f7c4 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -113,7 +113,7 @@ private: typedef ::std::vector<PageDescriptor> PageDescriptorList; PageDescriptorList maPageDescriptors; - Rectangle GetPageBox (sal_Int32 nPageIndex); + basegfx::B2DRange GetPageBox (sal_Int32 nPageIndex); void ProvideSize (sal_Int32 nPageIndex); @@ -129,9 +129,9 @@ void SscdSetStatus (const SdrPage* pPage, { ::sd::toolpanel::SlideSorterCacheDisplay* pDisplay = ::sd::toolpanel::SlideSorterCacheDisplay::Instance( - dynamic_cast<SdDrawDocument*>(pPage->GetModel())); - if (pDisplay != NULL) - pDisplay->SetPageStatus((pPage->GetPageNum()-1)/2, eStatus); + dynamic_cast< SdDrawDocument* >(&pPage->getSdrModelFromSdrPage())); + if (pDisplay) + pDisplay->SetPageStatus((pPage->GetPageNumber()-1)/2, eStatus); } void SscdSetRequestClass (const SdrPage* pPage, sal_Int32 nClass) @@ -166,9 +166,9 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate) { ::sd::toolpanel::SlideSorterCacheDisplay* pDisplay = ::sd::toolpanel::SlideSorterCacheDisplay::Instance( - dynamic_cast<const SdDrawDocument*>(pPage->GetModel())); + dynamic_cast< const SdDrawDocument* >(&pPage->getSdrModelFromSdrPage())); if (pDisplay != NULL) - pDisplay->SetUpToDate((pPage->GetPageNum()-1)/2, bUpToDate); + pDisplay->SetUpToDate((pPage->GetPageNumber()-1)/2, bUpToDate); } diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 24d07acc40f8..3bfd57d3e989 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -81,7 +81,7 @@ public: */ virtual sal_Int32 GetMinimumWidth (void); - /** The default implementaion always returns <FALSE/> + /** The default implementaion always returns <false/> */ virtual bool IsResizable (void); @@ -98,22 +98,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 <true/>. It hides the window otherwise. @return - Returns <TRUE/> when the expansion state changes. When an + Returns <true/> when the expansion state changes. When an expansion state is requested that is already in place then - <FALSE/> is returned. + <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 <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 <true/> when there is window and + <false/> otherwise. If <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 06876a94baba..df0175a4a0f2 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -106,7 +106,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 <false/> but unnecessary. */ bool HasExpansionIndicator (void) const; diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 9fbdc2b71ed7..c4a0f4f21ba7 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -92,7 +92,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 <true/> then the control is created. */ TreeNode* GetControl (void); @@ -105,13 +105,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 <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 (<true/>) or + not (<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 1e57a2832dfc..d7c2b66fd72b 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -64,7 +64,6 @@ class ToolPanelViewShell : public ViewShell { public: - TYPEINFO(); SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) ToolPanelViewShell ( @@ -119,7 +118,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 <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 @@ -151,7 +150,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 <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 842fc36d2e10..6282353bac9a 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -67,7 +67,7 @@ private: class SdTbxControl : public SfxToolBoxControl { private: - sal_Bool IsCheckable( sal_uInt16 nSId ); + bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index de9b75a2c266..f1a3dafced4c 100644 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -39,8 +39,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 <true/> when there is at least one more step to execute. + When the task has been executed completely then <false/> is returned. */ virtual bool HasNextStep (void) = 0; diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 30e971c1a498..1268296e71e5 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -36,7 +36,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 <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 029899f6dabf..ed78bc93a115 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -91,7 +91,7 @@ private: SdDrawDocument* mpDoc; XColorTable* pColTab; - sal_Bool bTreeUpdated; + bool bTreeUpdated; List* pCurrentActions; String aLastFile; ::std::vector< long > aVerbVector; @@ -109,7 +109,7 @@ private: void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( String const & rStr ); - String GetEditText( sal_Bool bURL = sal_False ); + String GetEditText( bool bURL = false ); sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 47f7de97b633..785383633b37 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -149,7 +149,7 @@ private: SfxMapUnit ePoolUnit; String GetScale( sal_Int32 nX, sal_Int32 nY ); - sal_Bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); + bool SetScale( const String& aScale, sal_Int32& rX, sal_Int32& rY ); DECL_LINK( ModifyScaleHdl, void * ); DECL_LINK( ModifyOriginalScaleHdl, void * ); diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index 15d22bd3d1d2..21262301d0f2 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -25,24 +25,23 @@ #define _SD_UNCHSS_HXX #include "sdundo.hxx" +#include <svl/itemset.hxx> -class SfxItemSet; class SfxStyleSheet; class SdDrawDocument; class StyleSheetUndoAction : public SdUndoAction { - SfxStyleSheet* pStyleSheet; - - SfxItemSet* pNewSet; - SfxItemSet* pOldSet; + SfxStyleSheet& mrStyleSheet; + SfxItemSet maNewSet; + SfxItemSet maOldSet; String aComment; public: - TYPEINFO(); - StyleSheetUndoAction(SdDrawDocument* pTheDoc, - SfxStyleSheet* pTheStyleSheet, - const SfxItemSet* pTheNewItemSet); + StyleSheetUndoAction( + SdDrawDocument& rTheDoc, + SfxStyleSheet& rTheStyleSheet, + const SfxItemSet& rTheNewItemSet); virtual ~StyleSheetUndoAction(); virtual void Undo(); @@ -53,3 +52,4 @@ public: #endif // _SD_UNCHSS_HXX +// eof diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index caef761c86b2..517a13af7f9a 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -45,8 +45,6 @@ private: public: - TYPEINFO(); - SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index 22fc621513bb..d4c1028dd510 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -41,7 +41,6 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction const sd::HeaderFooterSettings maNewSettings; public: - TYPEINFO(); SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ); virtual ~SdHeaderFooterUndoAction(); diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index 94b08f814b65..137b41d07095 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -35,7 +35,6 @@ class SdLayerModifyUndoAction : public SdUndoAction { public: - TYPEINFO(); SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, const String& rOldLayerName, const String& rOldLayerTitle, const String& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const String& rNewLayerName, const String& rNewLayerTitle, const String& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ); diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index c6f50ffe7918..4f927e8391ff 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -26,8 +26,8 @@ #include <tools/gen.hxx> #include <vcl/prntypes.hxx> - #include "sdundo.hxx" +#include <basegfx/vector/b2dvector.hxx> class SdDrawDocument; class SdPage; @@ -38,74 +38,74 @@ class SdPageFormatUndoAction : public SdUndoAction { SdPage* mpPage; - Size maOldSize; - sal_Int32 mnOldLeft; - sal_Int32 mnOldRight; - sal_Int32 mnOldUpper; - sal_Int32 mnOldLower; - sal_Bool mbOldScale; + basegfx::B2DVector maOldSize; + double mfOldLeft; + double mfOldRight; + double mfOldTop; + double mfOldBottom; + bool mbOldScale; Orientation meOldOrientation; sal_uInt16 mnOldPaperBin; - sal_Bool mbOldFullSize; - - Size maNewSize; - sal_Int32 mnNewLeft; - sal_Int32 mnNewRight; - sal_Int32 mnNewUpper; - sal_Int32 mnNewLower; - sal_Bool mbNewScale; + bool mbOldFullSize; + + basegfx::B2DVector maNewSize; + double mfNewLeft; + double mfNewRight; + double mfNewTop; + double mfNewBottom; + bool mbNewScale; Orientation meNewOrientation; sal_uInt16 mnNewPaperBin; - sal_Bool mbNewFullSize; + bool mbNewFullSize; public: - TYPEINFO(); - SdPageFormatUndoAction( SdDrawDocument* pDoc, + SdPageFormatUndoAction( + SdDrawDocument* pDoc, SdPage* pThePage, - const Size& rOldSz, - sal_Int32 nOldLft, - sal_Int32 nOldRgt, - sal_Int32 nOldUpr, - sal_Int32 nOldLwr, - sal_Bool bOldScl, + const basegfx::B2DVector& rOldSz, + double fOldLeft, + double fOldRight, + double fOldTop, + double fOldBottom, + bool bOldScl, Orientation eOldOrient, sal_uInt16 nOPaperBin, - sal_Bool bOFullSize, - - const Size& rNewSz, - sal_Int32 nNewLft, - sal_Int32 nNewRgt, - sal_Int32 nNewUpr, - sal_Int32 nNewLwr, - sal_Bool bNewScl, + bool bOFullSize, + + const basegfx::B2DVector& rNewSz, + double fNewLeft, + double fNewRight, + double fNewTop, + double fNewBottom, + bool bNewScl, Orientation eNewOrient, sal_uInt16 nNPaperBin, - sal_Bool bNFullSize - ) : - SdUndoAction(pDoc), + bool bNFullSize) + + : SdUndoAction(pDoc), mpPage (pThePage), maOldSize (rOldSz), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), + mfOldLeft(fOldLeft), + mfOldRight(fOldRight), + mfOldTop(fOldTop), + mfOldBottom(fOldBottom), mbOldScale (bOldScl), meOldOrientation(eOldOrient), mnOldPaperBin (nOPaperBin), mbOldFullSize (bOFullSize), - maNewSize (rNewSz), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt), - mnNewUpper (nNewUpr), - mnNewLower (nNewLwr), + mfNewLeft(fNewLeft), + mfNewRight(fNewRight), + mfNewTop(fNewTop), + mfNewBottom(fNewBottom), mbNewScale (bNewScl), meNewOrientation(eNewOrient), mnNewPaperBin (nNPaperBin), mbNewFullSize (bNFullSize) + { + } - {} virtual ~SdPageFormatUndoAction(); virtual void Undo(); @@ -118,23 +118,28 @@ class SdPageLRUndoAction : public SdUndoAction { SdPage* mpPage; - sal_Int32 mnOldLeft; - sal_Int32 mnOldRight; - sal_Int32 mnNewLeft; - sal_Int32 mnNewRight; + double mfOldLeft; + double mfOldRight; + double mfNewLeft; + double mfNewRight; public: - TYPEINFO(); - SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - sal_Int32 nOldLft, sal_Int32 nOldRgt, - sal_Int32 nNewLft, sal_Int32 nNewRgt ) : - SdUndoAction(pDoc), + SdPageLRUndoAction( + SdDrawDocument* pDoc, + SdPage* pThePage, + double fOldLeft, + double fOldRight, + double fNewLeft, + double fNewRight ) + : SdUndoAction(pDoc), mpPage (pThePage), - mnOldLeft (nOldLft), - mnOldRight (nOldRgt), - mnNewLeft (nNewLft), - mnNewRight (nNewRgt) - {} + mfOldLeft (fOldLeft), + mfOldRight (fOldRight), + mfNewLeft (fNewLeft), + mfNewRight (fNewRight) + { + } + virtual ~SdPageLRUndoAction(); virtual void Undo(); @@ -147,23 +152,28 @@ class SdPageULUndoAction : public SdUndoAction { SdPage* mpPage; - sal_Int32 mnOldUpper; - sal_Int32 mnOldLower; - sal_Int32 mnNewUpper; - sal_Int32 mnNewLower; + double mfOldTop; + double mfOldBottom; + double mfNewTop; + double mfNewBottom; public: - TYPEINFO(); - SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, - sal_Int32 nOldUpr, sal_Int32 nOldLwr, - sal_Int32 nNewUpr, sal_Int32 nNewLwr ) : - SdUndoAction(pDoc), + SdPageULUndoAction( + SdDrawDocument* pDoc, + SdPage* pThePage, + double fOldTop, + double fOldBottom, + double fNewTop, + double fNewBottom ) + : SdUndoAction(pDoc), mpPage (pThePage), - mnOldUpper (nOldUpr), - mnOldLower (nOldLwr), - mnNewUpper (nNewUpr), - mnNewLower (nNewLwr) - {} + mfOldTop (fOldTop), + mfOldBottom (fOldBottom), + mfNewTop (fNewTop), + mfNewBottom (fNewBottom) + { + } + virtual ~SdPageULUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index f2ab5a1e0c4f..62bc1f25c409 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -37,22 +37,21 @@ class ModifyPageUndoAction : public SdUndoAction String maNewName; AutoLayout meOldAutoLayout; AutoLayout meNewAutoLayout; - sal_Bool mbOldBckgrndVisible; - sal_Bool mbNewBckgrndVisible; - sal_Bool mbOldBckgrndObjsVisible; - sal_Bool mbNewBckgrndObjsVisible; + bool mbOldBckgrndVisible; + bool mbNewBckgrndVisible; + bool mbOldBckgrndObjsVisible; + bool mbNewBckgrndObjsVisible; String maComment; public: - TYPEINFO(); ModifyPageUndoAction( SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, AutoLayout eTheNewAutoLayout, - sal_Bool bTheNewBckgrndVisible, - sal_Bool bTheNewBckgrndObjsVisible); + bool bTheNewBckgrndVisible, + bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo(); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index d7453a697799..eaac8b3e023b 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -39,20 +39,20 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { SdrObject* pObject; - 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; + 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; ::com::sun::star::presentation::AnimationEffect eOldEffect; ::com::sun::star::presentation::AnimationEffect eNewEffect; ::com::sun::star::presentation::AnimationEffect eOldTextEffect; @@ -75,25 +75,24 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; String aOldBookmark; String aNewBookmark; - sal_Bool bOldInvisibleInPres; - sal_Bool bNewInvisibleInPres; + bool bOldInvisibleInPres; + bool bNewInvisibleInPres; sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; sal_uLong nOldPresOrder; sal_uLong nNewPresOrder; - sal_Bool bInfoCreated; + bool bInfoCreated; public: - TYPEINFO(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, - sal_Bool bCreated): + bool bCreated): SdUndoAction (pTheDoc), pObject (pObj), bInfoCreated (bCreated) {} - void SetActive(sal_Bool bTheOldActive, sal_Bool bTheNewActive) + void SetActive(bool bTheOldActive, bool bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldEffect = eTheOldEffect; eNewEffect = eTheNewEffect; } @@ -101,19 +100,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(sal_Bool bTheOldDim, sal_Bool bTheNewDim) + void SetDim(bool bTheOldDim, bool bTheNewDim) { bOldDimPrevious = bTheOldDim; bNewDimPrevious = bTheNewDim; } void SetDimColor(Color aTheOldDimColor, Color aTheNewDimColor) { aOldDimColor = aTheOldDimColor; aNewDimColor = aTheNewDimColor; } - void SetDimHide(sal_Bool bTheOldDimHide, sal_Bool bTheNewDimHide) + void SetDimHide(bool bTheOldDimHide, bool bTheNewDimHide) { bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; } - void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) + void SetSoundOn(bool bTheOldSoundOn, 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(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) + void SetPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; } @@ -121,7 +120,7 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(String aTheOldBookmark, String aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres) + void SetInvisibleInPres(bool bTheOldInvisibleInPres, bool bTheNewInvisibleInPres) { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } @@ -129,9 +128,9 @@ public: { eOldSecondEffect = eTheOldEffect; eNewSecondEffect = eTheNewEffect; } void SetSecondSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSecondSpeed = eTheOldSpeed; eNewSecondSpeed = eTheNewSpeed; } - void SetSecondSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) + void SetSecondSoundOn(bool bTheOldSoundOn, bool bTheNewSoundOn) { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } - void SetSecondPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) + void SetSecondPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index ec551921eb94..763a27663900 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -176,7 +176,7 @@ SD_CONSTASCII_ACTION( sUNO_View_IsSnapToObjectPoints, "IsSnapToObjectP SD_CONSTASCII_ACTION( sUNO_View_IsSnapLinesVisible, "IsSnapLinesVisible" ); SD_CONSTASCII_ACTION( sUNO_View_IsDragStripes, "IsDragStripes" ); SD_CONSTASCII_ACTION( sUNO_View_IsPlusHandlesAlwaysVisible, "IsPlusHandlesAlwaysVisible" ); -SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); +SD_CONSTASCII_ACTION( sUNO_View_IsFrameDragSingles, "IsFrameDragSingles" ); // other name for IsFrameHandles SD_CONSTASCII_ACTION( sUNO_View_IsMarkedHitMovesAlways, "IsMarkedHitMovesAlways" ); SD_CONSTASCII_ACTION( sUNO_View_EliminatePolyPointLimitAngle, "EliminatePolyPointLimitAngle" ); SD_CONSTASCII_ACTION( sUNO_View_IsEliminatePolyPoints, "IsEliminatePolyPoints" ); diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index d78bb34d9828..3b6d113c5468 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -93,7 +93,7 @@ private: SdDrawDocument* mpDoc; bool mbDisposed; - SdPage* InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate = sal_False ) throw(); + SdPage* InsertSdPage( sal_uInt32 nPage, sal_Bool bDuplicate = sal_False ) throw(); const sal_Bool mbImpressDoc; bool mbClipBoard; @@ -122,6 +122,11 @@ private: rtl::OUString maBuildId; void initializeDocument(); + +protected: + /** abstract SdrModel provider */ + virtual SdrModel* getSdrModel() const; + public: SdXImpressDocument( ::sd::DrawDocShell* pShell, bool bClipBoard = false ) throw(); SdXImpressDocument( SdDrawDocument* pDoc, bool bClipBoard = false ) throw(); diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 78a6abdbe87c..e59211f8eb57 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -36,18 +36,17 @@ class SdPresentationLayoutUndoAction : public SdUndoAction String aNewLayoutName; AutoLayout eOldAutoLayout; AutoLayout eNewAutoLayout; - sal_Bool bSetAutoLayout; // sal_True: AutoLayout aendern + bool bSetAutoLayout; // true: AutoLayout aendern SdPage* pPage; String aComment; public: - TYPEINFO(); SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc, String aTheOldLayoutName, String aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - sal_Bool bSet, + bool bSet, SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); diff --git a/sd/source/ui/inc/unslsel.hxx b/sd/source/ui/inc/unslsel.hxx index ad9c2e9d12f0..774b4c58516a 100644 --- a/sd/source/ui/inc/unslsel.hxx +++ b/sd/source/ui/inc/unslsel.hxx @@ -32,7 +32,6 @@ class SlideSelectionUndoAction : public SdUndoAction Container* pNewOrder; public: - TYPEINFO(); SlideSelectionUndoAction(SdDrawDocument* pTheDoc, Container* pOld, Container* pNew) : SdUndoAction(pTheDoc), diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 5d298ee03d2e..2efeb73c6169 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -24,10 +24,9 @@ #ifndef SD_ZOOM_LIST_HXX #define SD_ZOOM_LIST_HXX - #include <tools/gen.hxx> #include <tools/list.hxx> - +#include <basegfx/range/b2drange.hxx> namespace sd { @@ -39,15 +38,15 @@ public: ZoomList(ViewShell* pViewShell); virtual ~ZoomList(); - void InsertZoomRect(const Rectangle& rRect); - Rectangle GetNextZoomRect(); - Rectangle GetPreviousZoomRect(); - sal_Bool IsNextPossible() const; - sal_Bool IsPreviousPossible() const; + void InsertZoomRange(const basegfx::B2DRange& rRange); + basegfx::B2DRange GetNextZoomRange(); + basegfx::B2DRange GetPreviousZoomRange(); + bool IsNextPossible() const; + bool IsPreviousPossible() const; private: ViewShell* mpViewShell; - sal_uLong mnCurPos; + sal_uInt32 mnCurPos; }; } // end of namespace sd |