fix: #87257# class International removed

svx/source/items/paperinf.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paperinf.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:21 $
+ *  last change: $Author: pb $ $Date: 2001-07-10 11:15:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -246,21 +246,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter )
         const Size aInvalidSize;
 
         if ( aPaperSize == aInvalidSize )
-        {
-#ifdef OS2
-            // Workaround fuer OS/2, da class Printer unter OS/2 Macken hat
-            LanguageType eLType =
-                GetpApp()->GetAppInternational().GetLanguage();
-
-            if ( eLType == LANGUAGE_ENGLISH_US ||
-                 eLType == LANGUAGE_ENGLISH_UK )
-                return GetPaperSize(SVX_PAPER_LETTER);
-            else
-                return GetPaperSize(SVX_PAPER_A4);
-#else
             return GetPaperSize(SVX_PAPER_A4);
-#endif
-        }
         MapMode aMap1 = pPrinter->GetMapMode();
         MapMode aMap2;
 

svx/source/items/paraitem.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paraitem.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: mib $ $Date: 2001-07-05 09:36:38 $
+ *  last change: $Author: pb $ $Date: 2001-07-10 11:15:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,13 @@
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
 #include <com/sun/star/uno/Sequence.hxx>
 #endif
+#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#include <unotools/localedatawrapper.hxx>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
+#include <comphelper/processfactory.hxx>
+#endif
+
 #include <comphelper/types.hxx>
 
 using namespace ::rtl;
@@ -874,7 +881,8 @@ SvxTabStop::SvxTabStop()
 {
     nTabPos = 0;
     eAdjustment = SVX_TAB_ADJUST_LEFT;
-    cDecimal = GetpApp()->GetAppInternational().GetNumDecimalSep();
+    LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+    cDecimal = aLocaleWrapper.getNumDecimalSep().GetChar(0);
     cFill = cDfltFillChar;
 }
 
@@ -887,8 +895,10 @@ SvxTabStop::SvxTabStop( const long nPos, const SvxTabAdjust eAdjst,
     eAdjustment = eAdjst;
 
     if ( cDfltDecimalChar == cDec )
-        // default aus der International-Klasse besorgen
-        cDecimal = GetpApp()->GetAppInternational().GetNumDecimalSep();
+    {
+        LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+        cDecimal = aLocaleWrapper.getNumDecimalSep().GetChar(0);
+    }
     else
         cDecimal = cDec;
     cFill = cFil;

svx/source/stbctrls/pszctrl.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pszctrl.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-23 09:32:02 $
+ *  last change: $Author: pb $ $Date: 2001-07-10 11:22:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -112,6 +112,13 @@
 
 #include "dialogs.hrc"
 
+#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#include <unotools/localedatawrapper.hxx>
+#endif
+#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
+#include <comphelper/processfactory.hxx>
+#endif
+
 // -----------------------------------------------------------------------
 
 /*  [Beschreibung]
@@ -136,7 +143,8 @@ String GetMetricStr_Impl( long nVal, SfxMapUnit eUnit )
         eInUnit = FUNIT_100TH_MM;
 
     String sMetric;
-    char cSep = GetpApp()->GetAppInternational().GetNumDecimalSep();
+    LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+    const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep().GetChar(0);
     long nConvVal = MetricField::ConvertValue( nVal * 100, 0L, 0,
                                                eInUnit, eOutUnit );
 

svx/source/tbxctrls/tbcontrl.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbcontrl.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: sj $ $Date: 2001-05-22 10:41:32 $
+ *  last change: $Author: pb $ $Date: 2001-07-10 11:20:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1693,7 +1693,7 @@ void SvxTbxButtonColorUpdater::Update( const Color& rColor )
 void SvxTbxButtonColorUpdater::DrawChar( VirtualDevice& rVirDev, const Color& rCol )
 {
     Font aOldFont = rVirDev.GetFont();
-    Font aFont( System::GetStandardFont( STDFONT_ROMAN ) );
+    Font aFont = aOldFont;
     Size aSz = aFont.GetSize();
     aSz.Height() = theBmpSize.Height();
     aFont.SetSize( aSz );