From 22029c7e17b4cb48acb058d47ec9c3b6b8b6b294 Mon Sep 17 00:00:00 2001 From: Herbert Dürr Date: Tue, 26 Nov 2013 09:00:15 +0000 Subject: Resolves: #i123753# WaE: fix unoedhlp.hxx declaration of 'nId'... shadowing a member of SimpleHint Happy new times: Now even simple compiler warning fixes need their own issue. (cherry picked from commit 5cd09cc74da93da4c91c665822b6ab9a0d704a7a) Conflicts: svl/inc/svl/smplhint.hxx svl/source/notify/smplhint.cxx Change-Id: I445126425a22778cf7aaf33d3a34977903e59f84 --- include/svl/smplhint.hxx | 6 +++--- svl/source/notify/smplhint.cxx | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx index 848883763cb5..32e749ec4544 100644 --- a/include/svl/smplhint.hxx +++ b/include/svl/smplhint.hxx @@ -60,11 +60,11 @@ class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint { private: - sal_uLong nId; + sal_uLong mnId; public: TYPEINFO(); - SfxSimpleHint( sal_uLong nId ); - sal_uLong GetId() const { return nId; } + SfxSimpleHint( sal_uLong nId ) { mnId = nId; } + sal_uLong GetId() const { return mnId; } }; //-------------------------------------------------------------------- diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx index a30e900f5264..b85173431150 100644 --- a/svl/source/notify/smplhint.cxx +++ b/svl/source/notify/smplhint.cxx @@ -17,18 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include - TYPEINIT1(SfxSimpleHint, SfxHint); -// creates a SimpleHint with the type nId - -SfxSimpleHint::SfxSimpleHint( sal_uLong nIdP ) -{ - nId = nIdP; -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3