[Libreoffice-commits] core.git: vcl/source

[David Tardon]

 vcl/source/window/errinf.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a5aeec9b1c44ad321270260384c5a8b11ed2ba08
Author: David Tardon <dtar...@redhat.com>
Date:   Thu Apr 27 08:41:19 2017 +0200

    WaE: declaration of ‘nUserId’ shadows a member of ‘StringErrorInfo’
    
    Change-Id: I027346fb3c98e830b9515ae842cb5a3fb231420d

diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index 0db74341ff9f..7080cb013c04 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -309,8 +309,8 @@ DialogMask DynamicErrorInfo::GetDialogMask() const
 }
 
 StringErrorInfo::StringErrorInfo(
-    sal_uInt32 nUserId, const OUString& aStringP, DialogMask nMask)
-: DynamicErrorInfo(nUserId, nMask), aString(aStringP)
+    sal_uInt32 nArgUserId, const OUString& aStringP, DialogMask nMask)
+: DynamicErrorInfo(nArgUserId, nMask), aString(aStringP)
 {
 }
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits