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/DrawViewShell.hxx19
-rw-r--r--sd/source/ui/inc/FrameView.hxx4
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx1
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx2
-rw-r--r--sd/source/ui/inc/PresentationViewShell.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx2
-rw-r--r--sd/source/ui/inc/TabControl.hxx2
-rw-r--r--sd/source/ui/inc/View.hxx6
-rw-r--r--sd/source/ui/inc/ViewShell.hxx22
-rw-r--r--sd/source/ui/inc/optsitem.hxx2
-rw-r--r--sd/source/ui/inc/sdtreelb.hxx2
-rw-r--r--sd/source/ui/inc/slideshow.hxx4
13 files changed, 23 insertions, 47 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 6178bde590b8..d42b514753d3 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -88,7 +88,6 @@ public:
one view shell to the next.
*/
DrawViewShell (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
PageKind ePageKind,
@@ -279,7 +278,7 @@ public:
*/
virtual void ShowUIControls (bool bVisible) override;
- void ScannerEvent( const css::lang::EventObject& rEventObject );
+ void ScannerEvent();
bool IsLayerModeActive() const { return mbIsLayerModeActive;}
@@ -449,21 +448,9 @@ private:
virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) override;
- /** Stop a running slide show. The frame the show is running in is
- destroyed if
- a) it is running in its own frame, i.e. is a full screen show and
- b) the given flag bCloseFrame is true.
- @param bCloseFrame
- Be careful with this flag when stopping a full screen show.
- 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
- responsibility of the caller to avoid an illegal reentrant
- call.
+ /** Stop a running slide show.
*/
- void StopSlideShow (bool bCloseFrame);
+ void StopSlideShow();
/** Show the context menu for snap lines and points. Because snap lines
can not be selected the index of the snap line/point for which the
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index 15950ba61fe4..4ae22cc04c2d 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -165,8 +165,8 @@ public:
void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes);
bool IsNavigatorShowingAllShapes() const { return mbIsNavigatorShowingAllShapes;}
- void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse );
- void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse );
+ void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& );
+ void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& );
private:
sal_uInt16 mnRefCount;
diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx
index 5830ae0dcfcb..34b858df94b8 100644
--- a/sd/source/ui/inc/GraphicViewShell.hxx
+++ b/sd/source/ui/inc/GraphicViewShell.hxx
@@ -56,7 +56,6 @@ public:
one view shell to the next.
*/
GraphicViewShell (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameView);
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 221ea9396ddf..27a17bb07a81 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -110,7 +110,7 @@ public:
sal_uLong GetPaperWidth() { return mnPaperWidth;}
- bool PrepareClose(bool bUI = true);
+ bool PrepareClose();
virtual void GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const override;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) override;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index dc79fc1739e7..7284d36a03d5 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -155,7 +155,7 @@ private:
bool bPastePossible;
bool mbInitialized;
- void Construct (DrawDocShell* pDocSh);
+ void Construct();
DECL_LINK( ClipboardChanged, TransferableDataHelper*, void );
};
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index 6a4f33e28ebe..c0020685c02e 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -38,7 +38,7 @@ private:
static void InitInterface_Impl();
public:
- PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView);
+ PresentationViewShell( ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView);
virtual ~PresentationViewShell() override;
/** This method is used by a simple class that passes some
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 87f01e25df8f..97b0336bd149 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -249,7 +249,7 @@ private:
This method is usually called exactly one time from the
constructor.
*/
- void SetupControls (vcl::Window* pParentWindow);
+ void SetupControls();
/** This method is usually called exactly one time from the
constructor.
diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx
index d748fe38d4a5..e72e1a2fe100 100644
--- a/sd/source/ui/inc/TabControl.hxx
+++ b/sd/source/ui/inc/TabControl.hxx
@@ -101,7 +101,7 @@ private:
friend class TabControl::TabControlTransferable;
- void DragFinished( sal_Int8 nDropAction );
+ void DragFinished();
private:
using TabBar::StartDrag;
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 3c1c08f695c5..58915b3e5149 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -90,8 +90,8 @@ public:
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false);
virtual void MarkListHasChanged() override;
void SelectAll();
- void DoCut(vcl::Window* pWindow=nullptr);
- void DoCopy(vcl::Window* pWindow=nullptr);
+ void DoCut();
+ void DoCopy();
void DoPaste(vcl::Window* pWindow=nullptr);
virtual void DoConnect(SdrOle2Obj* pOleObj) override;
virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false);
@@ -110,7 +110,7 @@ public:
sal_uInt16 nLayer);
css::uno::Reference<css::datatransfer::XTransferable>
- CreateClipboardDataObject (::sd::View*, vcl::Window& rWindow);
+ CreateClipboardDataObject ();
css::uno::Reference<css::datatransfer::XTransferable>
CreateDragDataObject (::sd::View*, vcl::Window& rWindow,
const Point& rDragPos);
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 74ec3b0e6c99..7fcc96cdff92 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -110,7 +110,6 @@ public:
ViewShell (
- SfxViewFrame *pFrame,
vcl::Window* pParentWindow,
ViewShellBase& rViewShellBase);
virtual ~ViewShell() override;
@@ -180,7 +179,7 @@ public:
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);
- bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin );
+ bool RequestHelp( const HelpEvent& rEvt );
bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin );
bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin);
@@ -227,8 +226,8 @@ public:
void SetFrameView (FrameView* pFrameView);
virtual void ReadFrameViewData(FrameView* pView);
virtual void WriteFrameViewData();
- void WriteUserData(OUString& rString);
- void ReadUserData(const OUString& rString);
+ void WriteUserData();
+ void ReadUserData();
virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb);
@@ -313,17 +312,8 @@ public:
/** Return the border that is drawn around 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
- 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
- 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.
*/
- SvBorder GetBorder (bool bOuterResize);
+ SvBorder GetBorder();
/** Notify the view shell that its parent window has been resized.
The ViewShell places and resizes its UI elements accordingly.
@@ -503,8 +493,8 @@ protected:
virtual ::svl::IUndoManager* ImpGetUndoManager() const;
void ImpGetUndoStrings(SfxItemSet &rSet) const;
void ImpGetRedoStrings(SfxItemSet &rSet) const;
- void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq);
- void ImpSidRedo(bool bDrawViewShell, SfxRequest& rReq);
+ void ImpSidUndo(SfxRequest& rReq);
+ void ImpSidRedo(SfxRequest& rReq);
DECL_LINK( HScrollHdl, ScrollBar *, void );
DECL_LINK( VScrollHdl, ScrollBar *, void );
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 9526aee6d539..5bf26e738eff 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -175,7 +175,7 @@ class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
{
public:
- SdOptionsContentsItem( SdOptions* pOpts, ::sd::FrameView* pView );
+ SdOptionsContentsItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 76bfa73e0dbc..8541ace2557b 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -149,7 +149,7 @@ protected:
virtual void RequestingChildren( SvTreeListEntry* pParent ) override;
void DoDrag();
- void OnDragFinished( sal_uInt8 nDropAction );
+ void OnDragFinished();
/** 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
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index ada2329f0df8..b276da8e03df 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -162,8 +162,8 @@ public:
// events
void resize( const Size &rSize );
void activate(ViewShellBase& rBase);
- void deactivate(ViewShellBase& rBase);
- void paint( const ::tools::Rectangle& rRect );
+ void deactivate();
+ void paint();
bool keyInput(const KeyEvent& rKEvt);
generated by cgit (git 2.34.1) at 2024-07-19 03:56:53 +0000