Remove commented code in libs-core/formula

10 files changed, 3 insertions, 67 deletions

diff --git a/formula/inc/AddressConvention.hxx b/formula/inc/AddressConvention.hxx
index bf98438acc2c..e2846ac04708 100755
--- a/formula/inc/AddressConvention.hxx
+++ b/formula/inc/AddressConvention.hxx
@@ -33,7 +33,6 @@
 namespace formula
 {
 // =============================================================================
-// =============================================================================
 } // formula
 // =============================================================================
 
diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index bf1500ac45a3..e3f6d8497785 100755
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -46,7 +46,6 @@ namespace formula
     class FormEditData;
     class FormulaTokenArray;
 
-    // ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr();
     class SAL_NO_VTABLE IFunctionManager
     {
     public:
@@ -106,10 +105,6 @@ namespace formula
     {
     public:
         virtual bool isFunction() const = 0;
-        /*
-        OpCode eOp = pToken->GetOpCode();
-        if(!(pToken->IsFunction()|| ocArcTan2<=eOp))
-        */
         virtual sal_uInt32 getArgumentCount() const = 0;
     };
 
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 3b9a98f886ec..0da88cd678d0 100755
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -123,11 +123,6 @@ short lcl_GetRetFormat( OpCode eOpCode )
         case ocNominal:
         case ocPercentSign:
             return NUMBERFORMAT_PERCENT;
-//      case ocSum:
-//      case ocSumSQ:
-//      case ocProduct:
-//      case ocAverage:
-//          return -1;
         default:
             return NUMBERFORMAT_NUMBER;
     }
@@ -480,7 +475,6 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
             }
             else
             {
-                //DBG_ASSERT( isCore(), "FormulaCompiler::OpCodeMap::createSequenceOfAvailableMappings: AddIn mapping from collection only implemented for core languages");
                 _rCompiler.fillAddInToken(aVec,isEnglish());
             }
         }
@@ -838,7 +832,7 @@ sal_Bool FormulaCompiler::GetToken()
         return sal_False;
     }
     if ( bAutoCorrect && !pStack )
-    {   // #61426# don't merge stacked subroutine code into entered formula
+    {   // don't merge stacked subroutine code into entered formula
         aCorrectedFormula += aCorrectedSymbol;
         aCorrectedSymbol.Erase();
     }
@@ -1123,7 +1117,7 @@ void FormulaCompiler::Factor()
                 SetError(errPairExpected);
             short nJumpCount = 0;
             PutCode( pFacToken );
-            // #36253# during AutoCorrect (since pArr->GetCodeError() is
+            // during AutoCorrect (since pArr->GetCodeError() is
             // ignored) an unlimited ocIf would crash because
             // ScRawToken::Clone() allocates the JumpBuffer according to
             // nJump[0]*2+2, which is 3*2+2 on ocIf.
@@ -1901,7 +1895,7 @@ void FormulaCompiler::LocalizeString( String& /*rName*/ )
 void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, sal_Bool bTemp )
 {
     if ( bAutoCorrect && !pStack )
-    {   // #61426# don't merge stacked subroutine code into entered formula
+        {   // don't merge stacked subroutine code into entered formula
         aCorrectedFormula += aCorrectedSymbol;
         aCorrectedSymbol.Erase();
     }
diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 0155ede9c661..fb782e927f03 100755
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
 //***************************************************************************************
-//
 // registry functions
 namespace
 {
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 5a6defa7c098..cec4f58ee9dd 100755
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -86,7 +86,6 @@ bool FormulaToken::Is3DRef() const
 
 bool FormulaToken::IsFunction() const
 {
-//    OpCode eOp = GetOpCode();
     return (eOp != ocPush && eOp != ocBad && eOp != ocColRowName &&
             eOp != ocColRowNameAuto && eOp != ocName && eOp != ocDBArea &&
            (GetByte() != 0                                                  // x parameters
@@ -105,7 +104,6 @@ bool FormulaToken::IsFunction() const
 
 sal_uInt8 FormulaToken::GetParamCount() const
 {
-    // OpCode eOp = GetOpCode();
     if ( eOp < SC_OPCODE_STOP_DIV && eOp != ocExternal && eOp != ocMacro &&
             eOp != ocIf && eOp != ocChose && eOp != ocPercentSign )
         return 0;       // parameters and specials
@@ -336,7 +334,6 @@ bool FormulaTokenArray::Fill(const uno::Sequence< sheet::FormulaToken >& _aSeque
     }
     return bError;
 }
-//////////////////////////////////////////////////////////////////////////
 FormulaToken* FormulaTokenArray::GetNextReference()
 {
     while( nIndex < nLen )
@@ -593,7 +590,6 @@ bool FormulaTokenArray::HasNameOrColRowName() const
     return sal_False;
 }
 
-////////////////////////////////////////////////////////////////////////////
 
 FormulaTokenArray::FormulaTokenArray()
 {
@@ -733,7 +729,6 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
         pCode = new FormulaToken*[ MAXCODE ];
     if( nLen < MAXCODE-1 )
     {
-        // fprintf (stderr, "Add : %d\n", t->GetOpCode());
         pCode[ nLen++ ] = t;
         if( t->GetOpCode() == ocPush
             && ( t->GetType() == svSingleRef || t->GetType() == svDoubleRef ) )
@@ -1116,7 +1111,6 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissingToPof( const MissingConvent
                 if (!(pOcas[ i ] == nFn && pCur->GetOpCode() == ocSep))
                     bAdd = false;
             }
-            //fprintf( stderr, "ocAddress %d arg %d%s\n", (int)i, (int)pCtx[ pOcas[ i ] ].mnCurArg, (bAdd ? "" : " omitted"));
         }
         switch ( pCur->GetOpCode() )
         {
@@ -1141,7 +1135,6 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissingToPof( const MissingConvent
                 if (nOcas && pOcas[ nOcas-1 ] == nFn && pCtx[ nFn ].mnCurArg == nOmitAddressArg)
                 {
                     bAdd = false;
-                    //fprintf( stderr, "ocAddress %d sep %d omitted\n", (int)nOcas-1, nOmitAddressArg);
                 }
                 break;
             case ocMissing:
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 531ef0827e93..4125d8e1ba9c 100755
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -51,18 +51,6 @@ TabPage RID_FORMULATAB_FUNCTION
             < "Last Used" ; Default ; > ;
             < "All" ; Default ; > ;
         };
-        //  < "Database" ; Default ; > ;
-        //  < "Date&Time" ; Default ; > ;
-        //  < "Financial" ; Default ; > ;
-        //  < "Information" ; Default ; > ;
-        //  < "Logical" ; Default ; > ;
-        //  < "Mathematical" ; Default ; > ;
-        //  < "Array" ; Default ; > ;
-        //  < "Statistical" ; Default ; > ;
-        //  < "Spreadsheet" ; Default ; > ;
-        //  < "Text" ; Default ; > ;
-        //  < "Add-in" ; Default ; > ;
-        //};
     };
     ListBox LB_FUNCTION
     {
@@ -302,7 +290,6 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
 };
 ModelessDialog RID_FORMULADLG_FORMULA
 {
-    // OutputSize = TRUE ;
     Hide = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 321 , 228 ) ;
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 8d478d0ec787..ab266ddd9b7e 100755
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -188,7 +188,6 @@ namespace formula
         FixedInfo       aFtFuncDesc;
 
         FixedText       aFtEditName;
-        //FixedInfo     aFtEditDesc;
 
         FixedText       aFtResult;
         ValWnd          aWndResult;
@@ -234,12 +233,9 @@ namespace formula
         rtl::OString    aActivWinId;
         sal_Bool            bIsShutDown;
 
-
-
         Font            aFntBold;
         Font            aFntLight;
         sal_uInt16          nEdFocus;
-    //    Selection       theCurSel;
         sal_Bool            bEditFlag;
         const IFunctionDescription* pFuncDesc;
         xub_StrLen      nArgs;
@@ -272,14 +268,12 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aFtHeadLine     ( pParent, ModuleRes( FT_HEADLINE ) ),
     aFtFuncName     ( pParent, ModuleRes( FT_FUNCNAME ) ),
     aFtFuncDesc     ( pParent, ModuleRes( FT_FUNCDESC ) ),
-    //
     aFtEditName     ( pParent, ModuleRes( FT_EDITNAME ) ),
     aFtResult       ( pParent, ModuleRes( FT_RESULT ) ),
     aWndResult      ( pParent, ModuleRes( WND_RESULT ) ),
 
     aFtFormula      ( pParent, ModuleRes( FT_FORMULA ) ),
     aMEFormula      ( pParent, ModuleRes( ED_FORMULA ) ),
-    //
     aBtnMatrix      ( pParent, ModuleRes( BTN_MATRIX ) ),
     aBtnHelp        ( pParent, ModuleRes( BTN_HELP ) ),
     aBtnCancel      ( pParent, ModuleRes( BTN_CANCEL ) ),
@@ -290,17 +284,14 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
     aRefBtn         ( pParent, ModuleRes( RB_REF),&aEdRef,_pDlg ),
     aFtFormResult   ( pParent, ModuleRes( FT_FORMULA_RESULT)),
     aWndFormResult  ( pParent, ModuleRes( WND_FORMULA_RESULT)),
-    //
     pTheRefEdit     (NULL),
     pMEdit          (NULL),
     bUserMatrixFlag (sal_False),
-    //
     aTitle1         ( ModuleRes( STR_TITLE1 ) ),        // local resource
     aTitle2         ( ModuleRes( STR_TITLE2 ) ),        // local resource
     aTxtEnd         ( ModuleRes( STR_END ) ),           // local resource
     aTxtOk          ( aBtnEnd.GetText() ),
     m_aFormulaHelper(_pFunctionMgr),
-    //
     bIsShutDown     (sal_False),
     nEdFocus        (0),
     pFuncDesc       (NULL),
@@ -917,7 +908,6 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
             pParaWin->SetActiveLine(nActiv);
         }
 
-        //pParaWin->SetEdFocus( nEdFocus );
         UpdateValues();
     }
     else
@@ -1015,7 +1005,6 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
     }
     else if ( pBtn == &aBtnForward )
     {
-        //@pMEdit->GrabFocus();         // In order to show the selection too
         const IFunctionDescription* pDesc =pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
 
         if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
@@ -1025,7 +1014,6 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
             DblClkHdl(pFuncPage);      //new
             aBtnForward.Enable(sal_False); //new
         }
-        //@EditNextFunc( sal_True );
     }
     else if ( pBtn == &aBtnBackward )
     {
@@ -1090,7 +1078,6 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
 
             if ( !m_aArguments.empty() )        // still arguments there?
                 aSig = pDesc->getFormula( m_aArguments );           // for input line
-            //@ m_pHelper->setCurrentFormula( aSig );
         }
     }
     else
@@ -1098,7 +1085,6 @@ void FormulaDlg_Impl::UpdateFunctionDesc()
         aFtFuncName.SetText( String() );
         aFtFuncDesc.SetText( String() );
 
-        //ResizeArgArr( NULL );
         m_pHelper->setCurrentFormula( String() );
     }
 }
@@ -1190,8 +1176,6 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
 
     sal_Bool bFound;
 
-    //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
-
     bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     if ( bFound )
     {
@@ -1229,13 +1213,11 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
     if ( bForward )
     {
         nNextFStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
-        //@bFound = m_pHelper->getNextFunction( aFormula, sal_False, nNextFStart, &nNextFEnd, &pFuncDesc );
         bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     }
     else
     {
         nNextFStart = nFStart;
-        //@bFound = m_pHelper->getNextFunction( aFormula, sal_True, nNextFStart, &nNextFEnd, &pFuncDesc );
         bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_True, nNextFStart, &nNextFEnd);
     }
 
@@ -1263,7 +1245,6 @@ void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
 
         sal_Int32 nArgPos=m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
         m_aFormulaHelper.GetArgStrings(m_aArguments,aFormula, nFStart, nArgs );
-//      m_aArguments = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs );
 
         sal_uInt16 nActiv=pParaWin->GetSliderPos();
         sal_Bool    bFlag=sal_False;
@@ -1547,7 +1528,6 @@ void FormulaDlg_Impl::UpdateSelection()
 
     aRefBtn.Show( pButton != NULL );
 
-    //m_pHelper->RefInputStart( &aEdRef, pButton ? &aRefBtn : NULL );
     ::std::pair<RefButton*,RefEdit*> aPair;
     aPair.first = pButton ? &aRefBtn : NULL;
     aPair.second = &aEdRef;
@@ -1613,15 +1593,11 @@ void FormulaDlg_Impl::Update()
     else
         aTabCtrl.SetCurPageId(TP_STRUCT);
     aBtnMatrix.Check(pData->GetMatrixFlag());
-    /*aTimer.SetTimeout(200);
-    aTimer.SetTimeoutHdl(LINK( this, FormulaDlg_Impl, UpdateFocusHdl));
-    aTimer.Start();*/
 }
 void FormulaDlg_Impl::Update(const String& _sExp)
 {
     CalcStruct(_sExp);
     FillDialog();
-    //aBtnForward.Enable(sal_True); //@New
     FuncSelHdl(NULL);
 }
 void FormulaDlg_Impl::SetMeText(const String& _sText)
@@ -2130,7 +2106,6 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
 void FormEditData::SaveValues()
 {
     FormEditData* pTemp = new FormEditData(*this);
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 19b41b74b9cf..0553489c0b2b 100755
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -58,7 +58,6 @@ FormulaListBox::FormulaListBox( Window* pParent, const ResId& rResId ):
 void FormulaListBox::KeyInput( const KeyEvent& rKEvt )
 {
     KeyEvent aKEvt=rKEvt;
-    //ListBox::KeyInput(rKEvt);
 
     if(aKEvt.GetCharCode()==' ')
         DoubleClick();
@@ -95,7 +94,6 @@ inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos )
 
 FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
     TabPage(pParent,ModuleRes(RID_FORMULATAB_FUNCTION)),
-    //
     aFtCategory     ( this, ModuleRes( FT_CATEGORY ) ),
     aLbCategory     ( this, ModuleRes( LB_CATEGORY ) ),
     aFtFunction     ( this, ModuleRes( FT_FUNCTION ) ),
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 97e0a9cbe52f..336832c70332 100755
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -107,7 +107,6 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg )
 
     if ( nArgs > 4 )
         nArg = sal::static_int_cast<sal_uInt16>( nArg + GetSliderPos() );
-        //@ nArg += (sal_uInt16)aSlider.GetThumbPos();
 
     if ( (nArgs > 0) && (nArg<nArgs) )
     {
@@ -177,7 +176,6 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )
             SetArgName( i, pFuncDesc->getParameterName(nRealArg) );
     }
     if(nArg<nArgs) SetArgVal(i,aParaArray[nArg]);
-    //@ aArgInput[i].SetArgVal( *(pArgArr[nOffset+i]) );
 
 }
 
@@ -411,7 +409,6 @@ void ParaWin::SetArgumentOffset(sal_uInt16 nOffset)
     }
     else
     {
-        //aSlider.SetEndScrollHdl( LINK( this, ScFormulaDlg, ScrollHdl ) );
         aSlider.SetPageSize( 4 );
         aSlider.SetVisibleSize( 4 );
         aSlider.SetLineSize( 1 );
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index b1e8786ccf6b..b24556c70bf9 100755
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -100,7 +100,6 @@ void StructListBox::LoseFocus()
 
 StructPage::StructPage(Window* pParent):
     TabPage(pParent,ModuleRes(RID_FORMULATAB_STRUCT)),
-    //
     aFtStruct       ( this, ModuleRes( FT_STRUCT ) ),
     aTlbStruct      ( this, ModuleRes( TLB_STRUCT ) ),
     maImgEnd        ( ModuleRes( BMP_STR_END ) ),