summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-12-04 23:05:22 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2015-12-27 16:51:27 +0100
commit672b31d516888f0f1cd0fbfdd3fafc430a233dcb (patch)
treed57a445e48f9c31a10152b6f9407f5b143ebc3ac /sc
parent855128d61a6f376f24bf33f7d8f2add8df15353b (diff)
Lnge to Language in ScNumFormatAbbrev member names
Change-Id: I226e857eb9c3d30a40dbe6afcc395b109e836674
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/zforauto.hxx14
-rw-r--r--sc/source/core/tool/zforauto.cxx30
2 files changed, 22 insertions, 22 deletions
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index 956daf108340..4e9be263cb0a 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -29,8 +29,8 @@ class SvNumberFormatter;
class ScNumFormatAbbrev
{
OUString sFormatstring;
- LanguageType eLnge;
- LanguageType eSysLnge;
+ LanguageType eLanguage;
+ LanguageType eSysLanguage;
public:
ScNumFormatAbbrev();
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
@@ -42,17 +42,17 @@ public:
inline bool operator==(const ScNumFormatAbbrev& rNumFormat) const
{
return ((sFormatstring == rNumFormat.sFormatstring)
- && (eLnge == rNumFormat.eLnge)
- && (eSysLnge == rNumFormat.eSysLnge));
+ && (eLanguage == rNumFormat.eLanguage)
+ && (eSysLanguage == rNumFormat.eSysLanguage));
}
inline ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat)
{
sFormatstring = rNumFormat.sFormatstring;
- eLnge = rNumFormat.eLnge;
- eSysLnge = rNumFormat.eSysLnge;
+ eLanguage = rNumFormat.eLanguage;
+ eSysLanguage = rNumFormat.eSysLanguage;
return *this;
}
- inline LanguageType GetLanguage() const { return eLnge; }
+ inline LanguageType GetLanguage() const { return eLanguage; }
};
#endif
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index 22412ef570e9..6551c9c3c4d5 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -27,15 +27,15 @@
ScNumFormatAbbrev::ScNumFormatAbbrev() :
sFormatstring ( "Standard" ),
- eLnge (LANGUAGE_SYSTEM),
- eSysLnge (LANGUAGE_GERMAN) // otherwise "Standard" does not fit
+ eLanguage (LANGUAGE_SYSTEM),
+ eSysLanguage (LANGUAGE_GERMAN) // otherwise "Standard" does not fit
{
}
ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) :
sFormatstring (aFormat.sFormatstring),
- eLnge (aFormat.eLnge),
- eSysLnge (aFormat.eSysLnge)
+ eLanguage (aFormat.eLanguage),
+ eSysLanguage (aFormat.eSysLanguage)
{
}
@@ -50,16 +50,16 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, rtl_TextEncoding eByteStrSet )
sal_uInt16 nSysLang, nLang;
sFormatstring = rStream.ReadUniOrByteString( eByteStrSet );
rStream.ReadUInt16( nSysLang ).ReadUInt16( nLang );
- eLnge = (LanguageType) nLang;
- eSysLnge = (LanguageType) nSysLang;
- if ( eSysLnge == LANGUAGE_SYSTEM ) // old versions did write it
- eSysLnge = Application::GetSettings().GetLanguageTag().getLanguageType();
+ eLanguage = (LanguageType) nLang;
+ eSysLanguage = (LanguageType) nSysLang;
+ if ( eSysLanguage == LANGUAGE_SYSTEM ) // old versions did write it
+ eSysLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
}
void ScNumFormatAbbrev::Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const
{
rStream.WriteUniOrByteString( sFormatstring, eByteStrSet );
- rStream.WriteUInt16( eSysLnge ).WriteUInt16( eLnge );
+ rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eLanguage );
}
void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
@@ -68,15 +68,15 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uInt32 nFormat,
const SvNumberformat* pFormat = rFormatter.GetEntry(nFormat);
if (pFormat)
{
- eSysLnge = Application::GetSettings().GetLanguageTag().getLanguageType();
- eLnge = pFormat->GetLanguage();
+ eSysLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
+ eLanguage = pFormat->GetLanguage();
sFormatstring = pFormat->GetFormatstring();
}
else
{
OSL_FAIL("SCNumFormatAbbrev:: unknown number format");
- eLnge = LANGUAGE_SYSTEM;
- eSysLnge = LANGUAGE_GERMAN; // otherwise "Standard" does not fit
+ eLanguage = LANGUAGE_SYSTEM;
+ eSysLanguage = LANGUAGE_GERMAN; // otherwise "Standard" does not fit
sFormatstring = "Standard";
}
}
@@ -86,8 +86,8 @@ sal_uInt32 ScNumFormatAbbrev::GetFormatIndex( SvNumberFormatter& rFormatter)
short nType;
bool bNewInserted;
sal_Int32 nCheckPos;
- return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLnge,
- eSysLnge, nType, bNewInserted, nCheckPos);
+ return rFormatter.GetIndexPuttingAndConverting( sFormatstring, eLanguage,
+ eSysLanguage, nType, bNewInserted, nCheckPos);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */