summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-02 16:23:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-03 09:07:53 +0200
commit87661a7ab3275195ca251188ce4d7825fd038de6 (patch)
tree981ec5f6634b88ed23880f46dba4c3d77b316592 /sd/source/ui
parent68e213319f2a3ee2f90e7bfccae8e5e13492d357 (diff)
loplugin:checkunusedparams in sd
Change-Id: I217a4177e9c2cdc2d85100d253f7f38ec8aad756 Reviewed-on: https://gerrit.libreoffice.org/37162 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/app/optsitem.cxx2
-rw-r--r--sd/source/ui/app/sdmod.cxx8
-rw-r--r--sd/source/ui/app/sdmod2.cxx2
-rw-r--r--sd/source/ui/dlg/docprev.cxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx4
-rw-r--r--sd/source/ui/framework/factories/BasicViewFactory.cxx5
-rw-r--r--sd/source/ui/func/fuexpand.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx6
-rw-r--r--sd/source/ui/func/fupoor.cxx4
-rw-r--r--sd/source/ui/func/fusumry.cxx2
-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
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.cxx2
-rw-r--r--sd/source/ui/sidebar/PreviewValueSet.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx6
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx4
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx5
-rw-r--r--sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx3
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx10
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
-rw-r--r--sd/source/ui/view/Outliner.cxx8
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drviews8.cxx2
-rw-r--r--sd/source/ui/view/drviewsa.cxx10
-rw-r--r--sd/source/ui/view/drviewse.cxx8
-rw-r--r--sd/source/ui/view/frmview.cxx4
-rw-r--r--sd/source/ui/view/grviewsh.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx14
-rw-r--r--sd/source/ui/view/outlview.cxx4
-rw-r--r--sd/source/ui/view/presvish.cxx8
-rw-r--r--sd/source/ui/view/sdview2.cxx8
-rw-r--r--sd/source/ui/view/sdwindow.cxx2
-rw-r--r--sd/source/ui/view/tabcontr.cxx6
-rw-r--r--sd/source/ui/view/viewshe2.cxx14
-rw-r--r--sd/source/ui/view/viewshel.cxx10
55 files changed, 120 insertions, 165 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 8848dddce805..cdbcacd330e4 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -379,7 +379,7 @@ bool SdOptionsContents::WriteData( Any* pValues ) const
|*
\************************************************************************/
-SdOptionsContentsItem::SdOptionsContentsItem( SdOptions*, ::sd::FrameView*)
+SdOptionsContentsItem::SdOptionsContentsItem()
: SfxPoolItem ( ATTR_OPTIONS_CONTENTS )
, maOptionsContents ( 0, false )
{
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 27ec957c04f5..689ba7569b15 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -210,14 +210,6 @@ SvNumberFormatter* SdModule::GetNumberFormatter()
return pNumberFormatter;
}
-/** This method is deprecated and only an alias to
- * <member>GetVirtualRefDevice()</member>. The given argument is ignored.
- */
-OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell& )
-{
- return GetVirtualRefDevice();
-}
-
svtools::ColorConfig& SdModule::GetColorConfig()
{
return *mpColorConfig;
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index ce4dd0dfdc9f..c19ae34d1919 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -479,7 +479,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot )
pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) );
// TP_OPTIONS_CONTENTS:
- pRet->Put( SdOptionsContentsItem( pOptions, pFrameView ) );
+ pRet->Put( SdOptionsContentsItem() );
// TP_OPTIONS_MISC:
SdOptionsMiscItem aSdOptionsMiscItem( pOptions, pFrameView );
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 84cce2aa79e7..919867d9cd6d 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -126,7 +126,7 @@ void SdDocPreviewWin::ImpPaint( OutputDevice* pVDev )
pVDev->DrawRect(::tools::Rectangle( Point(0,0 ), pVDev->GetOutputSize()));
}
-void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect )
+void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& /*rRect*/ )
{
if( (!mxSlideShow.is()) || (!mxSlideShow->isRunning() ) )
{
@@ -140,7 +140,7 @@ void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const ::too
}
else
{
- mxSlideShow->paint( rRect );
+ mxSlideShow->paint();
}
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 073185fbecda..6e5a7a14a722 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -136,7 +136,7 @@ bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const css::datatransfer::Da
void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
{
- mrParent.OnDragFinished( nDropAction );
+ mrParent.OnDragFinished();
SdTransferable::DragFinished(nDropAction);
}
@@ -1238,7 +1238,7 @@ void SdPageObjsTLB::DoDrag()
}
}
-void SdPageObjsTLB::OnDragFinished( sal_uInt8 )
+void SdPageObjsTLB::OnDragFinished()
{
if( mpFrame->HasChildWindow( SID_NAVIGATOR ) )
{
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 0eace0ed525d..a537cb6a5574 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -333,7 +333,6 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
pViewShell.reset(
new DrawViewShell(
- &rFrame,
*mpBase,
&rWindow,
PageKind::Standard,
@@ -344,7 +343,6 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
pViewShell.reset(
new GraphicViewShell (
- &rFrame,
*mpBase,
&rWindow,
pFrameView));
@@ -364,7 +362,6 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
pViewShell.reset(
new DrawViewShell(
- &rFrame,
*mpBase,
&rWindow,
PageKind::Notes,
@@ -375,7 +372,6 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
pViewShell.reset(
new DrawViewShell(
- &rFrame,
*mpBase,
&rWindow,
PageKind::Handout,
@@ -386,7 +382,6 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
{
pViewShell.reset(
new PresentationViewShell(
- &rFrame,
*mpBase,
&rWindow,
pFrameView));
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 0feb4fd8cbb9..f49a3885a844 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -94,7 +94,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pOutl->EnableUndo(false);
if (mpDocSh)
- pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
+ pOutl->SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
pOutl->SetDefTab( mpDoc->GetDefaultTabulator() );
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d2228597d673..d4ace7dc8e36 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -402,7 +402,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
if( bNameOK )
bOK = mpDoc->InsertBookmarkAsObject( aObjectBookmarkList, aExchangeList,
- bLink, nullptr, nullptr, false );
+ nullptr, nullptr, false );
if( pDlg->IsRemoveUnnessesaryMasterPages() )
mpDoc->RemoveUnnecessaryMasterPages();
@@ -442,7 +442,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
std::unique_ptr<SdrOutliner> pOutliner(new SdOutliner( mpDoc, OutlinerMode::TextObject ));
// set reference device
- pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
+ pOutliner->SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage();
aLayoutName = pPage->GetLayoutName();
@@ -593,7 +593,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
pOutliner->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
// set reference device
- pOutliner->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh ));
+ pOutliner->SetRefDevice(SD_MOD()->GetVirtualRefDevice());
pOutliner->SetPaperSize(Size(0x7fffffff, 0x7fffffff));
SvStream* pStream = pMedium->GetInStream();
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 2771a542fe6e..8fa2896794ef 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -901,7 +901,7 @@ void FuPoor::DoCut()
{
if (mpView)
{
- mpView->DoCut(mpWindow);
+ mpView->DoCut();
}
}
@@ -912,7 +912,7 @@ void FuPoor::DoCopy()
{
if (mpView)
{
- mpView->DoCopy(mpWindow);
+ mpView->DoCopy();
}
}
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 8417c3c94ae6..e6a63b0f654e 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -165,7 +165,7 @@ void FuSummaryPage::DoExecute( SfxRequest& )
pOutl->EnableUndo(false);
if (mpDocSh)
- pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh ));
+ pOutl->SetRefDevice(SD_MOD()->GetVirtualRefDevice());
pOutl->SetDefTab( mpDoc->GetDefaultTabulator() );
pOutl->SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(mpDoc->GetStyleSheetPool()));
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);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 524061bead98..359b5ad5eda2 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -581,7 +581,7 @@ void MasterPagesSelector::UpdateAllPreviews()
mpContainer->RequestPreview(aToken);
}
}
- PreviewValueSet::Rearrange(true);
+ PreviewValueSet::Rearrange();
}
void MasterPagesSelector::ClearPageSet()
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index 62eacbabf20e..c15d89d4e231 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -72,7 +72,7 @@ void PreviewValueSet::Resize()
}
}
-void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/)
+void PreviewValueSet::Rearrange()
{
sal_uInt16 nNewColumnCount (CalculateColumnCount (
GetOutputSizePixel().Width()));
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx
index 880ee9190120..41d5a8fac54e 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -43,7 +43,7 @@ public:
/** Set the number of rows and columns according to the current number
of items. Call this method when new items have been inserted.
*/
- void Rearrange (bool bForceRequestResize = false);
+ void Rearrange();
protected:
virtual void MouseButtonDown (const MouseEvent& rEvent) override;
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 3fec3df97e44..48f6c3a321d4 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -254,7 +254,7 @@ void ShowWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const ::tools::Re
{
if( mxController.is() )
{
- mxController->paint(rRect);
+ mxController->paint();
}
else if(mpViewShell )
{
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 42237d0f83cf..51e2c0bfb094 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -977,7 +977,7 @@ void SlideShow::activate( ViewShellBase& rBase )
}
-void SlideShow::deactivate( ViewShellBase& /*rBase*/ )
+void SlideShow::deactivate()
{
mxController->deactivate();
}
@@ -987,10 +987,10 @@ bool SlideShow::keyInput(const KeyEvent& rKEvt)
return mxController.is() && mxController->keyInput(rKEvt);
}
-void SlideShow::paint( const ::tools::Rectangle& rRect )
+void SlideShow::paint()
{
if( mxController.is() )
- mxController->paint( rRect );
+ mxController->paint();
}
void SlideShow::pause( bool bPause )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3c48479037c3..8de1e7ac82d2 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1145,7 +1145,7 @@ void SlideshowImpl::onFirstPaint()
maUpdateTimer.Start();
}
-void SlideshowImpl::paint( const ::tools::Rectangle& /* rRect */ )
+void SlideshowImpl::paint()
{
if( mxView.is() ) try
{
@@ -1478,7 +1478,7 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor )
// XShapeEventListener
-void SlideshowImpl::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& /* aOriginalEvent */ )
+void SlideshowImpl::click( const Reference< XShape >& xShape )
{
SolarMutexGuard aSolarGuard;
@@ -3413,11 +3413,11 @@ void SAL_CALL SlideShowListenerProxy::disposing( const css::lang::EventObject& a
// XShapeEventListener
-void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& aOriginalEvent )
+void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const css::awt::MouseEvent& /*aOriginalEvent*/ )
{
SolarMutexGuard aSolarGuard;
if( mxController.is() )
- mxController->click(xShape, aOriginalEvent );
+ mxController->click(xShape );
}
} // namespace ::sd
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 68778470509c..0a3f5b8c6a69 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -223,7 +223,7 @@ public:
void slideEnded(const bool bReverse);
/// @throws css::uno::RuntimeException
void hyperLinkClicked(const OUString & hyperLink);
- void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent);
+ void click(const css::uno::Reference< css::drawing::XShape > & xShape);
bool swipe(const CommandSwipeData &rSwipeData);
bool longpress(const CommandLongPressData& rLongPressData);
@@ -232,7 +232,7 @@ public:
ViewShell* getViewShell() const { return mpViewShell; }
- void paint( const ::tools::Rectangle& rRect );
+ void paint();
bool keyInput(const KeyEvent& rKEvt);
void mouseButtonUp(const MouseEvent& rMEvt);
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index e20e963cb597..8bc8bb3e74da 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -99,8 +99,7 @@ RequestQueue::~RequestQueue()
void RequestQueue::AddRequest (
CacheKey aKey,
- RequestPriorityClass eRequestClass,
- bool /*bInsertWithHighestPriority*/)
+ RequestPriorityClass eRequestClass)
{
::osl::MutexGuard aGuard (maMutex);
@@ -184,7 +183,7 @@ void RequestQueue::ChangeClass (
Request::DataComparator(aKey)));
if (iRequest!=mpRequestQueue->end() && iRequest->meClass!=eNewRequestClass)
{
- AddRequest(aKey, eNewRequestClass, true);
+ AddRequest(aKey, eNewRequestClass);
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index b8fc2fb85903..7f3946be4954 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -56,8 +56,7 @@ public:
*/
void AddRequest (
CacheKey aKey,
- RequestPriorityClass eRequestClass,
- bool bInsertWithHighestPriority = false);
+ RequestPriorityClass eRequestClass);
/** Remove the specified request from the queue.
@param aKey
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index ebc201d46505..d69a340e67d0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -636,7 +636,7 @@ sal_Int8 Clipboard::AcceptDrop (
{
sal_Int8 nAction (DND_ACTION_NONE);
- const Clipboard::DropType eDropType (IsDropAccepted(rTargetHelper));
+ const Clipboard::DropType eDropType (IsDropAccepted());
switch (eDropType)
{
@@ -704,7 +704,7 @@ sal_Int8 Clipboard::ExecuteDrop (
{
sal_Int8 nResult = DND_ACTION_NONE;
mxUndoContext.reset();
- const Clipboard::DropType eDropType (IsDropAccepted(rTargetHelper));
+ const Clipboard::DropType eDropType (IsDropAccepted());
switch (eDropType)
{
@@ -857,7 +857,7 @@ sal_uInt16 Clipboard::InsertSlides (
return nInsertedPageCount;
}
-Clipboard::DropType Clipboard::IsDropAccepted (DropTargetHelper&) const
+Clipboard::DropType Clipboard::IsDropAccepted() const
{
const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
if (pDragTransferable == nullptr)
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 2842a1e2a97d..031fb61f6913 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -405,7 +405,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest)
= dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell());
if (pViewShell != nullptr)
{
- pViewShell->ImpSidUndo (false, rRequest);
+ pViewShell->ImpSidUndo (rRequest);
}
break;
}
@@ -416,7 +416,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest)
= dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell());
if (pViewShell != nullptr)
{
- pViewShell->ImpSidRedo (false, rRequest);
+ pViewShell->ImpSidRedo (rRequest);
}
break;
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index b7d819a6ebf3..bc0ce0836174 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -186,7 +186,7 @@ private:
implementation of proper handling master pages copy-and-paste.
*/
enum DropType { DT_PAGE, DT_PAGE_FROM_NAVIGATOR, DT_SHAPE, DT_NONE };
- DropType IsDropAccepted (DropTargetHelper& rTargetHelper) const;
+ DropType IsDropAccepted() const;
/** This method contains the code for AcceptDrop() and ExecuteDrop() shapes.
There are only minor differences for the two cases at this level.
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 9a0a758b2370..37a710a45663 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -183,7 +183,7 @@ void SlideSorter::Init()
pContentWindow->Hide();
// Set view pointer of base class.
- SetupControls(pParentWindow);
+ SetupControls();
mbIsValid = true;
}
@@ -242,7 +242,7 @@ void SlideSorter::Paint (const ::tools::Rectangle& rRepaintArea)
GetContentWindow());
}
-void SlideSorter::SetupControls (vcl::Window* )
+void SlideSorter::SetupControls()
{
GetVerticalScrollBar()->Show();
}
@@ -371,16 +371,12 @@ bool SlideSorter::RelocateToWindow (vcl::Window* pParentWindow)
ReleaseListeners();
- vcl::Window *pNewWindow = nullptr;
if (mpViewShell)
{
mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow);
- pNewWindow = mpViewShell->GetParentWindow();
}
- else
- pNewWindow = nullptr;
- SetupControls(pNewWindow);
+ SetupControls();
SetupListeners();
// For accessibility we have to shortly hide the content window. This
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index d56fb3f52389..1f015f1ae9bc 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -115,11 +115,11 @@ std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
}
SlideSorterViewShell::SlideSorterViewShell (
- SfxViewFrame* pFrame,
+ SfxViewFrame* /*pFrame*/,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
- : ViewShell (pFrame, pParentWindow, rViewShellBase),
+ : ViewShell (pParentWindow, rViewShellBase),
mpSlideSorter(),
mbIsArrangeGUIElementsPending(true)
{
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index aefeb457483a..6fb83a46f59f 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -638,7 +638,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL SdXImpressDocument::getViewD
::sd::FrameView* pFrameView = rList[ i ];
uno::Sequence< beans::PropertyValue > aSeq;
- pFrameView->WriteUserDataSequence( aSeq, false );
+ pFrameView->WriteUserDataSequence( aSeq );
xCont->insertByIndex( i, uno::makeAny( aSeq ) );
}
}
@@ -676,7 +676,7 @@ void SAL_CALL SdXImpressDocument::setViewData( const uno::Reference < container:
{
pFrameView = new ::sd::FrameView( mpDoc );
- pFrameView->ReadUserDataSequence( aSeq, false );
+ pFrameView->ReadUserDataSequence( aSeq );
rViews.push_back( pFrameView );
}
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 18c50b8c608d..ce0bf91fa98d 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -533,7 +533,7 @@ SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShap
}
else
{
- pPresObj = GetPage()->CreatePresObj( eObjKind, false, aRect, true );
+ pPresObj = GetPage()->CreatePresObj( eObjKind, false, aRect );
}
if( pPresObj )
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 11fc88a4f8dd..0cd8df02d24e 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -264,7 +264,7 @@ void SdOutliner::PrepareSpelling()
sd::ViewShellBase* pBase = dynamic_cast< sd::ViewShellBase *>( SfxViewShell::Current() );
if (pBase != nullptr)
SetViewShell (pBase->GetMainViewShell());
- SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) );
+ SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
std::shared_ptr<sd::ViewShell> pViewShell (mpWeakViewShell.lock());
if (pViewShell)
@@ -342,7 +342,7 @@ void SdOutliner::EndSpelling()
if(IsModified())
{
if(mpView && dynamic_cast< const sd::OutlineView *>( mpView ) != nullptr)
- static_cast<sd::OutlineView*>(mpView)->PrepareClose(false);
+ static_cast<sd::OutlineView*>(mpView)->PrepareClose();
if(mpDrawDocument && !mpDrawDocument->IsChanged())
mpDrawDocument->SetChanged();
}
@@ -374,7 +374,7 @@ bool SdOutliner::SpellNextDocument()
else
{
if( dynamic_cast< const sd::OutlineView *>( mpView ) != nullptr)
- static_cast<sd::OutlineView*>(mpView)->PrepareClose(false);
+ static_cast<sd::OutlineView*>(mpView)->PrepareClose();
mpDrawDocument->GetDocSh()->SetWaitCursor( true );
Initialize (true);
@@ -1612,7 +1612,7 @@ void SdOutliner::PrepareConversion()
void SdOutliner::BeginConversion()
{
- SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) );
+ SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
sd::ViewShellBase* pBase = dynamic_cast<sd::ViewShellBase*>( SfxViewShell::Current() );
if (pBase != nullptr)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 9487cba4ddb8..308e28f890af 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -786,7 +786,7 @@ void ViewShellBase::WriteUserData (OUString& rString, bool bBrowse)
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
if (pShell != nullptr)
- pShell->WriteUserData (rString);
+ pShell->WriteUserData();
}
void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse)
@@ -796,7 +796,7 @@ void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse)
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
if (pShell != nullptr)
- pShell->ReadUserData (rString);
+ pShell->ReadUserData();
}
SdrView* ViewShellBase::GetDrawView() const
@@ -829,7 +829,7 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ )
SvBorder aCurrentBorder (GetBorderPixel());
bool bOuterResize ( ! GetDocShell()->IsInPlaceActive());
SvBorder aBorder (GetBorder(bOuterResize));
- aBorder += pMainViewShell->GetBorder(bOuterResize);
+ aBorder += pMainViewShell->GetBorder();
if (bForce || (aBorder != aCurrentBorder))
{
@@ -1124,7 +1124,7 @@ void ViewShellBase::Implementation::ResizePixel (
// Calculate and set the border before the controls are placed.
SvBorder aBorder;
if (pMainViewShell != nullptr)
- aBorder = pMainViewShell->GetBorder(bOuterResize);
+ aBorder = pMainViewShell->GetBorder();
aBorder += mrBase.GetBorder(bOuterResize);
if (mrBase.GetBorderPixel() != aBorder)
mrBase.SetBorderPixel(aBorder);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index fd74fd14a497..26ac7a9b4f22 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -473,7 +473,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sd
if( (pShowWindow == pOutDev) || (xSlideshow->getAnimationMode() == ANIMATIONMODE_PREVIEW) )
{
if( pShowWindow == pOutDev && mpViewSh )
- xSlideshow->paint( rReg.GetBoundRect() );
+ xSlideshow->paint();
bStandardPaint = false;
}
}
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 8c23c9656f3a..ac4bf0203db4 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -45,7 +45,7 @@
namespace sd {
-void DrawViewShell::ScannerEvent( const css::lang::EventObject& )
+void DrawViewShell::ScannerEvent()
{
if( mxScannerManager.is() )
{
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 5c8832a5b111..c623adcb6517 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -95,14 +95,14 @@ public:
void ParentDestroyed() { mpParent = nullptr; }
};
-void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject )
+void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& /*rEventObject*/ )
{
if( mpParent )
- mpParent->ScannerEvent( rEventObject );
+ mpParent->ScannerEvent();
}
-DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument )
- : ViewShell (pFrame, pParentWindow, rViewShellBase)
+DrawViewShell::DrawViewShell( ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument )
+ : ViewShell (pParentWindow, rViewShellBase)
, maTabControl(VclPtr<sd::TabControl>::Create(this, pParentWindow))
, mbIsLayerModeActive(false)
, mbIsInSwitchPage(false)
@@ -156,7 +156,7 @@ DrawViewShell::~DrawViewShell()
EndListening (*GetDocSh());
if( SlideShow::IsRunning(*this) )
- StopSlideShow(false);
+ StopSlideShow();
DisposeFunctions();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 7cd022d38ea1..39688be50520 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -731,7 +731,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_PRESENTATION_END:
{
- StopSlideShow(true);
+ StopSlideShow();
rReq.Ignore ();
}
@@ -1385,13 +1385,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_UNDO :
{
// moved implementation to BaseClass
- ImpSidUndo(true, rReq);
+ ImpSidUndo(rReq);
}
break;
case SID_REDO :
{
// moved implementation to BaseClass
- ImpSidRedo(true, rReq);
+ ImpSidRedo(rReq);
}
break;
@@ -1615,7 +1615,7 @@ namespace slideshowhelp
}
}
-void DrawViewShell::StopSlideShow (bool /*bCloseFrame*/)
+void DrawViewShell::StopSlideShow()
{
Reference< XPresentation2 > xPresentation( GetDoc()->getPresentation() );
if(xPresentation.is() && xPresentation->isRunning())
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index df7efde02afa..e64042487324 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -372,7 +372,7 @@ static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
}
#define addValue( n, v ) push_back( std::pair< OUString, Any >( OUString( n ), v ) )
-void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rValues, bool )
+void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rValues )
{
std::vector< std::pair< OUString, Any > > aUserData;
@@ -523,7 +523,7 @@ static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList&
}
}
-void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool )
+void FrameView::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence )
{
const sal_Int32 nLength = rSequence.getLength();
if (nLength)
diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx
index ce5991ddcdec..509fbc4f0fd7 100644
--- a/sd/source/ui/view/grviewsh.cxx
+++ b/sd/source/ui/view/grviewsh.cxx
@@ -30,12 +30,10 @@
namespace sd {
GraphicViewShell::GraphicViewShell (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameView)
: DrawViewShell (
- pFrame,
rViewShellBase,
pParentWindow,
PageKind::Standard,
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 470a7eed34bc..25bf6e858a9b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -126,7 +126,7 @@ void OutlineViewShell::InitInterface_Impl()
/**
* common initialization part of both constructors
*/
-void OutlineViewShell::Construct(DrawDocShell* )
+void OutlineViewShell::Construct()
{
bool bModified = GetDoc()->IsChanged();
@@ -180,11 +180,11 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController()
* Default constructor, windows must not center themselves automatically
*/
OutlineViewShell::OutlineViewShell (
- SfxViewFrame* pFrame,
+ SfxViewFrame* /*pFrame*/,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
- : ViewShell(pFrame, pParentWindow, rViewShellBase),
+ : ViewShell(pParentWindow, rViewShellBase),
pOlView(nullptr),
pLastPage( nullptr ),
bPastePossible(false),
@@ -198,7 +198,7 @@ OutlineViewShell::OutlineViewShell (
mpFrameView->Connect();
- Construct(GetDocSh());
+ Construct();
SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::OutlineText));
@@ -635,13 +635,13 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
case SID_UNDO :
{
OutlineViewPageChangesGuard aGuard2(pOlView);
- ImpSidUndo(false, rReq);
+ ImpSidUndo(rReq);
}
break;
case SID_REDO :
{
OutlineViewPageChangesGuard aGuard2(pOlView);
- ImpSidRedo(false, rReq);
+ ImpSidRedo(rReq);
}
break;
@@ -1114,7 +1114,7 @@ bool OutlineViewShell::PrepareClose( bool bUI )
if( !ViewShell::PrepareClose(bUI) )
return false;
- return pOlView == nullptr || pOlView->PrepareClose(bUI);
+ return pOlView == nullptr || pOlView->PrepareClose();
}
/**
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 5821dde1d610..3a859aa68662 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -96,7 +96,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
// initialize Outliner: set Reference Device
bInitOutliner = true;
mrOutliner.Init( OutlinerMode::OutlineView );
- mrOutliner.SetRefDevice( SD_MOD()->GetRefDevice( rDocSh ) );
+ mrOutliner.SetRefDevice( SD_MOD()->GetVirtualRefDevice() );
//viewsize without the width of the image and number in front
mnPaperWidth = (mrOutlineViewShell.GetActiveWindow()->GetViewSize().Width() - 4000);
mrOutliner.SetPaperSize(Size(mnPaperWidth, 400000000));
@@ -1002,7 +1002,7 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage)
}
/** updates draw model with all changes from outliner model */
-bool OutlineView::PrepareClose(bool)
+bool OutlineView::PrepareClose()
{
::sd::UndoManager* pDocUndoMgr = dynamic_cast<sd::UndoManager*>(mpDocSh->GetUndoManager());
if (pDocUndoMgr != nullptr)
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index a9c63d886caf..206bd66ffea5 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -74,8 +74,8 @@ void PresentationViewShell::InitInterface_Impl()
}
-PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView)
-: DrawViewShell( pFrame, rViewShellBase, pParentWindow, PageKind::Standard, pFrameView)
+PresentationViewShell::PresentationViewShell( ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView)
+: DrawViewShell( rViewShellBase, pParentWindow, PageKind::Standard, pFrameView)
{
if( GetDocSh() && GetDocSh()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
maOldVisArea = GetDocSh()->GetVisArea( ASPECT_CONTENT );
@@ -140,11 +140,11 @@ void PresentationViewShell::Activate( bool bIsMDIActivate )
GetDocSh()->Connect( this );
}
-void PresentationViewShell::Paint( const ::tools::Rectangle& rRect, ::sd::Window* )
+void PresentationViewShell::Paint( const ::tools::Rectangle& /*rRect*/, ::sd::Window* )
{
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if( xSlideShow.is() )
- xSlideShow->paint(rRect);
+ xSlideShow->paint();
}
void PresentationViewShell::Resize()
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 24a0299bf729..76af9466f9d4 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -84,7 +84,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
{}
};
-css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& )
+css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDataObject()
{
// since SdTransferable::CopyToClipboard is called, this
// dynamically created object is destroyed automatically
@@ -234,7 +234,7 @@ void View::UpdateSelectionClipboard( bool bForceDeselect )
}
}
-void View::DoCut(vcl::Window* )
+void View::DoCut()
{
const OutlinerView* pOLV = GetTextEditOutlinerView();
@@ -251,7 +251,7 @@ void View::DoCut(vcl::Window* )
}
}
-void View::DoCopy (vcl::Window* pWindow)
+void View::DoCopy()
{
const OutlinerView* pOLV = GetTextEditOutlinerView();
@@ -260,7 +260,7 @@ void View::DoCopy (vcl::Window* pWindow)
else if( AreObjectsMarked() )
{
BrkAction();
- CreateClipboardDataObject( this, *pWindow );
+ CreateClipboardDataObject();
}
}
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 9d13093e6144..ce5d5ba1fa43 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -290,7 +290,7 @@ void Window::RequestHelp(const HelpEvent& rEvt)
{
if ( mpViewShell )
{
- if( !mpViewShell->RequestHelp( rEvt, this) )
+ if( !mpViewShell->RequestHelp( rEvt ) )
vcl::Window::RequestHelp( rEvt );
}
else
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index bbb7598bba31..7b60cc3796d5 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -57,9 +57,9 @@ bool TabControl::TabControlTransferable::GetData( const css::datatransfer::DataF
return false;
}
-void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction )
+void TabControl::TabControlTransferable::DragFinished( sal_Int8 /*nDropAction*/ )
{
- mrParent.DragFinished( nDropAction );
+ mrParent.DragFinished();
}
TabControl::TabControl(DrawViewShell* pViewSh, vcl::Window* pParent) :
@@ -163,7 +163,7 @@ void TabControl::StartDrag( sal_Int8, const Point& )
( new TabControl::TabControlTransferable( *this ) )->StartDrag( this, DND_ACTION_COPYMOVE );
}
-void TabControl::DragFinished( sal_Int8 )
+void TabControl::DragFinished()
{
bInternalMove = false;
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index a3f4f91ec719..3eee7b1e09e4 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -670,7 +670,7 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin)
}
}
-bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*)
+bool ViewShell::RequestHelp(const HelpEvent& rHEvt)
{
bool bReturn = false;
@@ -890,14 +890,14 @@ const ::tools::Rectangle& ViewShell::GetAllWindowRect()
return maAllWindowRectangle;
}
-void ViewShell::ReadUserData(const OUString&)
+void ViewShell::ReadUserData()
{
// zoom onto VisArea from FrameView
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_VISAREA,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD);
}
-void ViewShell::WriteUserData(OUString&)
+void ViewShell::WriteUserData()
{
// writing of our data is always done in WriteFrameViewData()
WriteFrameViewData();
@@ -961,7 +961,7 @@ sal_Int8 ViewShell::ExecuteDrop (
return pView ? pView->ExecuteDrop( rEvt, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE;
}
-void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse)
+void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool /*bBrowse*/)
{
const sal_Int32 nIndex = rSequence.getLength();
rSequence.realloc( nIndex + 1 );
@@ -976,12 +976,12 @@ void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert
rSequence[nIndex].Name = sUNO_View_ViewId;
rSequence[nIndex].Value <<= "view" + OUString::number( static_cast<sal_uInt16>(nViewID));
- mpFrameView->WriteUserDataSequence( rSequence, bBrowse );
+ mpFrameView->WriteUserDataSequence( rSequence );
}
-void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse )
+void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool /*bBrowse*/ )
{
- mpFrameView->ReadUserDataSequence( rSequence, bBrowse );
+ mpFrameView->ReadUserDataSequence( rSequence );
}
void ViewShell::VisAreaChanged(const ::tools::Rectangle& rRect)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 25917474f54c..b741231d7986 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -140,7 +140,7 @@ SfxViewFrame* ViewShell::GetViewFrame() const
/// declare SFX-Slotmap and standard interface
-ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase)
+ViewShell::ViewShell( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase)
: SfxShell(&rViewShellBase)
, mpParentWindow(pParentWindow)
{
@@ -381,7 +381,7 @@ void ViewShell::Deactivate(bool bIsMDIActivate)
{
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if(xSlideShow.is() && xSlideShow->isRunning() )
- xSlideShow->deactivate(GetViewShellBase());
+ xSlideShow->deactivate();
if(HasCurrentFunction())
GetCurrentFunction()->Deactivate();
@@ -970,7 +970,7 @@ void ViewShell::Resize()
pView->VisAreaChanged(GetActiveWindow());
}
-SvBorder ViewShell::GetBorder (bool )
+SvBorder ViewShell::GetBorder()
{
SvBorder aBorder;
@@ -1248,7 +1248,7 @@ public:
}
};
-void ViewShell::ImpSidUndo(bool, SfxRequest& rReq)
+void ViewShell::ImpSidUndo(SfxRequest& rReq)
{
//The xWatcher keeps the SlideSorter selection in sync
//with the page insertions/deletions that Undo may introduce
@@ -1299,7 +1299,7 @@ void ViewShell::ImpSidUndo(bool, SfxRequest& rReq)
rReq.Done();
}
-void ViewShell::ImpSidRedo(bool, SfxRequest& rReq)
+void ViewShell::ImpSidRedo(SfxRequest& rReq)
{
//The xWatcher keeps the SlideSorter selection in sync
//with the page insertions/deletions that Undo may introduce