[Libreoffice-commits] .: binfilter/inc

Thomas Arnhold tarnhold at kemper.freedesktop.org
Thu Feb 17 01:25:32 PST 2011


 binfilter/inc/bf_svtools/svarray.hxx |   17 -----------------
 binfilter/inc/bf_sw/ndhints.hxx      |    8 ++------
 binfilter/inc/bf_sw/swprtopt.hxx     |    5 -----
 3 files changed, 2 insertions(+), 28 deletions(-)

New commits:
commit eef794e1272fa8eedb957866998b814eb7d7965a
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Feb 17 10:22:00 2011 +0100

    Remove TCPP
    
    Seems to be an old compiler

diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index 4775034..a5cd573 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -755,28 +755,11 @@ void nm::Remove( const AE &aE, USHORT nL )\
         nm##_SAR::Remove( nP, nL);\
 }\
 
-#if defined(TCPP)
-
-#define _SORTARR_BLC_CASTS(nm, AE )\
-    BOOL Insert(  AE &aE ) {\
-        return Insert( (const AE&)aE );\
-    }\
-    USHORT GetPos( AE& aE ) const { \
-        return SvPtrarr::GetPos((const VoidPtr&)aE);\
-    }\
-    void Remove( AE& aE, USHORT nL = 1 ) { \
-        Remove( (const AE&) aE, nL	);\
-    }
-
-#else
-
 #define _SORTARR_BLC_CASTS(nm, AE )\
     USHORT GetPos( const AE& aE ) const { \
         return SvPtrarr::GetPos((const VoidPtr&)aE);\
     }
 
-#endif
-
 #define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
 SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\
 _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
diff --git a/binfilter/inc/bf_sw/ndhints.hxx b/binfilter/inc/bf_sw/ndhints.hxx
index 9634be6..074aea3 100644
--- a/binfilter/inc/bf_sw/ndhints.hxx
+++ b/binfilter/inc/bf_sw/ndhints.hxx
@@ -85,12 +85,8 @@ public:
     inline USHORT GetStartOf( const SwTxtAttr *pHt ) const;
     inline USHORT GetEndOf( const SwTxtAttr *pHt ) const;
     inline USHORT GetPos( const SwTxtAttr *pHt ) const
-//	OS: in svmem.hxx wird fuer TCPP GetPos ohne const gerufen
-#ifdef TCPP
-        { return SwpHtStart::GetPos( (SwTxtAttr *)pHt ); }
-#else
-        { return SwpHtStart::GetPos( pHt ); }
-#endif
+
+    return SwpHtStart::GetPos( pHt );
 
 #ifdef USED
     // Der Zugriffsoperator soll bald nur noch const sein!
diff --git a/binfilter/inc/bf_sw/swprtopt.hxx b/binfilter/inc/bf_sw/swprtopt.hxx
index 314a688..2b2e211 100644
--- a/binfilter/inc/bf_sw/swprtopt.hxx
+++ b/binfilter/inc/bf_sw/swprtopt.hxx
@@ -52,11 +52,6 @@ public:
 
     const String& GetJobName() const 	{ return sJobName; }
 
-#if defined(TCPP)
-    // seit neuestem (SV 223) kann der keinen mehr generieren
-    inline	SwPrtOptions(const SwPrtOptions& rNew) {*this = rNew;}
-#endif
-
     MultiSelection	aMulti;
     Point  aOffset;
     ULONG  nMergeCnt;			// Anzahl der Serienbriefe


More information about the Libreoffice-commits mailing list