incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1363696 - in /incubator/ooo/trunk/main/svtools/source: edit/textdoc.cxx filter/sgvspln.cxx filter/sgvtext.cxx
Date Fri, 20 Jul 2012 09:45:38 GMT
Author: ydario
Date: Fri Jul 20 09:45:38 2012
New Revision: 1363696

URL: http://svn.apache.org/viewvc?rev=1363696&view=rev
Log:
i118923 - OS/2 port: PM2 is no longer supported as macro, replaced with OS2 or deleted (old
compilers).

Modified:
    incubator/ooo/trunk/main/svtools/source/edit/textdoc.cxx
    incubator/ooo/trunk/main/svtools/source/filter/sgvspln.cxx
    incubator/ooo/trunk/main/svtools/source/filter/sgvtext.cxx

Modified: incubator/ooo/trunk/main/svtools/source/edit/textdoc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/edit/textdoc.cxx?rev=1363696&r1=1363695&r2=1363696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/edit/textdoc.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/edit/textdoc.cxx Fri Jul 20 09:45:38 2012
@@ -34,9 +34,6 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCha
 // Vergleichmethode wird von QuickSort gerufen...
 
 EXTERN_C
-#if defined( PM2 ) && (!defined( CSET ) && !defined ( MTW ) && !defined(
WTC ))
-int _stdcall
-#else
 #ifdef WNT
 #if _MSC_VER >= 1200
 int __cdecl
@@ -46,7 +43,6 @@ int _cdecl
 #else
 int
 #endif
-#endif
 
 CompareStart( const void* pFirst, const void* pSecond )
 {

Modified: incubator/ooo/trunk/main/svtools/source/filter/sgvspln.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/filter/sgvspln.cxx?rev=1363696&r1=1363695&r2=1363696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/filter/sgvspln.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/filter/sgvspln.cxx Fri Jul 20 09:45:38 2012
@@ -29,10 +29,6 @@
 
 #include <tools/poly.hxx>
 
-#if defined( PM2 ) && defined( __BORLANDC__ )
-#pragma option -Od
-#endif
-
 extern "C" {
 
 /*.pn 277 */

Modified: incubator/ooo/trunk/main/svtools/source/filter/sgvtext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/filter/sgvtext.cxx?rev=1363696&r1=1363695&r2=1363696&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/filter/sgvtext.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/filter/sgvtext.cxx Fri Jul 20 09:45:38 2012
@@ -613,7 +613,7 @@ sal_uInt16 SetTextContext(OutputDevice& 
 		switch (Atr.GetFont()) {
 		  case 92500: case 92501: case 92504: case 92505:
 		  {
-#if defined(WNT) || defined(PM2)
+#if defined(WNT) || defined(OS2)
 			  FNam=String::CreateFromAscii( "Times New Roman" );  // CG Times ist unter Windows und
OS/2 Times New Roman
 #else
 			  FNam=String::CreateFromAscii( "Times" );            // ansonsten ist das einfach Times



Mime
View raw message