Remove dead Code

author: Xisco Fauli <anistenis@gmail.com> 2011-02-27 20:44:41 +0100
committer: Thomas Arnhold <thomas@arnhold.org> 2011-03-01 15:06:13 +0100
commit: 57b6108bb13cec002eb89f1afe9530ac57ed993c (patch)
tree: 465d9687182a0dac0b37eacc33636413b6114e59
parent: df94d6c29485beff5b353b27ecff34f71fe208cb (diff)
63 files changed, 30 insertions, 1027 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index fee36d1c10..ac5db39ad7 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -259,18 +259,6 @@ void SfxPropertyHandler::Property( ApplicationProperty& rProp )
                 }
             }
             break;
-/*
-            case TT_PR_IMG:
-            {
-                SvDataMemberObjectRef aDataObject = new SvDataMemberObject();
-                SvData* pDataBmp = new SvData( FORMAT_BITMAP );
-                pDataBmp->SetData( pTTProperties->mpBmp );
-                aDataObject->Append( pDataBmp );
-                aDataObject->CopyClipboard();
-                pTTProperties->nActualPR = 0;
-            }
-            break;
-*/
             default:
             {
                 pTTProperties->nPropertyVersion = 0;
@@ -477,9 +465,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
 
         // DocWinActivate : both frames belong to the same TopWindow
         // TopWinActivate : both frames belong to different TopWindows
-// not used anymore!
-//		BOOL bDocWinActivate = pOldContainerFrame && pNewContainerFrame &&
-//        			pOldContainerFrame->GetTopViewFrame() == pNewContainerFrame->GetTopViewFrame();
+
         BOOL bTaskActivate = pOldContainerFrame != pNewContainerFrame;
 
         if ( pOldContainerFrame )
@@ -494,15 +480,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
 
         pAppData_Impl->pViewFrame = pFrame;
 
-        //const SfxObjectShell* pSh = pViewFrame ? pViewFrame->GetObjectShell() : 0;
-        //if ( !pSh )
-        //{
-        //    // otherwise BaseURL is set in activation of document
-        //    INetURLObject aObject( SvtPathOptions().GetWorkPath() );
-        //    aObject.setFinalSlash();
-        //    INetURLObject::SetBaseURL( aObject.GetMainURL( INetURLObject::NO_DECODE ) );
-        //}
-
         if( pNewContainerFrame )
         {
             pNewContainerFrame->DoActivate( bTaskActivate );
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 19f570c153..18872f5af6 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -102,12 +102,6 @@
 
 #define RID_STR_NOWELCOMESCREEN				(RID_SFX_APP_START+91)
 
-// Option for 'recommend opening document read only' is not evaluated (#i33095#)
-/* obsolete
-#define STR_EDITOBJECT						(RID_SFX_APP_START+92)
-#define STR_OPENOBJECT						(RID_SFX_APP_START+93)
-*/
-
 #define STR_CORRUPT_INSTALLATION			(RID_SFX_APP_START+94)
 #define IDS_SBERR_STOREREF					(RID_SFX_APP_START+97)
 
@@ -213,16 +207,10 @@
 #define RID_INVALID_URL_TITLE                   (RID_SFX_APP_START + 183)
 #define RID_DESKTOP                             (RID_SFX_APP_START + 184)
 
-// #define RID_XMLSEC_WARNING_BROKENSIGNATURE		(RID_SFX_APP_START + 185)
 #define RID_XMLSEC_QUERY_LOSINGSIGNATURE		(RID_SFX_APP_START + 186)
 #define RID_XMLSEC_QUERY_SAVEBEFORESIGN         (RID_SFX_APP_START + 187)
-    // FREE
-    // FREE
-#define RID_XMLSEC_INFO_WRONGDOCFORMAT          (RID_SFX_APP_START + 190)
 
-/* obsolete
-#define RID_WARNING_MACROSDISABLED              (RID_SFX_APP_START + 191)
-*/
+#define RID_XMLSEC_INFO_WRONGDOCFORMAT          (RID_SFX_APP_START + 190)
 
 #define STR_QUERY_UPDATE_LINKS                  (RID_SFX_APP_START + 192)
 #define STR_DDE_ERROR                           (RID_SFX_APP_START + 193)
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 55b812ba2b..757fcc56cd 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -147,8 +147,6 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
 
 BasicManager* SfxApplication::GetBasicManager()
 {
-//	DBG_ASSERT( pAppData_Impl->nBasicCallLevel != 0,
-//				"unnecessary call to GetBasicManager() - inefficient!" );
     if ( pAppData_Impl->nBasicCallLevel == 0 )
         // sicherheitshalber
         EnterBasicCall();
@@ -280,7 +278,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 //-------------------------------------------------------------------------
 void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 {
-//	SfxViewFrame *pFrame = SfxViewFrame::Current();
     SfxWhichIter aIter(rSet);
     for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
     {
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index d450933a0a..d82de2247b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -272,9 +272,6 @@ BOOL SfxApplication::GetOptions( SfxItemSet& rSet )
                     }
                     break;
                 case SID_ATTR_METRIC :
-//                    if(rSet.Put( SfxUInt16Item( rPool.GetWhich( SID_ATTR_METRIC ),
-//                                pOptions->GetMetric() ) ) )
-//                        bRet = TRUE;
                     break;
                 case SID_HELPBALLOONS :
                     if(rSet.Put( SfxBoolItem ( rPool.GetWhich( SID_HELPBALLOONS ),
@@ -624,7 +621,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_METRIC), TRUE, &pItem))
     {
         DBG_ASSERT(pItem->ISA(SfxUInt16Item), "UInt16Item expected");
-//        pOptions->SetMetric((FieldUnit)((const SfxUInt16Item*)pItem)->GetValue());
     }
 
     // HelpBalloons
@@ -1000,19 +996,11 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const
 //--------------------------------------------------------------------
 void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
-    //DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
 
     SfxObjectShell *pDoc = rEventHint.GetObjShell();
     if ( pDoc && ( pDoc->IsPreview() || !pDoc->Get_Impl()->bInitialized ) )
         return;
 
-#ifdef DBG_UTIL
-    //::rtl::OUString aName = SfxEventConfiguration::GetEventName_Impl( rEventHint.GetEventId() );
-    //ByteString aTmp( "SfxEvent: ");
-    //aTmp += ByteString( String(aName), RTL_TEXTENCODING_UTF8 );
-    //DBG_TRACE( aTmp.GetBuffer() );
-#endif
-
     if ( bSynchron )
     {
 #ifdef DBG_UTIL
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index af211739ba..73e6217266 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -59,17 +59,13 @@ void SfxApplication::RegisterChildWindow_Impl( SfxModule *pMod, SfxChildWinFacto
     if (!pAppData_Impl->pFactArr)
         pAppData_Impl->pFactArr = new SfxChildWinFactArr_Impl;
 
-//#ifdef DBG_UTIL
     for (USHORT nFactory=0; nFactory<pAppData_Impl->pFactArr->Count(); ++nFactory)
     {
         if (pFact->nId ==  (*pAppData_Impl->pFactArr)[nFactory]->nId)
         {
             pAppData_Impl->pFactArr->Remove( nFactory );
-//			DBG_ERROR("ChildWindow mehrfach registriert!");
-//			return;
         }
     }
-//#endif
 
     pAppData_Impl->pFactArr->C40_INSERT(
         SfxChildWinFactory, pFact, pAppData_Impl->pFactArr->Count() );
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 34b3d4555f..1615c299c9 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -76,9 +76,6 @@ public:
     virtual BOOL MakeTopic( const String& );
 
     virtual String	Topics();
-//	virtual String	Formats();
-//	virtual String	SysItems();
-//	virtual String	Status();
 
     virtual BOOL SysTopicExecute( const String* pStr );
 };
@@ -110,11 +107,6 @@ public:
     virtual BOOL StartAdviseLoop();
     virtual BOOL MakeItem( const String& rItem );
 
-// wird benoetigt?
-//	virtual void Connect( long n );
-//	virtual void Disconnect( long n );
-//	virtual void StopAdviseLoop();
-
 };
 
 
@@ -522,7 +514,6 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
     for( USHORT n = pAppData_Impl->pDocTopics->Count(); n; )
         if( (*pAppData_Impl->pDocTopics)[ --n ]->pSh == pSh )
         {
-            // JP 18.03.96 - Bug 26470
             //	falls das Document unbenannt wurde, ist trotzdem ein
             //	neues Topics anzulegen!
             if( !bFnd )
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index db271dbf1d..2d3f3ecc87 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -144,7 +144,6 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a
         xGlobalBroadcaster->notifyEvent(aEvent2);
     }
 
-    //pApp->Deinitialize();
     delete pApp;
     Application::Quit();
 }
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 85874f8345..4c570c5d23 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
 
-//#define TF_NEWDESKTOP
-
 #define _SDINTERN_HXX
 
 #include <stdio.h>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index f834558d12..f0cfd15704 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -164,13 +164,6 @@ void SfxApplication::InitializeDisplayName_Impl()
     {
         osl::ClearableMutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 
-        // create version string
-/*!!! (pb) don't show a version number at the moment
-        USHORT nProductVersion = ProductVersion::GetVersion().ToInt32();
-        String aVersion( String::CreateFromInt32( nProductVersion / 10 ) );
-        aVersion += 0x002E ; // 2Eh ^= '.'
-        aVersion += ( String::CreateFromInt32( nProductVersion % 10 ) );
-*/
         // load application title
         aTitle = String( ResId( RID_APPTITLE, *pAppData->pLabelResMgr ) );
         // merge version into title
@@ -322,7 +315,5 @@ SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppDat
 BOOL  SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
 SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; }
 SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; }
-//SfxOptions&  SfxApplication::GetOptions() { return *pAppData_Impl->pOptions; }
-//const SfxOptions& SfxApplication::GetOptions() const { return *pAppData_Impl->pOptions; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 7aae92f0bd..97b3c37318 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -288,7 +288,6 @@ private:
 
 sal_uInt32 CheckPasswd_Impl
 (
-    //Window *pWin,             // Parent des Dialogs
     SfxObjectShell*  pDoc,
     SfxItemPool&     /*rPool*/, // Pool, falls ein Set erzeugt werden mus
     SfxMedium*       pFile      // das Medium, dessen Passwort gfs. erfragt werden soll
@@ -322,9 +321,6 @@ sal_uInt32 CheckPasswd_Impl
                     // TODO/LATER:
                     // the storage either has no encrypted elements or it's just
                     // does not allow to detect it, probably it should be implemented laiter
-                    /*
-                    bIsEncrypted = ( aInfo.Load( xStorage ) && aInfo.IsPasswd() );
-                    */
                 }
 
                 if ( bIsEncrypted )
@@ -492,7 +488,6 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil
         SfxItemSet* pNew = xDoc->GetMedium()->GetItemSet()->Clone();
         pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL );
         pNew->ClearItem( SID_FILTER_NAME );
-        //pNew->Put( SfxStringItem( SID_FILTER_NAME, xDoc->GetFactory().GetFilter(0)->GetFilterName() ) );
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs;
         TransformItems( SID_OPENDOC, *pNew, aArgs );
         sal_Int32 nLength = aArgs.getLength();
@@ -904,13 +899,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             rReq.AppendItem( SfxBoolItem( SID_PREVIEW, TRUE ) );
         }
 
-        if ( STRING_NOTFOUND != aFileFlags.Search( 0x0053 ) )               // S = 53h
-        {
-            // not supported anymore
-            //rReq.RemoveItem( SID_SILENT );
-            //rReq.AppendItem( SfxBoolItem( SID_SILENT, TRUE ) );
-        }
-
         rReq.RemoveItem( SID_OPTIONS );
     }
 
@@ -934,41 +922,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             INetProtocol aINetProtocol = INetURLObject( aURL.Complete ).GetProtocol();
             SvtExtendedSecurityOptions aExtendedSecurityOptions;
             SvtExtendedSecurityOptions::OpenHyperlinkMode eMode = aExtendedSecurityOptions.GetOpenHyperlinkMode();
-            if ( eMode == SvtExtendedSecurityOptions::OPEN_WITHSECURITYCHECK )
-            {
-                if ( aINetProtocol == INET_PROT_FILE )
-                {
-/*!!! pb: #i49802# no security warning any longer
-                    // Check if file URL is a directory. This is not insecure!
-                    osl::Directory aDir( aURL.Main );
-                    sal_Bool bIsDir = ( aDir.open() == osl::Directory::E_None );
-
-                    if ( !bIsDir && !aExtendedSecurityOptions.IsSecureHyperlink( aURL.Complete ) )
-                    {
-                        // Security check for local files depending on the extension
-                        SolarMutexGuard aGuard;
-                        Window *pWindow = SFX_APP()->GetTopWindow();
 
-                        String aSecurityWarningBoxTitle( SfxResId( RID_SECURITY_WARNING_TITLE ));
-                        WarningBox	aSecurityWarningBox( pWindow, SfxResId( RID_SECURITY_WARNING_HYPERLINK ));
-                        aSecurityWarningBox.SetText( aSecurityWarningBoxTitle );
-
-                        // Replace %s with the real file name
-                        String aMsgText = aSecurityWarningBox.GetMessText();
-                        String aMainURL( aURL.Main );
-                        String aFileName;
-
-                        utl::LocalFileHelper::ConvertURLToPhysicalName( aMainURL, aFileName );
-                        aMsgText.SearchAndReplaceAscii( "%s", aFileName );
-                        aSecurityWarningBox.SetMessText( aMsgText );
-
-                        if( aSecurityWarningBox.Execute() == RET_NO )
-                            return;
-                    }
-*/
-                }
-            }
-            else if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
+            if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
             {
                 SolarMutexGuard aGuard;
                 Window *pWindow = SFX_APP()->GetTopWindow();
@@ -1212,8 +1167,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
     }
 
     Reference < XController > xController;
-//    if ( ( !bIsBlankTarget && pFrame ) || pLinkItem || !rReq.IsSynchronCall() )
-//    {
         // if a frame is given, it must be used for the starting point of the targetting mechanism
         // this code is also used if asynchronous loading is possible, because loadComponent always is synchron
         if ( !xTargetFrame.is() )
@@ -1250,15 +1203,11 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         {
             // if loading must be done synchron, we must wait for completion to get a return value
             // find frame by myself; I must konw the exact frame to get the controller for the return value from it
-            //if( aTarget.getLength() )
-            //    xTargetFrame = xTargetFrame->findFrame( aTarget, FrameSearchFlag::ALL );
             Reference < XComponent > xComp;
 
             try
             {
                 xComp = ::comphelper::SynchronousDispatch::dispatch( xTargetFrame, aFileName, aTarget, 0, aArgs );
-//                Reference < XComponentLoader > xLoader( xTargetFrame, UNO_QUERY );
-//                xComp = xLoader->loadComponentFromURL( aFileName, aTarget, 0, aArgs );
             }
             catch(const RuntimeException&)
             {
@@ -1288,37 +1237,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
             if ( xDisp.is() )
                 xDisp->dispatch( aURL, aArgs );
         }
-    /*
-    }
-    else
-    {
-        // synchron loading without a given frame or as blank frame
-        SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, FALSE );
-
-        // Desktop service must exists! dont catch() or check for problems here ...
-        // But loading of documents can fail by other reasons. Handle it more gracefully.
-        Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), UNO_QUERY );
-        Reference < XComponent >       xComp;
-        try
-        {
-            xComp = xDesktop->loadComponentFromURL( pFileNameItem->GetValue(), aTarget, 0, aArgs );
-        }
-        catch(const RuntimeException&)
-        {
-            throw;
-        }
-        catch(const ::com::sun::star::uno::Exception&)
-        {
-            xDesktop.clear();
-            xComp.clear();
-        }
-
-        Reference < XModel > xModel( xComp, UNO_QUERY );
-        if ( xModel.is() )
-            xController = xModel->getCurrentController();
-        else
-            xController = Reference < XController >( xComp, UNO_QUERY );
-    }*/
 
     if ( xController.is() )
     {
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 0b227734bb..c44cd04706 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -112,8 +112,6 @@ void SfxApplication::Deinitialize()
     // this method. Therefore this call makes no sense and is the source of
     // some stack traces, which we don't understand.
     // For more information see:
-    // #123501#
-    //SetViewFrame(0);
     pAppData_Impl->bDowning = FALSE;
     DBG_ASSERT( !SfxViewFrame::GetFirst(),
                 "existing SfxViewFrame after Execute" );
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 04f8a04210..8da42b90b1 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1239,7 +1239,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
             USHORT nSubCount = pType->nAttribs;
             if ( !nSubCount )
             {
-                //rPool.FillVariable( *pItem, *pVar, eUserMetric );
                 pValue[nActProp].Name = String( String::CreateFromAscii( pSlot->pUnoName ) ) ;
                 if ( !pItem->QueryValue( pValue[nActProp].Value ) )
                 {
@@ -1253,7 +1252,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 // complex type, add a property value for every member of the struct
                 for ( USHORT n=1; n<=nSubCount; ++n )
                 {
-                    //rPool.FillVariable( *pItem, *pVar, eUserMetric );
                     BYTE nSubId = (BYTE) (sal_Int8) pType->aAttrib[n-1].nAID;
                     if ( bConvertTwips )
                         nSubId |= CONVERT_TWIPS;
@@ -1290,7 +1288,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 USHORT nSubCount = rArg.pType->nAttribs;
                 if ( !nSubCount )
                 {
-                    //rPool.FillVariable( *pItem, *pVar, eUserMetric );
                     pValue[nActProp].Name = String( String::CreateFromAscii( rArg.pName ) ) ;
                     if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
                     {
@@ -1304,7 +1301,6 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                     // complex type, add a property value for every member of the struct
                     for ( USHORT n = 1; n <= nSubCount; ++n )
                     {
-                        //rPool.FillVariable( rItem, *pVar, eUserMetric );
                         BYTE nSubId = (BYTE) (sal_Int8) rArg.pType->aAttrib[n-1].nAID;
                         if ( bConvertTwips )
                             nSubId |= CONVERT_TWIPS;
@@ -1864,9 +1860,6 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::
                 SfxObjectShellRef rSh = pSh;
 
                 // execute function using its Sbx parent,
-                //SbxVariable* pRet = pMethod->GetParent()->Execute( aCall );
-                //rRetval = sbxToUnoValue( pRet );
-
                 SbxVariable* pRet = pMethod->GetParent()->Execute( aCall );
                 if ( pRet )
                 {
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index c1a89ef408..b1d2261571 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -305,8 +305,6 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
     }
 
     SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nID ) );
-    // aWinOpt.SetPosition( rInfo.aPos.X(), rInfo.aPos.Y() );
-    // aWinOpt.SetSize( rInfo.aSize.Width(), rInfo.aSize.Height() );
     aWinOpt.SetWindowState( String( rInfo.aWinState, RTL_TEXTENCODING_UTF8 ) );
 
     ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
@@ -411,9 +409,6 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin
 
         aWinData.Erase(0,nPos+1);
 
-        //aWinOpt.GetPosition( rInfo.aPos.X(), rInfo.aPos.Y() );
-        //aWinOpt.GetSize( rInfo.aSize.Width(), rInfo.aSize.Height() );
-
         // Sichtbarkeit laden: ist als ein char codiert
         rInfo.bVisible = (aWinData.GetChar(0) == 0x0056); // 'V' = 56h
         aWinData.Erase(0,1);
@@ -734,20 +729,14 @@ void SfxChildWindow::SetWorkWindow_Impl( SfxWorkWindow* pWin )
         pImp->pWorkWin->SetActiveChild_Impl( pWindow );
 }
 
-//SfxWorkWindow* SfxChildWindow::GetWorkWindow_Impl() const
-//{
-//	return pImp->pWorkWin;
-//}
-
 void SfxChildWindow::Activate_Impl()
 {
-    if(pImp->pWorkWin!=NULL) //@#60568#
+    if(pImp->pWorkWin!=NULL)
         pImp->pWorkWin->SetActiveChild_Impl( pWindow );
 }
 
 void SfxChildWindow::Deactivate_Impl()
 {
-//	pImp->pWorkWin->SetActiveChild_Impl( NULL );
 }
 
 sal_Bool SfxChildWindow::QueryClose()
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index a09999a98f..41f1a3e485 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -127,13 +127,11 @@ BOOL SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
             {
                 Graphic aGrf;
 
-                //JP 15.07.98: Bug 52959
                 //		falls das Nativformat doch erwuenscht ist, muss am
                 //		Ende das Flag zurueckgesetzt werden.
 // wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
 // GraphicNode entfernt wird.
                 BOOL bOldNativFormat = bNativFormat;
-//!!??				bNativFormat = 0 != (ASPECT_ICON & pSvData->GetAspect());
 
                 // falls gedruckt werden soll, warten wir bis die
                 // Daten vorhanden sind
@@ -291,7 +289,6 @@ BOOL SvFileObject::LoadFile_Impl()
     xMed->setStreamToLoadFrom(
         aStreamToLoadFrom.m_xInputStreamToLoadFrom,
         aStreamToLoadFrom.m_bIsReadOnly);
-    // setStreamToLoadFrom(0,0);
     if( sReferer.Len() )
         xMed->SetReferer( sReferer );
 
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 037f68b9d5..80990d449f 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -169,8 +169,6 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
     if ( m_xSlaveDispatcher.is() )
         xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags );
 
-    // INetURLObject aObj( aURL.Complete );
-    // sal_Bool bHelpURL = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
     BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
 
     if ( bHelpURL )
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 60616a82dd..6ee5e26eca 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -128,9 +128,6 @@ IMPL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit *, pEdit )
     return 0;
 }
 
-/*  */
-
-
 SvDDEObject::SvDDEObject()
     : pConnection( 0 ), pLink( 0 ), pRequest( 0 ), pGetData( 0 ), nError( 0 )
 {
@@ -190,7 +187,6 @@ BOOL SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
     else
     {
         // otherwise it will be executed asynchronously
-//              if( !pLink || !pLink->IsBusy() )
         {
             if( pRequest )
                 delete pRequest;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index c4038da546..7b27b38b39 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -505,8 +505,6 @@ void LinkManager::CancelTransfers()
         if( 0 != ( pLnk = &(*rLnks[ --n ])) &&
             OBJECT_CLIENT_FILE == (OBJECT_CLIENT_FILE & pLnk->GetObjType()) &&
             0 != ( pFileObj = (SvFileObject*)pLnk->GetObj() ) )
-//			0 != ( pFileObj = (SvFileObject*)SvFileObject::ClassFactory()->
-//									CastAndAddRef( pLnk->GetObj() )) )
             pFileObj->CancelTransfers();
 }
     // For the purpose of sending Status information from the file object to 
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index b0aeaa4d36..4ef56e0fac 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -369,7 +369,6 @@ BOOL SvBaseLink::Update()
         if( xObj.Is() )
         {
             xObj->setStreamToLoadFrom(m_xInputStreamToLoadFrom,m_bIsReadOnly);
-            // m_xInputStreamToLoadFrom = 0;
             String sMimeType( SotExchange::GetFormatMimeType(
                             pImplData->ClientType.nCntntType ));
             Any aData;
@@ -377,8 +376,7 @@ BOOL SvBaseLink::Update()
             if( xObj->GetData( aData, sMimeType ) )
             {
                 DataChanged( sMimeType, aData );
-                //JP 13.07.00: Bug 76817 - for manual Updates there is no
-                //				need to hold the ServerObject
+                //for manual Updates there is no need to hold the ServerObject
                 if( OBJECT_CLIENT_DDE == nObjType &&
                     LINKUPDATE_ONCALL == GetUpdateMode() && xObj.Is() )
                     xObj->RemoveAllDataAdvise( this );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 9a6832b518..a5f4963ea6 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2919,7 +2919,6 @@ void SfxHelpWindow_Impl::MakeLayout()
             Some VCL-patches could not solve this problem so I've established the
             workaround: resize the help window if it's visible .-)
         */
-//      pScreenWin->Hide();
 
         ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize();
         sal_Int32 nOldWidth = bIndex ? nCollapseWidth : nExpandWidth;
@@ -2936,8 +2935,6 @@ void SfxHelpWindow_Impl::MakeLayout()
         }
         else if ( aWinPos.X() > 0 && aWinPos.Y() > 0 )
             pScreenWin->SetPosPixel( aWinPos );
-
-//      pScreenWin->Show();
     }
 
     Clear();
@@ -3086,9 +3083,6 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG )
 
     ::rtl::OUString sHelpURL;
 
-// 	INetURLObject aObj(aEntry);
-//  BOOL bComplete = ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP );
-
     BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0);
 
     if (bComplete)
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index f4157a80cc..450fedf996 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -133,7 +133,6 @@ static rtl::OUString HelpLocaleString()
         else
         {
             rtl::OUString aBaseInstallPath;
-            // utl::Bootstrap::PathStatus aBaseLocateResult =
             utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
             static const char *szHelpPath = "/help/";
 
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 7d9ea18a3d..1c9117fa08 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -126,8 +126,6 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const St
         // path and abbreviate it with a special function:
         String aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
 
-//		::utl::LocalFileHelper::ConvertURLToPhysicalName( aURLString, aPhysicalName );
-
         ::rtl::OUString	aSystemPath( aFileSystemPath );
         ::rtl::OUString	aCompactedSystemPath;
 
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 47839f8cef..981809af6b 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -416,7 +416,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
 {
     DBG_ASSERT( pThis->m_pFileDlg, "ShutdownIcon, DialogClosedHdl_Impl(): no file dialog" );
 
-    // use ctor for filling up filters automatically! #89169#
+    // use ctor for filling up filters automatically!
     if ( ERRCODE_NONE == pThis->m_pFileDlg->GetError() )
     {
         Reference< XFilePicker >    xPicker = pThis->m_pFileDlg->GetFilePicker();
@@ -451,7 +451,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
                 aArgs[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("UpdateDocMode"));
                 aArgs[2].Value <<= nUpdateDoc;
 
-                // pb: #102643# use the filedlghelper to get the current filter name,
+                // use the filedlghelper to get the current filter name,
                 // because it removes the extensions before you get the filter name.
                 OUString aFilterName( pThis->m_pFileDlg->GetCurrentFilter() );
 
@@ -465,7 +465,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
 
                     xPickerControls->getValue( ExtendedFilePickerElementIds::CHECKBOX_READONLY, 0 ) >>= bReadOnly;
 
-                    // #95239#: Only set porperty if readonly is set to TRUE
+                    // Only set porperty if readonly is set to TRUE
 
                     if ( bReadOnly )
                     {
@@ -540,7 +540,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
     }
 
 #ifdef WNT
-    // #103346 Destroy dialog to prevent problems with custom controls
+    // Destroy dialog to prevent problems with custom controls
     // This fix is dependent on the dialog settings. Destroying the dialog here will
     // crash the non-native dialog implementation! Therefore make this dependent on
     // the settings.
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 96d6cea142..bb296a5e98 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -317,7 +317,7 @@ static gboolean display_menu_cb( GtkWidget *,
 
 #ifdef ENABLE_GIO
 /*
- * See rhbz#610103. If the quickstarter is running, then LibreOffice is
+ * If the quickstarter is running, then LibreOffice is
  * upgraded, then the old quickstarter is still running, but is now unreliable
  * as the old install has been deleted. A fairly intractable problem but we
  * can avoid much of the pain if we turn off the quickstarter if we detect
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 3d877e573d..534a55a7cb 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -342,30 +342,6 @@ static void addTaskbarIcon( HWND hWnd )
 
 // -------------------------------
 
-/*
-static void removeTaskbarIcon()
-{
-    ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance();
-    OSL_ENSURE( pShutdownIcon, "ShutdownIcon instance empty!");
-
-    if( !pShutdownIcon )
-        return;
-
-    if ( IsWindow( aListenerWindow ))
-    {
-        deleteSystrayMenu( popupMenu );
-
-        NOTIFYICONDATAA nid;
-        nid.cbSize=sizeof(NOTIFYICONDATA);
-        nid.hWnd = aListenerWindow;
-        nid.uID = ID_QUICKSTART;
-        Shell_NotifyIconA(NIM_DELETE, &nid);
-    }
-}
-*/
-
-// -------------------------------
-
 LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     static UINT s_uTaskbarRestart = 0;
@@ -429,7 +405,6 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 #endif
                     int m = TrackPopupMenuEx( popupMenu, TPM_RETURNCMD|TPM_LEFTALIGN|TPM_RIGHTBUTTON,
                                               pt.x, pt.y, hWnd, NULL );
-                    // BUGFIX: See Q135788 (PRB: Menus for Notification Icons Don't Work Correctly)
                     PostMessage( hWnd, NULL, 0, 0 );
                     switch( m )
                     {
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4dc917d4e5..86d4bb0f95 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -524,7 +524,6 @@ void SfxWorkWindow::Sort_Impl()
         {
             USHORT k;
             for (k=0; k<aSortedList.Count(); k++)
-//                              if ( (*pChilds)[aSortedList[k]]->eAlign > pCli->eAlign )
                 if (ChildAlignValue((*pChilds)[aSortedList[k]]->eAlign) >
                     ChildAlignValue(pCli->eAlign))
                     break;
@@ -570,7 +569,6 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra
         pSplit[n] = pSplitWin;
     }
 
-    //nOrigMode = SFX_VISIBILITY_CLIENT;
     nOrigMode = SFX_VISIBILITY_STANDARD;
     nUpdateMode = SFX_VISIBILITY_STANDARD;
 }
@@ -729,12 +727,6 @@ void SfxWorkWindow::DeleteControllers_Impl()
            SfxChildWindow *pChild = pCW->pWin;
         if (pChild)
         {
-/*
-            USHORT nFlags = pCW->aInfo.nFlags;
-            pCW->aInfo = pChild->GetInfo();
-            pCW->aInfo.nFlags |= nFlags;
-            SaveStatus_Impl(pChild, pCW->aInfo);
-*/
             pChild->Hide();
 
             // If the child window is a direct child window and not in a 
@@ -753,14 +745,10 @@ void SfxWorkWindow::DeleteControllers_Impl()
         // ATTENTION: The array itself is cleared after this loop!!
         // Therefore we have to set every array entry to zero as it could be
         // accessed by calling pChild->Destroy().
-        // See task 128307 (Windows)
         // Window::NotifyAllChilds() calls SfxWorkWindow::DataChanged_Impl for
         // 8-bit displays (WM_QUERYPALETTECHANGED message due to focus change)!!
-        //(*pChildWins)[n] = 0;
     }
 
-    //pChildWins->Remove((USHORT)0, nCount);
-
     Reference< com::sun::star::frame::XFrame > xFrame = GetFrameInterface();
     Reference< com::sun::star::beans::XPropertySet > xPropSet( xFrame, UNO_QUERY );
     Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
@@ -1065,7 +1053,6 @@ void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
                                             SfxChildAlignment eAlign )
 {
     DBG_CHKTHIS(SfxWorkWindow, 0);
-//	DBG_ASSERT( pChilds, "aligning unregistered child" );
     DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
 
     SfxChild_Impl *pChild = FindChild_Impl(rWindow);
@@ -1088,7 +1075,6 @@ void SfxWorkWindow::AlignChild_Impl( Window& rWindow,
 void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 {
     DBG_CHKTHIS(SfxWorkWindow, 0);
-//	DBG_ASSERT( pChilds, "releasing unregistered child" );
 
     SfxChild_Impl *pChild = 0;
     USHORT nPos;
@@ -1350,7 +1336,6 @@ void SfxFrameWorkWin_Impl::UpdateObjectBars_Impl()
 
     SfxWorkWindow::UpdateObjectBars_Impl();
 
-//	if ( pTask->IsActive() )
     {
         pWork = pParent;
         while ( pWork )
@@ -1656,9 +1641,6 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
         pCW->aInfo.bVisible = aInfo.bVisible;
         pCW->aInfo.nFlags |= aInfo.nFlags;
 
-        // No! Otherwise, you could have disable any window stored (Partwindow!)
-//              pCW->aInfo.bVisible = TRUE;
-
         // The creation was successful
         GetBindings().Invalidate(pCW->nId);
 
@@ -1667,7 +1649,6 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, BOOL bSetFocus )
         {
             DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
             if ((*pChilds)[TbxMatch(nPos)])// &&
-//       pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
             {
                 // ChildWindow replaces ObjectBar
                 (*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
@@ -1711,20 +1692,6 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
 
     // existing window goes out of the context and is therefore removed
     USHORT nPos = pChildWin->GetPosition();
-    if (nPos != CHILDWIN_NOPOS)
-    {
-/*
-        // ChildWindow overloads a ObjectBar
-        DBG_ASSERT(nPos < SFX_OBJECTBAR_MAX, "Illegal objectbar position!");
-        if ((*pChilds)[TbxMatch(nPos)] &&
-            (aObjBars[nPos].nMode & nUpdateMode) ) //&&
-//                                                 pChildWin->GetAlignment() == (*pChilds)[nPos]->eAlign )
-        {
-            // ObjectBar was overloaded; now display it again
-            (*pChilds)[TbxMatch(nPos)]->nVisible ^= CHILD_NOT_HIDDEN;
-        }
-*/
-    }
 
     // Save the information in the INI file 
     USHORT nFlags = pCW->aInfo.nFlags;
@@ -1825,22 +1792,6 @@ void SfxWorkWindow::UpdateStatusBar_Impl()
     }
 }
 
-//------------------------------------------------------------------------
-/*
-void SfxWorkWindow::SetObjectBarVisibility_Impl( USHORT nMask )
-{
-    switch( nMask )
-    {
-        case SFX_VISIBILITY_UNVISIBLE:
-        case SFX_VISIBILITY_STANDARD:
-        case SFX_VISIBILITY_CLIENT:
-        case SFX_VISIBILITY_SERVER:
-            nOrigMode = nMask;
-    }
-    if (nMask != nUpdateMode)
-        nUpdateMode = nMask;
-}*/
-
 void SfxWorkWindow::MakeVisible_Impl( BOOL bVis )
 {
     if ( bVis )
@@ -1985,7 +1936,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             if ( nPos == USHRT_MAX )
                 return;
 
-//                      SfxChild_Impl *pChild = (*pChilds)[nPos];
             Rectangle aOuterRect( GetTopRect_Impl() );
             aOuterRect.SetPos( pWorkWin->OutputToScreenPixel( aOuterRect.TopLeft() ));
             Rectangle aInnerRect( aOuterRect );
@@ -2004,7 +1954,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
                     {
                         case SFX_ALIGN_TOP:
                             // Objekt-Toolboxes come always last
-                            //if ( bTbx || i <= nPos)
                                 aInnerRect.Top() += pCli->aSize.Height();
                             break;
 
@@ -2027,7 +1976,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                         case SFX_ALIGN_BOTTOM:
                             // Objekt-Toolboxes come always last
-                            //if ( bTbx || i <= nPos)
                                 aInnerRect.Bottom() -= pCli->aSize.Height();
                             break;
 
@@ -2050,7 +1998,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                         case SFX_ALIGN_LEFT:
                             // Toolboxes come always last
-                            //if (bTbx || i <= nPos)
                                 aInnerRect.Left() += pCli->aSize.Width();
                             break;
 
@@ -2072,7 +2019,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                         case SFX_ALIGN_RIGHT:
                             // Toolboxes come always last
-                            //if (bTbx || i <= nPos)
                                 aInnerRect.Right() -= pCli->aSize.Width();
                             break;
 
@@ -2150,7 +2096,6 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
     }
 }
 
-
 //--------------------------------------------------------------------
 
 void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, USHORT nMode )
@@ -2589,8 +2534,6 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(USHORT nId)
 
 void SfxWorkWindow::ResetChildWindows_Impl()
 {
-//      if ( pParent )
-//              pParent->ResetChildWindows_Impl();
 
     for ( USHORT n = 0; n < pChildWins->Count(); ++n )
     {
@@ -2699,11 +2642,6 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
         }
     }
 }
-/*
-SfxStatBar_Impl* SfxWorkWindow::GetStatusBar_Impl()
-{
-    return &aStatBar;
-} */
 
 SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign )
 {
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index ae31181a43..202ea4ed05 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1026,7 +1026,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
         {
             nClipboardId = SotExchange::RegisterFormatName( sHumanName );
 
-            // #100570# For external filters ignore clipboard IDs
+            // For external filters ignore clipboard IDs
             if((nFlags & SFX_FILTER_STARONEFILTER) == SFX_FILTER_STARONEFILTER)
             {
                 nClipboardId = 0;
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 9e70420f9e..31ee13fb95 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -102,8 +102,6 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
         case HTML_O_MARGINWIDTH:
             aMargin.Width() = pOption->GetNumber();
 
-//			if( aMargin.Width() < 1 )
-//				aMargin.Width() = 1;
             if( !bMarginHeight )
                 aMargin.Height() = 0;
             bMarginWidth = TRUE;
@@ -111,8 +109,6 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
         case HTML_O_MARGINHEIGHT:
             aMargin.Height() = pOption->GetNumber();
 
-//			if( aMargin.Height() < 1 )
-//				aMargin.Height() = 1;
             if( !bMarginWidth )
                 aMargin.Width() = 0;
             bMarginHeight = TRUE;
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 9ec69bcaf4..e4ee0b6ff5 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -32,7 +32,6 @@
 #include <svl/inetdef.hxx>
 #include "svtools/htmlkywd.hxx"
 
-//!(dv) #include <chaos2/cntapi.hxx>
 #include <rtl/tencinfo.h>
 
 #include <unotools/configmgr.hxx>
@@ -66,17 +65,6 @@ static sal_Char const sHTML_SC_no[] =		"NO";
 static sal_Char const sHTML_SC_auto[] =	"AUTO";
 static sal_Char const sHTML_MIME_text_html[] =	"text/html; charset=";
 
-/* not used anymore?
-static HTMLOutEvent aFrameSetEventTable[] =
-{
-    { sHTML_O_SDonload,		sHTML_O_onload,		SFX_EVENT_OPENDOC	},
-    { sHTML_O_SDonunload,	sHTML_O_onunload,	SFX_EVENT_PREPARECLOSEDOC	},
-    { sHTML_O_SDonfocus,	sHTML_O_onfocus,	SFX_EVENT_ACTIVATEDOC	},
-    { sHTML_O_SDonblur,		sHTML_O_onblur,		SFX_EVENT_DEACTIVATEDOC	},
-    { 0,					0,				  	0					}
-};
-*/
-
 #if defined(UNX)
 const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012";
 #else
@@ -263,23 +251,6 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         }
     }
 }
-/*
-void SfxFrameHTMLWriter::OutHeader( rtl_TextEncoding eDestEnc )
-{
-    // <HTML>
-    // <HEAD>
-    // <TITLE>Titel</TITLE>
-    // </HEAD>
-    HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_html ) << sNewLine;
-    HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head );
-
-    Out_DocInfo( Strm(), &pDoc->GetDocInfo(), "\t", eDestEnc );
-    Strm() << sNewLine;
-    HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head, FALSE ) << sNewLine;
-
-//!     OutScript();                    // Hear the scripts in the Header are still missing
-}
-*/
 
 void SfxFrameHTMLWriter::Out_FrameDescriptor(
     SvStream& rOut, const String& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
@@ -344,19 +315,6 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
                 (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_frameborder) += '=') += pStr;
             }
         }
-
-        // TODO/LATER: currently not supported attributes
-        // resize
-        //if( !pFrame->IsResizable() )
-        //    (sOut += ' ') += sHTML_O_noresize;
-        //
-        //if ( pFrame->GetWallpaper() )
-        //{
-        //    ((sOut += ' ') += sHTML_O_bordercolor) += '=';
-        //    rOut << sOut.GetBuffer();
-        //    HTMLOutFuncs::Out_Color( rOut, pFrame->GetWallpaper()->GetColor(), eDestEnc );
-        //}
-        //else
             rOut << sOut.GetBuffer();
     }
     catch ( uno::Exception& )
@@ -371,7 +329,6 @@ String SfxFrameHTMLWriter::CreateURL( SfxFrame* pFrame )
     if( !aRet.Len() && pShell )
     {
         aRet = pShell->GetMedium()->GetName();
-//!(dv)		CntAnchor::ToPresentationURL( aRet );
     }
 
     return aRet;
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 72d42397d0..508295afda 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -38,7 +38,6 @@
 #include <svl/eitem.hxx>
 #include <tools/time.hxx>
 
-// includes below due to nRescheduleLocks
 #include "appdata.hxx"
 #include <sfx2/request.hxx>
 #include <sfx2/frame.hxx>
@@ -281,27 +280,6 @@ const String& SfxProgress::GetStateText_Impl() const
 }
 
 // -----------------------------------------------------------------------
-/*
-IMPL_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus*, pStatus )
-{
-    INetRequest* pReq = 0;
-    const INetHint *pHint = PTR_CAST( INetHint, pStatus->pHint );
-    pReq = PTR_CAST( INetRequest, pStatus->pBC );
-
-    String aString;
-    if( pReq )
-        aString = SfxMedium::GetStatusString( pHint->GetId(), pReq, pHint );
-    if( aString.Len() )
-    {
-        GetpApp()->ShowStatusText( aString );
-        if( pThis )
-            pThis->pImp->bIsStatusText = TRUE;
-    }
-    return 0;
-}
-*/
-
-// -----------------------------------------------------------------------
 
 // Required in App data
 static ULONG nLastTime = 0;
@@ -355,10 +333,6 @@ BOOL SfxProgress::SetState
 */
 
 {
-//  Was stoped by Stop-Button?
-//	if ( pImp->IsCancelled() )
-//		return FALSE;
-
     if( pImp->pActiveProgress ) return TRUE;
 
     nVal = nNewVal;
@@ -391,14 +365,6 @@ BOOL SfxProgress::SetState
                 SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
                 if ( !pHiddenItem || !pHiddenItem->GetValue() )
                 {
-                    // not in a view, perhaps it's just loading
-                    //SfxFrame* pFrame = pMedium->GetLoadTargetFrame();
-                    //if ( pFrame && pFrame->GetCurrentViewFrame() )
-                    //{
-                        // recycling frame
-                        //pImp->pView = pFrame->GetCurrentViewFrame();
-                    //}
-                    //else
                     {
                         SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
                         Reference< XStatusIndicator > xInd;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index abb88fb64c..d51d7fed6f 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -256,12 +256,6 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     {
         // Register the medium, so that it can be stopped.
         pSh->RegisterTransfer( *pDLMedium );
-
-        // Transfer Target-Frame, so that also the javascript:-URLs
-        // can be "loaded".
-        //const SfxMedium *pShMedium = pSh->GetMedium();
-        //if( pShMedium )
-        //      pDLMedium->SetLoadTargetFrame( pShMedium->GetLoadTargetFrame() );
     }
 
     // Push Download (Note: Can also be synchronous).
@@ -300,7 +294,7 @@ BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
         DBG_ASSERT( pStream, "Kein In-Stream vom Medium erhalten" );
 
         SvMemoryStream aStream;
-        if( pStream )   // HACK due to bug #65563#
+        if( pStream )
             aStream << *pStream;
 
         aStream.Seek( STREAM_SEEK_TO_END );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index c1c1a73106..0e59378855 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1052,7 +1052,6 @@ void SfxBindings::Release( SfxControllerItem& rItem )
 {
     DBG_MEMTEST();
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
-    //! DBG_ASSERT( nRegLevel > 0, "release without EnterRegistrations" );
     DBG_ASSERT( !pImp->bInNextJob, "SfxBindings::Release while status-updating" );
     ENTERREGISTRATIONS();
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 96536be37a..802eaca6e4 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -423,9 +423,6 @@ SfxDispatcher::~SfxDispatcher()
     SfxApplication *pSfxApp = SFX_APP();
     SfxBindings* pBindings = GetBindings();
 
-//      if (pImp->nEventId)
-//              pSfxApp->RemoveEventHdl(pImp->nEventId);
-
     // When not flushed, revive the bindings
     if ( pBindings && !pSfxApp->IsDowning() && !bFlushed )
         pBindings->DLEAVEREGISTRATIONS();
@@ -778,7 +775,6 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
 
     if ( bMDI && pImp->pFrame )
     {
-        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
@@ -883,7 +879,6 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
 
     if ( bHidePopups )
     {
-        //SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl();
         SfxBindings *pBind = GetBindings();
         while ( pBind )
         {
@@ -967,23 +962,6 @@ int SfxDispatcher::GetShellAndSlot_Impl
     return sal_False;
 }
 
-/*
-struct Executer : public SfxHint
-{
-    SfxRequest *pRequest;
-    const SfxSlot* pSlot;
-    sal_uInt16 nLevel;
-
-    Executer( SfxRequest* pReq, const SfxSlot* p, sal_uInt16 n )
-        :  pRequest( pReq )
-        , pSlot(p)
-        , nLevel(n)
-        {}
-    ~Executer()
-    {delete pRequest;}
-};
-*/
-
 //--------------------------------------------------------------------
 void SfxDispatcher::_Execute
 (
@@ -1027,7 +1005,6 @@ void SfxDispatcher::_Execute
                     if ( eCallMode & SFX_CALLMODE_RECORD )
                         rReq.AllowRecording( TRUE );
                     pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
-//                    pDispat->pImp->xPoster->Post(new Executer(new SfxRequest(rReq), &rSlot, n ));
                     return;
                 }
             }
@@ -1125,16 +1102,6 @@ sal_uInt16 SfxDispatcher::ExecuteFunction( sal_uInt16 nSlot, const SfxItemSet& r
     if ( !nMode )
         nMode = pImp->nStandardMode;
 
-/*
-    // at the moment not implemented
-    // through Bindings/Interceptor? (then the return value is not exact)
-    sal_Bool bViaBindings = SFX_USE_BINDINGS == ( nMode & SFX_USE_BINDINGS );
-    nMode &= ~sal_uInt16(SFX_USE_BINDINGS);
-    if ( bViaBindings && GetBindings() )
-        return GetBindings()->Execute( nSlot, rArgs, nMode )
-                ? EXECUTE_POSSIBLE
-                : EXECUTE_NO;
-*/
     // otherwise through the Dispatcher 
     if ( IsLocked(nSlot) )
         return 0;
@@ -1542,7 +1509,6 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
     SFX_STACK(SfxDispatcher::PostMsgHandler);
 
     // Has also the Pool not yet died?
-//    SfxRequest* pReq = pExec->pRequest;
     if ( !pReq->IsCancelled() )
     {
         if ( !IsLocked(pReq->GetSlot()) )
@@ -1550,8 +1516,6 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
             Flush();
             SfxSlotServer aSvr;
             if ( _FindServer(pReq->GetSlot(), aSvr, HACK(x) sal_True ) )
-//            SfxShell *pShell = GetShell(pExec->nLevel);
-//            if ( pShell && pShell->GetInterface()->GetSlot( pExec->pSlot->GetSlotId() ) )
             {
                 const SfxSlot *pSlot = aSvr.GetSlot();
                 SfxShell *pSh = GetShell(aSvr.GetShellLevel());
@@ -1563,23 +1527,17 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
                 // be destroyed in the Call_Impl, thus do not use it anymore!
                 pReq->SetSynchronCall( sal_False );
                 Call_Impl( *pSh, *pSlot, *pReq, pReq->AllowsRecording() ); //! why bRecord?
-//                Call_Impl( *pShell, *pExec->pSlot, *pReq, sal_True ); //! why bRecord?
                 DBG( pSfxApp->LeaveAsynchronCall_Impl() );
             }
-
-//            delete pExec;
         }
         else
         {
-//            pImp->xPoster->Post(pExec);
             if ( pImp->bLocked )
                 pImp->aReqArr.Insert( new SfxRequest(*pReq), pImp->aReqArr.Count() );
             else
                 pImp->xPoster->Post(new SfxRequest(*pReq));
         }
     }
-//    else
-//        delete pExec;
 
     delete pReq;
     return 0;
@@ -1951,9 +1909,6 @@ void SfxDispatcher::FlushImpl()
     if ( pImp->pParent )
         pImp->pParent->Flush();
 
-//      if ( pImp->bQuiet )
-//              return;
-
     pImp->bFlushing = !pImp->bFlushing;
     if ( !pImp->bFlushing )
     {
@@ -2345,8 +2300,6 @@ sal_Bool SfxDispatcher::_FindServer
     }
 
     sal_Bool bReadOnly = ( 2 != nSlotEnableMode && pImp->bReadOnly );
-//                              ( pImp->pFrame && pImp->pFrame->GetObjectShell() );
-//                                pImp->pFrame->GetObjectShell()->IsLoading() );
 
     // search through all the shells of the chained dispatchers 
     // from top to bottom
@@ -2470,8 +2423,6 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
         return sal_False;
 
     sal_Bool bReadOnly = ( 2 != nSlotEnableMode && pImp->bReadOnly );
-//                              ( pImp->pFrame && pImp->pFrame->GetObjectShell());
-//                                pImp->pFrame->GetObjectShell()->IsLoading() );
 
     for ( sal_uInt16 i=0 ; i < nTotCount; ++i )
     {
@@ -2639,10 +2590,6 @@ const SfxPoolItem* SfxDispatcher::_Execute( const SfxSlotServer &rSvr )
                         pDispat->pImp->xPoster->Post(
                             new SfxRequest( pSlot->GetSlotId(),
                                 SFX_CALLMODE_RECORD, pShell->GetPool() ) );
-//                        pDispat->pImp->xPoster->Post(new Executer(
-//                                new SfxRequest( pSlot->GetSlotId(),
-//                                    SFX_CALLMODE_RECORD, pShell->GetPool() ),
-//                                pSlot, n ));
                         return 0;
                     }
             }
@@ -2699,20 +2646,7 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
     SfxDispatcher &rDisp = *SFX_APP()->GetDispatcher_Impl();
     sal_uInt16 nShLevel = 0;
     SfxShell *pSh;
-/*
-    const SvVerbList *pVerbList = 0;
-    sal_uInt16 nMaxShellLevel = rDisp.pImp->aStack.Count();
-    for ( pSh = rDisp.GetShell(nShLevel);
-          pSh && nShLevel < nMaxShellLevel ;
-          ++nShLevel, pSh = rDisp.GetShell(nShLevel) )
-    {
-        if ( pSh->GetVerbs() )
-        {
-            pVerbList = pSh->GetVerbs();
-            break;
-        }
-    }
-*/
+
     nShLevel=0;
     if ( rDisp.pImp->bQuiet )
     {
@@ -2726,14 +2660,6 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
         const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId();
         if ( ( nConfigId == 0 && rResId.GetId() ) || ( nConfigId != 0 && rResId.GetId() == nConfigId ) )
         {
-            //SfxPopupMenuManager aPop( rResId.GetId(), *rDisp.GetBindings() );
-            //aPop.SetResMgr(rResId.GetResMgr());
-            //aPop.AddClipboardFunctions();
-            //aPop.Initialize();
-            //if ( pVerbList && pVerbList->Count() )
-            //    aPop.InsertVerbs(pVerbList);
-            //aPop.RemoveDisabledEntries();
-            //aPop.Execute( pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow );
             SfxPopupMenuManager::ExecutePopup( rResId, rDisp.GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow );
             return;
         }
@@ -2744,13 +2670,6 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
 void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos )
 {
     Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow();
-/*
-    SfxPopupMenuManager aPop( rId, *GetBindings() );
-    aPop.AddClipboardFunctions();
-    aPop.Initialize();
-    aPop.RemoveDisabledEntries();
-    aPop.Execute( pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow );
-*/
     SfxPopupMenuManager::ExecutePopup( rId, GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow );
 }
 
@@ -2840,8 +2759,6 @@ void SfxDispatcher::LockUI_Impl( sal_Bool bLock )
 //-------------------------------------------------------------------------
 void SfxDispatcher::HideUI( sal_Bool bHide )
 {
-//	if ( !bHide && pImp->bReadOnly )
-//		bHide = sal_True;
     sal_Bool bWasHidden = pImp->bNoUI;
     pImp->bNoUI = bHide;
     if ( pImp->pFrame )
@@ -2872,7 +2789,6 @@ void SfxDispatcher::HideUI( sal_Bool bHide )
 void SfxDispatcher::SetReadOnly_Impl( sal_Bool bOn )
 {
     pImp->bReadOnly = bOn;
-//	pImp->bNoUI = bOn;
 }
 
 sal_Bool SfxDispatcher::GetReadOnly_Impl() const
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 03efe61eae..54204703c3 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -124,7 +124,7 @@ SfxMacroStatement::SfxMacroStatement
     bDone( bRequestDone ),
     pDummy( 0 )
 {
-    // Workaround Recording non exported Slots (#25386#)
+    // Workaround Recording non exported Slots
     if ( !rSlot.pName )
         return;
 
@@ -311,7 +311,6 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
                             n = n + aReplacement.Len();
                             aRecordable.SetChar((unsigned short) (n-2), 0x0029);// ')' = 29h
                             aRecordable.Replace( n-1, 2, DEFINE_CONST_UNICODE("+\"") );
-                            // ++n;
                         }
                         else
                         {
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index 4240e3c641..c7717e4584 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -150,14 +150,6 @@ TypeId SfxSlotPool::GetSlotType( USHORT nId ) const
 {
     const SfxSlot* pSlot = (const_cast <SfxSlotPool*> (this))->GetSlot( nId );
     return pSlot ? pSlot->GetType()->Type() : 0;
-/*
-    for ( USHORT nPos = 0; nPos < _pTypes->Count(); ++nPos )
-    {
-        if ( _pTypes->GetObject(nPos)->nId == nId )
-            return _pTypes->GetObject(nPos)->nType;
-    }
-    return _pParentPool ? _pParentPool->GetSlotType( nId ) : 0;
- */
 }
 
 //====================================================================
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 2d071174db..a09969aa8a 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -174,10 +174,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
         USHORT nIter = 1;
         for ( pIter = pSlots; nIter <= nCount; ++pIter, ++nIter )
         {
-            //! hier bitte sinnvoll pruefen
-            //! DBG_ASSERT(!(pIter->IsMode(SFX_SLOT_CACHABLE) &&
-            //!                 pIter->IsMode(SFX_SLOT_VOLATILE)),
-            //!             "invalid Flags" );
+
             DBG_ASSERT( nIter == nCount ||
                         pIter->GetSlotId() != (pIter+1)->GetSlotId(),
                         "doppelte SID" );
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 0e567833ae..1cd0e7acdf 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -81,7 +81,6 @@ struct SfxShell_Impl: public SfxBroadcaster
     SfxViewShell*               pViewSh;    // SfxViewShell falls Shell ViewFrame/ViewShell/SubShell ist
     SfxViewFrame*               pFrame;     // Frame, falls <UI-aktiv>
     SfxRepeatTarget*            pRepeatTarget;
-//    SbxObjectRef                xParent;
     BOOL						bInAppBASIC;
     BOOL                        bActive;
     ULONG						nDisableFlags;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index fe29c0129b..1e10889bce 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -107,7 +107,6 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::
         SfxPoolItem *pItem=NULL;
         sal_uInt16 nId = pCache->GetId();
         SfxItemState eState = SFX_ITEM_DISABLED;
-        // pCache->Invalidate( sal_False );
         if ( !aStatus.IsEnabled )
         {
             // default
@@ -376,8 +375,6 @@ void SfxStateCache::SetState
 */
 
 {
-//    if ( pDispatch )
-//        return;
     SetState_Impl( eState, pState, bMaybeDirty );
 }
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c5a2a167d2..a6d48d5f84 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -72,7 +72,6 @@
 namespace css = ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
-//long nOfficeDispatchCount = 0;
 
 enum URLTypeId
 {
@@ -342,24 +341,18 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno:
 
 SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL )
 {
-//    nOfficeDispatchCount++;
-
     // this object is an adapter that shows a ::com::sun::star::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state
     pControllerItem = new SfxDispatchController_Impl( this, &rBindings, pDispat, pSlot, rURL );
 }
 
 SfxOfficeDispatch::SfxOfficeDispatch( SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL )
 {
-//    nOfficeDispatchCount++;
-
     // this object is an adapter that shows a ::com::sun::star::frame::XDispatch-Interface to the outside and uses a SfxControllerItem to monitor a state
     pControllerItem = new SfxDispatchController_Impl( this, NULL, pDispat, pSlot, rURL );
 }
 
 SfxOfficeDispatch::~SfxOfficeDispatch()
 {
-//    --nOfficeDispatchCount;
-
     if ( pControllerItem )
     {
         // when dispatch object is released, destroy its connection to this object and destroy it
@@ -655,14 +648,6 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         )
        )
     {
-        /*
-        if ( !IsBound() && pBindings )
-        {
-            pBindings->ENTERREGISTRATIONS();
-            BindInternal_Impl( nSlot, pBindings );
-            pBindings->LEAVEREGISTRATIONS();
-        } */
-
         if ( !pDispatcher && pBindings )
             pDispatcher = GetBindings().GetDispatcher_Impl();
 
@@ -862,13 +847,6 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const ::com::sun::st
     if ( !pDispatch )
         return;
 
-    /*if ( !IsBound() && pBindings )
-    {
-        pBindings->ENTERREGISTRATIONS();
-        BindInternal_Impl( nSlot, pBindings );
-        pBindings->LEAVEREGISTRATIONS();
-    } */
-
     // Use alternative QueryState call to have a valid UNO representation of the state.
     ::com::sun::star::uno::Any aState;
     if ( !pDispatcher && pBindings )
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index ec18d94d68..3fb1efe99b 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -62,22 +62,6 @@ namespace
     enum RedliningMode  { RL_NONE, RL_WRITER, RL_CALC };
     enum RedlineFunc    { RF_ON, RF_PROTECT };
 
-/*
-    bool QueryIsEnabled( USHORT _nSlot )
-    {
-        bool bRes = false;
-        SfxViewShell* pViewSh = SfxViewShell::Current();
-        if (pViewSh)
-        {
-            const SfxPoolItem* pItem;
-            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
-            SfxItemState eState = pDisp->QueryState( _nSlot, pItem );
-            bRes = (eState & SFX_ITEM_DISABLED) == 0;
-        }
-        return bRes;
-    }
-*/
-
     bool QueryState( USHORT _nSlot, bool& _rValue )
     {
         bool bRet = false;
@@ -119,10 +103,8 @@ namespace
     }
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
-
 static short lcl_GetPassword( 
     Window *pParent, 
     bool bProtect, 
@@ -161,10 +143,8 @@ static bool lcl_IsPasswordCorrect( const String &rPassword )
     return bRes;
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
-
 struct SfxSecurityPage_Impl
 {
     SfxSecurityPage &   m_rMyTabPage;
@@ -505,10 +485,8 @@ IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG )
     return 0;
 }
 
-
 //////////////////////////////////////////////////////////////////////
 
-
 SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet & rItemSet )
 {
     return new SfxSecurityPage( pParent, rItemSet );
@@ -544,10 +522,8 @@ void SfxSecurityPage::Reset( const SfxItemSet & rItemSet )
     DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
     if (m_pImpl.get() != 0)
         m_pImpl->Reset_Impl( rItemSet );
-}
-    
+}  
 
 //////////////////////////////////////////////////////////////////////
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 347fdb938d..70083e684a 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -488,11 +488,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException,
         new ::comphelper::OInteractionApprove );
     ::rtl::Reference< ::comphelper::OInteractionAbort > pAbort(
         new ::comphelper::OInteractionAbort );
-    /* this does not seem to work
-    if (i_rException.Code != ucb::IOErrorCode_WRONG_FORMAT) {
-        pRequest->addContinuation( pRetry.get() );
-    }
-    */
+
     pRequest->addContinuation( pApprove.get() );
     pRequest->addContinuation( pAbort.get() );
     // actually call the handler
@@ -839,7 +835,6 @@ DocumentMetadataAccess::~DocumentMetadataAccess()
 {
 }
 
-
 // ::com::sun::star::rdf::XRepositorySupplier:
 uno::Reference< rdf::XRepository > SAL_CALL
 DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException)
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 696e9fbd6d..58f3d6ae40 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -600,9 +600,6 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::TryInsertMetadatable(
                                 ::boost::bind( &Metadatable::IsInClipboard, _1 )
                 ) ) ) )
             {
-// ???  this is not undoable
-//                pList->clear();
-//                pList->push_back( &i_rObject );
                 pList->push_front( &i_rObject );
                 return true;
             }
@@ -1056,8 +1053,6 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::TryInsertMetadatable(
     OSL_ENSURE(isContentFile(i_rStreamName) || isStylesFile(i_rStreamName),
         "invalid stream");
 
-    //wntmsci12 won't parse this:
-//    Metadatable ** ppEntry( LookupEntry(i_rStreamName, i_rIdref) );
     Metadatable ** ppEntry = LookupEntry(i_rStreamName, i_rIdref);
     if (ppEntry)
     {
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 71cbd7b9c3..f2b665f245 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -334,11 +334,8 @@ protected:
 
     /// check if we are initialized properly
     void SAL_CALL checkInit() const;
-    //    throw (css::uno::RuntimeException);
     /// initialize state from given DOM tree
     void SAL_CALL init(css::uno::Reference<css::xml::dom::XDocument> i_xDom);
-    //    throw (css::uno::RuntimeException, css::io::WrongFormatException,
-    //        css::uno::Exception);
     /// update element in DOM tree
     void SAL_CALL updateElement(const char *i_name,
         std::vector<std::pair<const char *, ::rtl::OUString> >* i_pAttrs = 0);
@@ -349,31 +346,24 @@ protected:
     /// extract base URL (necessary for converting relative links)
     css::uno::Reference<css::beans::XPropertySet> SAL_CALL getURLProperties(
         const css::uno::Sequence<css::beans::PropertyValue> & i_rMedium) const;
-    //    throw (css::uno::RuntimeException);
     /// get text of standard meta data element
     ::rtl::OUString SAL_CALL getMetaText(const char* i_name) const;
-    //    throw (css::uno::RuntimeException);
     /// set text of standard meta data element iff not equal to existing text
     bool SAL_CALL setMetaText(const char* i_name,
         const ::rtl::OUString & i_rValue);
-    //    throw (css::uno::RuntimeException);
     /// set text of standard meta data element iff not equal to existing text
     void SAL_CALL setMetaTextAndNotify(const char* i_name,
         const ::rtl::OUString & i_rValue);
-    //    throw (css::uno::RuntimeException);
     /// get text of standard meta data element's attribute
     ::rtl::OUString SAL_CALL getMetaAttr(const char* i_name,
         const char* i_attr) const;
-    //    throw (css::uno::RuntimeException);
     /// get text of a list of standard meta data elements (multiple occ.)
     css::uno::Sequence< ::rtl::OUString > SAL_CALL getMetaList(
         const char* i_name) const;
-    //    throw (css::uno::RuntimeException);
     /// set text of a list of standard meta data elements (multiple occ.)
     bool SAL_CALL setMetaList(const char* i_name,
         const css::uno::Sequence< ::rtl::OUString > & i_rValue,
         AttrVector const* = 0);
-    // throw (css::uno::RuntimeException);
     void createUserDefined();
 };
 
@@ -1176,8 +1166,6 @@ SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
 // initialize state from DOM tree
 void SAL_CALL SfxDocumentMetaData::init(
         css::uno::Reference<css::xml::dom::XDocument> i_xDoc)
-//        throw (css::uno::RuntimeException, css::io::WrongFormatException,
-//               css::uno::Exception)
 {
     if (!i_xDoc.is()) throw css::uno::RuntimeException(
         ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
@@ -1217,8 +1205,6 @@ void SAL_CALL SfxDocumentMetaData::init(
     try {
         m_xParent = xPath->selectSingleNode(xDocNode, prefix);
     } catch (com::sun::star::uno::Exception &) {
-//        DBG_WARNING("SfxDocumentMetaData::init: "
-//            "caught RuntimeException from libxml!");
     }
 
     if (!m_xParent.is()) {
@@ -1985,7 +1971,6 @@ SfxDocumentMetaData::loadFromStorage(
                 " XML parsing exception")), *this);
     }
     // NB: the implementation of XMLOasisMetaImporter calls initialize
-//    init(xDocBuilder->getDocument());
     checkInit();
 }
 
@@ -2229,7 +2214,6 @@ SfxDocumentMetaData::createClone()
                     "SfxDocumentMetaData::createClone: exception")),
                 css::uno::Reference<css::uno::XInterface>(*this), a);
     }
-//    return static_cast< ::cppu::OWeakObject * > (pNew);
     return css::uno::Reference<css::util::XCloneable> (pNew);
 }
 
diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx
index 56b8072f35..b4dbba56e9 100644
--- a/sfx2/source/doc/applet.cxx
+++ b/sfx2/source/doc/applet.cxx
@@ -201,9 +201,6 @@ throw( uno::RuntimeException )
         pWin->SetBackground();
         pWin->Show();
 
-    //      aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "width" ) ), String( aPosSize.GetWidth() ) );
-    //      aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "height" ) ), String( aPosSize.GetHeight() ) );
-
         if( maName.getLength() )
             maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "name" ) ), maName );
 
@@ -286,12 +283,6 @@ void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyNam
             aAny >>= maClass;
         break;
         case WID_APPLET_CODEBASE  :
-            //pImpl->aCodeBase = rURL.GetMainURL( INetURLObject::NO_DECODE );
-            //if( rURL.GetProtocol() == INET_PROT_FILE
-            //    && pImpl->aCodeBase.GetChar( 9 ) == INET_ENC_DELIM_TOKEN )
-            //    // Laufwerksbuchstabe auf ':' patchen
-            //    pImpl->aCodeBase.SetChar( 9, INET_DELIM_TOKEN );
-
             aAny >>= maCodeBase;
         break;
         case WID_APPLET_COMMANDS  :
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index 687e326fec..56b8a73524 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -69,7 +69,6 @@
 #define STR_PRINT_STYLES_HEADER				(RID_SFX_DOC_START+ 21)
 #define MSG_PRINT_ERROR						(RID_SFX_DOC_START+ 22)
 #define STR_BACKUP_COPY						(RID_SFX_DOC_START+ 23)
-// #define MSG_WARNING_BACKUP					(RID_SFX_DOC_START+ 24)
 #define MSG_CANT_OPEN_TEMPLATE				(RID_SFX_DOC_START+ 25)
 #define MSG_VIEW_OPEN_CANT_SAVE 			(RID_SFX_DOC_START+ 26)
 #define STR_ERROR_SAVE						(RID_SFX_DOC_START+ 27)
@@ -90,7 +89,6 @@
 #define MSG_TEMPLATE_DIR_NOT_EXIST          (RID_SFX_DOC_START+ 40)
 #define MSG_DOCINFO_CANTREAD	            (RID_SFX_DOC_START+ 41)
 #define STR_ERROR_NOSTORAGE		            (RID_SFX_DOC_START+ 42)
-// #define STR_QUERY_SAVEOWNFORMAT             (RID_SFX_DOC_START+ 43)
 #define STR_QUERY_MUSTOWNFORMAT 			(RID_SFX_DOC_START+ 44)
 #define STR_SAVEDOC 						(RID_SFX_DOC_START+ 45)
 #define STR_UPDATEDOC						(RID_SFX_DOC_START+ 46)
@@ -163,18 +161,12 @@
 
 // some icons are commented out since they are removed
 #define BMP_SIGNATURE						(RID_SFX_DOC_START+97)
-// #define BMP_128X128_BASE_DOC				(RID_SFX_DOC_START+98)
 #define BMP_128X128_CALC_DOC				(RID_SFX_DOC_START+99)
-// #define BMP_128X128_CALC_TEMP				(RID_SFX_DOC_START+100)
 #define BMP_128X128_CHART_DOC				(RID_SFX_DOC_START+101)
 #define BMP_128X128_DRAW_DOC				(RID_SFX_DOC_START+102)
-// #define BMP_128X128_DRAW_TEMP				(RID_SFX_DOC_START+103)
 #define BMP_128X128_IMPRESS_DOC				(RID_SFX_DOC_START+104)
-// #define BMP_128X128_IMPRESS_TEMP			(RID_SFX_DOC_START+105)
-// #define BMP_128X128_MASTER_DOC				(RID_SFX_DOC_START+106)
 #define BMP_128X128_MATH_DOC				(RID_SFX_DOC_START+107)
 #define BMP_128X128_WRITER_DOC				(RID_SFX_DOC_START+108)
-// #define BMP_128X128_WRITER_TEMP				(RID_SFX_DOC_START+109)
 
 #define STR_HIDDENINFO_CONTAINS				(RID_SFX_DOC_START+110)
 #define STR_HIDDENINFO_RECORDCHANGES		(RID_SFX_DOC_START+111)
@@ -187,9 +179,7 @@
 #define STR_HIDDENINFO_CONTINUE_SIGNING		(RID_SFX_DOC_START+118)
 #define STR_HIDDENINFO_CONTINUE_CREATEPDF	(RID_SFX_DOC_START+119)
 
-// #define MSG_WARNING_MACRO_ISDISABLED        (RID_SFX_DOC_START+120)
 #define STR_NEW_FILENAME_SAVE               (RID_SFX_DOC_START+121)
-// #define STR_MACROS_DISABLED                 (RID_SFX_DOC_START+122)
 #define STR_ERROR_DELETE_TEMPLATE_DIR		(RID_SFX_DOC_START+123)
 #define STR_DOCINFO_INFOFIELD				(RID_SFX_DOC_START+124)
 
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index b92975e68b..bbefb37943 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -74,8 +74,6 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 )
 
 DBG_NAME(SfxObjectFactory)
 
-//static SfxObjectFactoryArr_Impl* pObjFac = 0;
-
 //========================================================================
 
 struct SfxObjectFactory_Impl
@@ -349,37 +347,6 @@ String SfxObjectFactory::GetStandardTemplate( const String& rServiceName )
     return sTemplate;
 }
 
-/*
-const SfxObjectFactory* SfxObjectFactory::GetFactory( const String& rFactoryURL )
-{
-    const SfxObjectFactory* pFactory = 0;
-    String aFact( rFactoryURL );
-    String aPrefix( DEFINE_CONST_UNICODE( "private:factory/" ) );
-    if ( aPrefix.Len() == aFact.Match( aPrefix ) )
-        // Aufruf m"oglich mit z.B. "swriter" oder "private:factory/swriter"
-        aFact.Erase( 0, aPrefix.Len() );
-    sal_uInt16 nPos = aFact.Search( '?' );
-
-    // Etwaige Parameter abschneiden
-    aFact.Erase( nPos, aFact.Len() );
-
-    SfxApplication *pApp = SFX_APP();
-
-    // "swriter4" durch "swriter" ersetzen, zum Vergleichen uppercase verwenden
-    WildCard aSearchedFac( aFact.EraseAllChars('4').ToUpperAscii() );
-    for( sal_uInt16 n = GetObjectFactoryCount_Impl(); !pFactory && n--; )
-    {
-        pFactory = &GetObjectFactory_Impl( n );
-        String aCompareTo = String::CreateFromAscii( pFactory->GetShortName() );
-        aCompareTo.ToUpperAscii();
-        if( !aSearchedFac.Matches( aCompareTo ) )
-            pFactory = 0;
-    }
-
-    return pFactory;
-}
-*/
-
 const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
 {
     USHORT nVersion=0;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a14a84e767..b9a28f042e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -686,8 +686,6 @@ sal_Bool SfxMedium::CloseOutStream_Impl()
         //maybe we need a new flag when the storage was created from the outstream
         if ( pImp->xStorage.is() )
         {
-            //const SvStream *pStorage = aStorage->GetSvStream();
-            //if ( pStorage == pOutStream )
                 CloseStorage();
         }
 
@@ -1423,8 +1421,6 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool
 {
     if ( !GetError() && !pImp->m_xZipStorage.is() )
     {
-        // very careful!!!
-        // if bReadOnly == sal_False and there is no temporary file the original file might be used
         GetMedium_Impl();
 
         try
@@ -2291,8 +2287,6 @@ void SfxMedium::GetMedium_Impl()
                 pImp->xInputStream->skipBytes(0);
                 if(m_bIsReadOnly)
                     GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
-
-                // m_xInputStreamToLoadFrom = 0;
             }
             else
             {
@@ -2648,27 +2642,6 @@ void SfxMedium::Close()
 {
     if ( pImp->xStorage.is() )
     {
-        // don't close the streams if they belong to the
-        // storage
-        //TODO/MBA: how to?! Do we need the flag?!
-        /*
-        const SvStream *pStream = aStorage->GetSvStream();
-        if ( pStream && pStream == pInStream )
-        {
-            CloseZipStorage_Impl();
-            pInStream = NULL;
-            pImp->xInputStream = Reference < XInputStream >();
-            pImp->xLockBytes.Clear();
-            if ( pSet )
-                pSet->ClearItem( SID_INPUTSTREAM );
-            aStorage->SetDeleteStream( TRUE );
-        }
-        else if ( pStream && pStream == pOutStream )
-        {
-            pOutStream = NULL;
-            aStorage->SetDeleteStream( TRUE );
-        } */
-
         CloseStorage();
     }
 
@@ -2681,27 +2654,6 @@ void SfxMedium::CloseAndRelease()
 {
     if ( pImp->xStorage.is() )
     {
-        // don't close the streams if they belong to the
-        // storage
-        //TODO/MBA: how to?! Do we need the flag?!
-        /*
-        const SvStream *pStream = aStorage->GetSvStream();
-        if ( pStream && pStream == pInStream )
-        {
-            CloseZipStorage_Impl();
-            pInStream = NULL;
-            pImp->xInputStream = Reference < XInputStream >();
-            pImp->xLockBytes.Clear();
-            if ( pSet )
-                pSet->ClearItem( SID_INPUTSTREAM );
-            aStorage->SetDeleteStream( TRUE );
-        }
-        else if ( pStream && pStream == pOutStream )
-        {
-            pOutStream = NULL;
-            aStorage->SetDeleteStream( TRUE );
-        } */
-
         CloseStorage();
     }
 
@@ -2809,7 +2761,6 @@ void SfxMedium::SetIsRemote_Impl()
         case INET_PROT_POP3:
         case INET_PROT_NEWS:
         case INET_PROT_IMAP:
-//        case INET_PROT_OUT:
         case INET_PROT_VIM:
             bRemote = TRUE; break;
         default:
@@ -3032,13 +2983,6 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
 
 SfxMedium::~SfxMedium()
 {
-    /* Attention
-        Don't enable CancelTransfers() till you know that the writer/web has changed his asynchronous load
-        behaviour. Otherwhise may StyleSheets inside a html file will be loaded at the right time.
-        => further the help will be empty then ... #100490#
-     */
-    //CancelTransfers();
-
     // if there is a requirement to clean the backup this is the last possibility to do it
     ClearBackup_Impl();
 
diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx
index 27100eb4b6..a6daa90a64 100644
--- a/sfx2/source/doc/docinf.cxx
+++ b/sfx2/source/doc/docinf.cxx
@@ -314,7 +314,6 @@ uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(GDIMetaFile* i_pThumb)
 // magic value 160 taken from GraphicHelper::getThumbnailFormatFromGDI_Impl()
         if( i_pThumb->CreateThumbnail( 160, aBitmap ) ) {
             aBitmap.GetBitmap().Write( aStream, FALSE, FALSE );
-//            uno::Sequence<sal_uInt8> aSeq(aStream.GetSize()); // WRONG
             aStream.Seek(STREAM_SEEK_TO_END);
             uno::Sequence<sal_uInt8> aSeq(aStream.Tell());
             const sal_uInt8* pBlob(
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index fa915f1d79..99388aeda0 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -311,8 +311,6 @@ static sal_Bool getTextProperty_Impl( Content& rContent,
                                       OUString& rPropValue );
 
 //========================================================================
-//========================================================================
-//========================================================================
 
 String SfxDocumentTemplates::GetFullRegionName
 (
@@ -758,25 +756,6 @@ String SfxDocumentTemplates::GetDefaultTemplatePath
     else
         return String();
 
-/* dv! missing: create the directory, if it doesn't exists
-
-
-    DBG_ASSERT(aDirs.GetTokenCount(cDelim), "Keine Bereiche");
-    DirEntry aPath(aDirs.GetToken(0, cDelim));
-
-    // Verzeichnis anlegen
-    if(!aPath.MakeDir())
-        return String();
-
-    MakeFileName_Impl(aPath, rLongName, sal_True);
-    SfxTemplateDir  *pEntry = new SfxTemplateDir;
-    SfxTemplateDirEntryPtr pDirEntry =
-        new SfxTemplateDirEntry( String( '.' ), aPath.GetPath() );
-    pDirEntry->SetContent(new SfxTemplateDir(aPath.GetPath()));
-    pEntry->Insert(pDirEntry, pEntry->Count());
-    pDirs->Insert(pEntry, pDirs->Count());
-    return aPath.GetFull();
-*/
 }
 
 //------------------------------------------------------------------------
@@ -1774,7 +1753,6 @@ void SfxDocumentTemplates::Construct()
 //  verz"ogerter Aufbau der Verwaltungsdaten
 
 {
-//  pImp->Construct();
 }
 
 //------------------------------------------------------------------------
@@ -1862,8 +1840,6 @@ sal_Bool SfxDocumentTemplates::HasUserContents( sal_uInt16 nRegion, sal_uInt16 n
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent,
                                 const OUString& rTitle )
 {
@@ -2029,9 +2005,6 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 RegionData_Impl::RegionData_Impl( const SfxDocTemplate_Impl* pParent,
                                   const OUString& rTitle )
 {
@@ -2247,8 +2220,6 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 
 SfxDocTemplate_Impl::SfxDocTemplate_Impl()
 : mbConstructed( sal_False )
@@ -2671,8 +2642,6 @@ void SfxDocTemplate_Impl::Clear()
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 sal_Bool getTextProperty_Impl( Content& rContent,
                                const OUString& rPropName,
                                OUString& rPropValue )
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 9a82256652..c73d0c587e 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -392,10 +392,6 @@ public:
     DocTemplates_EntryData_Impl*    getEntry( size_t nPos ) { return maEntries[ nPos ]; }
 };
 
-//=============================================================================
-//=============================================================================
-//=============================================================================
-
 //-----------------------------------------------------------------------------
 // private SfxDocTplService_Impl
 //-----------------------------------------------------------------------------
@@ -2223,8 +2219,6 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 
 SFX_IMPL_XSERVICEINFO( SfxDocTplService, TEMPLATE_SERVICE_NAME, TEMPLATE_IMPLEMENTATION_NAME )
 SFX_IMPL_SINGLEFACTORY( SfxDocTplService )
@@ -2364,8 +2358,6 @@ void SAL_CALL SfxDocTplService::update()
         pImp->update( sal_True );
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 //------------------------------------------------------------------------
 
 Updater_Impl::Updater_Impl( SfxDocTplService_Impl* pTemplates )
@@ -2392,8 +2384,6 @@ void SAL_CALL Updater_Impl::onTerminated()
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 WaitWindow_Impl::WaitWindow_Impl()
     : WorkWindow( NULL, WB_BORDER | WB_3DLOOK )
 {
@@ -2424,8 +2414,6 @@ void WaitWindow_Impl::Paint( const Rectangle& /*rRect*/ )
 }
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
                                           const OUString& rTitle,
                                           const OUString& rOwnURL )
@@ -2756,8 +2744,6 @@ void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup )
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 GroupData_Impl::GroupData_Impl( const OUString& rTitle )
 {
     maTitle = rTitle;
@@ -2826,8 +2812,6 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle,
 }
 
 // -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
 DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle )
 {
     maTitle         = rTitle;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 918f2fe488..67b9dd4432 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -750,7 +750,7 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
             }
             if(!bCopy && &aSourceDoc != &aTargetDoc)
             {
-                //#109566# pool styles that are moved produce
+                //pool styles that are moved produce
                 //an rIdx == INDEX_IGNORE
                 //the method has to return true to keep the box content consistent
                 bRemovedFromSource = aSourceDoc->Remove(aSource[nSLevel+1],
@@ -759,7 +759,6 @@ BOOL SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
             }
         }
     }
-//  rIdx++;
     return (((rIdx != INDEX_IGNORE)|| bRemovedFromSource) && bOk )
         ? bKeepExpansion? (BOOL)2: TRUE: FALSE;
 }
@@ -959,12 +958,7 @@ BOOL SfxOrganizeListBox_Impl::EditedEntry(SvLBoxEntry* pEntry, const String& rTe
         ErrorBox( this, aResId ).Execute();
         return FALSE;
     }
-/*
-    else
-    {
-        SfxTemplateOrganizeDlg* pDlg = (SfxTemplateOrganizeDlg*)Window::GetParent();
-    }
-*/
+
     return TRUE;
 }
 
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 8d9622a21d..16b7839a1a 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -74,7 +74,6 @@ IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, sal_Bool bHasBorder, WinB
         SetBorderStyle( WINDOW_BORDER_NOBORDER );
     else
         SetBorderStyle( WINDOW_BORDER_NORMAL );
-    //SetActivateMode( ACTIVATE_MODE_GRABFOCUS );
 }
 
 void IFrameWindow_Impl::SetBorder( sal_Bool bNewBorder )
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 52e36d7241..f8abaa1e39 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -176,7 +176,7 @@ SfxPreviewWin::SfxPreviewWin(
     // adjust contrast mode initially
     SetDrawMode( OUTPUT_DRAWMODE_COLOR );
 
-    // #107818# This preview window is for document previews.  Therefore
+    // This preview window is for document previews.  Therefore
     // right-to-left mode should be off
     EnableRTL( FALSE );
 }
@@ -668,8 +668,6 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     aPrevTimer.SetTimeout( 500 );
     aPrevTimer.SetTimeoutHdl( LINK( this, SfxNewFileDialog_Impl, Update));
 
-//	 else
-//		  aRegionLb.InsertEntry(String(SfxResId(STR_STANDARD)));
     aRegionLb.SelectEntryPos(0);
     RegionSelect(&aRegionLb);
 }
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 4dd1601636..d0f44903bb 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -90,8 +90,6 @@ using namespace ::com::sun::star::uno;
 
 //====================================================================
 
-//====================================================================
-
 static
 bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight)
 {
@@ -588,29 +586,7 @@ BOOL SfxObjectShell::Insert(SfxObjectShell &rSource,
         else
             bRet = FALSE;
     }
-/*
-    else if (nSourceIdx1 == CONTENT_CONFIG)
-    {
-        nIdx1 = CONTENT_CONFIG;
-
-        SfxConfigManager *pCfgMgr = SFX_CFGMANAGER();
-        if ( !GetConfigManager() )
-        {
-            SetConfigManager(new SfxConfigManager(0, pCfgMgr));
-            SetTemplateConfig(FALSE);
-            if (this == Current())
-                GetConfigManager()->Activate(pCfgMgr);
-        }
 
-        if (GetConfigManager()->CopyItem(
-            nSourceIdx2, nIdx2, rSource.GetConfigManager()))
-        {
-            SetModified(TRUE);
-            bRet = TRUE;
-            SFX_APP()->GetDispatcher_Impl()->Update_Impl(TRUE);
-        }
-    }
-*/
     return bRet;
 }
 
@@ -821,7 +797,6 @@ void SfxObjectShell::LoadStyles
     {
         SfxStyleSheetBase *pSource;
         SfxStyleSheetBase *pDest;
-//      Styles_Impl () : pSource(0), pDest(0) {}
     };
 
     SfxStyleSheetBasePool *pSourcePool = rSource.GetStyleSheetPool();
@@ -852,7 +827,6 @@ void SfxObjectShell::LoadStyles
     for ( USHORT i = 0; i < nFound; ++i )
     {
         pFound[i].pDest->GetItemSet().PutExtended(pFound[i].pSource->GetItemSet(), SFX_ITEM_DONTCARE, SFX_ITEM_DEFAULT);
-//      pFound[i].pDest->SetHelpId(pFound[i].pSource->GetHelpId());
         if(pFound[i].pSource->HasParentSupport())
             pFound[i].pDest->SetParent(pFound[i].pSource->GetParent());
         if(pFound[i].pSource->HasFollowSupport())
@@ -1003,27 +977,8 @@ void SfxObjectShell::UpdateFromTemplate_Impl(  )
                     // remember date/time of check
                     xDocProps->setTemplateDate(aTemplDate);
                     // TODO/LATER: new functionality to store document info is required ( didn't work for SO7 XML format )
-//REPLACE					pInfo->Save(xDocStor);
                 }
             }
-/*
-        SfxConfigManager *pCfgMgr = SFX_CFGMANAGER();
-        {
-            SfxConfigManager *pTemplCfg = new SfxConfigManager(aTemplStor, pCfgMgr);
-            SetConfigManager(pTemplCfg);
-            SetTemplateConfig(TRUE);
-
-            // Falls der gerade zerst"orte CfgMgr des Dokuments der
-            // aktive war, pCfgMgr lieber neu holen
-            pCfgMgr = SFX_CFGMANAGER();
-
-            // ggf. den neuen ConfigManager aktivieren
-            if ( this == SfxObjectShell::Current() )
-                pTemplCfg->Activate(pCfgMgr);
-        }
-*/
-        // Template und Template-DocInfo werden nicht mehr gebraucht
-//            delete pTemplInfo;
         }
     }
 }
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 7f75714ba9..8fe4f35209 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -986,18 +986,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
                     rSet.DisableItem( nWhich );
                     break;
                 }
-/*
-                const SfxFilter* pCombinedFilters = NULL;
-                SfxFilterContainer* pFilterContainer = GetFactory().GetFilterContainer();
-
-                if ( pFilterContainer )
-                {
-                    SfxFilterFlags    nMust    = SFX_FILTER_IMPORT | SFX_FILTER_EXPORT;
-                    SfxFilterFlags    nDont    = SFX_FILTER_NOTINSTALLED | SFX_FILTER_INTERNAL;
-
-                    pCombinedFilters = pFilterContainer->GetAnyFilter( nMust, nDont );
-                }
-*/
                 if ( /*!pCombinedFilters ||*/ !GetMedium() )
                     rSet.DisableItem( nWhich );
                 else
@@ -1008,25 +996,6 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
             case SID_EXPORTDOCASPDF:
             case SID_DIRECTEXPORTDOCASPDF:
             {
-                /*
-
-                 search for filter cant work correctly ...
-                 Because it's not clear, which export filter for which office module
-                 must be searched. On the other side it can be very expensive doing so.
-                 The best solution would be: on installation time we should know if pdf feature
-                 was installed or not!!! (e.g. by writing a bool inside cfg)
-
-                SfxFilterContainer* pFilterContainer = GetFactory().GetFilterContainer();
-                if ( pFilterContainer )
-                {
-                    String aPDFExtension = String::CreateFromAscii( "pdf" );
-                    const SfxFilter* pFilter = pFilterContainer->GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT );
-                    if ( pFilter != NULL )
-                        break;
-                }
-
-                rSet.DisableItem( nWhich );
-                */
                 break;
             }
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e6cb611d0e..91ba9fbbfe 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -769,8 +769,6 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 
         if( IsOwnStorageFormat_Impl(*pMed) && pMed->GetFilter() )
         {
-//???? dv			DirEntry aDirEntry( pMed->GetPhysicalName() );
-//???? dv			SetFileName( aDirEntry.GetFull() );
         }
         Broadcast( SfxSimpleHint(SFX_HINT_NAMECHANGED) );
 
@@ -1019,9 +1017,6 @@ sal_Bool SfxObjectShell::DoSave()
         bOk = pMedium->Commit();
     }
 
-//#88046
-//    if ( bOk )
-//        SetModified( sal_False );
     return bOk;
 }
 
@@ -1871,7 +1866,6 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
             // TODO/LATER: may be it should be done in SwitchPersistence also
             // TODO/LATER: find faster way to copy storage; perhaps sharing with backup?!
             xStorage->copyToStorage( xTmpStorage );
-            //CopyStoragesOfUnknownMediaType( xStorage, xTmpStorage );
             bResult = SaveCompleted( xTmpStorage );
 
             if ( bResult )
@@ -1979,11 +1973,7 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
 
     sal_Bool bOk = sal_True;
     sal_Bool bMedChanged = pNewMed && pNewMed!=pMedium;
-/*	sal_Bool bCreatedTempStor = pNewMed && pMedium &&
-        IsPackageStorageFormat_Impl(*pMedium) &&
-        !IsPackageStorageFormat_Impl(*pNewMed) &&
-        pMedium->GetName().Len();
-*/
+
     DBG_ASSERT( !pNewMed || pNewMed->GetError() == ERRCODE_NONE, "DoSaveCompleted: Medium has error!" );
 
     // delete Medium (and Storage!) after all notifications
@@ -2221,7 +2211,7 @@ sal_Bool SfxObjectShell::InsertFrom( SfxMedium& rMedium )
     }
     if ( xLoader.is() )
     {
-        // #131744#: it happens that xLoader does not support xImporter!
+        // it happens that xLoader does not support xImporter!
         try{
         uno::Reference< lang::XComponent >  xComp( GetModel(), uno::UNO_QUERY_THROW );
         uno::Reference< document::XImporter > xImporter( xLoader, uno::UNO_QUERY_THROW );
@@ -2316,7 +2306,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium )
     }
     if ( xLoader.is() )
     {
-        // #131744#: it happens that xLoader does not support xImporter!
+        // it happens that xLoader does not support xImporter!
         try{
         uno::Reference< lang::XComponent >  xComp( GetModel(), uno::UNO_QUERY_THROW );
         uno::Reference< document::XImporter > xImporter( xLoader, uno::UNO_QUERY_THROW );
@@ -2549,7 +2539,6 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
     // writing is done through a copy, that will be transferred to the target ( of course after calling HandsOff )
     SfxMedium* pMediumTmp = new SfxMedium( pRetrMedium->GetName(), pRetrMedium->GetOpenMode(), pRetrMedium->IsDirect(), pFilter, pSet );
     pMediumTmp->SetLongName( pRetrMedium->GetLongName() );
-//    pMediumTmp->CreateTempFileNoCopy();
     if ( pMediumTmp->GetErrorCode() != ERRCODE_NONE )
     {
         SetError( pMediumTmp->GetError(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
@@ -2559,10 +2548,6 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
 
     // copy version list from "old" medium to target medium, so it can be used on saving
     pMediumTmp->TransferVersionList_Impl( *pRetrMedium );
-/*
-    if ( pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_PACKED ) )
-        SetError( GetMedium()->Unpack_Impl( pRetrMedium->GetPhysicalName() ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-*/
 
     // an interaction handler here can aquire only in case of GUI Saving
     // and should be removed after the saving is done
@@ -2726,9 +2711,6 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
         return sal_False;
     }
 
-    // this notification should be already sent by caller in sfxbasemodel
-    // SFX_APP()->NotifyEvent(SfxEventHint( bSaveTo? SFX_EVENT_SAVETODOC : SFX_EVENT_SAVEASDOC,this));
-
     if( SFX_ITEM_SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() )
         aParams->Put( SfxBoolItem( SID_UNPACK, sal_False ) );
 
@@ -2757,7 +2739,6 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
             pSet->ClearItem( SID_CHARSET );
             pSet->ClearItem( SID_FILTER_NAME );
             pSet->ClearItem( SID_OPTIONS );
-            //pSet->ClearItem( SID_FILE_FILTEROPTIONS );
             pSet->ClearItem( SID_VERSION );
             pSet->ClearItem( SID_EDITDOC );
             pSet->ClearItem( SID_OVERWRITE );
@@ -2873,13 +2854,6 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
     if ( pImp->bPreserveVersions )
         pNewFile->TransferVersionList_Impl( *pMedium );
 
-/*
-    if ( GetMedium()->GetFilter() && ( GetMedium()->GetFilter()->GetFilterFlags() & SFX_FILTER_PACKED ) )
-    {
-        SfxMedium *pMed = bCopyTo ? pMedium : pNewFile;
-        pNewFile->SetError( GetMedium()->Unpack_Impl( pMed->GetPhysicalName() ) , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
-    }
-*/
     // Save the document ( first as temporary file, then transfer to the target URL by committing the medium )
     sal_Bool bOk = sal_False;
     if ( !pNewFile->GetErrorCode() && SaveTo_Impl( *pNewFile, NULL ) )
diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx
index 43d763c093..4ba2b1e919 100644
--- a/sfx2/source/doc/objuno.cxx
+++ b/sfx2/source/doc/objuno.cxx
@@ -745,24 +745,6 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
                 break;
             case WID_FROM :
             {
-                // QUESTION: do we still need this?
-                /*
-                // String aStrVal( sTemp );
-                if ( aStrVal.Len() > TIMESTAMP_MAXLENGTH )
-                {
-                    SvAddressParser aParser( aStrVal );
-                    if ( aParser.Count() > 0 )
-                    {
-                        String aEmail = aParser.GetEmailAddress(0);
-                        String aRealname = aParser.GetRealName(0);
-
-                        if ( aRealname.Len() <= TIMESTAMP_MAXLENGTH )
-                            aStrVal = aRealname;
-                        else if ( aEmail.Len() <= TIMESTAMP_MAXLENGTH )
-                            aStrVal = aEmail;
-                    }
-                } */
-
                 if ( _pImp->m_xDocProps->getAuthor() != sTemp )
                     _pImp->m_xDocProps->setAuthor(sTemp);
                 break;
@@ -811,7 +793,6 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
                 if ( _pImp->m_xDocProps->getDefaultTarget() != sTemp )
                     _pImp->m_xDocProps->setDefaultTarget(sTemp);
                 break;
-//            case WID_CONTENT_TYPE : // this is readonly!
                case MID_CATEGORY:
                case MID_MANAGER:
                case MID_COMPANY:
@@ -1074,9 +1055,6 @@ void SAL_CALL  SfxDocumentInfoObject::setFastPropertyValue(sal_Int32 nHandle, co
 
 sal_Int16 SAL_CALL  SfxDocumentInfoObject::getUserFieldCount() throw( ::com::sun::star::uno::RuntimeException )
 {
-//    uno::Reference<beans::XPropertyAccess> xPropSet(
-//        _pImp->m_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
-//    return xPropSet->getPropertyValues().getLength();
     return FOUR;
 }
 
@@ -1219,7 +1197,6 @@ SfxStandaloneDocumentInfoObject::SfxStandaloneDocumentInfoObject( const ::com::s
     uno::Reference< lang::XInitialization > xDocProps(
         _xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "com.sun.star.document.DocumentProperties"))), uno::UNO_QUERY_THROW);
-//    xDocProps->initialize(uno::Sequence<uno::Any>());
     uno::Any a;
     a <<= xDocProps;
     uno::Sequence<uno::Any> args(1);
@@ -1299,8 +1276,6 @@ void SAL_CALL  SfxStandaloneDocumentInfoObject::loadFromURL(const ::rtl::OUStrin
     uno::Reference< document::XDocumentProperties > xDocProps(
         _xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
             "com.sun.star.document.DocumentProperties"))), uno::UNO_QUERY_THROW);
-//    uno::Reference< lang::XInitialization > xInit(xDocProps, uno::UNO_QUERY_THROW);
-//    xInit->initialize(uno::Sequence<uno::Any>());
     _pImp->Reset(xDocProps);
     aGuard.clear();
 
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 058247a517..ad06e20bf3 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -161,9 +161,6 @@ void lcl_UpdateAppBasicDocVars(  const Reference< XInterface >& _rxComponent, bo
 
 //=========================================================================
 
-
-//=========================================================================
-
 class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener >
 {
     SfxObjectShell* mpDoc;
@@ -625,9 +622,6 @@ sal_uInt16 SfxObjectShell::PrepareClose
 
         // fragen, ob gespeichert werden soll
         short nRet = RET_YES;
-        //TODO/CLEANUP
-        //brauchen wir UI=2 noch?
-        //if( SfxApplication::IsPlugin() == sal_False || bUI == 2 )
         {
             //initiate help agent to inform about "print modifies the document"
             SvtPrintWarningOptions aPrintOptions;
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index 24b73c805a..702369bfc1 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -97,7 +97,6 @@ const sal_Int32 CLIPFMT_WIN             = -1;
 const sal_Int32 CLIPDATAFMT_DIB         = 8;
 
 // ============================================================================
-// ============================================================================
 
 /** Helper for classes that need text encoding settings.
 
@@ -168,8 +167,6 @@ private:
     void                ImplSaveString16( SvStream& rStrm, const String& rValue ) const;
 };
 
-
-// ============================================================================
 // ============================================================================
 
 /** Base class for all classes related to OLE property sets.
@@ -213,7 +210,6 @@ private:
 };
 
 // ============================================================================
-// ============================================================================
 
 /** Base class for all OLE property objects. */
 class SfxOlePropertyBase : public SfxOleObjectBase
@@ -249,7 +245,6 @@ private:
 };
 
 // ============================================================================
-// ============================================================================
 
 /** Property containing custom names for other properties in the property set. */
 class SfxOleDictionaryProperty : public SfxOlePropertyBase, public SfxOleStringHelper
@@ -277,7 +272,6 @@ private:
 };
 
 // ============================================================================
-// ============================================================================
 
 /** A section in a property set. Contains properties with unique identifiers. */
 class SfxOleSection : public SfxOleObjectBase
@@ -361,7 +355,6 @@ private:
 typedef ::boost::shared_ptr< SfxOleSection > SfxOleSectionRef;
 
 // ============================================================================
-// ============================================================================
 
 /** Enumerates different section types in OLE property sets. */
 enum SfxOleSectionType
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index ee0c050a4b..faa6055bbf 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -437,11 +437,11 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
         }
     }
 
-    //os 12.11.98: die PaperSize darf nur gesetzt werden, wenn tatsaechlich
+    //die PaperSize darf nur gesetzt werden, wenn tatsaechlich
     //PAPER_USER gilt, sonst koennte vom Treiber ein falsches Format gewaehlt werden
     if(nPaperFormat == view::PaperFormat_USER && aSetPaperSize.Width())
     {
-        //JP 23.09.98 - Bug 56929 - MapMode von 100mm in die am
+        //MapMode von 100mm in die am
         //			Device gesetzten umrechnen. Zusaetzlich nur dann
         //			setzen, wenn sie wirklich veraendert wurden.
         aSetPaperSize = pPrinter->LogicToPixel( aSetPaperSize, MAP_100TH_MM );
@@ -452,7 +452,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
         }
     }
 
-    // #96772#: wait until printing is done
+    //wait until printing is done
     SfxPrinter* pDocPrinter = pViewSh->GetPrinter();
     while ( pDocPrinter->IsPrinting() )
         Application::Yield();
@@ -595,8 +595,6 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
     SfxViewShell* pView = pViewFrm->GetViewShell();
     if ( !pView )
         return;
-
-//	SfxAllItemSet aArgs( pView->GetPool() );
     sal_Bool bMonitor = sal_False;
     // We need this information at the end of this method, if we start the vcl printer
     // by executing the slot. Because if it is a ucb relevant URL we must wait for
@@ -800,81 +798,8 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin
             {
                 if ( !m_xPrintJob.is() )
                     m_xPrintJob = new SfxPrintJob_Impl( this );
-/*
-                PrintDialog* pDlg = pPrintHint->GetPrintDialog();
-                Printer* pPrinter = pPrintHint->GetPrinter();
-                ::rtl::OUString aPrintFile ( ( pPrinter && pPrinter->IsPrintFileEnabled() ) ? pPrinter->GetPrintFile() : String() );
-                ::rtl::OUString aRangeText ( ( pDlg && pDlg->IsRangeChecked(PRINTDIALOG_RANGE) ) ? pDlg->GetRangeText() : String() );
-                sal_Bool bSelectionOnly = ( ( pDlg && pDlg->IsRangeChecked(PRINTDIALOG_SELECTION) ) ? sal_True : sal_False );
-
-                sal_Int32 nArgs = 2;
-                if ( aPrintFile.getLength() )
-                    nArgs++;
-                if ( aRangeText.getLength() )
-                    nArgs++;
-                else if ( bSelectionOnly )
-                    nArgs++;
-
-                m_aPrintOptions.realloc(nArgs);
-                m_aPrintOptions[0].Name = DEFINE_CONST_UNICODE("CopyCount");
-                m_aPrintOptions[0].Value <<= (sal_Int16) (pPrinter ? pPrinter->GetCopyCount() : 1 );
-                m_aPrintOptions[1].Name = DEFINE_CONST_UNICODE("Collate");
-                m_aPrintOptions[1].Value <<= (sal_Bool) (pDlg ? pDlg->IsCollateChecked() : sal_False );
-
-                if ( bSelectionOnly )
-                {
-                    m_aPrintOptions[2].Name = DEFINE_CONST_UNICODE("Selection");
-                    m_aPrintOptions[2].Value <<= bSelectionOnly;
-                }
-                else if ( aRangeText.getLength() )
-                {
-                    m_aPrintOptions[2].Name = DEFINE_CONST_UNICODE("Pages");
-                    m_aPrintOptions[2].Value <<= aRangeText;
-                }
-
-                if ( aPrintFile.getLength() )
-                {
-                    m_aPrintOptions[nArgs-1].Name = DEFINE_CONST_UNICODE("FileName");
-                    m_aPrintOptions[nArgs-1].Value <<= aPrintFile;
-                }
-*/
                 m_aPrintOptions = pPrintHint->GetOptions();
             }
-/*
-            else if ( pPrintHint->GetWhich() == -3 )    // -3 : AdditionalPrintOptions
-            {
-                    uno::Sequence < beans::PropertyValue >& lOldOpts = m_aPrintOptions;
-                    const uno::Sequence < beans::PropertyValue >& lNewOpts = pPrintHint->GetAdditionalOptions();
-                    sal_Int32 nOld = lOldOpts.getLength();
-                    sal_Int32 nAdd = lNewOpts.getLength();
-                    lOldOpts.realloc( nOld + nAdd );
-
-                    // assume that all new elements are overwriting old ones and so don't need to be added
-                    sal_Int32 nTotal = nOld;
-                    for ( sal_Int32 n=0; n<nAdd; n++ )
-                    {
-                        sal_Int32 m;
-                        for ( m=0; m<nOld; m++ )
-                            if ( lNewOpts[n].Name == lOldOpts[m].Name )
-                                // new option overwrites old one
-                                break;
-
-                        if ( m == nOld )
-                        {
-                            // this is a new option, so add it to the resulting sequence - counter must be incremented
-                            lOldOpts[nTotal].Name = lNewOpts[n].Name;
-                            lOldOpts[nTotal++].Value = lNewOpts[n].Value;
-                        }
-                        else
-                            // overwrite old option with new value, counter stays unmodified
-                            lOldOpts[m].Value = lNewOpts[n].Value;
-                    }
-
-                    if ( nTotal != lOldOpts.getLength() )
-                        // at least one new options has overwritten an old one, so we allocated too much
-                        lOldOpts.realloc(  nTotal );
-            }
-*/
             else if ( pPrintHint->GetWhich() != -2 )    // -2 : CancelPrintJob
             {
                 view::PrintJobEvent aEvent;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5215f26d22..9046cc863a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -790,8 +790,6 @@ void SAL_CALL SfxBaseModel::dispose() throw(::com::sun::star::uno::RuntimeExcept
     {
         // as long as an SfxObjectShell is assigned to an SfxBaseModel it is still existing here
         // so we can't dispose the shared DocumentInfoObject here
-        // uno::Reference < lang::XComponent > xComp( m_pData->m_xDocumentInfo, uno::UNO_QUERY );
-        // xComp->dispose();
         m_pData->m_xDocumentInfo = 0;
     }
 
@@ -901,7 +899,6 @@ SfxBaseModel::getDocumentProperties()
             ::comphelper::getProcessServiceFactory()->createInstance(
                 DEFINE_CONST_UNICODE("com.sun.star.document.DocumentProperties") ),
             uno::UNO_QUERY_THROW);
-//        xDocProps->initialize(uno::Sequence<uno::Any>());
         m_pData->m_xDocumentProperties.set(xDocProps, uno::UNO_QUERY_THROW);
         uno::Reference<util::XModifyBroadcaster> xMB(m_pData->m_xDocumentProperties, uno::UNO_QUERY_THROW);
         xMB->addModifyListener(new SfxDocInfoListener_Impl(*m_pData->m_pObjectShell));
@@ -1770,23 +1767,9 @@ void SAL_CALL SfxBaseModel::load(   const uno::Sequence< beans::PropertyValue >&
             throw frame::IllegalArgumentIOException();
         }
 
-        // !TODO: currently not working
-        //SFX_ITEMSET_ARG( pParams, pFrameItem, SfxFrameItem, SID_DOCFRAME, FALSE );
-        //if( pFrameItem && pFrameItem->GetFrame() )
-        //{
-        //	SfxFrame* pFrame = pFrameItem->GetFrame();
-        //	pMedium->SetLoadTargetFrame( pFrame );
-        //}
-
         SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False );
         sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False;
 
-        // SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False);
-        // sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue();
-        //
-        // does already happen in DoLoad call
-        //m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC );
-
         // load document
         sal_uInt32 nError = ERRCODE_NONE;
         if ( !m_pData->m_pObjectShell->DoLoad(pMedium) )
@@ -2455,11 +2438,6 @@ void SfxBaseModel::Notify(			SfxBroadcaster&	rBC		,
             {
             case SFX_EVENT_STORAGECHANGED:
             {
-                // for now this event is sent only on creation of a new storage for new document
-                // and in case of reload of medium without document reload
-                // other events are used to detect storage change
-                // NotifyStorageListeners_Impl();
-
                 if ( m_pData->m_xUIConfigurationManager.is()
                   && m_pData->m_pObjectShell->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
                 {
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index c69bbca975..3ab1142066 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -238,7 +238,7 @@ void SfxURLToolBoxControl_Impl::StateChanged
 {
     if ( nSID == SID_OPENURL )
     {
-        // Disable URL box if command is disabled #111014#
+        // Disable URL box if command is disabled
         GetURLBox()->Enable( SFX_ITEM_DISABLED != eState );
     }
 
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 63fabd70d2..9db9f968e0 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -196,9 +196,9 @@ static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
 
 PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 {
-    //
+    
     // build thesaurus sub menu if look-up string is available
-    //
+
     PopupMenu* pThesSubMenu = 0;
     SfxPoolItem *pItem = 0;
     pBindings->QueryState( SID_THES, pItem );
@@ -288,7 +288,6 @@ void SfxMenuManager::UseDefault()
         ResId aResId(GetType(),*pResMgr);
         aResId.SetRT(RSC_MENU);
         Menu *pSVMenu = new PopupMenu( aResId );
-        //SfxMenuManager::EraseItemCmds( pSVMenu ); // Remove .uno cmds to be compatible with 6.0/src641
 
         if ( bAddClipboardFuncs )
         {
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 4d196264e6..bd417dde19 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -181,10 +181,6 @@ void SfxVirtualMenu::Construct_Impl()
     pSVMenu->SetDeactivateHdl( LINK(this, SfxVirtualMenu, Deactivate) );
     pSVMenu->SetSelectHdl( LINK(this, SfxVirtualMenu, Select) );
 
-    // #107258# accelerator keys are needed for accessibility
-    //if ( bOLE )
-    //    InvalidateKeyCodes();
-
     if ( !pResMgr && pParent )
         pResMgr = pParent->pResMgr;
 }
@@ -428,22 +424,6 @@ void SfxVirtualMenu::CreateFromSVMenu()
             }
             else
             {
-/*
-                if ( nSlotId >= SID_SFX_START && !SfxMenuManager::IsPopupFunction(nSlotId) )
-                {
-                    // Echte Popups sollen keine SlotIds haben; leider sind
-                    // da noch Altlasten mit herumzuschleppen ...
-                    String aTitle = pSVMenu->GetItemText( nSlotId );
-                    pSVMenu->SetPopupMenu( nSlotId, NULL );
-                    USHORT nPos = pSVMenu->GetItemPos( nSlotId );
-                    pSVMenu->RemoveItem( nPos );
-                    nSlotId = 1;
-                    while ( pSVMenu->GetItemPos(nSlotId) != MENU_ITEM_NOTFOUND )
-                        nSlotId++;
-                    pSVMenu->InsertItem( nSlotId, aTitle, 0, nPos );
-                    pSVMenu->SetPopupMenu( nSlotId, pPopup );
-                }
-*/
                 pSVMenu->SetHelpId( nSlotId, 0L );
                 pMnuCtrl = pItems+nPos;
 
@@ -575,7 +555,6 @@ IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu )
     if ( pMenu == pSVMenu )
     {
         // AutoDeactivate ist jetzt nicht mehr n"otig
-        //USHORT nSlotId = pMenu->GetCurItemId();
         if ( pAutoDeactivate )
             pAutoDeactivate->Stop();
     }
@@ -918,8 +897,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
     // MI: wozu war der noch gut?
     // MBA: scheint ein alter QAP-Hack gewesen zu sein ( in rev.1.41 eingecheckt ! )
-//	if ( Application::IsInModalMode() )
-//		return TRUE; // abw"urgen
 
     if ( pMenu )
     {
@@ -1033,13 +1010,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
 
         pBindings->Update( SID_IMAGE_ORIENTATION );
 
-        // HelpText on-demand
-        if ( !bHelpInitialized )
-        {
-            // TODO/CLEANUP: do we need help texts in context menus?
-            // old way with SlotInfo doesn't work anymore
-        }
-
         // bis zum Deactivate die Statusupdates unterdr"ucken
         pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = TRUE;
 
@@ -1088,22 +1058,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
 {
     USHORT nSlotId = (USHORT) pMenu->GetCurItemId();
     DBG_OUTF( ("SfxVirtualMenu %lx selected %u from %lx", this, nSlotId, pMenu) );
-/*
-    if ( pSVMenu->GetItemCommand( nSlotId ).Len() )
-    {
-        SfxMenuCtrlArr_Impl& rCtrlArr = GetAppCtrl_Impl();
-        for ( USHORT nPos=0; nPos<rCtrlArr.Count(); nPos++ )
-        {
-            SfxMenuControl* pCtrl = rCtrlArr[nPos];
-            if ( pCtrl->GetId() == nSlotId )
-            {
-                SfxUnoMenuControl *pUnoCtrl = (SfxUnoMenuControl*) pCtrl;
-                pUnoCtrl->Select();
-                return TRUE;
-            }
-        }
-    }
-*/
+
     if ( nSlotId >= START_ITEMID_WINDOWLIST && nSlotId <= END_ITEMID_WINDOWLIST )
     {
         // window list menu item selected
@@ -1294,9 +1249,6 @@ void SfxVirtualMenu::InitializeHelp()
     for ( USHORT nPos = 0; nPos<pSVMenu->GetItemCount(); ++nPos )
     {
         USHORT nSlotId = pSVMenu->GetItemId(nPos);
-        // TODO/CLEANUP: this code does nothing!
-//        if ( !bHelpInitialized )
-//            pSVMenu->SetHelpText( nId, rSlotPool.GetSlotHelpText_Impl( nId ) );
         SfxMenuControl &rCtrl = pItems[nPos];
         if ( nSlotId && !rCtrl.GetId() )
         {
author	Xisco Fauli <anistenis@gmail.com>	2011-02-27 20:44:41 +0100
committer	Thomas Arnhold <thomas@arnhold.org>	2011-03-01 15:06:13 +0100
commit	57b6108bb13cec002eb89f1afe9530ac57ed993c (patch)
tree	465d9687182a0dac0b37eacc33636413b6114e59
parent	df94d6c29485beff5b353b27ecff34f71fe208cb (diff)