[Libreoffice-commits] .: starmath/inc sw/inc sw/source

[François Tigeot]

 starmath/inc/applicat.hxx           |    4 ----
 sw/inc/swtypes.hxx                  |    3 ---
 sw/source/core/doc/doc.cxx          |    2 +-
 sw/source/core/layout/laycache.cxx  |    4 ----
 sw/source/core/txtnode/fntcache.cxx |    4 ++--
 sw/source/core/txtnode/swfont.cxx   |    2 +-
 sw/source/filter/ascii/wrtasc.cxx   |    2 --
 7 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 4088be015542903d27f949d3945595b389deae12
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Apr 22 23:41:42 2011 +0200

    Remove PM2 macro usage

diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 5876937..0aaaba6 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -38,10 +38,6 @@ class SvxErrorHandler;
 #define APPLICATIONNAME		"smath3"
 
 
-#ifdef PM2
-#define RELEASE     "PM304"
-#endif
-
 #ifdef WNT
 #define RELEASE     "WNT304"
 #endif
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 6229fc4..efcb2dc 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -35,9 +35,6 @@
 #define INCLUDED_LIMITS_H
 #endif
 
-#ifdef PM20
-#include <stdlib.h>
-#endif
 #include <com/sun/star/uno/Reference.h>
 #include "swdllapi.h"
 #include <i18npool/lang.h>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 95abe91..e5d8fd0 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1194,7 +1194,7 @@ static void lcl_FormatPostIt(
 
     pIDCO->SplitNode( *aPam.GetPoint(), false );
     aStr = pField->GetPar2();
-#if defined( WNT ) || defined( PM2 )
+#if defined( WNT )
     // Bei Windows und Co alle CR rausschmeissen
     aStr.EraseAllChars( '\r' );
 #endif
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index bef6087..71abd96 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -592,11 +592,7 @@ sal_uLong SwLayHelper::CalcPageCount()
             {
                 nMaxParaPerPage = Max( sal_uLong(20),
                                        sal_uLong(20 + nNdCount / 1000 * 3) );
-#ifdef PM2
-                const sal_uLong nMax = 49;
-#else
                 const sal_uLong nMax = 53;
-#endif
                 nMaxParaPerPage = Min( nMaxParaPerPage, nMax );
                 nPgCount = nNdCount / nMaxParaPerPage;
             }
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 381e8fa..714c1ff 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -512,7 +512,7 @@ void SwFntObj::CreateScrFont( const ViewShell& rSh, const OutputDevice& rOut )
 
 
 void SwFntObj::GuessLeading( const ViewShell&
-#if defined(WNT) || defined(PM2)
+#if defined(WNT)
                              rSh
 #endif
                              , const FontMetric& rMet )
@@ -525,7 +525,7 @@ void SwFntObj::GuessLeading( const ViewShell&
         return;
     }
 
-#if defined(WNT) || defined(PM2)
+#if defined(WNT)
     OutputDevice *pWin = rSh.GetWin() ?
                          rSh.GetWin() :
                          GetpApp()->GetDefaultDevice();
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 773d9e5..3dfd523 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -70,7 +70,7 @@
 #include <txtfrm.hxx>       // SwTxtFrm
 #include <scriptinfo.hxx>
 
-#if defined(WNT) || defined(PM2)
+#if defined(WNT)
 #define FNT_LEADING_HACK
 #endif
 
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 9c6093e..a6b947a 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -51,10 +51,8 @@ SwASCWriter::SwASCWriter( const String& rFltNm )
     switch( 5 <= rFltNm.Len() ? rFltNm.GetChar( 4 ) : 0 )
     {
     case 'D':
-#if !defined(PM2)
                 aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_850 );
                 aNewOpts.SetParaFlags( LINEEND_CRLF );
-#endif
                 if( 5 < rFltNm.Len() )
                     switch( rFltNm.Copy( 5 ).ToInt32() )
                     {