summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-04-25 13:00:07 +0200
committerMichael Stahl <mstahl@redhat.com>2012-04-25 13:01:57 +0200
commitafccf73c63731fa17d113a6a983ee17c13db5f5f (patch)
treed8eed2265af170ef60aa23b9b9e08dc4604efab7 /sw
parentbcc3e0e7e8863e4b707301349960ffb306f42f24 (diff)
Revert "WaE: hides overloaded virtual function"
This reverts commit 192edc5e65685a3093d94457dca9db8d3b891486. The method must be called Notify so the SfxBroadcaster calls it instead of the base class method that does nothing.
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e04c6deb63d2..28bf2e75be43 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1402,7 +1402,7 @@ AddressMultiLineEdit::~AddressMultiLineEdit()
EndListening(*GetTextEngine());
}
-void AddressMultiLineEdit::NotifyOfHint( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
+void AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if(rHint.ISA(TextHint) &&
static_cast<const TextHint&>(rHint).GetId() == TEXT_HINT_VIEWSELECTIONCHANGED &&
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index d2e32f6a2db6..beacab6f959e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -168,6 +168,8 @@ class AddressMultiLineEdit : public MultiLineEdit, public SfxListener
Link m_aSelectionLink;
SwCustomizeAddressBlockDialog* m_pParentDialog;
+ using Window::Notify;
+
using MultiLineEdit::SetText;
protected:
@@ -176,7 +178,7 @@ public:
AddressMultiLineEdit(SwCustomizeAddressBlockDialog* pParent, const ResId& rResId);
~AddressMultiLineEdit();
- virtual void NotifyOfHint( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
void SetSelectionChangedHdl( const Link& rLink ) {m_aSelectionLink = rLink;}