[Libreoffice-commits] .: 2 commits - svl/source svtools/source tools/inc

[François Tigeot]

 svl/source/svdde/ddedata.cxx                 |   25 +------------------------
 svtools/source/edit/textdoc.cxx              |    3 ---
 svtools/source/filter.vcl/filter/sgvspln.cxx |    4 ----
 svtools/source/filter.vcl/filter/sgvtext.cxx |    4 ++--
 tools/inc/tools/gen.hxx                      |   12 ------------
 5 files changed, 3 insertions(+), 45 deletions(-)

New commits:
commit 5a82149da436722b519ce02d677b7c602ab8135a
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sat Apr 23 09:42:46 2011 +0200

    Remove support for the obsolete BORLANDC compiler

diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 01f656f..8794f7d 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.hxx
@@ -140,17 +140,10 @@ public:
     Point&				operator *= ( const long nVal );
     Point&				operator /= ( const long nVal );
 
-#ifdef __BORLANDC__
-    friend Point		operator+( const Point &rVal1, const Point &rVal2 );
-    friend Point		operator-( const Point &rVal1, const Point &rVal2 );
-    friend Point		operator*( const Point &rVal1, const long nVal2 );
-    friend Point		operator/( const Point &rVal1, const long nVal2 );
-#else
     friend inline Point operator+( const Point &rVal1, const Point &rVal2 );
     friend inline Point operator-( const Point &rVal1, const Point &rVal2 );
     friend inline Point operator*( const Point &rVal1, const long nVal2 );
     friend inline Point operator/( const Point &rVal1, const long nVal2 );
-#endif
 
     long				getX() const { return X(); }
     long				getY() const { return Y(); }
@@ -449,13 +442,8 @@ public:
     Rectangle&			operator += ( const Point& rPt );
     Rectangle&			operator -= ( const Point& rPt );
 
-#ifdef __BORLANDC__
-    friend Rectangle	operator + ( const Rectangle& rRect, const Point& rPt );
-    friend Rectangle	operator - ( const Rectangle& rRect, const Point& rPt );
-#else
     friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt );
     friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt );
-#endif
 
     TOOLS_DLLPUBLIC friend SvStream&	operator>>( SvStream& rIStream, Rectangle& rRect );
     TOOLS_DLLPUBLIC friend SvStream&	operator<<( SvStream& rOStream, const Rectangle& rRect );
commit e63d01ff86261643d9b0337c5cb0db6555c638d4
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Apr 22 21:52:55 2011 +0200

    Remove PM2 macro usage

diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index a35fae1..3e1d6a4 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -161,23 +161,11 @@ sal_uLong DdeData::GetExternalFormat( sal_uLong nFmt )
 
     default:
         {
-#if defined(WNT) || defined( PM2 )
-            String aName( SotExchange::GetFormatName( nFmt ) );
-
 #if defined(WNT)
-
+            String aName( SotExchange::GetFormatName( nFmt ) );
             if( aName.Len() )
                 nFmt = RegisterClipboardFormat( reinterpret_cast<LPCWSTR>(aName.GetBuffer()) );
 #endif
-#if defined( PM2 )
-
-            if( aName.Len() )
-            {
-                HATOMTBL hSysTable = WinQuerySystemAtomTable();
-                nFmt = (sal_uLong)WinAddAtom( hSysTable, (PSZ)aName.GetBuffer() );
-            }
-#endif
-#endif
         }
     }
     return nFmt;
@@ -209,17 +197,6 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt )
                 nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast<const sal_Unicode*>(szName)) );
         }
 #endif
-#if defined(PM2)
-        if( nFmt > CF_PALETTE )
-        {
-            char szName[ 256 ];
-
-            HATOMTBL hSysTable = WinQuerySystemAtomTable();
-            WinQueryAtomName( hSysTable, (ATOM)nFmt, (PSZ)szName,
-                                sizeof( szName ) );
-            nFmt = SotExchange::RegisterFormatName( String( szName ) );
-        }
-#endif
         break;
     }
     return nFmt;
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 6f82dcd..8315a07 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -39,9 +39,6 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr );
 // Vergleichmethode wird von QuickSort gerufen...
 
 EXTERN_C
-#if defined( PM2 )
-int _stdcall
-#else
 #ifdef WNT
 #if _MSC_VER >= 1200
 int __cdecl
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index 30ae1ac..c54d5ae 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.cxx
@@ -34,10 +34,6 @@
 
 #include <tools/poly.hxx>
 
-#if defined( PM2 ) && defined( __BORLANDC__ )
-#pragma option -Od
-#endif
-
 extern "C" {
 
 /*.pn 277 */
diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx
index 17b776d..8051cca 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter.vcl/filter/sgvtext.cxx
@@ -617,8 +617,8 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s
         switch (Atr.GetFont()) {
           case 92500: case 92501: case 92504: case 92505:
           {
-#if defined(WNT) || defined(PM2)
-              FNam=String::CreateFromAscii( "Times New Roman" );  // CG Times ist unter Windows und OS/2 Times New Roman
+#if defined(WNT)
+              FNam=String::CreateFromAscii( "Times New Roman" );  // CG Times ist unter Windows Times New Roman
 #else
               FNam=String::CreateFromAscii( "Times" );            // ansonsten ist das einfach Times
 #endif