Remove Dead Code

14 files changed, 9 insertions, 212 deletions

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 4e816f6146..b07caa4bb7 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -215,11 +215,6 @@ SfxModalDialog::~SfxModalDialog()
 */
 
 {
-/*
-    SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
-    if ( pHelpPI )
-        pHelpPI->ResetTopic();
-*/
     SetDialogData_Impl();
     aTimer.Stop();
     delete pOutputSet;
@@ -236,11 +231,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
 
 IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG )
 {
-/*
-    SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI();
-    if ( pHelpPI )
-        pHelpPI->LoadTopic( GetHelpId() );
- */
     return 0L;
 }
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 28a5c19dab..e8cf46e791 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1445,7 +1445,6 @@ void SfxInternetPage::Reset( const SfxItemSet& rSet )
 
     ChangeState( eNewState );
 
-    // #102907# ------------------------
     SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
     if ( pROItem && pROItem->GetValue() )
     {
@@ -2063,7 +2062,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny )
         pCurrent++;
         pNewCurrent++;
     }
-    //
+
     pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel();
     pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel();
     pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 3e1ddafb34..d996cdab78 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -447,7 +447,6 @@ friend class SfxDockingWindow;
     Size				aMinSize;
     SfxSplitWindow*		pSplitWin;
     BOOL				bSplitable;
-//	BOOL				bAutoHide;
     Timer               aMoveTimer;
 
     // Folgende members sind nur in der Zeit von StartDocking bis EndDocking
@@ -614,12 +613,6 @@ void SfxDockingWindow::ToggleFloatingMode()
             GetFloatingWindow()->SetWindowState( pImp->aWinState );
         else
             GetFloatingWindow()->SetOutputSizePixel( GetFloatingSize() );
-/*
-        if ( pImp->bSplitable && !pImp->bEndDocked )
-            // Wenn das Fenster vorher in einem SplitWindow lag, kommt von
-            // Sv kein Show
-            Show();
-*/
     }
     else
     {
@@ -894,12 +887,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ )
 */
 
 {
-/*
-    if(rSize.Width()   < pImp->aMinSize.Width())
-        rSize.Width()  = pImp->aMinSize.Width();
-    if(rSize.Height()  < pImp->aMinSize.Height())
-        rSize.Height() = pImp->aMinSize.Height();
-*/
+
 }
 
 //-------------------------------------------------------------------------
@@ -931,7 +919,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->bDockingPrevented = FALSE;
 
     pImp->bSplitable = TRUE;
-//	pImp->bAutoHide = FALSE;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
@@ -940,8 +927,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
-
-//	DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");
 }
 
 //-------------------------------------------------------------------------
@@ -971,7 +956,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->bDockingPrevented = FALSE;
 
     pImp->bSplitable = TRUE;
-//	pImp->bAutoHide = FALSE;
 
     // Zun"achst auf Defaults setzen; das Alignment wird in der Subklasse gesetzt
     pImp->nLine = pImp->nDockLine = 0;
@@ -980,8 +964,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT);
     pImp->aMoveTimer.SetTimeout(50);
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
-
-//	DBG_ASSERT(pMgr,"DockingWindow erfordert ein SfxChildWindow!");
 }
 
 //-------------------------------------------------------------------------
@@ -997,7 +979,6 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
 {
     if ( !pMgr )
     {
-        // Bugfix #39771
         pImp->SetDockAlignment( SFX_ALIGN_NOALIGNMENT );
         pImp->bConstructed = TRUE;
         return;
@@ -1147,7 +1128,6 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
 
         if ( pImp->bSplitable )
         {
-//			pImp->bAutoHide = ( pInfo->nFlags & SFX_CHILDWIN_AUTOHIDE) != 0;
             pImp->pSplitWin = pWorkWin->GetSplitWindow_Impl(GetAlignment());
             pImp->pSplitWin->InsertWindow(this, pImp->aSplitSize);
         }
@@ -1171,7 +1151,6 @@ void SfxDockingWindow::Initialize_Impl()
 {
     if ( !pMgr )
     {
-        // Bugfix #39771
         pImp->bConstructed = TRUE;
         return;
     }
@@ -1881,8 +1860,6 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt )
 USHORT SfxDockingWindow::GetWinBits_Impl() const
 {
     USHORT nBits = 0;
-//	if ( pImp->bAutoHide )
-//		nBits |= SWIB_AUTOHIDE;
     return nBits;
 }
 
@@ -1944,14 +1921,6 @@ void SfxDockingWindow::AutoShow_Impl( BOOL bShow )
     }
 }
 
-/*
-void SfxDockingWindow::Pin_Impl( BOOL bPinned )
-{
-    if ( pImp->pSplitWin )
-        pImp->pSplitWin->Pin_Impl( bPinned );
-}
-*/
-
 SfxSplitWindow* SfxDockingWindow::GetSplitWindow_Impl() const
 {
     return pImp->pSplitWin;
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 22f253eaa2..3d3b88d61f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -321,8 +321,7 @@ void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& ) throw ( Run
 }
 
 // ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
+
 void FileDialogHelper_Impl::dispose()
 {
     if ( mxFileDlg.is() )
@@ -610,7 +609,6 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow )
                 {
                     mbShowPreview = bShowPreview;
 
-                    // #97633
                     // setShowState has currently no effect for the
                     // OpenOffice FilePicker (see svtools/source/filepicker/iodlg.cxx)
                     uno::Reference< XFilePreview > xFilePreview( mxFileDlg, UNO_QUERY );
@@ -717,7 +715,6 @@ IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG )
 
         if ( ERRCODE_NONE == getGraphic( aURL, maGraphic ) )
         {
-            // #89491
             // changed the code slightly;
             // before: the bitmap was scaled and
             // surrounded a white frame
@@ -742,7 +739,7 @@ IMPL_LINK( FileDialogHelper_Impl, TimeOutHdl_Impl, Timer*, EMPTYARG )
             else
                 aBmp.Scale( nYRatio, nYRatio );
 
-            // #94505# Convert to true color, to allow CopyPixel
+            // Convert to true color, to allow CopyPixel
             aBmp.Convert( BMP_CONVERSION_24BIT );
 
             // and copy it into the Any
@@ -1033,9 +1030,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                 break;
         }
 
-
-
-        //Sequence < Any > aInitArguments( mbSystemPicker || !mpPreferredParentWindow ? 1 : 3 );
         Sequence < Any > aInitArguments( !mpPreferredParentWindow ? 3 : 4 );
 
         // This is a hack. We currently know that the internal file picker implementation
@@ -1072,8 +1066,6 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
                                         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),
                                         makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) )
                                     );
-
-
         }
 
         try
@@ -1235,7 +1227,6 @@ void FileDialogHelper_Impl::preExecute()
     updatePreviewState( sal_False );
 
     implInitializeFileName( );
-    // #106079# / 2002-12-09 / fs@openoffice.org
 
 #if !(defined(MACOSX) && defined(QUARTZ)) && !defined(WNT)
     // allow for dialog implementations which need to be executed before they return valid values for
@@ -1270,7 +1261,6 @@ void FileDialogHelper_Impl::implInitializeFileName( )
 
         // in case we're operating as save dialog, and "auto extension" is checked,
         // cut the extension from the name
-        // #106079# / 2002-12-09 / fs@openoffice.org
         if ( mbIsSaveDlg && mbHasAutoExt )
         {
             try
@@ -1309,21 +1299,7 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute()
 //On MacOSX the native file picker has to run in the primordial thread because of drawing issues
 //On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
 //primordial thread as the ucb gnome-vfs2 provider was initialized in.
-/*
-#ifdef WNT
-    if ( mbSystemPicker )
-    {
-        PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
-        pThread->create();
-        while ( pThread->GetReturnValue() == nMagic )
-            Application::Yield();
-        pThread->join();
-        nRet = pThread->GetReturnValue();
-        delete pThread;
-    }
-    else
-#endif
-*/
+
     {
         try
         {
@@ -1378,35 +1354,7 @@ String FileDialogHelper_Impl::implEnsureURLExtension(const String& sURL,
                                                      const String& /*sExtension*/)
 {
     return sURL;
-    /*
-    // This feature must be active for file save/export only !
-    if (
-        (! mbIsSaveDlg) &&
-        (! mbExport   )
-        )
-        return sURL;
-
-    // no extension available (because "ALL *.*" was selected) ?
-    // Nod idea what else should happen here .-)
-    if (sExtension.Len() < 1)
-        return sURL;
-
-    // Some FilePicker implementations already add the right extension ...
-    // or might be the user used the right one already ...
-    // Dont create duplicate extension.
-    INetURLObject aURL(sURL);
-    if (aURL.getExtension().equals(sExtension))
-        return sURL;
-
-    // Ignore any other extension set by the user.
-    // Make sure suitable extension is used always.
-    // e.g. "test.bla.odt" for "ODT"
-    ::rtl::OUStringBuffer sNewURL(256);
-    sNewURL.append     (sURL      );
-    sNewURL.appendAscii("."       );
-    sNewURL.append     (sExtension);
-    return sNewURL.makeStringAndClear();
-    */
+
 }
 
 // ------------------------------------------------------------------------
@@ -1733,12 +1681,6 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath )
         // nothing to do
         return;
 
-    /*
-    if ( !::utl::UCBContentHelper::IsFolder( _rPath ) )
-        // only valid folders accepted here
-        return;
-    */
-
     maPath = _rPath;
     if ( mxFileDlg.is() )
     {
@@ -2236,9 +2178,6 @@ void FileDialogHelper_Impl::setDefaultValues()
         {
             DBG_ERROR( "FileDialogHelper_Impl::setDefaultValues: caught an exception while setting the display directory!" );
         }
-
-        // INetURLObject aStdDirObj( SvtPathOptions().GetWorkPath() );
-        //SetStandardDir( aStdDirObj.GetMainURL( INetURLObject::NO_DECODE ) );
     }
 }
 
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 4b8501dcf9..d6dee33ab4 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -693,12 +693,6 @@ namespace sfx2
             FilterGroupEntryReferrer::iterator aBelongsToLocal = aLocalClassesRef.find( sFilterName );
             if ( aLocalClassesRef.end() != aBelongsToLocal )
             {
-/*
-#ifdef DBG_UTIL
-                const ::rtl::OUString& rLocalClassDisplayName = aBelongsToLocal->second->First;
-                const ::rtl::OUString& rLocalClassExtension = aBelongsToLocal->second->Second;
-#endif
-*/
                 // okay, there is a local class which the filter belongs to
                 // -> append the wildcard
                 aExtendWildcard( *aBelongsToLocal );
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx
index c786234382..6c104a2c61 100644
--- a/sfx2/source/dialog/mailmodelapi.cxx
+++ b/sfx2/source/dialog/mailmodelapi.cxx
@@ -322,7 +322,6 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt
         {
             // detect filter
             const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel));
-//			sal_Bool bHasFilter = pFilter != NULL;
 
             sal_Bool bRet = sal_False;
             // create temp file name with leading chars and extension
@@ -381,7 +380,6 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt
                     Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
                     SfxStoringHelper aHelper(xMgr);
                     aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SaveAs")),aArgs, sal_False, ::rtl::OUString() );
-                    //	xStor->storeToURL(rFileName,aArgs);
                     bRet = sal_True;
                 }
                 catch(Exception&)
@@ -389,11 +387,6 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt
                 }
             }
 
-            // restore old settings
-/* TODO
-            if ( !bModified && xDocShell->IsEnableSetModified() )
-                xDocShell->SetModified( FALSE );
-*/
             eRet = bRet ? SAVE_SUCCESSFULL : SAVE_ERROR;
         }
     }
@@ -448,7 +441,6 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt
                     Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory();
                     SfxStoringHelper aHelper(xMgr);
                     aHelper.GUIStoreModel(_xModel,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportToPDF")),aArgs, sal_False, ::rtl::OUString);
-                    //	xStor->storeToURL(rFileName,aArgs);
                     bRet = sal_True;
                 }
                 catch(Exception&)
@@ -456,12 +448,6 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt
                 }
 
                 eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
-
-                // restore old settings
-                /* TODO
-                if ( !bModified && xDocShell->IsEnableSetModified() )
-                    xDocShell->SetModified( FALSE );
-                */
             }
         }
     }
@@ -480,7 +466,6 @@ SfxMailModel::SendMailResult SfxMailModel::AttachDocument(   MailDocType _eMailD
     SaveResult eSaveResult;
     String aFileName;
 
-//	sal_Bool bSuccessfull = sal_False;
     if ( _eMailDocType == TYPE_SELF )
         eSaveResult = SaveDocument( _sAttachmentTitle,_xModel,aFileName);
     else
@@ -664,7 +649,6 @@ SfxMailModel::SendMailResult SfxMailModel::Send( )
                     xSimpleMailMessage->setSubject( maSubject );
                     xSimpleMailMessage->setAttachement( aAttachmentSeq );
 
-                    // Bugfix: #95743#
                     // Due to the current clipboard implementation we cannot stop the main thread
                     // because the clipboard implementation calls the main thread from another thread
                     // and this would result in a deadlock!
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 3e82c68da9..22586be091 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -316,7 +316,6 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
 
 {
     SfxMapUnit eUnit = SFX_MAPUNIT_CM;
-//    FieldUnit eFieldUnit = pSfxApp->GetOptions().GetMetric();
     FieldUnit eFieldUnit( FUNIT_CM );
     SfxModule* pModule = SfxModule::GetActiveModule();
     if ( pModule )
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index a38141a3af..f0eca7431c 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -95,37 +95,9 @@ SfxPartChildWnd_Impl::~SfxPartChildWnd_Impl()
     // and we need a valid pMgr for further operations ...
 
     SfxPartDockWnd_Impl* pWin = (SfxPartDockWnd_Impl*) pWindow;
-//    if( pWin != NULL && !xFrame.is() )
-//        pWin->ReleaseChildWindow_Impl();
-/*
-    // Release frame and window.
-    // If frame reference is valid here ... start dieing from inside by calling dispose().
-    SetFrame( NULL );
-    pWindow = NULL;
-*/
+
     if ( pWin && xFrame == pWin->GetBindings().GetActiveFrame() )
         pWin->GetBindings().SetActiveFrame( NULL );
-/*
-    if( xFrame.is() )
-    {
-        try
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > xCloseable  ( xFrame, ::com::sun::star::uno::UNO_QUERY );
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDisposeable( xFrame, ::com::sun::star::uno::UNO_QUERY );
-            if (xCloseable.is())
-                xCloseable->close(sal_True);
-            else
-            if (xDisposeable.is())
-                xDisposeable->dispose();
-        }
-        catch( ::com::sun::star::util::CloseVetoException& )
-        {
-        }
-        catch( ::com::sun::star::lang::DisposedException& )
-        {
-        }
-    }
- */
 }
 
 sal_Bool SfxPartChildWnd_Impl::QueryClose()
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 3fb1efe99b..604a092201 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -476,8 +476,6 @@ IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG )
     m_bNewPasswordIsValid = true;
     m_aNewPassword = bNewProtection? aPasswordText : String();
 
-//    // RecordChangesCB is enabled if protection is off
-//    m_aRecordChangesCB.Enable( !bNewProtection );
     m_aRecordChangesCB.Check( bNewProtection );
     // toggle text of button "Protect" <-> "Unprotect"
     m_aChangeProtectionPB.SetText( bNewProtection ? m_aUnProtectSTR : m_aProtectSTR );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 381de0e07d..0ccda20cd4 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -102,7 +102,6 @@ friend class SfxSplitWindow;
                             aTimer.SetTimeoutHdl(
                                 LINK(pOwner, SfxSplitWindow, TimerHdl ) );
                             aTimer.SetTimeout( 200 );
-//                            EnableDrop( TRUE );
                             SetAlign( pOwner->GetAlign() );
                             Actualize();
                             ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() );
@@ -251,7 +250,6 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
             pEmptyWin->nState = (USHORT) aWinData.GetToken( 1, ',' ).ToInt32();
             if ( pEmptyWin->nState & 2 )
                 pEmptyWin->bFadeIn = TRUE;
-            //bPinned = !( pEmptyWin->nState & 1 );
             bPinned = TRUE; // always assume pinned - floating mode not used anymore
 
             USHORT i=2;
@@ -578,12 +576,6 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
         // alles eine Zeile nach vorne!
         nLine--;
     }
-/*
-    else if ( nLine == nL && nPos > nP )
-    {
-        nPos--;
-    }
-*/
     RemoveWindow( pDockWin );
     InsertWindow( pDockWin, rSize, nLine, nPos, bNewLine );
 }
@@ -1238,13 +1230,7 @@ void SfxSplitWindow::Show_Impl()
             pDock->pWin->FadeIn( pEmptyWin->bFadeIn );
     }
 }
-/*
-void SfxSplitWindow::Pin_Impl( BOOL bPin )
-{
-    if ( bPinned != bPin )
-        AutoHide();
-}
-*/
+
 BOOL SfxSplitWindow::ActivateNextChild_Impl( BOOL bForward )
 {
     // Wenn kein pActive, auf erstes bzw. letztes Fenster gehen ( bei !bForward wird erst in der loop dekrementiert )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 1202b56a92..0aaeffd3ec 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1511,8 +1511,6 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
             nRet = pPage->DeactivatePage( &aTmp );
         else
             nRet = pPage->DeactivatePage( NULL );
-//!		else
-//!			pPage->FillItemSet( aTmp );
 
         if ( ( SfxTabPage::LEAVE_PAGE & nRet ) == SfxTabPage::LEAVE_PAGE &&
              aTmp.Count() )
@@ -1590,7 +1588,6 @@ const SfxItemSet* SfxTabDialog::GetOutputItemSet
 
         if ( pDataObject->bOnDemand )
             return &pDataObject->pTabPage->GetItemSet();
-        // else
         return pOutSet;
     }
     return NULL;
@@ -1711,25 +1708,6 @@ const USHORT* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
         qsort( (void*)aUS.GetData(),
                aUS.Count(), sizeof(USHORT), TabDlgCmpUS_Impl );
 
-    // Ranges erzeugen
-    //!! Auskommentiert, da fehlerhaft
-    /*
-    pRanges = new USHORT[aUS.Count() * 2 + 1];
-    int j = 0;
-    i = 0;
-
-    while ( i < aUS.Count() )
-    {
-        pRanges[j++] = aUS[i];
-        // aufeinanderfolgende Zahlen
-        for( ; i < aUS.Count()-1; ++i )
-            if ( aUS[i] + 1 != aUS[i+1] )
-                break;
-        pRanges[j++] = aUS[i++];
-    }
-    pRanges[j] = 0;		// terminierende NULL
-    */
-
     pRanges = new USHORT[aUS.Count() + 1];
     memcpy(pRanges, aUS.GetData(), sizeof(USHORT) * aUS.Count());
     pRanges[aUS.Count()] = 0;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 8a97d4e9cc..8893ad10e7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -261,9 +261,6 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
 
 sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
-//	rEvt.maDropEvent.Context->acceptDrop( DND_ACTION_NONE );
-//	rEvt.maDropEvent.Context->dropComplete( TRUE );
-
     sal_Int8 nRet = DND_ACTION_NONE;
     SfxObjectShell* pDocShell = pDialog->GetObjectShell();
     TransferableDataHelper aHelper( rEvt.maDropEvent.Transferable );
@@ -1195,8 +1192,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
         const USHORT nCount = aArr.Count();
         for(USHORT i = 0; i < nCount; ++i)
             FillBox_Impl(pTreeBox, aArr[i], aEntries);
-
-//		EnableEdit(FALSE);
+;
         EnableItem(SID_STYLE_WATERCAN,FALSE);
 
         SfxTemplateItem* pState = pFamilyState[nActFamily-1];
@@ -1371,7 +1367,6 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags)
 // Aktualisierung Anzeige: Gie\skanne an/aus
 void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
 {
-//	EnableItem(SID_STYLE_WATERCAN, pItem != 0);
     bWaterDisabled =  pItem == 0;
 
     if(!bWaterDisabled)
@@ -1766,7 +1761,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
             bHierarchical=TRUE;
             const String aSelectEntry( GetSelectedEntry());
             aFmtLb.Hide();
-            // aFilterLb.Disable();
 
             pTreeBox = new StyleTreeListBox_Impl(
                     this, WB_HASBUTTONS | WB_HASLINES |
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index ae4d90d9eb..edb1b7f6b1 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -140,9 +140,6 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
         {
             rTemplateDlg.EnableExample_Impl(
                 GetId(), eState != SFX_ITEM_DISABLED );
-            // Das Select Disabled dann, falls enabled und Style Readonly
-/*			String aStr = rTemplateDlg.GetSelectedEntry();
-            if( aStr.Len() ) rTemplateDlg.SelectStyle( aStr ); */
             break;
         }
         case SID_STYLE_NEW:
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 9a7d487ce7..b9b0393604 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -144,8 +144,6 @@ SfxVersionTableDtor& SfxVersionTableDtor::operator=( const SfxVersionTableDtor&
 }
 
 //----------------------------------------------------------------
-//----------------------------------------------------------------
-//----------------------------------------------------------------
 SfxVersionInfo::SfxVersionInfo()
 {
 }