summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2001-07-06 11:22:09 +0000
committerjp <jp@openoffice.org>2001-07-06 11:22:09 +0000
commitdf6d84b599dfcb7a13ce9a4966c443fc90b7d0a5 (patch)
treee640c5e0ecab33f7ff50c06b25cab014886e16f6
parent98f4155a7e921b1d7ff8aafaffedb628ecbd0bf8 (diff)
remove GetAppInternational
-rw-r--r--sw/source/core/bastyp/init.cxx7
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx14
2 files changed, 9 insertions, 12 deletions
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 5a1d17824a..17bd2fdbb0 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: init.cxx,v $
*
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
*
- * last change: $Author: mib $ $Date: 2001-07-04 14:17:46 $
+ * last change: $Author: jp $ $Date: 2001-07-06 12:22:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1035,8 +1035,7 @@ void SwCalendarWrapper::LoadCalendar( USHORT eLang, const String& rUniqueId )
ULONG GetAppLanguage()
{
-// return Application::GetAppInternational().GetFormatLanguage();
- return Application::GetAppInternational().GetLanguage();
+ return Application::GetSettings().GetLanguage();
}
CollatorWrapper& GetAppCollator()
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index f12de484cd..ff12c71b5f 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: attrdesc.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: er $ $Date: 2001-05-13 03:33:17 $
+ * last change: $Author: jp $ $Date: 2001-07-06 12:21:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -177,17 +177,12 @@ static sal_Char __READONLY_DATA sKomma[] = ", ";
{
SfxItemIter aIter( *this );
const IntlWrapper rInt( ::comphelper::getProcessServiceFactory(),
- Application::GetAppInternational().GetLanguage() );
+ GetAppLanguage() );
while( TRUE )
{
-#if SUPD>546
aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric,
ePresMetric, aStr,
&rInt );
-#else
- aIter.GetCurItem()->GetPresentation( ePres, eCoreMetric,
- ePresMetric, aStr );
-#endif
if( rText.Len() && aStr.Len() )
rText += String::CreateFromAscii(sKomma);
rText += aStr;
@@ -1265,6 +1260,9 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation(
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.5 2001/05/13 03:33:17 er
+ replaced International with IntlWrapper
+
Revision 1.4 2001/02/23 12:45:30 os
Complete use of DefaultNumbering component