Cleanup commented-out code

* multiple comments containing //CHINA001
* a large section of commented out code

6 files changed, 11 insertions, 143 deletions

diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index cd67d1ab5bb3..6f153ae9345d 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -411,23 +411,22 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
     else if (&m_aSoundsLikeCJKSettings == pButton)
     {
         SfxItemSet aSet( SFX_APP()->GetPool() );
-        //CHINA001 SvxJSearchOptionsDialog aDlg( this, aSet, RID_SVXPAGE_JSEARCH_OPTIONS, m_pSearchEngine->GetTransliterationFlags() );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         if(pFact)
         {
             AbstractSvxJSearchOptionsDialog* aDlg = pFact->CreateSvxJSearchOptionsDialog( this, aSet, m_pSearchEngine->GetTransliterationFlags() );
-            DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
-            aDlg->Execute(); //CHINA001 aDlg.Execute();
+            DBG_ASSERT(aDlg, "Dialogdiet fail!");
+            aDlg->Execute();
 
 
-            INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+            INT32 nFlags = aDlg->GetTransliterationFlags();
             m_pSearchEngine->SetTransliterationFlags(nFlags);
 
             m_cbCase.Check(m_pSearchEngine->GetCaseSensitive());
             OnCheckBoxToggled( &m_cbCase );
             m_aHalfFullFormsCJK.Check( !m_pSearchEngine->GetIgnoreWidthCJK() );
             OnCheckBoxToggled( &m_aHalfFullFormsCJK );
-            delete aDlg; //add for CHINA001
+            delete aDlg;
         }
     }
 
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index c5bf6d8ffa39..fe7dfa0d17da 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -37,7 +37,7 @@
 #include <cuires.hrc>
 
 #include "dlgname.hxx"
-#include "defdlgname.hxx" //CHINA001
+#include "defdlgname.hxx"
 #include "dlgname.hrc"
 #include <dialmgr.hxx>
 
@@ -80,9 +80,6 @@ SvxNameDialog::SvxNameDialog( Window* pWindow, const String& rName, const String
     }
 }
 
-/* -----------------------------27.02.2002 15:22------------------------------
-
- ---------------------------------------------------------------------------*/
 IMPL_LINK(SvxNameDialog, ModifyHdl, Edit*, EMPTYARG)
 {
     if(aCheckNameHdl.IsSet())
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a87d7710f484..4a53e7bb3dee 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -35,7 +35,7 @@
 
 #include "hldoctp.hxx"
 #include "hyperdlg.hrc"
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx"
 
 sal_Char __READONLY_DATA sHash[]                = "#";
 sal_Char __READONLY_DATA sFileScheme[]          = INET_FILE_SCHEME;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 79fde6c7a64c..347b940b9a9b 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -34,7 +34,7 @@
 
 #include "hlinettp.hxx"
 #include "hyperdlg.hrc"
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx"
 
 #define STD_DOC_SUBPATH     "internal"
 #define STD_DOC_NAME        "url_transfer.htm"
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f9e2c3814552..bc65531c0b69 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -36,17 +36,17 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
 #include "hyperdlg.hrc"
-#include "cuihyperdlg.hxx"  //CHINA001
+#include "cuihyperdlg.hxx"
 #include "hltpbase.hxx"
 #include "macroass.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <cuires.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <cuires.hrc>
 
 using namespace ::ucbhelper;
 
 //########################################################################
 //#                                                                      #
-//# ComboBox-Control, wich is filled with all current framenames         #
+//# ComboBox-Control, which is filled with all current framenames        #
 //#                                                                      #
 //########################################################################
 
@@ -125,130 +125,6 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return nRet;
 }
 
-/*
-Diese Methode parsed eine EMailadresse aus einem D&D-DataObjekt aus der Adre�datenbank heraus
-
-#ifndef _OFF_OFADBMGR_HXX
-#include <offmgr/ofadbmgr.hxx>
-#endif
-#ifndef _SFX_APP_HXX
-#include <offmgr/app.hxx>
-#endif
-#ifndef _SDB_SDBCURS_HXX
-#include <sdb/sdbcurs.hxx>
-#endif
-
-#define DB_DD_DELIM         ((char)11)
-
-String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem )
-{
-#if !defined( ICC ) && !defined( SOLARIS )
-    String aAddress;
-
-    if (  DragServer::HasFormat( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) )
-    {
-        ULONG nLen = DragServer::GetDataLen( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) - 1;
-        USHORT i = 0;
-        String aTxt;
-        char *pTxt = aTxt.AllocStrBuf( (USHORT)nLen );
-        DragServer::PasteData( nItem, pTxt, nLen, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE );
-        String aDBName = aTxt.GetToken( i++, DB_DD_DELIM );
-        String aTableName = aTxt.GetToken( i++, DB_DD_DELIM );
-        i++;    // Format"anderung
-        String aStatement = aTxt.GetToken( i++, DB_DD_DELIM );
-        if ( !aStatement )
-        {
-            aDBName += DB_DELIM;
-            aDBName += aTableName;
-        }
-        else
-        {
-            // use here another delimiter, because the OfaDBMgr uses two
-            // delimiters ( (char)11 and ; )
-            aDBName += ';';
-            aDBName += aStatement;
-        }
-        SbaSelectionListRef pSelectionList;
-        pSelectionList.Clear();
-        pSelectionList = new SbaSelectionList;
-        USHORT nTokCnt = aTxt.GetTokenCount( DB_DD_DELIM );
-
-        for ( ; i < nTokCnt; ++i )
-            pSelectionList->Insert(
-                (void*)(USHORT)aTxt.GetToken( i, DB_DD_DELIM ), LIST_APPEND );
-
-        OfaDBMgr* pDBMgr = SFX_APP()->GetOfaDBMgr();
-        BOOL bBasic = DBMGR_STD;
-
-        if ( !pDBMgr->OpenDB( bBasic, aDBName ) )
-            return aAddress;
-
-        OfaDBParam& rParam = pDBMgr->GetDBData( bBasic );
-        pDBMgr->ChangeStatement( bBasic, aStatement );
-        rParam.pSelectionList->Clear();
-
-        if ( pSelectionList.Is() &&
-                (long)pSelectionList->GetObject(0) != -1L )
-            *rParam.pSelectionList = *pSelectionList;
-
-        if ( !pDBMgr->ToFirstSelectedRecord( bBasic ) )
-        {
-            pDBMgr->CloseAll();
-            return aAddress;
-        }
-
-        if ( pDBMgr->IsSuccessful( bBasic ) )
-        {
-            //  Spaltenk"opfe
-            SbaDBDataDefRef aDBDef = pDBMgr->OpenColumnNames( bBasic );
-
-            if ( aDBDef.Is() )
-            {
-                SbaColumn* pCol = aDBDef->GetColumn("EMAIL");
-                ULONG nPos = 0;
-
-                if ( pCol )
-                    nPos = aDBDef->GetOriginalColumns().GetPos( pCol ) + 1;
-                for ( i = 0 ; nPos && i < pSelectionList->Count(); ++i )
-                {
-                    ULONG nIndex = (ULONG)pSelectionList->GetObject(i);
-
-                    // N"achsten zu lesenden Datensatz ansteuern
-
-                    BOOL bEnd = rParam.GetCursor()->IsOffRange();
-
-                    if ( !bEnd )
-                    {
-                        const ODbRowRef aRow =
-                            pDBMgr->GetSelectedRecord( bBasic, i );
-
-                        if ( aRow.Is() )
-                        {
-                            aAddress += pDBMgr->
-                                ImportDBField( (USHORT)nPos, &aDBDef, aRow.getBodyPtr() );
-                            aAddress += ',';
-                        }
-                        else
-                        {
-                            aAddress.Erase();
-                            break;
-                        }
-                    }
-                    else
-                        break;
-                }
-            }
-        }
-        pDBMgr->CloseAll();
-    }
-    aAddress.EraseTrailingChars( ',' );
-    return aAddress;
-#else
-    return String();
-#endif
-}
-*/
-
 void SvxHyperURLBox::Select()
 {
     SvtURLBox::Select();
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 62e6e405dbd2..fab3062b35d2 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -81,7 +81,6 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG )
             {
                 try
                 {
-                    //CHINA001 xCol->setPropertyValue(::svxform::FM_PROP_HIDDEN, ::cppu::bool2any(sal_False));
                     xCol->setPropertyValue(CUIFM_PROP_HIDDEN, ::cppu::bool2any(sal_False));
                 }
                 catch(...)
@@ -115,13 +114,10 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com:
         sal_Bool bIsHidden = sal_False;
         try
         {
-            //CHINA001 ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(::svxform::FM_PROP_HIDDEN);
             ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN);
             bIsHidden = ::comphelper::getBOOL(aHidden);
 
             ::rtl::OUString sName;
-            //CHINA001 xCurCol->getPropertyValue(::svxform::FM_PROP_LABEL) >>= sName;
-
             xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName;
             sCurName = (const sal_Unicode*)sName;
         }