Fix warning C4459 when building with MSVC without -Wv:18

Discovered by https://gerrit.libreoffice.org/c/core/+/163717

Like these:

C:/lo/core/oox/source/export/shapes.cxx(2411): warning C4459: declaration of 'XML_line' hides global declaration

Change-Id: I74738753254ad1c468025d25bfb0bfe21787180f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163779
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

5 files changed, 96 insertions, 96 deletions

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e2aaa1aa8f84..5fea3f14179f 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2424,11 +2424,11 @@ void SbUnoObject::doIntrospection()
 
 
 // Start of a list of all SbUnoMethod-Instances
-static SbUnoMethod* pFirst = nullptr;
+static SbUnoMethod* s_pFirst = nullptr;
 
 void clearUnoMethodsForBasic( StarBASIC const * pBasic )
 {
-    SbUnoMethod* pMeth = pFirst;
+    SbUnoMethod* pMeth = s_pFirst;
     while( pMeth )
     {
         SbxObject* pObject = pMeth->GetParent();
@@ -2443,8 +2443,8 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic )
                 // set the new StarBASIC as the parent of the module
                 // pObject->SetParent( NULL );
 
-                if( pMeth == pFirst )
-                    pFirst = pMeth->pNext;
+                if( pMeth == s_pFirst )
+                    s_pFirst = pMeth->pNext;
                 else if( pMeth->pPrev )
                     pMeth->pPrev->pNext = pMeth->pNext;
                 if( pMeth->pNext )
@@ -2457,7 +2457,7 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic )
                 pObject->SbxValue::Clear();
 
                 // start from the beginning after object clearing, the cycle will end since the method is removed each time
-                pMeth = pFirst;
+                pMeth = s_pFirst;
             }
             else
                 pMeth = pMeth->pNext;
@@ -2469,7 +2469,7 @@ void clearUnoMethodsForBasic( StarBASIC const * pBasic )
 
 void clearUnoMethods()
 {
-    SbUnoMethod* pMeth = pFirst;
+    SbUnoMethod* pMeth = s_pFirst;
     while( pMeth )
     {
         pMeth->SbxValue::Clear();
@@ -2492,9 +2492,9 @@ SbUnoMethod::SbUnoMethod
     pParamInfoSeq = nullptr;
 
     // enregister the method in a list
-    pNext = pFirst;
+    pNext = s_pFirst;
     pPrev = nullptr;
-    pFirst = this;
+    s_pFirst = this;
     if( pNext )
         pNext->pPrev = this;
 }
@@ -2503,8 +2503,8 @@ SbUnoMethod::~SbUnoMethod()
 {
     pParamInfoSeq.reset();
 
-    if( this == pFirst )
-        pFirst = pNext;
+    if( this == s_pFirst )
+        s_pFirst = pNext;
     else if( pPrev )
         pPrev->pNext = pNext;
     if( pNext )
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index 9726c9869525..3e76f6faa9ce 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -61,23 +61,23 @@ public:
 
 namespace
 {
-constexpr OUString givenname(u"givenname"_ustr);
-constexpr OUString sn(u"sn"_ustr);
-constexpr char fathersname[]("fathersname");
-constexpr OUString initials(u"initials"_ustr);
-constexpr OUString street(u"street"_ustr);
-constexpr OUString l(u"l"_ustr);
-constexpr OUString st(u"st"_ustr);
-constexpr char apartment[]("apartment");
-constexpr OUString postalcode(u"postalcode"_ustr);
-constexpr OUString c(u"c"_ustr);
-constexpr OUString o(u"o"_ustr);
-constexpr char position[]("position");
-constexpr OUString title(u"title"_ustr);
-constexpr OUString homephone(u"homephone"_ustr);
-constexpr OUString telephonenumber(u"telephonenumber"_ustr);
-constexpr OUString facsimiletelephonenumber(u"facsimiletelephonenumber"_ustr);
-constexpr OUString mail(u"mail"_ustr);
+constexpr OUString _givenname(u"givenname"_ustr);
+constexpr OUString _sn(u"sn"_ustr);
+constexpr char _fathersname[]("fathersname");
+constexpr OUString _initials(u"initials"_ustr);
+constexpr OUString _street(u"street"_ustr);
+constexpr OUString _l(u"l"_ustr);
+constexpr OUString _st(u"st"_ustr);
+constexpr char _apartment[]("apartment");
+constexpr OUString _postalcode(u"postalcode"_ustr);
+constexpr OUString _c(u"c"_ustr);
+constexpr OUString _o(u"o"_ustr);
+constexpr char _position[]("position");
+constexpr OUString _title(u"title"_ustr);
+constexpr OUString _homephone(u"homephone"_ustr);
+constexpr OUString _telephonenumber(u"telephonenumber"_ustr);
+constexpr OUString _facsimiletelephonenumber(u"facsimiletelephonenumber"_ustr);
+constexpr OUString _mail(u"mail"_ustr);
 
 // Backend class implementing access to Active Directory user data. It caches its encoded data
 // in a configuration entry, to allow reusing it when user later doesn't have access to AD DC
@@ -107,20 +107,20 @@ public:
                                          "ADsGetObject failed");
             // Fetch all the required information right now, when we know to have access to AD
             // (later the connection may already be lost)
-            m_aMap[givenname] = Str(pUser, &IADsUser::get_FirstName);
-            m_aMap[sn] = Str(pUser, &IADsUser::get_LastName);
-            m_aMap[initials] = Str(pUser, L"initials");
-            m_aMap[street] = Str(pUser, L"streetAddress");
-            m_aMap[l] = Str(pUser, L"l");
-            m_aMap[st] = Str(pUser, L"st");
-            m_aMap[postalcode] = Str(pUser, L"postalCode");
-            m_aMap[c] = Str(pUser, L"co");
-            m_aMap[o] = Str(pUser, L"company");
-            m_aMap[title] = Str(pUser, &IADsUser::get_Title);
-            m_aMap[homephone] = Str(pUser, L"homePhone");
-            m_aMap[telephonenumber] = Str(pUser, L"TelephoneNumber");
-            m_aMap[facsimiletelephonenumber] = Str(pUser, L"facsimileTelephoneNumber");
-            m_aMap[mail] = Str(pUser, &IADsUser::get_EmailAddress);
+            m_aMap[_givenname] = Str(pUser, &IADsUser::get_FirstName);
+            m_aMap[_sn] = Str(pUser, &IADsUser::get_LastName);
+            m_aMap[_initials] = Str(pUser, L"initials");
+            m_aMap[_street] = Str(pUser, L"streetAddress");
+            m_aMap[_l] = Str(pUser, L"l");
+            m_aMap[_st] = Str(pUser, L"st");
+            m_aMap[_postalcode] = Str(pUser, L"postalCode");
+            m_aMap[_c] = Str(pUser, L"co");
+            m_aMap[_o] = Str(pUser, L"company");
+            m_aMap[_title] = Str(pUser, &IADsUser::get_Title);
+            m_aMap[_homephone] = Str(pUser, L"homePhone");
+            m_aMap[_telephonenumber] = Str(pUser, L"TelephoneNumber");
+            m_aMap[_facsimiletelephonenumber] = Str(pUser, L"facsimileTelephoneNumber");
+            m_aMap[_mail] = Str(pUser, &IADsUser::get_EmailAddress);
 
             CacheData();
         }
@@ -131,20 +131,20 @@ public:
         }
     }
 
-    virtual OUString GetGivenName() override { return m_aMap[givenname]; }
-    virtual OUString GetSn() override { return m_aMap[sn]; }
-    virtual OUString GetInitials() override { return m_aMap[initials]; }
-    virtual OUString GetStreet() override { return m_aMap[street]; }
-    virtual OUString GetCity() override { return m_aMap[l]; }
-    virtual OUString GetState() override { return m_aMap[st]; }
-    virtual OUString GetPostalCode() override { return m_aMap[postalcode]; }
-    virtual OUString GetCountry() override { return m_aMap[c]; }
-    virtual OUString GetOrganization() override { return m_aMap[o]; }
-    virtual OUString GetTitle() override { return m_aMap[title]; }
-    virtual OUString GetHomePhone() override { return m_aMap[homephone]; }
-    virtual OUString GetTelephoneNumber() override { return m_aMap[telephonenumber]; }
-    virtual OUString GetFaxNumber() override { return m_aMap[facsimiletelephonenumber]; }
-    virtual OUString GetMail() override { return m_aMap[mail]; }
+    virtual OUString GetGivenName() override { return m_aMap[_givenname]; }
+    virtual OUString GetSn() override { return m_aMap[_sn]; }
+    virtual OUString GetInitials() override { return m_aMap[_initials]; }
+    virtual OUString GetStreet() override { return m_aMap[_street]; }
+    virtual OUString GetCity() override { return m_aMap[_l]; }
+    virtual OUString GetState() override { return m_aMap[_st]; }
+    virtual OUString GetPostalCode() override { return m_aMap[_postalcode]; }
+    virtual OUString GetCountry() override { return m_aMap[_c]; }
+    virtual OUString GetOrganization() override { return m_aMap[_o]; }
+    virtual OUString GetTitle() override { return m_aMap[_title]; }
+    virtual OUString GetHomePhone() override { return m_aMap[_homephone]; }
+    virtual OUString GetTelephoneNumber() override { return m_aMap[_telephonenumber]; }
+    virtual OUString GetFaxNumber() override { return m_aMap[_facsimiletelephonenumber]; }
+    virtual OUString GetMail() override { return m_aMap[_mail]; }
 
 private:
     typedef HRESULT (__stdcall IADsUser::*getstrfunc)(BSTR*);
@@ -186,20 +186,20 @@ private:
         try
         {
             OUString sCachedData = "user=" + m_sUserDN // user DN
-                                   + "\0" + givenname + "=" + GetGivenName() // 1st name
-                                   + "\0" + sn + "=" + GetSn() // sn
-                                   + "\0" + initials + "=" + GetInitials() // initials
-                                   + "\0" + street + "=" + GetStreet() // street
-                                   + "\0" + l + "=" + GetCity() // l
-                                   + "\0" + st + "=" + GetState() // st
-                                   + "\0" + postalcode + "=" + GetPostalCode() // p.code
-                                   + "\0" + c + "=" + GetCountry() // c
-                                   + "\0" + o + "=" + GetOrganization() // o
-                                   + "\0" + title + "=" + GetTitle() // title
-                                   + "\0" + homephone + "=" + GetHomePhone() // h.phone
-                                   + "\0" + telephonenumber + "=" + GetTelephoneNumber() // tel
-                                   + "\0" + facsimiletelephonenumber + "=" + GetFaxNumber() // fax
-                                   + "\0" + mail + "=" + GetMail(); // mail
+                                   + "\0" + _givenname + "=" + GetGivenName() // 1st name
+                                   + "\0" + _sn + "=" + GetSn() // sn
+                                   + "\0" + _initials + "=" + GetInitials() // initials
+                                   + "\0" + _street + "=" + GetStreet() // street
+                                   + "\0" + _l + "=" + GetCity() // l
+                                   + "\0" + _st + "=" + GetState() // st
+                                   + "\0" + _postalcode + "=" + GetPostalCode() // p.code
+                                   + "\0" + _c + "=" + GetCountry() // c
+                                   + "\0" + _o + "=" + GetOrganization() // o
+                                   + "\0" + _title + "=" + GetTitle() // title
+                                   + "\0" + _homephone + "=" + GetHomePhone() // h.phone
+                                   + "\0" + _telephonenumber + "=" + GetTelephoneNumber() // tel
+                                   + "\0" + _facsimiletelephonenumber + "=" + GetFaxNumber() // fax
+                                   + "\0" + _mail + "=" + GetMail(); // mail
             const css::uno::Sequence<sal_Int8> seqCachedData(
                 reinterpret_cast<const sal_Int8*>(sCachedData.getStr()),
                 sCachedData.getLength() * sizeof(sal_Unicode));
@@ -330,71 +330,71 @@ css::uno::Any WinUserInfoBe::getPropertyValue(OUString const& PropertyName)
     OUString sValue;
     // Only process the first argument of possibly multiple space- or comma-separated arguments
     OUString sToken = PropertyName.getToken(0, ' ').getToken(0, ',');
-    if (sToken == givenname)
+    if (sToken == _givenname)
     {
         sValue = m_pImpl->GetGivenName();
     }
-    else if (sToken == sn)
+    else if (sToken == _sn)
     {
         sValue = m_pImpl->GetSn();
     }
-    else if (sToken == fathersname)
+    else if (sToken == _fathersname)
     {
         sValue = m_pImpl->GetFathersname();
     }
-    else if (sToken == initials)
+    else if (sToken == _initials)
     {
         sValue = m_pImpl->GetInitials();
     }
-    else if (sToken == street)
+    else if (sToken == _street)
     {
         sValue = m_pImpl->GetStreet();
     }
-    else if (sToken == l)
+    else if (sToken == _l)
     {
         sValue = m_pImpl->GetCity();
     }
-    else if (sToken == st)
+    else if (sToken == _st)
     {
         sValue = m_pImpl->GetState();
     }
-    else if (sToken == apartment)
+    else if (sToken == _apartment)
     {
         sValue = m_pImpl->GetApartment();
     }
-    else if (sToken == postalcode)
+    else if (sToken == _postalcode)
     {
         sValue = m_pImpl->GetPostalCode();
     }
-    else if (sToken == c)
+    else if (sToken == _c)
     {
         sValue = m_pImpl->GetCountry();
     }
-    else if (sToken == o)
+    else if (sToken == _o)
     {
         sValue = m_pImpl->GetOrganization();
     }
-    else if (sToken == position)
+    else if (sToken == _position)
     {
         sValue = m_pImpl->GetPosition();
     }
-    else if (sToken == title)
+    else if (sToken == _title)
     {
         sValue = m_pImpl->GetTitle();
     }
-    else if (sToken == homephone)
+    else if (sToken == _homephone)
     {
         sValue = m_pImpl->GetHomePhone();
     }
-    else if (sToken == telephonenumber)
+    else if (sToken == _telephonenumber)
     {
         sValue = m_pImpl->GetTelephoneNumber();
     }
-    else if (sToken == facsimiletelephonenumber)
+    else if (sToken == _facsimiletelephonenumber)
     {
         sValue = m_pImpl->GetFaxNumber();
     }
-    else if (sToken == mail)
+    else if (sToken == _mail)
     {
         sValue = m_pImpl->GetMail();
     }
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 8c003bcdb438..4151c61798f2 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2408,7 +2408,7 @@ void ShapeExport::WriteTableCellProperties(const Reference< XPropertySet>& xCell
     mpFS->endElementNS( XML_a, XML_tcPr );
 }
 
-void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& rBorderLine)
+void ShapeExport::WriteBorderLine(const sal_Int32 xml_line_element, const BorderLine2& rBorderLine)
 {
 // While importing the table cell border line width, it converts EMU->Hmm then divided result by 2.
 // To get original value of LineWidth need to multiple by 2.
@@ -2418,7 +2418,7 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r
 
     if ( nBorderWidth > 0 )
     {
-        mpFS->startElementNS(XML_a, XML_line, XML_w, OString::number(nBorderWidth));
+        mpFS->startElementNS(XML_a, xml_line_element, XML_w, OString::number(nBorderWidth));
         if ( rBorderLine.Color == sal_Int32( COL_AUTO ) )
             mpFS->singleElementNS(XML_a, XML_noFill);
         else
@@ -2446,13 +2446,13 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r
                 break;
         }
         mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, sBorderStyle);
-        mpFS->endElementNS(XML_a, XML_line);
+        mpFS->endElementNS(XML_a, xml_line_element);
     }
     else if( nBorderWidth == 0)
     {
-        mpFS->startElementNS(XML_a, XML_line);
+        mpFS->startElementNS(XML_a, xml_line_element);
         mpFS->singleElementNS(XML_a, XML_noFill);
-        mpFS->endElementNS( XML_a, XML_line );
+        mpFS->endElementNS(XML_a, xml_line_element);
     }
 }
 
diff --git a/sw/source/core/bastyp/proofreadingiterator.cxx b/sw/source/core/bastyp/proofreadingiterator.cxx
index 64c0ac2b1d09..c767351c3930 100644
--- a/sw/source/core/bastyp/proofreadingiterator.cxx
+++ b/sw/source/core/bastyp/proofreadingiterator.cxx
@@ -20,7 +20,7 @@
 
 namespace
 {
-css::uno::Reference<css::linguistic2::XProofreadingIterator> instance;
+css::uno::Reference<css::linguistic2::XProofreadingIterator> _instance;
 bool disposed = false;
 
 void doDispose(css::uno::Reference<css::linguistic2::XProofreadingIterator> const& inst)
@@ -42,7 +42,7 @@ sw::proofreadingiterator::get(css::uno::Reference<css::uno::XComponentContext> c
     bool disp;
     {
         SolarMutexGuard g;
-        instance = inst;
+        _instance = inst;
         disp = disposed;
     }
     if (disp)
@@ -57,8 +57,8 @@ void sw::proofreadingiterator::dispose()
     css::uno::Reference<css::linguistic2::XProofreadingIterator> inst;
     {
         SolarMutexGuard g;
-        inst = instance;
-        instance.clear();
+        inst = _instance;
+        _instance.clear();
         disposed = true;
     }
     doDispose(inst);
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 065b06019635..302d74375f5c 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -1202,7 +1202,7 @@ sal_uInt16 WinSalInfoPrinter::GetPaperBinBySourceIndex( const ImplJobSetup* pSet
     if (nBins != GDI_ERROR)
     {
         auto pBuffer = std::make_unique<sal_uInt16[]>(nBins);
-        DWORD nBins = ImplDeviceCaps( this, DC_BINS, reinterpret_cast<BYTE*>(pBuffer.get()), pSetupData );
+        nBins = ImplDeviceCaps( this, DC_BINS, reinterpret_cast<BYTE*>(pBuffer.get()), pSetupData );
         if (nBins != GDI_ERROR)
         {
             for (DWORD nBin = 0; nBin < nBins; ++nBin)