summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-04-28 13:24:36 +0200
committerEike Rathke <erack@redhat.com>2015-04-28 13:26:28 +0200
commit9fdde6457d3d07b01c4bfc300637533a7dccb920 (patch)
tree86c139b07f4af260a65e44c19669f7735e343866
parentf318e305b6afa715ef759b8589823da53b812a88 (diff)
use sensible variable naming, tdf#85432 follow-up
Change-Id: Ibb468ff3b4c3210c4c5df60fbd42d74884bbfdb3
-rw-r--r--cui/source/dialogs/about.cxx22
-rw-r--r--cui/source/inc/about.hxx2
2 files changed, 12 insertions, 12 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;
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 132ab541702e..c9c6983b0940 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -49,7 +49,7 @@ private:
OUString m_aBasedDerivedTextStr;
OUString m_aCreditsLinkStr;
OUString m_sBuildStr;
- OUString m_pLocaleStr;
+ OUString m_aLocaleStr;
void StyleControls();
void SetLogo();