diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-09 10:09:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-09 10:10:13 +0200 |
commit | 184a00b96235f6432294ded63ce4a4a318effdb5 (patch) | |
tree | e4ae0e00cb168fa43d280cfb51a50515258b5320 /sd | |
parent | 534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff) |
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'sd')
68 files changed, 67 insertions, 346 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index da589b87f33f..6310fe3c4a42 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -267,10 +267,10 @@ public: ::sd::DrawDocShell* pBookmarkDocSh, bool bCopy, Point* pObjPos); - bool IsStartWithPresentation() const; + bool IsStartWithPresentation() const { return mbStartWithPresentation;} void SetStartWithPresentation( bool bStartWithPresentation ); - bool IsExitAfterPresenting() const; + bool IsExitAfterPresenting() const { return mbExitAfterPresenting;} void SetExitAfterPresenting( bool bExitAfterPresenting ); /// load xml-based impress layout definitions into document @@ -401,7 +401,7 @@ public: scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const> when formatting depends on the current printer metrics. */ - sal_Int32 GetPrinterIndependentLayout (void); + sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;} void SetOnlineSpell( bool bIn ); bool GetOnlineSpell() const { return mbOnlineSpell; } diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 0b695f0fdb3f..b3af2ebb7889 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -107,7 +107,7 @@ public: The returned pointer is NULL when the device could not be created when this modules was instantiated. */ - OutputDevice* GetVirtualRefDevice (void); + OutputDevice* GetVirtualRefDevice (void) { return mpVirtualRefDevice;} /** Deprecated alias to <member>GetVirtualRefDevice</member>. @param rDocShell diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 4cce90698c09..d73b3245539b 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -242,19 +242,19 @@ public: void SetStopSound( bool bStopSound ) { mbStopSound = bStopSound; } bool IsStopSound() const { return mbStopSound; } - sal_Int16 getTransitionType() const; + sal_Int16 getTransitionType() const { return mnTransitionType;} void setTransitionType( sal_Int16 nTransitionType ); - sal_Int16 getTransitionSubtype() const; + sal_Int16 getTransitionSubtype() const { return mnTransitionSubtype;} void setTransitionSubtype( sal_Int16 nTransitionSubtype ); - bool getTransitionDirection() const; + bool getTransitionDirection() const { return mbTransitionDirection;} void setTransitionDirection( bool bTransitionbDirection ); - sal_Int32 getTransitionFadeColor() const; + sal_Int32 getTransitionFadeColor() const { return mnTransitionFadeColor;} void setTransitionFadeColor( sal_Int32 nTransitionFadeColor ); - double getTransitionDuration() const; + double getTransitionDuration() const { return mfTransitionDuration;} void setTransitionDuration( double fTranstionDuration ); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, @@ -371,7 +371,7 @@ public: When this method returns <TRUE/> for a master page then this master page should not be deleted automatically. */ - bool IsPrecious (void) const; + bool IsPrecious (void) const { return mbIsPrecious; } void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 ); diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 2245654020af..957f946cbec5 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -925,25 +925,13 @@ void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode) } } -sal_Int32 SdDrawDocument::GetPrinterIndependentLayout (void) -{ - return mnPrinterIndependentLayout; -} -bool SdDrawDocument::IsStartWithPresentation() const -{ - return mbStartWithPresentation; -} void SdDrawDocument::SetStartWithPresentation( bool bStartWithPresentation ) { mbStartWithPresentation = bStartWithPresentation; } -bool SdDrawDocument::IsExitAfterPresenting() const -{ - return mbExitAfterPresenting; -} void SdDrawDocument::SetExitAfterPresenting( bool bExitAfterPresenting ) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 477ea485179c..30ea98df6027 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -3077,14 +3077,6 @@ void SdPage::SetPrecious (const bool bIsPrecious) -bool SdPage::IsPrecious (void) const -{ - return mbIsPrecious; -} - - - - HeaderFooterSettings::HeaderFooterSettings() { mbHeaderVisible = true; diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index d76d29a3fb77..c3b80fbfc937 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -528,10 +528,6 @@ void SdPage::RemoveEmptyPresentationObjects() } } -sal_Int16 SdPage::getTransitionType (void) const -{ - return mnTransitionType; -} void SdPage::setTransitionType( sal_Int16 nTransitionType ) { @@ -539,10 +535,6 @@ void SdPage::setTransitionType( sal_Int16 nTransitionType ) ActionChanged(); } -sal_Int16 SdPage::getTransitionSubtype (void) const -{ - return mnTransitionSubtype; -} void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) { @@ -550,10 +542,6 @@ void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) ActionChanged(); } -bool SdPage::getTransitionDirection (void) const -{ - return mbTransitionDirection; -} void SdPage::setTransitionDirection ( bool bTransitionbDirection ) { @@ -561,10 +549,6 @@ void SdPage::setTransitionDirection ( bool bTransitionbDirection ) ActionChanged(); } -sal_Int32 SdPage::getTransitionFadeColor (void) const -{ - return mnTransitionFadeColor; -} void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) { @@ -572,10 +556,6 @@ void SdPage::setTransitionFadeColor ( sal_Int32 nTransitionFadeColor ) ActionChanged(); } -double SdPage::getTransitionDuration (void) const -{ - return mfTransitionDuration; -} void SdPage::setTransitionDuration ( double fTranstionDuration ) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index e62bf65ffa6d..ef01a40afff0 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -74,10 +74,6 @@ AccessibleSlideSorterObject::~AccessibleSlideSorterObject (void) -sal_uInt16 AccessibleSlideSorterObject::GetPageNumber (void) const -{ - return mnPageNumber; -} diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 78e8920a1bfb..5714eeb81a39 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -186,7 +186,7 @@ public: bool getIsPreview() const; void setIsPreview( bool bIsPreview ); - sal_uInt16 getId() const; + sal_uInt16 getId() const { return mnId;} bool select( const OUString& rsPresetId ); @@ -473,10 +473,6 @@ void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview ) mpCBXPReview->Check( bIsPreview ); } -sal_uInt16 CustomAnimationCreateTabPage::getId() const -{ - return mnId; -} bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) { diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 15b157801e11..b3392e6ba665 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -226,10 +226,6 @@ SvNumberFormatter* SdModule::GetNumberFormatter() return pNumberFormatter; } -OutputDevice* SdModule::GetVirtualRefDevice (void) -{ - return mpVirtualRefDevice; -} /** This method is deprecated and only an alias to * <member>GetVirtualRefDevice()</member>. The given argument is ignored. diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 77997dc97467..cff6d88dea58 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -738,10 +738,6 @@ sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Se } -SdDrawDocument* SdTransferable::GetSourceDoc (void) const -{ - return mpSourceDoc; -} void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData) { diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index a80f78302621..f0f1c62c7481 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -142,10 +142,6 @@ bool Assistent::IsFirstPage() const return nPage == 0; } -int Assistent::GetCurrentPage() const -{ - return mnCurrentPage; -} bool Assistent::IsEnabled( int nPage ) const { diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 980af6305811..cc0ac1b3cf71 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -160,10 +160,6 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction ) -NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const -{ - return meDragType; -} @@ -837,10 +833,6 @@ void SdPageObjsTLB::SetShowAllShapes ( -bool SdPageObjsTLB::GetShowAllShapes (void) const -{ - return mbShowAllShapes; -} diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 2882d0c43b9c..e5c5273b0ce2 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -647,10 +647,6 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: return bRet; } -SdDrawDocument* DrawDocShell::GetDoc() -{ - return mpDoc; -} SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() { diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index c6fc83a08d8c..43523f16f1c4 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -89,10 +89,6 @@ void SmartTag::deselect() -bool SmartTag::isSelected() const -{ - return mbSelected; -} diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 351c28e1b7b6..d4a7270b51a7 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -77,7 +77,7 @@ public: /** The page number as given to the constructor. */ - sal_uInt16 GetPageNumber (void) const; + sal_uInt16 GetPageNumber (void) const { return mnPageNumber;} void FireAccessibleEvent ( short nEventId, diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 084040be7bf7..492732f329a4 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -153,7 +153,7 @@ public: The returned pointer is <NULL/> after a call to ReleaseViewShellBase(). */ - ViewShellBase* GetViewShellBase (void); + ViewShellBase* GetViewShellBase (void) { return mpBase;} /** This method is typically called from the destructor of ViewShellBase to tell the DrawController that it and its members must not access diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 151ed6975889..4ce23492310b 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -113,7 +113,7 @@ public: rtl::Reference<FuPoor> GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const rtl::Reference<FuPoor>& xFunction ); - SdDrawDocument* GetDoc(); + SdDrawDocument* GetDoc() { return mpDoc;} DocumentType GetDocumentType() const { return meDocType; } SfxPrinter* GetPrinter(bool bCreate); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 96c5c9c94de6..5c4a63344611 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -285,7 +285,7 @@ public: void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); - bool IsLayerModeActive (void) const; + bool IsLayerModeActive (void) const { return mbIsLayerModeActive;} sal_uInt16* GetSlotArray() const { return mpSlotArray; } diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index e0309275fd22..db095b8abfc1 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -66,7 +66,7 @@ public: The result may be <NULL/> when the SetFormShell() method has not yet been called or was last called with <NULL/>. */ - FmFormShell* GetFormShell (void); + FmFormShell* GetFormShell (void) { return mpFormShell;} private: ViewShellBase& mrBase; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 40bdffe449bd..c83b7f2e8bb5 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -94,7 +94,7 @@ public: PageKind GetPageKindOnLoad() const { return mePageKindOnLoad; } void SetSelectedPage (sal_uInt16 nPage); - sal_uInt16 GetSelectedPage () const; + sal_uInt16 GetSelectedPage () const { return mnSelectedPage;} /** is used in FrameView::ReadUserDataSequence() only to store the page that was selected while last saving this document */ @@ -114,7 +114,7 @@ public: /** Return the value of the edit mode as it was when the document was loaded. */ - EditMode GetViewShEditModeOnLoad (void) const; + EditMode GetViewShEditModeOnLoad (void) const { return meEditModeOnLoad;} void SetLayerMode(bool bMode) { mbLayerMode = bMode; } @@ -141,14 +141,14 @@ public: /** Return the type of the view shell previously associated with this frame view. */ - ViewShell::ShellType GetPreviousViewShellType (void) const; + ViewShell::ShellType GetPreviousViewShellType (void) const { return mePreviousViewShellType;} /** Remember the type of the view shell at the time when the document is loaded or, rather, when the ViewShellBase is constructed. */ void SetViewShellTypeOnLoad (ViewShell::ShellType eType); - ViewShell::ShellType GetViewShellTypeOnLoad (void) const; + ViewShell::ShellType GetViewShellTypeOnLoad (void) const { return meViewShellTypeOnLoad;} void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } @@ -167,7 +167,7 @@ public: double GetTabCtrlPercent() const { return mnTabCtrlPercent; } void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); - bool IsNavigatorShowingAllShapes (void) const; + bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} 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 ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 8df6870572bf..df312e82b1e8 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -111,7 +111,7 @@ public: DECL_LINK( EndDropHdl, void * ); DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* ); - sal_uLong GetPaperWidth(); + sal_uLong GetPaperWidth() { return mnPaperWidth;} bool PrepareClose(bool bUI = true); diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 2781d367afcf..55934933d68a 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -84,7 +84,7 @@ public: Calling this method should be necessary only during startup and shutdown (when that can be detected). */ - bool IsValid (void) const; + bool IsValid (void) const { return mbIsValid;} /** Create a new slide sorter that is strongly coupled to the given view shell. Use this function for a slide sorter in the left pane. @@ -150,7 +150,7 @@ public: @return May be empty. */ - ViewShell* GetViewShell (void) const; + ViewShell* GetViewShell (void) const { return mpViewShell;} /** Return the XController object of the main view. */ @@ -161,7 +161,7 @@ public: @return May be empty. */ - ViewShellBase* GetViewShellBase (void) const; + ViewShellBase* GetViewShellBase (void) const { return mpViewShellBase;} void Paint (const Rectangle& rRepaintArea); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index da4098d5f5f3..672342b08487 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -115,9 +115,9 @@ public: void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh(void) const; + inline DrawDocShell* GetDocSh(void) const { return mpDocSh; } inline SdDrawDocument& GetDoc(void) const; - inline ViewShell* GetViewShell(void) const; + inline ViewShell* GetViewShell(void) const { return mpViewSh; } virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -275,20 +275,11 @@ private: }; -DrawDocShell* View::GetDocSh (void) const -{ - return mpDocSh; -} SdDrawDocument& View::GetDoc (void) const { return mrDoc; } -ViewShell* View::GetViewShell (void) const -{ - return mpViewSh; -} - } // end of namespace sd #endif diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 87edbc5a611e..378d6f069aa9 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -146,9 +146,9 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const; + inline ::Window* GetParentWindow (void) const { return mpParentWindow; } - inline ::sd::View* GetView (void) const; + inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; SD_DLLPUBLIC DrawDocShell* GetDocSh (void) const; @@ -159,7 +159,7 @@ public: /** The active window is usually the mpContentWindow. When there is a show running then the active window is a ShowWindow. */ - ::sd::Window* GetActiveWindow (void) const; + ::sd::Window* GetActiveWindow (void) const { return mpActiveWindow;} /** Set the active window. When the shell is displayed in the center pane then the window of the ViewShellBase is also set to the given @@ -196,7 +196,7 @@ public: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); - bool HasRuler (void); + bool HasRuler (void) { return mbHasRulers;} void SetRuler(bool bRuler); /** Set internal values of all scroll bars that determine thumb size and @@ -222,9 +222,9 @@ public: void ExecReq( SfxRequest &rReq ); - ZoomList* GetZoomList (void); + ZoomList* GetZoomList (void) { return mpZoomList;} - FrameView* GetFrameView (void); + FrameView* GetFrameView (void) { return mpFrameView; } /** Setting a frame view triggers ReadFrameViewData() for the new frame. @param pFrameView @@ -594,16 +594,6 @@ private: -::Window* ViewShell::GetParentWindow (void) const -{ - return mpParentWindow; -} - -::sd::View* ViewShell::GetView (void) const -{ - return mpView; -} - SdrView* ViewShell::GetDrawView (void) const { return static_cast<SdrView*>(mpView); diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e693e6183065..038de7685c9f 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -102,8 +102,8 @@ public: */ static ViewShellBase* GetViewShellBase (SfxViewFrame* pFrame); - DrawDocShell* GetDocShell (void) const; - SdDrawDocument* GetDocument (void) const; + DrawDocShell* GetDocShell (void) const { return mpDocShell;} + SdDrawDocument* GetDocument (void) const { return mpDocument;} /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 677ca5dc982b..049e02790937 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -49,7 +49,7 @@ public: ViewShellHint (HintId nHintId); - HintId GetHintId (void) const; + HintId GetHintId (void) const { return meHintId;} private: HintId meHintId; diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index cb04ba7c952b..6dc691d49c8e 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -63,7 +63,7 @@ public: bool IsFirstPage() const; - int GetCurrentPage() const; + int GetCurrentPage() const { return mnCurrentPage;} }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index dad48ca76f70..6a0ffca46a7b 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -76,7 +76,7 @@ public: NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ); ::sd::DrawDocShell& GetDocShell() const; - NavigatorDragType GetDragType() const; + NavigatorDragType GetDragType() const { return meDragType;} static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdPageObjsTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); @@ -201,7 +201,7 @@ public: void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); - bool GetShowAllShapes (void) const; + bool GetShowAllShapes (void) const { return mbShowAllShapes;} bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 10ebdf788dcb..095beecf83dd 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -79,7 +79,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SdDrawDocument* GetSourceDoc (void) const; + SdDrawDocument* GetSourceDoc (void) const { return mpSourceDoc;} /** User data objects can be used to store information temporarily at the transferable. The slide sorter uses this to store diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index b34a47da1d5b..f227e417d911 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -63,7 +63,7 @@ public: virtual bool Command( const CommandEvent& rCEvt ); /** returns true if this smart tag is currently selected */ - bool isSelected() const; + bool isSelected() const { return mbSelected;} ::sd::View& getView() const { return mrView; } diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index bc595f1139b3..dde213073a1f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -100,7 +100,7 @@ public: void SetBackgroundColor (const Color aColor); void SetTextColor (const Color aColor); void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); - sal_Int32 GetTop (void) const; + sal_Int32 GetTop (void) const { return mnTop;} void SetTop (const sal_Int32 nTop); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; @@ -492,10 +492,6 @@ void PresenterTextView::Implementation::SetFontDescriptor ( -sal_Int32 PresenterTextView::Implementation::GetTop (void) const -{ - return mnTop; -} diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 4edeeacebd0b..8dfc1b807dc3 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -267,10 +267,6 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) -MasterPageContainer::PreviewSize MasterPageContainer::GetPreviewSize (void) const -{ - return mePreviewSize; -} diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 79706d093481..692815a0b4ba 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -75,7 +75,7 @@ public: /** Returns the preview size. */ - PreviewSize GetPreviewSize (void) const; + PreviewSize GetPreviewSize (void) const { return mePreviewSize;} /** Return the preview size in pixels. */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index f0d23099ddad..1229588cc911 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -165,18 +165,10 @@ void BitmapCache::Clear (void) -bool BitmapCache::IsFull (void) const -{ - return mbIsFull; -} -sal_Int32 BitmapCache::GetSize (void) -{ - return mnNormalCacheSize; -} diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index 1ceae6b69997..0b892be83943 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -79,12 +79,12 @@ public: /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const; + bool IsFull (void) const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void); + sal_Int32 GetSize (void) { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 7b28c7d6ab53..cab9f9244d53 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -51,7 +51,7 @@ public: animation is marked as expired to prevent another run. */ void Expire (void); - bool IsExpired (void); + bool IsExpired (void) { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -342,10 +342,6 @@ void Animator::Animation::Expire (void) -bool Animator::Animation::IsExpired (void) -{ - return mbIsExpired; -} diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 597f3ec6a251..1d1f295f4752 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -211,10 +211,6 @@ model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const -sal_Int32 FocusManager::GetFocusedPageIndex (void) const -{ - return mnPageIndex; -} void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescriptor) diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index b2c66b284ec0..c047be13a4c2 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -161,10 +161,6 @@ void InsertionIndicatorHandler::UpdatePosition ( -bool InsertionIndicatorHandler::IsActive (void) const -{ - return mbIsActive; -} diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 1484159df697..5d40c03c21af 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -275,10 +275,6 @@ int PageSelector::GetPageCount (void) const -int PageSelector::GetSelectedPageCount (void) const -{ - return mnSelectedPageCount; -} diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 091249582316..cd70c1324d07 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -65,10 +65,6 @@ void Properties::HandleDataChangeEvent (void) -bool Properties::IsHighlightCurrentSlide (void) const -{ - return mbIsHighlightCurrentSlide; -} @@ -81,10 +77,6 @@ void Properties::SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide) -bool Properties::IsShowSelection (void) const -{ - return mbIsShowSelection; -} @@ -97,10 +89,6 @@ void Properties::SetShowSelection (const bool bIsShowSelection) -bool Properties::IsShowFocus (void) const -{ - return mbIsShowFocus; -} @@ -113,10 +101,6 @@ void Properties::SetShowFocus (const bool bIsShowFocus) -bool Properties::IsCenterSelection (void) const -{ - return mbIsCenterSelection; -} @@ -129,10 +113,6 @@ void Properties::SetCenterSelection (const bool bIsCenterSelection) -bool Properties::IsSmoothSelectionScrolling (void) const -{ - return mbIsSmoothSelectionScrolling; -} @@ -145,10 +125,6 @@ void Properties::SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrol -bool Properties::IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const -{ - return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation; -} @@ -224,10 +200,6 @@ void Properties::SetHighlightColor (const Color& rColor) -bool Properties::IsUIReadOnly (void) const -{ - return mbIsUIReadOnly; -} @@ -240,10 +212,6 @@ void Properties::SetUIReadOnly (const bool bIsUIReadOnly) -bool Properties::IsOnlyPreviewTriggersMouseOver (void) const -{ - return mbIsOnlyPreviewTriggersMouseOver; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 5024a7d5b304..62963579a93d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -174,7 +174,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const; + bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -1173,10 +1173,6 @@ void SelectionFunction::ModeHandler::StartDrag ( -bool SelectionFunction::ModeHandler::IsMouseOverIndicatorAllowed (void) const -{ - return mbIsMouseOverIndicatorAllowed; -} diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index c1d55ca1a998..3b055a0848be 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -124,10 +124,6 @@ const ::std::vector<TransferableData::Representative>& TransferableData::GetRepr -SlideSorterViewShell* TransferableData::GetSourceViewShell (void) const -{ - return mpViewShell; -} } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index c6a4f1e5df28..e4135045f369 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -88,10 +88,6 @@ void VisibleAreaManager::DeactivateCurrentSlideTracking (void) -bool VisibleAreaManager::IsCurrentSlideTrackingActive (void) const -{ - return mbIsCurrentSlideTrackingActive; -} diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index ebf2fe97dc74..881567e87868 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -110,7 +110,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const; + sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index dbe7709aec34..75953a49046d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -87,7 +87,7 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const; + bool IsActive (void) const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 0ef877f96d39..0cb6486dd7c4 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -109,7 +109,7 @@ public: deselect them. */ int GetPageCount (void) const; - int GetSelectedPageCount (void) const; + int GetSelectedPageCount (void) const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 46c8b61fdaf2..7d70c203fe9a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -40,21 +40,21 @@ public: /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const; + bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const; + bool IsShowSelection (void) const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const; + bool IsShowFocus (void) const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,21 +62,21 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const; + bool IsCenterSelection (void) const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const; + bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const; + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. @@ -102,14 +102,14 @@ public: /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const; + bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const; + bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} private: diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index ed756d864d2b..ad67d7a09ef0 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -75,7 +75,7 @@ public: /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const; + SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index 5e8de169c779..62c1ea3b14e2 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -39,7 +39,7 @@ public: void ActivateCurrentSlideTracking (void); void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const; + bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 09fc74c5ea82..f7cb2a4dabd7 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -78,8 +78,8 @@ public: /** Set the edit mode to that currently used by the controller. */ bool SetEditModeFromController (void); - EditMode GetEditMode (void) const; - PageKind GetPageType (void) const; + EditMode GetEditMode (void) const { return meEditMode;} + PageKind GetPageType (void) const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3949be34f42d..196369a060e1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -69,7 +69,7 @@ public: /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const; + SdPage* GetPage (void) const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ @@ -80,7 +80,7 @@ public: XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const; + sal_Int32 GetPageIndex (void) const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); bool UpdateMasterPage (void); diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index b44bfa987cb9..a94a598e5b43 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -84,7 +84,7 @@ public: method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const; + Layouter::Orientation GetOrientation (void) const { return meOrientation;} void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 1e50f741502d..15262e33e014 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -72,7 +72,7 @@ public: OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const; + bool IsVisible (void) const { return mbIsVisible;} void Hide (void); void Show (void); diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 1c21d0e3215a..75201f4cb8fd 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -166,18 +166,10 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) -EditMode SlideSorterModel::GetEditMode (void) const -{ - return meEditMode; -} -PageKind SlideSorterModel::GetPageType (void) const -{ - return mePageKind; -} diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index ecaf10c4b6c9..58ba11158ba4 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -73,10 +73,6 @@ PageDescriptor::~PageDescriptor (void) -SdPage* PageDescriptor::GetPage (void) const -{ - return mpPage; -} @@ -89,10 +85,6 @@ Reference<drawing::XDrawPage> PageDescriptor::GetXDrawPage (void) const -sal_Int32 PageDescriptor::GetPageIndex (void) const -{ - return mnIndex; -} diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 8182f0a868f8..b2c604d38703 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -248,10 +248,6 @@ SlideSorter::~SlideSorter (void) -bool SlideSorter::IsValid (void) const -{ - return mbIsValid; -} @@ -335,18 +331,10 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) -ViewShellBase* SlideSorter::GetViewShellBase (void) const -{ - return mpViewShellBase; -} -ViewShell* SlideSorter::GetViewShell (void) const -{ - return mpViewShell; -} diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index fba8dd6ec84a..35f40cb5e553 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -621,10 +621,6 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) -Layouter::Orientation SlideSorterView::GetOrientation (void) const -{ - return meOrientation; -} diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 3755352cc3b3..eb5ceeb41d76 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -354,10 +354,6 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat -bool InsertionIndicatorOverlay::IsVisible (void) const -{ - return mbIsVisible; -} diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 380b69c2478b..75ae4e6128c7 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -617,10 +617,6 @@ void DrawController::BroadcastContextChange (void) const -ViewShellBase* DrawController::GetViewShellBase (void) -{ - return mpBase; -} diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 8e21db98f798..1225f8d61bcc 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -137,10 +137,6 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) -FmFormShell* FormShellManager::GetFormShell (void) -{ - return mpFormShell; -} diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index c8e262a61125..a576cf871483 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -95,7 +95,7 @@ public: /** Return the OutlinerView that was provided by the last call to ProvideOutlinerView() (or NULL when there was no such call.) */ - OutlinerView* GetOutlinerView (void); + OutlinerView* GetOutlinerView (void) { return mpOutlineView;} /** Provide in the member mpOutlineView an instance of OutlinerView that is either taken from the ViewShell, when it is an OutlineViewShell, @@ -1742,10 +1742,6 @@ Outliner::Implementation::~Implementation (void) -OutlinerView* Outliner::Implementation::GetOutlinerView () -{ - return mpOutlineView; -} diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 96c15633a346..4237e2c461f4 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -412,17 +412,9 @@ ViewShellBase* ViewShellBase::GetViewShellBase (SfxViewFrame* pViewFrame) -DrawDocShell* ViewShellBase::GetDocShell (void) const -{ - return mpDocShell; -} -SdDrawDocument* ViewShellBase::GetDocument (void) const -{ - return mpDocument; -} diff --git a/sd/source/ui/view/ViewShellHint.cxx b/sd/source/ui/view/ViewShellHint.cxx index a4eddefed9b2..130152a85376 100644 --- a/sd/source/ui/view/ViewShellHint.cxx +++ b/sd/source/ui/view/ViewShellHint.cxx @@ -33,10 +33,6 @@ ViewShellHint::ViewShellHint (HintId eHintId) -ViewShellHint::HintId ViewShellHint::GetHintId (void) const -{ - return meHintId; -} } // end of namespace sd diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 6ceeca8a4cb3..5760ffb69bed 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -471,10 +471,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) -bool DrawViewShell::IsLayerModeActive (void) const -{ - return mbIsLayerModeActive; -} /** diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index d780e1db0f34..a5fdb8862cb7 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -380,10 +380,6 @@ void FrameView::SetViewShEditModeOnLoad (EditMode eMode) -EditMode FrameView::GetViewShEditModeOnLoad (void) const -{ - return meEditModeOnLoad; -} @@ -959,10 +955,6 @@ void FrameView::SetPreviousViewShellType (ViewShell::ShellType eType) -ViewShell::ShellType FrameView::GetPreviousViewShellType (void) const -{ - return mePreviousViewShellType; -} @@ -975,10 +967,6 @@ void FrameView::SetViewShellTypeOnLoad (ViewShell::ShellType eType) -ViewShell::ShellType FrameView::GetViewShellTypeOnLoad (void) const -{ - return meViewShellTypeOnLoad; -} @@ -991,10 +979,6 @@ void FrameView::SetSelectedPage(sal_uInt16 nPage) -sal_uInt16 FrameView::GetSelectedPage (void) const -{ - return mnSelectedPage; -} @@ -1007,10 +991,6 @@ void FrameView::SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAl -bool FrameView::IsNavigatorShowingAllShapes (void) const -{ - return mbIsNavigatorShowingAllShapes; -} } // end of namespace sd diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index b6b4d4153260..058c01556722 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -1042,10 +1042,6 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage) return GetOutlineTextObject(pPage); } -sal_uLong OutlineView::GetPaperWidth() -{ - return mnPaperWidth; -} /** updates draw model with all changes from outliner model */ bool OutlineView::PrepareClose(bool) diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 8f91d6c75af0..68864d49d508 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -717,14 +717,6 @@ bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) -FrameView* ViewShell::GetFrameView (void) -{ - return mpFrameView; -} - - - - void ViewShell::SetFrameView (FrameView* pNewFrameView) { mpFrameView = pNewFrameView; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 17bcf5f8cd1b..2ff4a712b1d1 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -829,10 +829,6 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& } -bool ViewShell::HasRuler (void) -{ - return mbHasRulers; -} @@ -1447,10 +1443,6 @@ void ViewShell::SetIsMainViewShell (bool bIsMainViewShell) -::sd::Window* ViewShell::GetActiveWindow (void) const -{ - return mpActiveWindow; -} @@ -1476,10 +1468,6 @@ void ViewShell::Draw(OutputDevice &, const Region &) -ZoomList* ViewShell::GetZoomList (void) -{ - return mpZoomList; -} |