diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-14 23:15:32 -0400 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-25 11:40:12 +0200 |
| commit | 3596f71385820a32f869fb37d5fb83334128d80f (patch) | |
| tree | bc5ef4fce136e1d195364af3bf80872bc0a070b9 /svl | |
| parent | 9f0b663e834c04ff30d36272066ac1abcc217c1e (diff) | |
fdo#71491: Adjust reference during undo of drag-n-drop of cell range.
Also with this commit, the signature of SvtListener::Notify() changes,
by dropping the first argument which nobody uses. This change was necessary
in order to call it directly without needing to pass any broadcaster instance.
(cherry picked from commit 88955714d345d8584e86ae34bf5f5d1f3f4af9f7)
(cherry picked from commit 99809b246c5dd2be548668032fac4f3c65fb962a)
(cherry picked from commit 8b368d808e90561a9b34658e6b811a8fad83088f)
(cherry picked from commit 83ee6b640eaf86f9aef6f42a4dd9c8a930cf9135)
Conflicts:
sc/inc/table.hxx
sc/source/core/data/table2.cxx
sc/source/ui/undo/undoblk.cxx
svl/source/notify/broadcast.cxx
Change-Id: I6a1e97f0fb1e070d1d8f7db614690b04c9e8024e
Reviewed-on: https://gerrit.libreoffice.org/8600
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/notify/broadcast.cxx | 2 | ||||
| -rw-r--r-- | svl/source/notify/listener.cxx | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 24b5790c0336..f13721e3a440 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -56,7 +56,7 @@ public: void operator() ( SvtListener* p ) { - p->Notify(mrBC, mrHint); + p->Notify(mrHint); } }; diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 59d3ef9f3352..66207bf4c0bc 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -80,15 +80,7 @@ bool SvtListener::HasBroadcaster() const return !maBroadcasters.empty(); } -void SvtListener::Notify( SvtBroadcaster& -#ifdef DBG_UTIL -rBC -#endif -, const SfxHint& ) -{ - DBG_ASSERT( IsListening( rBC ), - "notification from unregistered broadcaster" ); -} +void SvtListener::Notify( const SfxHint& ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |