mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

must change: System::GetLanguage removed

Browse Source
This commit is contained in:
Oliver Specht
2001-07-11 10:48:57 +00:00
parent 1034019f70
commit 6f9af22ea7
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
svx/source/items/numitem.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: numitem.cxx,v $ * $RCSfile: numitem.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: os $ $Date: 2001-07-02 14:25:11 $ * last change: $Author: os $ $Date: 2001-07-11 11:48:57 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -82,9 +82,6 @@
#include <vcl/window.hxx> #include <vcl/window.hxx>
#endif #endif
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#ifndef _SV_SYSTEM_HXX //autogen
#include <vcl/system.hxx>
#endif
#ifndef _UNO_LINGU_HXX #ifndef _UNO_LINGU_HXX
#include <unolingu.hxx> #include <unolingu.hxx>
#endif #endif
@@ -166,9 +163,7 @@ SvxNumberType::~SvxNumberType()
---------------------------------------------------------------------------*/ ---------------------------------------------------------------------------*/
String SvxNumberType::GetNumStr( ULONG nNo ) const String SvxNumberType::GetNumStr( ULONG nNo ) const
{ {
LanguageType eLang = System::GetLanguage(); LanguageType eLang = Application::GetSettings().GetLanguage();
if(LANGUAGE_SYSTEM == eLang)
eLang = ::GetSystemLanguage();
Locale aLocale = SvxCreateLocale(eLang); Locale aLocale = SvxCreateLocale(eLang);
return GetNumStr( nNo, aLocale ); return GetNumStr( nNo, aLocale );
} }
@@ -641,9 +636,7 @@ SvxNumRule::SvxNumRule(ULONG nFeatures, USHORT nLevels, BOOL bCont, SvxNumRuleTy
eNumberingType(eType) eNumberingType(eType)
{ {
++nRefCount; ++nRefCount;
LanguageType eLang = System::GetLanguage(); LanguageType eLang = Application::GetSettings().GetLanguage();
if(LANGUAGE_SYSTEM == eLang)
eLang = ::GetSystemLanguage();
aLocale = SvxCreateLocale(eLang); aLocale = SvxCreateLocale(eLang);
for(USHORT i = 0; i < SVX_MAX_NUM; i++) for(USHORT i = 0; i < SVX_MAX_NUM; i++)
{ {
@@ -694,9 +687,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
SvxNumRule::SvxNumRule(SvStream &rStream) SvxNumRule::SvxNumRule(SvStream &rStream)
{ {
++nRefCount; ++nRefCount;
LanguageType eLang = System::GetLanguage(); LanguageType eLang = Application::GetSettings().GetLanguage();
if(LANGUAGE_SYSTEM == eLang)
eLang = ::GetSystemLanguage();
aLocale = SvxCreateLocale(eLang); aLocale = SvxCreateLocale(eLang);
USHORT nVersion; USHORT nVersion;
USHORT nTemp; USHORT nTemp;