diff options
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/about.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index ed4fcc337396..63028087c105 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -76,7 +76,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent) m_aVersionTextStr = m_pVersion->GetText(); m_aBasedTextStr = get<FixedText>("libreoffice")->GetText(); m_aBasedDerivedTextStr = get<FixedText>("derived")->GetText(); - m_pLocaleStr = get<FixedText>("locale")->GetText();; + m_aLocaleStr = get<FixedText>("locale")->GetText();; m_pVersion->SetText(GetVersionString()); @@ -234,7 +234,7 @@ OUString AboutDialog::GetBuildId() OUString AboutDialog::GetLocaleString() { - OUString pLocaleStr; + OUString aLocaleStr; rtl_Locale * pLocale; osl_getProcessLocale( &pLocale ); @@ -242,14 +242,14 @@ OUString AboutDialog::GetLocaleString() if ( pLocale && pLocale->Language ) { if (pLocale->Country && rtl_uString_getLength( pLocale->Country) > 0) - pLocaleStr = OUString(pLocale->Language) + "_" + OUString(pLocale->Country); + aLocaleStr = OUString(pLocale->Language) + "_" + OUString(pLocale->Country); else - pLocaleStr = OUString(pLocale->Language); + aLocaleStr = OUString(pLocale->Language); if (pLocale->Variant && rtl_uString_getLength( pLocale->Variant) > 0) - pLocaleStr += OUString(pLocale->Variant); + aLocaleStr += OUString(pLocale->Variant); } - return pLocaleStr; + return aLocaleStr; } OUString AboutDialog::GetVersionString() @@ -264,7 +264,7 @@ OUString AboutDialog::GetVersionString() OUString sBuildId = GetBuildId(); - OUString pLocaleStr = GetLocaleString(); + OUString aLocaleStr = GetLocaleString(); if (!sBuildId.trim().isEmpty()) { @@ -282,15 +282,15 @@ OUString AboutDialog::GetVersionString() sVersion += "\n" EXTRA_BUILDID; } - if (!pLocaleStr.trim().isEmpty()) + if (!aLocaleStr.trim().isEmpty()) { sVersion += "\n"; - if (m_pLocaleStr.indexOf("$LOCALE") == -1) + if (m_aLocaleStr.indexOf("$LOCALE") == -1) { SAL_WARN( "cui.dialogs", "translated locale string in translations doesn't contain $LOCALE placeholder" ); - m_pLocaleStr += " $LOCALE"; + m_aLocaleStr += " $LOCALE"; } - sVersion += m_pLocaleStr.replaceAll("$LOCALE", pLocaleStr); + sVersion += m_aLocaleStr.replaceAll("$LOCALE", aLocaleStr); } return sVersion; |