Remove lots of dead code

13 files changed, 10 insertions, 344 deletions

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index b0e21d180e52..214234dac155 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -156,23 +156,6 @@ String lcl_MakeTabEntry(const SfxFilter* pFilter)
 BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ )
 {
     BOOL bRet = FALSE;
-/*!!! (pb) needs new implementation
-    String aIniEntry;
-    String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ),
-                                              String::CreateFromAscii("java") );
-    INetURLObject aIniFileObj( aFullName, INET_PROT_FILE );
-    String aIniPath = aIniFileObj.getName();
-    if ( pIniMgr->SearchFile( aIniPath ) )
-    {
-        Config aJavaCfg( aIniPath );
-        aJavaCfg.SetGroup( "Java" );
-        ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) );
-        String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8);
-        String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8);
-        if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() )
-            bRet = TRUE;
-    }
-*/
     return bRet;
 }
 
@@ -216,12 +199,9 @@ void SvxNoSpaceEdit::Modify()
 }
 
 /********************************************************************/
-/********************************************************************/
 /*                                                                  */
 /*  SvxProxyTabPage                                                 */
 /*                                                                  */
-/*                                                                  */
-/********************************************************************/
 /********************************************************************/
 
 SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
@@ -683,12 +663,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
 
 
 /********************************************************************/
-/********************************************************************/
 /*                                                                  */
 /*  SvxSearchTabPage                                                */
 /*                                                                  */
-/*                                                                  */
-/********************************************************************/
 /********************************************************************/
 
 SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
@@ -1099,104 +1076,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
-
-/********************************************************************/
-/********************************************************************/
-/*                                                                  */
-/*  SvxOtherTabPage                                                 */
-/*                                                                  */
-/********************************************************************/
-/********************************************************************/
-
-/*
-SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
-
-    PatternField( pParent, rResId ),
-
-    sMsg233 ( ResId( ST_MSG_233 ) ),
-    sMsg255 ( ResId( ST_MSG_255 ) )
-
-{
-    FreeResource();
-    SelectFixedFont();
-} */
-
-/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt )
-{
-    PatternField::KeyInput( rKEvt );
-    BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE );
-    String sEntry( GetText() );
-    sEntry[(USHORT)3] = '.';
-    sEntry[(USHORT)7] = '.';
-    sEntry[(USHORT)11] = '.';
-    Selection aSelection( GetSelection() );
-    String sPart( sEntry.GetToken( 0, '.' ) );
-    USHORT i, nPart( sPart.EraseLeadingChars() );
-    BOOL bSet = FALSE;
-
-    if ( sPart.Len() && ( !nPart || nPart > 255 ) )
-    {
-        // der erste Part darf nicht 0 und nicht gr"osser 255 sein
-        String sMsg( sPart );
-        sMsg += ' ';
-        sMsg += sMsg233;
-        InfoBox( this, sMsg ).Execute();
-
-        if ( nPart == 0 )
-            sPart = "  1";
-        else
-            sPart = "255";
-        sEntry.SetToken( 0, '.', sPart );
-        bSet = TRUE;
-    };
-
-    for ( i = 1; i < 4; i++ )
-    {
-        // die anderen Parts d"urfen nicht gr"osser 255 sein
-        sPart = sEntry.GetToken( i, '.' );
-        nPart = sPart.EraseLeadingChars();
-
-        if ( nPart > 255 )
-        {
-            String sMsg( sPart );
-            sMsg += ' ';
-            sMsg += sMsg255;
-            InfoBox( this, sMsg ).Execute();
-
-            if ( nPart == 0 )
-                sPart = "  1";
-            else
-                sPart = "255";
-            sEntry.SetToken( i, '.', sPart );
-            bSet = TRUE;
-        };
-    }
-
-    if ( bSet )
-    {
-        SetText( sEntry );
-        SetSelection( aSelection );
-    }
-}
-*/
-// -----------------------------------------------------------------------
-#if 0
-long SvxPatternField::Notify( NotifyEvent& rNEvt )
-{
-    return PatternField::Notify( rNEvt );
-/*! long nHandled = 0;
-
-    if ( rNEvt.GetType() == EVENT_KEYUP )
-    {
-        const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-        KeyInput( *pKEvt );
-        nHandled = 1;
-    }
-    return nHandled;*/
-}
-#endif
-
 // class JavaScriptDisableQueryBox_Impl --------------------------------------
 
 class JavaScriptDisableQueryBox_Impl : public ModalDialog
@@ -1607,18 +1486,9 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 namespace
 {
-/*    bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg )
-    {
-        bool    b = _rOpt.IsOptionEnabled( _eOpt );
-        _rCtrl.Enable( b );
-        _Img.Show( !b );
-        return b;
-    }
-*/
     bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt,
                                                         CheckBox& _rCtrl, FixedImage& _rImg )
     {
-//        bool    b = Enable( _rOpt, _eOpt, _rCtrl, _rImg );
         bool    b = _rOpt.IsOptionEnabled( _eOpt );
         _rCtrl.Enable( b );
         _rImg.Show( !b );
@@ -1729,7 +1599,6 @@ inline bool getDllURL(rtl::OString * path)
         return false;
     }
     dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
-//    osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
     ::rtl::OUString sysDirPath;
     osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
     *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 3d6e4e305df6..caacec11a3bb 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -82,16 +82,6 @@ SvxJavaTable::~SvxJavaTable()
 void SvxJavaTable::SetTabs()
 {
     SvxSimpleTable::SetTabs();
-/*
-    USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT |
-                     SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE;
-    if ( aTabs.Count() > 0 )
-    {
-        SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0);
-        pTab->nFlags &= ~nAdjust;
-        pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE;
-    }
-*/
 }
 
 void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt )
@@ -181,8 +171,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
     m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
     m_aResetTimer.SetTimeout( RESET_TIMEOUT );
 
-//!   m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) );
-
     static long aStaticTabs[]=
     {
         5, 0, 15, 90, 130, 300
@@ -243,13 +231,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
         JavaInfo* pInfo = *pIter;
         jfw_freeJavaInfo( pInfo );
     }
-/*
-    rtl_uString** pParamArr = m_parParameters;
-    for ( sal_Int32 i = 0; i < m_nParamSize; ++i )
-        rtl_uString_release( *pParamArr++ );
-    rtl_freeMemory( m_parParameters );
-    rtl_uString_release( m_pClassPath );
-*/
+
     jfw_unlock();
 }
 
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 337a963c1a3e..49c6048dcc11 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -294,7 +294,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck )
             pItem->SetStateChecked();
         else
             pItem->SetStateUnchecked();
-        //InvalidateEntry( pEntry );
     }
 }
 
@@ -451,7 +450,6 @@ void OptionsUserData::SetChecked( BOOL bVal )
 
 void OptionsUserData::SetNumericValue( BYTE nNumVal )
 {
-//  DBG_ASSERT( nNumVal < 256, "value out of range" );
     if (HasNumericValue()  &&  (GetNumericValue() != nNumVal))
     {
         nVal &= 0xffffff00;
@@ -492,8 +490,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
         Font aFont( aOldFont );
         aFont.SetWeight( WEIGHT_BOLD );
 
-//      BOOL bFett = TRUE;
-//      USHORT nPos = 0;
         //??? das untere byte aus dem user data in string wandeln
         OptionsUserData aData( (ULONG) pEntry->GetUserData() );
         if(aData.HasNumericValue())
@@ -504,9 +500,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
             rDev.DrawText( aNewPos, sTxt );
         }
 
-//          if( STRING_NOTFOUND != nPos )
-//              aNewPos.X() += rDev.GetTextWidth( sTxt );
-
         rDev.SetFont( aOldFont );
     }
 }
@@ -1328,7 +1321,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
     for (ULONG i = 0;  i < nEntries;  ++i)
     {
         INT32 nDics = aDics.getLength();
-//        const uno::Reference< XDictionary > *pDic = aDics.getConstArray();
 
         aActiveDics.realloc( nDics );
         OUString *pActiveDic = aActiveDics.getArray();
@@ -1356,7 +1348,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
             }
         }
     }
-    //
+
     aActiveDics.realloc( nActiveDics );
     Any aTmp;
     aTmp <<= aActiveDics;
@@ -1430,11 +1422,9 @@ ULONG SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDi
     {
         uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY );
 
-//        ULONG nUserData = 0;
         BOOL bChecked = rxDic->isActive();
         BOOL bEditable = !xStor.is() || !xStor->isReadonly();
         BOOL bDeletable = bEditable;
-//        BOOL bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE;
 
         nRes = DicUserData( nIdx,
                 bChecked, bEditable, bDeletable ).GetUserData();
@@ -1548,9 +1538,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
 
     pEntry = CreateEntry( sGrammarAuto,       CBCOL_FIRST );
     aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal;
-//    const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK );
-//    if (pItem)
-//        bVal = ((SfxBoolItem *) pItem)->GetValue();
     nUserData = OptionsUserData( EID_GRAMMAR_AUTO, FALSE, 0, TRUE, bVal).GetUserData();
     pEntry->SetUserData( (void *)nUserData );
     pModel->Insert( pEntry );
@@ -1958,7 +1945,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
                        aLinguModulesFT.GetPosPixel().Y();
         DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" );
         Point   aPos;
-        //
+
         aPos = aLinguDicsFT.GetPosPixel();
         aPos.Y() -= nDeltaY;
         aLinguDicsFT.SetPosPixel( aPos );
@@ -1974,7 +1961,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
         aPos = aLinguDicsDelPB.GetPosPixel();
         aPos.Y() -= nDeltaY;
         aLinguDicsDelPB.SetPosPixel( aPos );
-        //
+
         aPos = aLinguOptionsFT.GetPosPixel();
         aPos.Y() -= nDeltaY;
         aLinguOptionsFT.SetPosPixel( aPos );
@@ -1984,7 +1971,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
         aPos = aLinguOptionsEditPB.GetPosPixel();
         aPos.Y() -= nDeltaY;
         aLinguOptionsEditPB.SetPosPixel( aPos );
-        //
+
         Size aSize( aLinguOptionsCLB.GetSizePixel() );
         aSize.Height() += nDeltaY;
         aLinguOptionsCLB.SetSizePixel( aSize );
@@ -2146,8 +2133,6 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
 
 IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
 {
-//    if (pBox == (SvTreeListBox *) &aModulesCLB)
-//    {
         pBox = &aModulesCLB;
         SvLBoxEntry *pCurEntry = pBox->GetCurEntry();
         if (pCurEntry)
@@ -2173,7 +2158,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
                 }
             }
         }
-//    }
     return 0;
 }
 
@@ -2197,7 +2181,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     Locale aCurLocale;
     SvxLanguageToLocale(aCurLocale, eCurLanguage);
     SvLBoxTreeList *pModel = aModulesCLB.GetModel();
-//  uno::Reference<XLinguServiceManager>&   xMgr = rLinguData.GetManager();
 
     if (pBox)
     {
@@ -2263,8 +2246,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
     aModulesCLB.Clear();
     if(LANGUAGE_DONTKNOW != eCurLanguage)
     {
-//      sal_Int32 nEntryPos = 1;
-
         ULONG n;
         ServiceInfo_Impl* pInfo;
 
@@ -2276,7 +2257,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
                                          String(), TRUE, FALSE, TYPE_SPELL, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
-        //
+
         Sequence< OUString > aNames( rLinguData.GetSortedImplNames( eCurLanguage, TYPE_SPELL ) );
         const OUString *pName = aNames.getConstArray();
         ULONG nNames = (ULONG) aNames.getLength();
@@ -2320,7 +2301,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_GRAMMAR, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
-        //
+
         aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_GRAMMAR );
         pName = aNames.getConstArray();
         nNames = (ULONG) aNames.getLength();
@@ -2364,7 +2345,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_HYPH, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
-        //
+
         aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_HYPH );
         pName = aNames.getConstArray();
         nNames = (ULONG) aNames.getLength();
@@ -2408,7 +2389,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
         pUserData = new ModuleUserData_Impl( String(), TRUE, FALSE, TYPE_THES, 0 );
         pEntry->SetUserData( (void *)pUserData );
         pModel->Insert( pEntry );
-        //
+
         aNames = rLinguData.GetSortedImplNames( eCurLanguage, TYPE_THES );
         pName = aNames.getConstArray();
         nNames = (ULONG) aNames.getLength();
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a2c594cc1b78..ae8dba0ce42e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -627,7 +627,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
     }
 
     aDocInfoCB.Check(aSaveOpt.IsDocInfoSave());
-//    aDocInfoCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE));
 
     aBackupCB.Check(aSaveOpt.IsBackup());
     BOOL bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
@@ -637,22 +636,16 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
     aAutoSaveCB.Check(aSaveOpt.IsAutoSave());
     aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat());
     aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
-//    aAutoSaveCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
 
     // the pretty printing
     aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting());
-//    aSizeOptimizationCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOPRETTYPRINTING ));
-
 
     aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() );
-//    aAutoSaveEdit.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME));
 
     // relativ speichern
     aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() );
-//    aRelativeFsysCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS));
 
     aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() );
-//    aRelativeInetCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET));
 
     void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() );
     aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) );
@@ -666,7 +659,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
     aSizeOptimizationCB.SaveValue();
     aAutoSaveCB.SaveValue();
     aAutoSaveEdit.SaveValue();
-//  aAutoSavePromptBtn.SaveValue();
 
     aRelativeFsysCB.SaveValue();
     aRelativeInetCB.SaveValue();
@@ -683,14 +675,12 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
         {
             aAutoSaveEdit.Enable();
             aMinuteFT.Enable();
-//          aAutoSavePromptBtn.Enable();
             aAutoSaveEdit.GrabFocus();
         }
         else
         {
             aAutoSaveEdit.Disable();
             aMinuteFT.Disable();
-//          aAutoSavePromptBtn.Disable();
         }
     }
     return 0;
@@ -706,7 +696,6 @@ OUString lcl_ExtracUIName(const Sequence<PropertyValue> rProperties)
         if(!pProperties[nProp].Name.compareToAscii("UIName"))
         {
             pProperties[nProp].Value >>= sRet;
-//!            break;
         }
         else if(!pProperties[nProp].Name.compareToAscii("Flags"))
         {
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 85bc19f67daf..edd01918573c 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -470,16 +470,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
         {
             if(pField == &aLeftMF)
             {
-//              nLeft = aPageSize.Width() -
-//                  ((nRight + aOrigSize.Width()) * nWidthZoom) / 100;
                 nLeft = aOrigSize.Width() -
                             ( aPageSize.Width() * 100 / nWidthZoom + nRight );
                 aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit );
             }
             else
             {
-//              nRight = aPageSize.Width() -
-//                  ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100;
                 nRight = aOrigSize.Width() -
                             ( aPageSize.Width() * 100 / nWidthZoom + nLeft );
                 aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit );
@@ -503,16 +499,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
         {
             if(pField == &aTopMF)
             {
-//              nTop = aPageSize.Height() -
-//                  ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100;
                 nTop = aOrigSize.Height() -
                             ( aPageSize.Height() * 100 / nHeightZoom + nBottom);
                 aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit );
             }
             else
             {
-//              nBottom = aPageSize.Height() -
-//                  ((aOrigSize.Height() - nTop)*nHeightZoom) / 100;
                 nBottom = aOrigSize.Height() -
                             ( aPageSize.Height() * 100 / nHeightZoom + nTop);
                 aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit );
@@ -605,11 +597,6 @@ void SvxGrfCropPage::CalcMinMaxBorder()
     nMin = nMinWidth - (nL >= 0 ? nL : 0);
     aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit );
 
-    // Zoom nicht unter 2%
-/*  nMin = (aOrigSize.Width() * 102) /100;
-    aLeftMF.SetMax(aPageSize.Width() - nR - nMin);
-    aRightMF.SetMax(aPageSize.Width() - nL - nMin);
-*/
     long nUp  = lcl_GetValue( aTopMF, eUnit );
     long nMinHeight = (aOrigSize.Height() * 10) /11;
     nMin = nMinHeight - (nUp >= 0 ? nUp : 0);
@@ -618,11 +605,6 @@ void SvxGrfCropPage::CalcMinMaxBorder()
     long nLow = lcl_GetValue(aBottomMF, eUnit );
     nMin = nMinHeight - (nLow >= 0 ? nLow : 0);
     aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit );
-
-    // Zoom nicht unter 2%
-/*  nMin = (aOrigSize.Height() * 102) /100;
-    aTopMF.SetMax(aPageSize.Height() - nLow - nMin);
-    aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/
 }
 /*--------------------------------------------------------------------
     Beschreibung:   Spinsize auf 1/20 der Originalgroesse setzen,
@@ -808,7 +790,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz )
     Invalidate();
 }
 
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 0c306fbe051a..81d2b5dc337c 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -524,9 +524,6 @@ BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
         }
     }
 
-//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE};
-//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW};
-
     if( bPositionModified )
     {
         // Position
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 203e7ea1f585..9869aba5dcc1 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -328,7 +328,7 @@ int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
     const SfxPoolItem* pItem;
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+
     //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
     SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
     if(eState != SFX_ITEM_SET)
@@ -402,11 +402,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG)
     return 0;
 }
 
-/**************************************************************************/
-/*                                                                        */
-/*                                                                        */
-/**************************************************************************/
-
 
 SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent,
                                const SfxItemSet& rSet)  :
@@ -514,8 +509,6 @@ void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
     delete pSaveNum;
     pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
-
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
     else if(*pSaveNum != *pActNum)
@@ -573,11 +566,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet)
 
 }
 
-/**************************************************************************/
-/*                                                                        */
-/*                                                                        */
-/**************************************************************************/
-
 
 SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
@@ -721,7 +709,6 @@ void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
     delete pSaveNum;
     pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
     else if(*pSaveNum != *pActNum)
@@ -850,10 +837,6 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
     }
 }
 
-/**************************************************************************/
-/*                                                                        */
-/*                                                                        */
-/**************************************************************************/
 
 SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
@@ -877,7 +860,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
     aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl));
 
     // Grafiknamen ermitteln
-
     GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
     pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP    );
     for(USHORT i = 0; i < aGrfNames.Count(); i++)
@@ -925,7 +907,6 @@ void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
     const SfxPoolItem* pItem;
     bPreset = FALSE;
     BOOL bIsPreset = FALSE;
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet();
     if(pExampleSet)
     {
@@ -967,8 +948,6 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 {
     if ( !aGrfNames.Count() )
     {
-// das ist im SfxItemSet leider nicht zulaessig #52134#
-//      rSet.DisableItem(SID_ATTR_NUMBERING_RULE);
         return FALSE;
     }
     if( (bPreset || bModified) && pActNum)
@@ -1356,7 +1335,6 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     else
         aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1);
 
-//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     USHORT nMask = 1;
     aLevelLB.SetUpdateMode(FALSE);
     aLevelLB.SetNoSelection();
@@ -1636,12 +1614,6 @@ void SvxNumOptionsTabPage::InitControls()
                 aStartED.SetText(aEmptyStr);
         break;
         case SHOW_BULLET:
-        {
-//              const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont();
-//              if(pFnt)
-//                  ChgTxtFont(aBulletFT, *pFnt);
-//              aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar()));
-        }
         break;
         case SHOW_BITMAP:
         break;
@@ -1855,8 +1827,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
                     aNumFmt.SetBulletChar( SVX_DEF_BULLET );
                 pActNum->SetLevel(i, aNumFmt);
                 SwitchNumberType(SHOW_BULLET);
-                //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont());
-                //aBulletFT.SetText( aNumFmt.GetBulletChar() );
                 // Zuweisung der Zeichenvorlage automatisch
                 if(bAutomaticCharStyles)
                 {
@@ -1867,7 +1837,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
             {
                 aNumFmt.SetPrefix( aPrefixED.GetText() );
                 aNumFmt.SetSuffix( aSuffixED.GetText() );
-//              aNumFmt.SetBulletFont(0);
                 SwitchNumberType(SHOW_NUMBERING);
                 pActNum->SetLevel(i, aNumFmt);
                 CheckForStartValue_Impl(nNumberingType);
@@ -1897,7 +1866,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
     {
         aCharFmtLB.SelectEntry(sSelectStyle);
         CharFmtHdl_Impl(&aCharFmtLB);
-        // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt
         bAutomaticCharStyles = TRUE;
     }
     return 0;
@@ -2005,7 +1973,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
     Size                    aSize;
     sal_Bool                bSucc(sal_False);
     SvxOpenGraphicDialog    aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) );
-//  aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE );
 
     if(MN_GALLERY_ENTRY <= nItemId )
     {
@@ -2436,7 +2403,6 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
         aStdFont.SetColor(aTextColor);
         aStdFont.SetFillColor(aBackColor);
 
-        //
         USHORT nFontHeight = nYStep * 6 / 10;
         if(bPosition)
             nFontHeight = nYStep * 15 / 10;
@@ -3040,7 +3006,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
         if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, FALSE, &pItem))
             nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue();
     }
-    //
     if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, FALSE, &pItem))
     {
         delete pSaveNum;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index c4c9dde501f6..269847ee9b0a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -181,9 +181,6 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet)
 
 IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG )
 {
-//! if ( aLeftIndent.IsRelativeMode() )
-//!     return 0; //!!!
-
     SfxItemPool* pPool = GetItemSet().GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     FieldUnit eUnit =
@@ -1003,8 +1000,6 @@ void    SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet)
                         0x0002 --->EnableRegisterMode()
                         0x0004 --->EnableAutoFirstLine()
                         0x0008 --->EnableNegativeMode()
-
-
             */
     SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False);
     SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False);
@@ -1710,7 +1705,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
             aPagenumEdit.Enable(FALSE);
             aPagenumText.Enable(FALSE);
         }
-//!!!   ApplyCollClickHdl_Impl( &aApplyCollBtn );
 
         if ( !bIsPageModel )
         {
@@ -1936,10 +1930,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
     aBreakTypeLB        ( this, CUI_RES( LB_BREAKTYPE     )),
     aBreakPositionFT    ( this, CUI_RES( FT_BREAKPOSITION )),
     aBreakPositionLB    ( this, CUI_RES( LB_BREAKPOSITION )),
-//    aPageBox            ( this, CUI_RES( BTN_BREAKPAGE ) ),
-//    aColumnBox          ( this, CUI_RES( BTN_BREAKCOLUMN ) ),
-//    aBeforeBox          ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ),
-//    aAfterBox           ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ),
     aApplyCollBtn       ( this, CUI_RES( BTN_PAGECOLL ) ),
     aApplyCollBox       ( this, CUI_RES( LB_PAGECOLL ) ),
     aPagenumText        ( this, CUI_RES( FT_PAGENUM ) ),
@@ -2319,17 +2309,10 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox)
 void SvxAsianTabPage::Reset( const SfxItemSet& rSet )
 {
     lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB );
-//  lcl_SetBox(rSet, , aAllowWordBreakCB );
     lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB );
 
-
     //character distance not yet available
-//  lcl_SetBox(rSet, , aPuntuationCB    );
     lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB );
-//  lcl_SetBox(rSet, , aAdjustNumbersCB );
-//  aAllowWordBreakCB   .Enable(FALSE);
-//  aPuntuationCB       .Enable(FALSE);
-//  aAdjustNumbersCB    .Enable(FALSE);
 }
 
 IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox )
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index e9bde505a0da..1d3a8bdd2b26 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1167,32 +1167,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
     else
         m_bAtVertPosModified = TRUE;
 
-    // OD 12.11.2003 #i22341# - following special handling no longer needed
-    /*
-    if (!bHori && m_pVMap == aVCharMap)
-    {
-        // Ausrichtung Vertikal
-        String sEntry;
-        USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB);
-        USHORT nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB);
-        USHORT nRel = GetRelation(m_pVMap, m_aVertToLB);
-
-        if (nRel == SwFPos::REL_CHAR)
-            sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM);
-        else
-            sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP);
-
-        USHORT nOldPos = m_aVertLB.GetSelectEntryPos();
-
-        String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1);
-        if (sName != sEntry)
-        {
-            m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1);
-            m_aVertLB.InsertEntry(sEntry);
-            m_aVertLB.SelectEntryPos(nOldPos);
-        }
-    }
-    */
     if(m_bHtmlMode  && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung
     {
         if(bHori)
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 42e4a867b181..260281b03fdc 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -121,13 +121,11 @@ SvxLineTabDialog::SvxLineTabDialog
 
     AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0);
     AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0);
-//  AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 );
 
     SetCurPageId( RID_SVXPAGE_LINE );
 
     CancelButton& rBtnCancel = GetCancelButton();
     rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
-//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) );
 }
 
 // -----------------------------------------------------------------------
@@ -279,18 +277,6 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
             ( (SvxShadowTabPage&) rPage ).Construct();
         }
         break;
-/*
-        case RID_SVXPAGE_COLOR:
-            ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab );
-            ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType );
-            ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType );
-            ( (SvxColorTabPage&) rPage ).SetPos( &mnPos );
-            ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP );
-            ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState );
-            ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable );
-            ( (SvxColorTabPage&) rPage ).Construct();
-        break;
-*/
     }
 }
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 3216a8cff824..14f9aefaff01 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -125,7 +125,6 @@ SvxBitmapTabPage::SvxBitmapTabPage
     // Setzen des Output-Devices
     rXFSet.Put( aXFStyleItem );
     rXFSet.Put( aXBitmapItem );
-    //aCtlPreview.SetAttributes( aXFillAttr );
 
     aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) );
     aBtnImport.SetClickHdl(
@@ -357,14 +356,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG )
     }
     if( pXOBitmap )
     {
-        //WorkWindow        aTmpWW( DLGWIN );
-        //VirtualDevice aVD( aTmpWW );
-        //USHORT    nLines = aCtlPixel.GetLineCount();
-        //Color aPixelColor, aBackColor;
-        //BOOL  bPixelColor = FALSE;
-        //USHORT    nWidth  = pBitmap->GetSizePixel().Width();
-        //USHORT    nHeight = pBitmap->GetSizePixel().Height();
-
         // #85339# try to convert bitmapped item to array item.
         if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT)
         {
@@ -576,9 +567,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
                 break;
 
                 case RET_CANCEL:
-                    // return( -1L );
                 break;
-                // return( TRUE ); // Abbruch
             }
             delete aMessDlg;
         }
@@ -647,7 +636,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         if( pWarnBox->Execute() != RET_OK )
             break;
     }
-    //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() );
     delete pDlg;
     delete pWarnBox;
 
@@ -778,7 +766,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
                 if( pWarnBox->Execute() != RET_OK )
                     break;
             }
-            //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() );
             delete pDlg;
             delete pWarnBox;
 
@@ -798,7 +785,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
                 if( TRUE ) {                // ??? overlapped with pDlg
                                             // and srolling
                     Invalidate( aRect );
-                    //aLbBitmaps.Invalidate();
                 }
 #endif
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 492802a80a17..2d534a3d9f23 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -115,9 +115,7 @@ SvxGradientTabPage::SvxGradientTabPage
 
     // Solange NICHT vom Item unterstuetzt
 
-    //aMtrColorTo.Disable();
     aMtrColorTo.SetValue( 100 );
-    //aMtrColorFrom.Disable();
     aMtrColorFrom.SetValue( 100 );
 
     // Setzen des Output-Devices
@@ -312,9 +310,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
                 break;
 
                 case RET_CANCEL:
-                    // return( -1L ); <-- wuerde die Seite nicht verlassen
                 break;
-                // return( TRUE ); // Abbruch
             }
             delete aMessDlg;
         }
@@ -484,7 +480,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         if( pWarnBox->Execute() != RET_OK )
             break;
     }
-    //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() );
     delete pDlg;
     delete pWarnBox;
 
@@ -513,7 +508,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         if( TRUE ) {                // ??? overlapped with pDlg
                                     // and srolling
             Invalidate( aRect );
-            //aLbGradients.Invalidate();
         }
 #endif
 
@@ -719,7 +713,6 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
             else
             {
                 LeaveWait();
-                //aIStream.Close();
                 ErrorBox( DLGWIN, WinBits( WB_OK ),
                     String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
             }
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 771ad92430e5..d01c7603f180 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -285,9 +285,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
             break;
 
             case RET_CANCEL:
-                // return( -1L ); <-- wuerde die Seite nicht verlassen
             break;
-            // return( TRUE ); // Abbruch
         }
         delete aMessDlg;
     }
@@ -338,7 +336,6 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
 
 void SvxHatchTabPage::Reset( const SfxItemSet& rSet )
 {
-    // aLbHatchings.SelectEntryPos( 0 );
     ChangeHatchHdl_Impl( this );
 
     // Status der Buttons ermitteln
@@ -461,19 +458,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG )
             default:  aCtlAngle.SetActualRP( RP_MM ); break;
         }
 
-        // Backgroundcolor
-        /*
-        const SfxPoolItem* pPoolItem = NULL;
-        if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), TRUE, &pPoolItem ) )
-        {
-            rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) );
-            if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) )
-            {
-                Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() );
-                rXFSet.Put( XFillColorItem( String(), aColor ) );
-            }
-        }
-        */
         // ItemSet fuellen und an aCtlPreview weiterleiten
         rXFSet.Put( XFillHatchItem( String(), *pHatch ) );
         aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -548,7 +532,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         if( pWarnBox->Execute() != RET_OK )
             break;
     }
-    //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() );
     delete pDlg;
     delete pWarnBox;
 
@@ -572,7 +555,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         if( TRUE ) {                // ??? overlapped with pDlg
                                     // and srolling
             Invalidate( aRect );
-            //aLbHatchings.Invalidate();
         }
 #endif