diff options
author | David Tardon <dtardon@redhat.com> | 2012-03-07 12:54:57 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-03-07 14:01:30 +0100 |
commit | a81dca114b355a32cd903ea308c7edc1d23d3174 (patch) | |
tree | e3daa9b6d4639c7ab4e2796cb1e97c49626f2082 /sal | |
parent | WaE: deprecated conversion from string constant to 'sal_Char*' (diff) | |
download | core-a81dca114b355a32cd903ea308c7edc1d23d3174.tar.gz core-a81dca114b355a32cd903ea308c7edc1d23d3174.zip |
WaE: declaration of 'aTmpPath' shadows a previous local
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/w32/profile.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index c6b3cced936f..b44758e21058 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -2504,16 +2504,16 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str } else { - ::osl::LongPathBuffer< sal_Char > aTmpPath( MAX_LONG_PATH ); + ::osl::LongPathBuffer< sal_Char > aTmpPath2( MAX_LONG_PATH ); int n; if ((n = WideCharToMultiByte( - CP_ACP,0, ::osl::mingw_reinterpret_cast<LPCWSTR>(aPath), -1, aTmpPath, - aTmpPath.getBufSizeInSymbols(), NULL, NULL)) + CP_ACP,0, ::osl::mingw_reinterpret_cast<LPCWSTR>(aPath), -1, aTmpPath2, + aTmpPath2.getBufSizeInSymbols(), NULL, NULL)) > 0) { - strcpy(aTmpPath + n, SVERSION_USER); - if (access(aTmpPath, 0) >= 0) + strcpy(aTmpPath2 + n, SVERSION_USER); + if (access(aTmpPath2, 0) >= 0) { dwPathLen += MultiByteToWideChar( CP_ACP, 0, SVERSION_USER, -1, |