nuke dead code

Change-Id: I0ea47ee535ba0e903bae0de227acd311ca96aa03

31 files changed, 0 insertions, 387 deletions

diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 9433e26517c8..77a3c16f3929 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -74,20 +74,6 @@ namespace connectivity {
 }
 
 // -------------------------------------------------------------------------
-/*
-MQuery::MQuery()
-{
-    OSL_TRACE( "IN MQuery::MQuery()" );
-
-   construct();
-#if OSL_DEBUG_LEVEL > 0
-    m_oThreadID = osl_getThreadIdentifier(NULL);
-#endif
-
-    OSL_TRACE( "\tOUT MQuery::MQuery()" );
-}
-*/
-// -------------------------------------------------------------------------
 MQuery::MQuery( const OColumnAlias& _ca )
     :m_rColumnAlias( _ca )
 {
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 37e818ad4a9a..7c5f86f2634d 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -85,22 +85,6 @@ void OMySQLCatalog::refreshViews()
     Sequence< ::rtl::OUString > aTypes(1);
     aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
 
-/*
-    sal_Bool bSupportsViews = sal_False;
-    try
-    {
-        Reference<XResultSet> xRes = m_xMetaData->getTableTypes();
-        Reference<XRow> xRow(xRes,UNO_QUERY);
-        while ( !bSupportsViews && xRow.is() && xRes->next() )
-        {
-            ::rtl::OUString sTableType( xRow->getString( 1 ) );
-            bSupportsViews = sTableType.equalsIgnoreAsciiCase( aTypes[0] );
-        }
-    }
-    catch(const SQLException&)
-    {
-    }
-*/
     // let's simply assume the server is new enough to support views. Current drivers
     // as of this writing might not return the proper information in getTableTypes, so
     // don't rely on it.
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx b/cppuhelper/inc/cppuhelper/compbase1.hxx
index c18210d13d94..32d2954b4ea9 100644
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase1.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 1 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx b/cppuhelper/inc/cppuhelper/compbase10.hxx
index 9c0a1c14fe56..f059a95394da 100644
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase10.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase10.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 10 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx b/cppuhelper/inc/cppuhelper/compbase11.hxx
index 33d8a2f17bad..0eab9c553f34 100644
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase11.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase11.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 11 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase12.hxx b/cppuhelper/inc/cppuhelper/compbase12.hxx
index cb0a03a82581..9a0a908848bc 100644
--- a/cppuhelper/inc/cppuhelper/compbase12.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase12.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 12 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase2.hxx b/cppuhelper/inc/cppuhelper/compbase2.hxx
index f055fe35e7ed..1fe5140b9ee5 100644
--- a/cppuhelper/inc/cppuhelper/compbase2.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase2.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 2 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase3.hxx b/cppuhelper/inc/cppuhelper/compbase3.hxx
index a31570ad2d0f..31c0072ef34d 100644
--- a/cppuhelper/inc/cppuhelper/compbase3.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase3.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 3 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase4.hxx b/cppuhelper/inc/cppuhelper/compbase4.hxx
index b2e204711cfe..69f31b052d56 100644
--- a/cppuhelper/inc/cppuhelper/compbase4.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase4.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 4 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase5.hxx b/cppuhelper/inc/cppuhelper/compbase5.hxx
index 8b279daf3587..bdf6fd95198c 100644
--- a/cppuhelper/inc/cppuhelper/compbase5.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase5.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 5 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase6.hxx b/cppuhelper/inc/cppuhelper/compbase6.hxx
index a91b07e929b4..20ada1cb1799 100644
--- a/cppuhelper/inc/cppuhelper/compbase6.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase6.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 6 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase7.hxx b/cppuhelper/inc/cppuhelper/compbase7.hxx
index 81910ed9c56d..5fbed705f5f4 100644
--- a/cppuhelper/inc/cppuhelper/compbase7.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase7.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase7.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 7 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase8.hxx b/cppuhelper/inc/cppuhelper/compbase8.hxx
index 8d4009a86383..ebc1b83ad454 100644
--- a/cppuhelper/inc/cppuhelper/compbase8.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase8.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 8 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase9.hxx b/cppuhelper/inc/cppuhelper/compbase9.hxx
index 946b319b8911..72444c2531ac 100644
--- a/cppuhelper/inc/cppuhelper/compbase9.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase9.hxx
@@ -30,9 +30,6 @@
 
 #include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-/*
-__DEF_COMPIMPLHELPER_EX( 9 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
index aca4ce83e591..0f861a5040fb 100644
--- a/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
+++ b/cppuhelper/inc/cppuhelper/implbase_ex_post.hxx
@@ -170,63 +170,6 @@ class_data##N AggImplInheritanceHelper##N< BaseClass, __IFC##N >::s_cd = \
 __DEF_CLASS_DATA_INIT_EX( N, (AggImplInheritanceHelper##N< BaseClass, __IFC##N > *) ); \
 }
 
-#define __DEF_COMPIMPLHELPER_EX( N ) \
-namespace cppu \
-{ \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakComponentImplHelper##N \
-    : public WeakComponentImplHelperBase \
-    , public ::com::sun::star::lang::XTypeProvider \
-    , __PUBLIC_IFC##N \
-{ \
-    static class_data##N s_cd; \
-public: \
-    inline WeakComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \
-        : WeakComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakComponentImplHelper_query( rType, (class_data *)&s_cd, this, (WeakComponentImplHelperBase *)this ); } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakComponentImplHelper_getTypes( (class_data *)&s_cd ); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \
-}; \
-template< __CLASS_IFC##N > \
-class_data##N WeakComponentImplHelper##N< __IFC##N >::s_cd = \
-__DEF_CLASS_DATA_INIT_EX( N, (WeakComponentImplHelper##N< __IFC##N > *) ); \
-template< __CLASS_IFC##N > \
-class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggComponentImplHelper##N \
-    : public WeakAggComponentImplHelperBase \
-    , public ::com::sun::star::lang::XTypeProvider \
-    , __PUBLIC_IFC##N \
-{ \
-    static class_data##N s_cd; \
-public: \
-    inline WeakAggComponentImplHelper##N( ::osl::Mutex & rMutex ) SAL_THROW(()) \
-        : WeakAggComponentImplHelperBase( rMutex ) \
-        {} \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakAggComponentImplHelperBase::queryInterface( rType ); } \
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakAggComponentImplHelper_queryAgg( rType, (class_data *)&s_cd, this, (WeakAggComponentImplHelperBase *)this ); } \
-    virtual void SAL_CALL acquire() throw () \
-        { WeakAggComponentImplHelperBase::acquire(); } \
-    virtual void SAL_CALL release() throw () \
-        { WeakAggComponentImplHelperBase::release(); } \
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException) \
-        { return WeakAggComponentImplHelper_getTypes( (class_data *)&s_cd ); } \
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-        { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \
-}; \
-template< __CLASS_IFC##N > \
-class_data##N WeakAggComponentImplHelper##N< __IFC##N >::s_cd = \
-__DEF_CLASS_DATA_INIT_EX( N, (WeakAggComponentImplHelper##N< __IFC##N > *) ); \
-}
-
 /// @endcond
 
 #endif
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index c203840c57d3..ee2fe2eaf4da 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -173,39 +173,6 @@
     return ::rtl::OUString();
 }
 
-/*
-::rtl::OUString getCurTypeNameFromGUID_Impl( const uno::Reference< lang::XMultiServiceFactory > xFactory, GUID* guid )
-{
-    ::rtl::OUString aResult;
-
-    const ::rtl::OUString aServiceName ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.document.FilterFactory" ) );
-    uno::Reference < container::XNameAccess > xFilters = uno::Reference < io::XOutputStream > (
-    xFactory->createInstance ( aServiceName ),
-    uno::UNO_QUERY );
-
-    if ( xFilters.is() )
-    {
-        ::rtl::OUString aFilterName = getFilterNameFromGUID_Impl( guid );
-        if ( aFilterName.getLength() )
-        {
-            uno::Any aAnyProp = xFilters->getByName( aFilterName );
-            uno::Sequence< beans::PropertyValue > aProperties;
-            if ( aAnyProp >>= aProperties ) )
-            {
-                for ( sal_Int32 nInd = 0; nInd < aProperties.getLength; nInd++ )
-                if ( aProperties[nInd].Name == "UIName" )
-                {
-                    aProperties[nInd].Value >>= aResult;
-                    break;
-                }
-            }
-    }
-    }
-
-    return aResult;
-}
-*/
-
 // Fix strange warnings about some
 // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
 // warning C4505: 'xxx' : unreferenced local function has been removed
diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index 94dd0ccdcf1c..0b4eacbf2c8c 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -285,24 +285,12 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc
         {
             wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] );
             if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
-//              || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ,
-//                 (const BYTE *)aFileExt[ind], strlen( aFileExt[ind] ) )
               || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ,
                  (const BYTE *)aClassID, strlen(aClassID)) )
                     aResult = FALSE;
 
             if( hkey )
                 RegCloseKey(hkey),hkey= NULL;
-
-/*
-            wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] );
-            if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL )
-              || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ,
-                 (const BYTE *)aMimeType[ind], strlen( aMimeType[ind] ) ) )
-                    aResult = FALSE;
-            if( hkey )
-                RegCloseKey(hkey),hkey= NULL;
-*/
         }
     }
 
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 04c3778b9f04..0be0f468ce7a 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -90,12 +90,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
     }
     if( ! bFound )
         return 0;
-/*
-    {
-        osl::MutexGuard aGuard( m_aUserEventMutex );
-        m_aUserEventIDs.pop_front();
-    }
-*/
 
     MediatorMessage* pMessage;
     CommandAtoms nCommand;
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 63ca5b6f1c49..161c0965f8d3 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -176,11 +176,6 @@ checkForUpdates(
                     // ignore
                 }
 
-/*
-                o_rUpdateInfo.Sources.push_back( DownloadSource(true,
-                    UNISTRING("http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=solarissparcwjre&lang=en-US&version=2.2.1") ) );
-*/
-
                 sal_Int32 i, imax = xNodeList->getLength();
                 for( i = 0; i < imax; ++i )
                 {
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 88153a092ada..c6790d574af6 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -335,26 +335,6 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
             }
         }
         break;
-/*
-        case css::uno::TypeClass_CHAR :
-        case css::uno::TypeClass_VOID :
-        case css::uno::TypeClass_TYPE :
-        case css::uno::TypeClass_ENUM :
-        case css::uno::TypeClass_TYPEDEF :
-        case css::uno::TypeClass_UNION :
-        case css::uno::TypeClass_EXCEPTION :
-        case css::uno::TypeClass_ARRAY :
-        case css::uno::TypeClass_INTERFACE :
-        case css::uno::TypeClass_SERVICE :
-        case css::uno::TypeClass_MODULE :
-        case css::uno::TypeClass_INTERFACE_METHOD :
-        case css::uno::TypeClass_INTERFACE_ATTRIBUTE :
-        case css::uno::TypeClass_UNKNOWN :
-        case css::uno::TypeClass_PROPERTY :
-        case css::uno::TypeClass_CONSTANT :
-        case css::uno::TypeClass_CONSTANTS :
-        case css::uno::TypeClass_SINGLETON :
-*/
         default: break;
     }
 
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 1e09df3ac435..090ce6f56d9f 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -80,15 +80,6 @@ void CacheUpdateListener::startListening()
 
     css::uno::Reference< css::util::XChangesListener > xThis(static_cast< css::util::XChangesListener* >(this), css::uno::UNO_QUERY_THROW);
     xNotifier->addChangesListener(xThis);
-
-/*
-    css::uno::Reference< css::container::XContainer > xNotifier(xConfigAccess, css::uno::UNO_QUERY);
-    if (!xNotifier.is())
-        return;
-
-    css::uno::Reference< css::container::XContainerListener > xThis(static_cast< css::container::XContainerListener* >(this), css::uno::UNO_QUERY);
-    xNotifier->addContainerListener(xThis);
-*/
 }
 
 
@@ -106,15 +97,6 @@ void CacheUpdateListener::stopListening()
 
     css::uno::Reference< css::util::XChangesListener > xThis(static_cast< css::util::XChangesListener* >(this), css::uno::UNO_QUERY);
     xNotifier->removeChangesListener(xThis);
-
-/*
-    css::uno::Reference< css::container::XContainer > xNotifier(xConfigAccess, css::uno::UNO_QUERY);
-    if (!xNotifier.is())
-        return;
-
-    css::uno::Reference< css::container::XContainerListener > xThis(static_cast< css::container::XContainerListener* >(this), css::uno::UNO_QUERY);
-    xNotifier->removeContainerListener(xThis);
-*/
 }
 
 
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 1b6158589072..9db541c784dd 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2306,25 +2306,6 @@ GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterC
     if (rGraphic.GetType()==GRAPHIC_GDIMETAFILE)
     {
         GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
-
-/*
-        MapMode     aMap72( MAP_INCH );
-        Fraction    aDPIFrac( 1, 72 );
-        Size        aOldSize = aScaledMtf.GetPrefSize();
-
-        aMap72.SetScaleX( aDPIFrac );
-        aMap72.SetScaleY( aDPIFrac );
-
-        Size aNewSize = OutputDevice::LogicToLogic( aOldSize,
-                                                    aScaledMtf.GetPrefMapMode(),
-                                                    aMap72 );
-
-        aScaledMtf.Scale( Fraction( aNewSize.Width(), aOldSize.Width() ),
-                          Fraction( aNewSize.Height(), aOldSize.Height() ) );
-        aScaledMtf.SetPrefMapMode( aMap72 );
-        aScaledMtf.SetPrefSize( aNewSize );
-*/
-
         return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
     }
     else
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 5fd735a40620..d05abb4e5389 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -87,8 +87,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
         aDXFLineInfo.eStyle = LINE_DASH;
         for (i=0; i < (pLT->nDashCount); i++) {
             x = pLT->fDash[i] * pDXF->getGlobalLineTypeScale();
-// ####
-            // x = (sal_Int32) rTransform.TransLineWidth( pLT->fDash[i] * pDXF->getGlobalLineTypeScale() );
             if ( x >= 0.0 ) {
                 if ( aDXFLineInfo.nDotCount == 0 ) {
                     aDXFLineInfo.nDotCount ++;
@@ -120,16 +118,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
         }
     }
 
-#if 0
-    if (aDXFLineInfo.DashCount > 0 && aDXFLineInfo.DashLen == 0.0)
-        aDXFLineInfo.DashLen ( 1 );
-    if (aDXFLineInfo.DotCount > 0 && aDXFLineInfo.DotLen() == 0.0)
-        aDXFLineInfo.SetDotLen( 1 );
-    if (aDXFLineInfo.GetDashCount > 0 || aDXFLineInfo.GetDotCount > 0)
-        if (aDXFLineInfo.GetDistance() == 0)
-            aDXFLineInfo.SetDistance( 1 );
-#endif
-
     return aDXFLineInfo;
 }
 
@@ -243,19 +231,6 @@ void DXF2GDIMetaFile::DrawLineEntity(const DXFLineEntity & rE, const DXFTransfor
         LineInfo aLineInfo;
         aLineInfo = rTransform.Transform(aDXFLineInfo);
 
-#if 0
-        printf("%f\n", rTransform.TransLineWidth(1000.0));
-
-        // LINE_NONE = 0, LINE_SOLID = 1, LINE_DASH = 2, LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-        aLineInfo.SetStyle( LINE_DASH );
-        aLineInfo.SetWidth( 300 );
-        aLineInfo.SetDashCount( 2 );
-        aLineInfo.SetDashLen( 100 );
-        aLineInfo.SetDotCount( 1 );
-        aLineInfo.SetDotLen( 0 );
-        aLineInfo.SetDistance( 500 );
-#endif
-
         pVirDev->DrawLine(aP0,aP1,aLineInfo);
         if (rE.fThickness!=0) {
             Point aP2,aP3;
@@ -591,8 +566,6 @@ void DXF2GDIMetaFile::DrawLWPolyLineEntity(const DXFLWPolyLineEntity & rE, const
                 pVirDev->DrawPolygon( aPoly );
             else
                 pVirDev->DrawPolyLine( aPoly );
-                // ####
-                //pVirDev->DrawPolyLine( aPoly, aDXFLineInfo );
         }
     }
 }
@@ -636,46 +609,6 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
                         }
                         break;
                         case 2 :
-                        {
-/*
-                            double frx,fry,fA1,fdA,fAng;
-                            sal_uInt16 nPoints,i;
-                            DXFVector aC;
-                            Point aPS,aPE;
-                            fA1=((DXFEdgeTypeCircularArc*)pEdge)->fStartAngle;
-                            fdA=((DXFEdgeTypeCircularArc*)pEdge)->fEndAngle - fA1;
-                            while ( fdA >= 360.0 )
-                                fdA -= 360.0;
-                            while ( fdA <= 0 )
-                                fdA += 360.0;
-                            rTransform.Transform(((DXFEdgeTypeCircularArc*)pEdge)->aCenter, aC);
-                            if ( fdA > 5.0 && rTransform.TransCircleToEllipse(((DXFEdgeTypeCircularArc*)pEdge)->fRadius,frx,fry ) == sal_True )
-                            {
-                                DXFVector aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
-                                aVS*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
-                                aVS+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
-                                DXFVector aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
-                                aVE*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
-                                aVE+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
-                                if ( rTransform.Mirror() == sal_True )
-                                {
-                                    rTransform.Transform(aVS,aPS);
-                                    rTransform.Transform(aVE,aPE);
-                                }
-                                else
-                                {
-                                    rTransform.Transform(aVS,aPE);
-                                    rTransform.Transform(aVE,aPS);
-                                }
-                                pVirDev->DrawArc(
-                                    Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
-                                              (long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)),
-                                    aPS,aPE
-                                );
-                            }
-*/
-                        }
-                        break;
                         case 3 :
                         case 4 :
                         break;
@@ -900,14 +833,10 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
                 fScale = 0;  // -Wall added this...
             }
             else {
-//              if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
                     if (fWidth>fHeight)
                         fScale=10000.0/fWidth;
                     else
                         fScale=10000.0/fHeight;
-//              }
-//              else
-//                  fScale=1.0;
                 aTransform=DXFTransform(fScale,-fScale,fScale,
                                         DXFVector(-pDXF->aBoundingBox.fMinX*fScale,
                                                    pDXF->aBoundingBox.fMaxY*fScale,
@@ -920,14 +849,10 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
     else {
         fHeight=pVPort->fHeight;
         fWidth=fHeight*pVPort->fAspectRatio;
-//      if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
             if (fWidth>fHeight)
                 fScale=10000.0/fWidth;
             else
                 fScale=10000.0/fHeight;
-//      }
-//      else
-//          fScale=1.0;
         aTransform=DXFTransform(
             DXFTransform(pVPort->aDirection,pVPort->aTarget),
             DXFTransform(
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index c9e433cce28b..be8d38ac7c19 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -421,14 +421,6 @@ public:
 
 sal_Bool OS2METReader::Callback(sal_uInt16 /*nPercent*/)
 {
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==sal_True) {
-            pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            return sal_True;
-        }
-    }
-*/
     return sal_False;
 }
 
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 8d4070e9b0f6..3a0388e55c05 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -175,17 +175,6 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
 
 void PCDReader::MayCallback(sal_uLong /*nPercent*/)
 {
-/*
-    if ( nPercent >= nLastPercent + 3 )
-    {
-        nLastPercent=nPercent;
-        if ( pCallback != NULL && nPercent <= 100 && bStatus == sal_True )
-        {
-            if ( ( (*pCallback)( pCallerData, (sal_uInt16)nPercent ) ) == sal_True )
-                bStatus = sal_False;
-        }
-    }
-*/
 }
 
 // -------------------------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index d5507736aa48..0fd6d164eab5 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -83,14 +83,6 @@ PCXReader::~PCXReader()
 
 sal_Bool PCXReader::Callback( sal_uInt16 /*nPercent*/ )
 {
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==sal_True) {
-            nStatus = sal_False;
-            return sal_True;
-        }
-    }
-*/
     return sal_False;
 }
 
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index aa00e589c165..879300be59d5 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -359,14 +359,6 @@ void PictReader::SetFillColor( const Color& rColor )
 
 sal_Bool PictReader::Callback(sal_uInt16 /*nPercent*/)
 {
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==sal_True) {
-            pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            return sal_True;
-        }
-    }
-*/
     return sal_False;
 }
 
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 22738fc26169..bcfc757493d3 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -151,17 +151,6 @@ public:
 
 void TIFFReader::MayCallback( sal_uLong /*nPercent*/ )
 {
-/*
-    if ( nPercent >= nLastPercent + 3 )
-    {
-        nLastPercent=nPercent;
-        if ( pCallback != NULL && nPercent <= 100 && bStatus == sal_True )
-        {
-            if (((*pCallback)(pCallerData,(sal_uInt16)nPercent)) == sal_True )
-                bStatus = sal_False;
-        }
-    }
-*/
 }
 
 // ---------------------------------------------------------------------------------
diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx
index 549bfcaafb8c..be5dfac79bc7 100644
--- a/filter/source/placeware/zip.cxx
+++ b/filter/source/placeware/zip.cxx
@@ -26,10 +26,6 @@
  *
  ************************************************************************/
 
-
-/*
-#include <tools/datetime.hxx>
-*/
 #include <osl/diagnose.h>
 #include <rtl/crc.h>
 
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index b5a7139e99e0..f497fc7e6822 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -135,14 +135,6 @@ static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleSe
     }
 }
 
-/*
-static void addFile( Reference< XInterface > xRootFolder, Reference< XSingleServiceFactory > xFactory, const OUString& rSourceFile, const OUString& rName ) throw( Exception )
-{
-    Reference< XInputStream > xInput(  new utl::OSeekableInputStreamWrapper( new SvFileStream(rSourceFile, STREAM_READ ), true ) );
-    _addFile( xRootFolder, xFactory, xInput, rName );
-}
-*/
-
 void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference< XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( Exception )
 {
     if( !rSourceFile.isEmpty() &&
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 558ac0d94e82..252c4194bf84 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -613,10 +613,6 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
 
         aValues[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) );
         aValues[0].Value <<= pFilterEntry->maInterfaceName;
-/*
-        aValues[i  ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
-        aValues[i++].Value <<= pFilterEntry->maDocType;
-*/
         aValues[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ClipboardFormat" ) );
         OUString aDocType;
         if( !pFilterEntry->maDocType.match( sDocTypePrefix ) )
@@ -1190,12 +1186,6 @@ void XMLFilterSettingsDialog::initFilterList()
 
                             for( nValue2 = 0; nValue2 < nValueCount2; nValue2++, pValues2++ )
                             {
-/*
-                                if ( pValues2->Name == "MediaType" )
-                                {
-                                    pValues2->Value >>= pTempFilter->maDocType;
-                                } else
-*/
                                 if ( pValues2->Name == "ClipboardFormat" )
                                 {
                                     OUString aDocType;
@@ -1653,14 +1643,6 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
     Sequence< OUString > aUserData(8);
 
     aUserData[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) );
-    /*
-    const application_info_impl* pInfo = getApplicationInfo( maDocumentService );
-    if( pInfo )
-    {
-        aUserData[2] = pInfo->maXMLImporter;
-        aUserData[3] = pInfo->maXMLExporter;
-    }
-    */
     aUserData[1] = maXSLTTransformerImpl;
     aUserData[2] = maImportService;
     aUserData[3] = maExportService;