summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/AccessibleSlideSorterObject.hxx2
-rw-r--r--sd/source/ui/inc/DrawController.hxx2
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/inc/FormShellManager.hxx2
-rw-r--r--sd/source/ui/inc/FrameView.hxx10
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx6
-rw-r--r--sd/source/ui/inc/View.hxx13
-rw-r--r--sd/source/ui/inc/ViewShell.hxx22
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx4
-rw-r--r--sd/source/ui/inc/ViewShellHint.hxx2
-rw-r--r--sd/source/ui/inc/assclass.hxx2
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx4
-rw-r--r--sd/source/ui/inc/sdxfer.hxx2
-rw-r--r--sd/source/ui/inc/smarttag.hxx2
16 files changed, 30 insertions, 49 deletions
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; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:39:54 +0000