remove non-compiled code

9 files changed, 8 insertions, 256 deletions

diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 8d0bb0b98474..fd31ded8456c 100644
--- a/svl/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
@@ -28,8 +28,7 @@
 #ifndef _CNTRSRT_HXX
 #define _CNTRSRT_HXX
 
-#if 0
-***********************************************************************
+/***********************************************************************
 *
 *   Hier folgt die Beschreibung fuer die exportierten Makros:
 *
@@ -53,8 +52,7 @@
 *
 *       Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors
 *       alle im Conatiner vorhandenen Objekte geloescht werden.
-*
-#endif
+*/
 
 #include <tools/contnr.hxx>
 
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index c9cfce85eeeb..eb922a99fe25 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -196,12 +196,6 @@ private:
     inline ULONG             ReleaseRef( ULONG n = 1 ) const;
     SVL_DLLPRIVATE long      Delete_Impl(void*);
 
-#if 0
-    // @@@ virtual, but private, and dummy impl. @@@
-    virtual void             Store( SvStream & ) const;
-    virtual void             GetVersion() const;
-#endif
-
 protected:
                              SfxPoolItem( USHORT nWhich = 0 );
                              SfxPoolItem( const SfxPoolItem& );
@@ -413,38 +407,6 @@ public:
 };
 
 // -----------------------------------------------------------------------
-
-#if 0  /* @@@ NOT USED @@@ */
-class SfxInvalidItem: public SfxPoolItem
-{
-friend class SfxItemSet;
-
-    const SfxPoolItem*      pDefaultItem;
-
-private:
-                            TYPEINFO();
-                            SfxInvalidItem( USHORT nWhich, const SfxPoolItem &rDefault );
-                            SfxInvalidItem( const SfxInvalidItem& );
-    virtual                 ~SfxInvalidItem();
-
-public:
-    virtual int             operator==( const SfxPoolItem& ) const;
-
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    XubString &rText,
-                                    const IntlWrapper * = 0 ) const;
-    const SfxPoolItem*      GetDefaultItem() const { return pDefaultItem; }
-
-    // von sich selbst eine Kopie erzeugen
-    virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
-    virtual SfxPoolItem*    Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream&       Store(SvStream &, USHORT nVer ) const;
-};
-#endif /* @@@ NOT USED @@@ */
-
-// -----------------------------------------------------------------------
 // Handle Klasse fuer PoolItems
 
 class SVL_DLLPUBLIC SfxItemHandle
@@ -466,26 +428,6 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem);
 
 // -----------------------------------------------------------------------
 
-#if 0  /* @@@ NOT USED @@@ */
-class SfxItemChangedHint: public SfxHint
-{
-    const SfxPoolItem&  _rOld;
-    const SfxPoolItem&  _rNew;
-
-public:
-                        TYPEINFO(); \
-                        SfxItemChangedHint( const SfxPoolItem &rOld,
-                                            const SfxPoolItem &rNew )
-                        :   _rOld( rOld ),
-                            _rNew( rNew )
-                        {}
-
-    const SfxPoolItem&  GetOldItem() const { return _rOld; }
-    const SfxPoolItem&  GetNewItem() const { return _rNew; }
-};
-
-#endif /* @@@ NOT USED @@@ */
-
 #endif // #ifndef _SFXPOOLITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index b95d80ee372f..76a75b4d498a 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -29,8 +29,7 @@
 #ifndef _SVARRAY_HXX
 #define _SVARRAY_HXX
 
-#if 0
-***********************************************************************
+/***********************************************************************
 *
 *   Hier folgt die Beschreibung fuer die exportierten Makros:
 *
@@ -96,8 +95,7 @@
 *   PtrArr:     SvStrings, SvStringsDtor
 *   SortArr:    SvStringsSort, SvStringsSortDtor,
 *               SvStringsISort, SvStringsISortDtor
-***********************************************************************
-#endif
+***********************************************************************/
 
 #include "svl/svldllapi.h"
 
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 8bf1619189f5..9ed45a146be8 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -65,13 +65,9 @@ typedef List DdeTopics;
 typedef List DdeItems;
 #endif
 
-//#if 0 // _SOLAR__PRIVATE
 DECLARE_LIST( DdeTransactions, DdeTransaction* )
 DECLARE_LIST( DdeFormats, long )
-//#else
-//typedef List DdeTransactions;
-//typedef List DdeFormats;
-//#endif
+
 
 #ifndef STRING_LIST
 #define STRING_LIST
@@ -90,9 +86,8 @@ class SVL_DLLPUBLIC DdeData
     friend class    DdeTransaction;
     DdeDataImp*     pImp;
 
-//#if 0 // _SOLAR__PRIVATE
     SVL_DLLPRIVATE void            Lock();
-//#endif
+
     void            SetFormat( ULONG nFmt );
 
 public:
@@ -139,9 +134,7 @@ class DdeTopicList
 {
     StringList      aTopics;
 
-//#if 0 // _SOLAR__PRIVATE
                     DECL_LINK( Data, DdeData* );
-//#endif
 public:
                     DdeTopicList( const String& );
                     ~DdeTopicList();
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 1455a94f706f..a8238df32e4f 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -26,8 +26,7 @@
  *
  ************************************************************************/
 
-#if 0
-***********************************************************************
+/***********************************************************************
 *
 *   Die vordefinierte Arrays werden ueber POSITIV-Defines aktiviert:
 *   (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
@@ -38,8 +37,7 @@
 *   SortArr:    SvStringsSort, SvStringsSortDtor,
 *               SvStringsISort, SvStringsISortDtor,
 *               SvUShortsSort
-***********************************************************************
-#endif
+***********************************************************************/
 
 #include "svl/svldllapi.h"
 #include <svl/svarray.hxx>
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 297ed54daa9b..afa3183bd88c 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -211,9 +211,7 @@ enum NfEvalDateFormat
 };
 
 
-//#if 0 // _SOLAR__PRIVATE
 #define _ZFORLIST_DECLARE_TABLE
-//#endif
 #ifdef _ZFORLIST_DECLARE_TABLE
 DECLARE_TABLE (SvNumberFormatTable, SvNumberformat*)
 DECLARE_TABLE (SvNumberFormatterIndexTable, sal_uInt32*)
@@ -244,12 +242,10 @@ class SVL_DLLPUBLIC NfCurrencyEntry
 
 private:
 
-//#if 0 // _SOLAR__PRIVATE
                         // nDecimalFormat := 0, 1, 2
                         // #,##0 or #,##0.00 or #,##0.-- are assigned
     SVL_DLLPRIVATE void             Impl_BuildFormatStringNumChars( String&,
                             const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
-//#endif    // __PRIVATE
 
 public:
 
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index ac9614c0d3f6..7b2000e80307 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -2040,73 +2040,6 @@ void SfxItemSet::DisableItem(USHORT nWhich)
 
 // -----------------------------------------------------------------------
 
-#if 0
-BOOL SfxAllItemSet::Remove(USHORT nWhich)
-{
-    DBG_CHKTHIS(SfxAllItemSet, 0);
-    USHORT *pPtr = _pWhichRanges;
-    USHORT nPos = 0;
-    while( *pPtr )
-    {
-        if( *pPtr <= nWhich && nWhich <= *(pPtr+1) )
-        {
-            USHORT *pTmp = pPtr;
-            USHORT nLeft = 0;
-            USHORT nRest = 0;
-            while(*++pTmp){
-                if( nLeft & 1 )
-                    nRest = *pTmp - *(pTmp-1) + 1;
-                ++nLeft;
-            }
-
-            // in diesem Bereich
-            nPos += nWhich - *pPtr;
-            nRest -= nWhich - *pPtr;
-            // 3,3
-            if(*pPtr == nWhich && *(pPtr+1) == nWhich) {
-                memmove(pPtr, pPtr + 2, nLeft * sizeof(USHORT));
-                nFree += 2;
-            }
-                // Anfang
-            else if(*pPtr == nWhich)
-                (*pPtr)++;
-                // Ende
-            else if(*(pPtr+1) == nWhich)
-                (*(pPtr+1))--;
-            else {
-                if(nPos + nRest + 2 > nFree) {
-                    USHORT nOf = pPtr - _pWhichRanges;
-                    _pWhichRanges = IncrSize(_pWhichRanges, nPos + nRest, nInitCount);
-                    nFree += nInitCount;
-                    pPtr = _pWhichRanges + nOf;
-                }
-                memmove(pPtr +2, pPtr, (nLeft+2) * sizeof(USHORT));
-                *++pPtr  = nWhich-1;
-                *++pPtr = nWhich+1;
-                nFree -= 2;
-            }
-            SfxPoolItem* pItem = *( _aItems + nPos );
-            if( pItem )
-            {
-                if(_pPool)
-                    _pPool->Remove(*pItem );
-                else
-                    delete pItem;
-                --_nCount;
-            }
-            memmove(_aItems + nPos +1, _aItems + nPos,
-                    sizeof(SfxPoolItem *) * (nRest - 1));
-            break;          // dann beim Parent suchen
-        }
-        nPos += *(pPtr+1) - *pPtr + 1;
-        pPtr += 2;
-    }
-    return *pPtr? TRUE: FALSE;
-}
-#endif
-
-// -----------------------------------------------------------------------
-
 SfxItemSet *SfxAllItemSet::Clone(BOOL bItems, SfxItemPool *pToPool ) const
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 0205b35100de..83af20cf9b9e 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -361,75 +361,6 @@ SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const
 }
 
 // SfxInvalidItem ---------------------------------------------------------
-#if 0  /* @@@ NOT USED @@@ */
-SfxInvalidItem::SfxInvalidItem( USHORT nWhich, const SfxPoolItem &rDefault ):
-    SfxPoolItem(nWhich),
-    pDefaultItem(&rDefault)
-{
-    DBG_CTOR(SfxInvalidItem, 0);
-}
-
-// ------------------------------------------------------------------------
-SfxInvalidItem::SfxInvalidItem( const SfxInvalidItem& rCopy):
-    SfxPoolItem(rCopy),
-    pDefaultItem(rCopy.pDefaultItem)
-{
-    DBG_CTOR(SfxInvalidItem, 0);
-    //! pDefaultItem->ReleaseRef?
-}
-
-// ------------------------------------------------------------------------
-SfxInvalidItem::~SfxInvalidItem()
-{
-    DBG_DTOR(SfxInvalidItem, 0);
-}
-
-// ------------------------------------------------------------------------
-int SfxInvalidItem::operator==( const SfxPoolItem& rCmp) const
-{
-    DBG_CHKTHIS(SfxInvalidItem, 0);
-    DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal type" );
-    return *pDefaultItem == *((SfxInvalidItem&)rCmp).pDefaultItem;
-}
-
-// ------------------------------------------------------------------------
-SfxItemPresentation SfxInvalidItem::GetPresentation
-(
-    SfxItemPresentation     ePresentation,
-    SfxMapUnit              eCoreMetric,
-    SfxMapUnit              ePresentationMetric,
-    XubString&              rText,
-    const IntlWrapper *
-)   const
-{
-    DBG_CHKTHIS(SfxInvalidItem, 0);
-    rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Invalid"));
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-// ------------------------------------------------------------------------
-SfxPoolItem* SfxInvalidItem::Clone(SfxItemPool *) const
-{
-    DBG_CHKTHIS(SfxInvalidItem, 0);
-    return new SfxInvalidItem(*this);
-}
-
-// ------------------------------------------------------------------------
-SfxPoolItem* SfxInvalidItem::Create(SvStream &, USHORT nVersion) const
-{
-    DBG_CHKTHIS(SfxInvalidItem, 0);
-    DBG_ERROR("SfxInvalidItem::Create() ist sinnlos");
-    return Clone();
-}
-
-// ------------------------------------------------------------------------
-SvStream& SfxInvalidItem::Store(SvStream &rStream, USHORT nItemVersion ) const
-{
-    DBG_CHKTHIS(SfxInvalidItem, 0);
-    DBG_ERROR("SfxInvalidItem::Store() ist sinnlos");
-    return rStream;
-}
-#endif /* @@@ NOT USED @@@ */
 
 // SfxItemHandle ----------------------------------------------------------
 SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem):
@@ -490,20 +421,6 @@ bool SfxPoolItem::HasMetrics() const
 }
 
 // -----------------------------------------------------------------------
-#if 0  /* @@@ NOT USED @@@ */
-void SfxPoolItem::GetVersion() const
-{
-    DBG_ERROR( "dummy called" );
-}
-
-// -----------------------------------------------------------------------
-void SfxPoolItem::Store(SvStream &rStream) const
-{
-    DBG_ERROR( "dummy called" );
-}
-#endif /* @@@ NOT USED @@@ */
-
-// -----------------------------------------------------------------------
 
 bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
 {
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 854f7e80533e..54252992d13b 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -116,17 +116,6 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
 
 void ImpSvNumberInputScan::Reset()
 {
-#if 0
-// ER 16.06.97 18:56 Vorbelegung erfolgt jetzt in NumberStringDivision,
-// wozu immer alles loeschen wenn einiges wieder benutzt oder gar nicht
-// gebraucht wird..
-    for (USHORT i = 0; i < SV_MAX_ANZ_INPUT_STRINGS; i++)
-    {
-        sStrArray[i].Erase();
-        nNums[i] = SV_MAX_ANZ_INPUT_STRINGS-1;
-        IsNum[i] = FALSE;
-    }
-#endif
     nMonth       = 0;
     nMonthPos    = 0;
     nTimePos     = 0;
@@ -154,19 +143,7 @@ void ImpSvNumberInputScan::Reset()
 // static
 inline BOOL ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
 {
-    // If the input string wouldn't be converted using TransformInput() we'd
-    // to use something similar to the following and to adapt many places.
-#if 0
-    // use faster isdigit() if possible
-    if ( c < 128 )
-        return isdigit( (unsigned char) c ) != 0;
-    if ( c < 256 )
-        return FALSE;
-    String aTmp( c );
-    return pFormatter->GetCharClass()->isDigit( aTmp, 0 );
-#else
     return c < 128 && isdigit( (unsigned char) c );
-#endif
 }