sd/source/ui/inc/DrawViewShell.hxx | 4 ++--
sd/source/ui/inc/OutlineViewShell.hxx | 4 ++--
sd/source/ui/inc/ViewShell.hxx | 4 ++--
sd/source/ui/view/ViewShellBase.cxx | 4 ++--
sd/source/ui/view/drviews5.cxx | 8 ++++----
sd/source/ui/view/outlnvsh.cxx | 8 ++++----
sd/source/ui/view/viewshe2.cxx | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 99a74aaf42fe4baa73dccc0a90438deb86736b5d
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Mon Jun 18 14:32:11 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 19 08:15:24 2018 +0200
Remove unused parameter bBrowse
The parameter bBrowse in ReadUserDataSequence and
WriteUserDataSequence was only forwarded in the call
chain and finally ignored in class ViewShell.
Change-Id: Ibc8fd6ce92dd700e70e5bcf11de5bd93e5e14986
Reviewed-on: https://gerrit.libreoffice.org/56034
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index b8f1dab8f038..ba2acc0a708a 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -287,8 +287,8 @@ public:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
::sd::Window* pTargetWindow, sal_uInt16
nPage, SdrLayerID nLayer ) override;
- virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse ) override;
- virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse ) override;
+ virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& ) override;
+ virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& ) override;
virtual void VisAreaChanged(const ::tools::Rectangle& rRect) override;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx
b/sd/source/ui/inc/OutlineViewShell.hxx
index ffe701349ab0..de8927022c55 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -113,8 +113,8 @@ public:
ErrCode ReadRtf(SvStream& rInput);
- virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse ) override;
- virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse ) override;
+ virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& ) override;
+ virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& ) override;
/** this method is called when the visible area of the view from this
viewshell is changed */
virtual void VisAreaChanged(const ::tools::Rectangle& rRect) override;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index a78834330ed3..7498ff14ce2e 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -285,8 +285,8 @@ public:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt,
DropTargetHelper& rTargetHelper,
::sd::Window* pTargetWindow, sal_uInt16
nPage, SdrLayerID nLayer );
- virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse );
- virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >&, bool bBrowse );
+ virtual void WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& );
+ virtual void ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& );
/** this method is called when the visible area of the view from this
viewshell is changed */
virtual void VisAreaChanged(const ::tools::Rectangle& rRect);
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 590a32d837f0..1a7be406ffee 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -692,7 +692,7 @@ void ViewShellBase::WriteUserDataSequence (
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
if (pShell != nullptr)
- pShell->WriteUserDataSequence (rSequence, false);
+ pShell->WriteUserDataSequence (rSequence);
}
void ViewShellBase::ReadUserDataSequence (
@@ -702,7 +702,7 @@ void ViewShellBase::ReadUserDataSequence (
ViewShell* pShell = GetMainViewShell().get();
if (pShell != nullptr)
{
- pShell->ReadUserDataSequence (rSequence, true/*bBrowse*/);
+ pShell->ReadUserDataSequence (rSequence);
// For certain shell types ReadUserDataSequence may have changed the
// type to another one. Make sure that the center pane shows the
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index d9a7dca7fb78..35c235082f95 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -436,11 +436,11 @@ void DrawViewShell::HidePage()
pFormShell->PrepareClose(false);
}
-void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& rSequence, bool bBrowse )
+void DrawViewShell::WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& rSequence )
{
WriteFrameViewData();
- ViewShell::WriteUserDataSequence( rSequence, bBrowse );
+ ViewShell::WriteUserDataSequence( rSequence );
const sal_Int32 nIndex = rSequence.getLength();
rSequence.realloc( nIndex + 1 );
@@ -451,11 +451,11 @@ void DrawViewShell::WriteUserDataSequence (
css::uno::Sequence < css::beans::Pro
GetDocSh()->GetDoc()->WriteUserDataSequence(rSequence);
}
-void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& rSequence, bool bBrowse )
+void DrawViewShell::ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& rSequence )
{
WriteFrameViewData();
- ViewShell::ReadUserDataSequence( rSequence, bBrowse );
+ ViewShell::ReadUserDataSequence( rSequence );
const sal_Int32 nLength = rSequence.getLength();
const css::beans::PropertyValue *pValue = rSequence.getConstArray();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index a4ca4ecee0a8..53572f9c57d0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1805,18 +1805,18 @@ ErrCode OutlineViewShell::ReadRtf(SvStream& rInput)
return bRet;
}
-void OutlineViewShell::WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& rSequence, bool bBrowse )
+void OutlineViewShell::WriteUserDataSequence ( css::uno::Sequence <
css::beans::PropertyValue >& rSequence )
{
WriteFrameViewData();
- ViewShell::WriteUserDataSequence( rSequence, bBrowse );
+ ViewShell::WriteUserDataSequence( rSequence );
}
-void OutlineViewShell::ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& rSequence, bool bBrowse )
+void OutlineViewShell::ReadUserDataSequence ( const css::uno::Sequence <
css::beans::PropertyValue >& rSequence )
{
WriteFrameViewData();
- ViewShell::ReadUserDataSequence( rSequence, bBrowse );
+ ViewShell::ReadUserDataSequence( rSequence );
ReadFrameViewData( mpFrameView );
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 885422b508c5..fafde8c53584 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -901,7 +901,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 )
{
const sal_Int32 nIndex = rSequence.getLength();
rSequence.realloc( nIndex + 1 );
@@ -919,7 +919,7 @@ void ViewShell::WriteUserDataSequence ( css::uno::Sequence
< css::beans::Propert
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 )
{
mpFrameView->ReadUserDataSequence( rSequence );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
