#i123768# remove pre-IA2 code remains that has been commented out

The pre-IA2 code is available in the repository and
the commented out code made the methods less readable.

13 files changed, 0 insertions, 182 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index e43d4a23fcf1..e47c0e57616d 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -230,7 +230,6 @@ sal_Int32
     ScAccessibleCellBase::createAccessibleName(void)
     throw (uno::RuntimeException)
 {
-    //String sName( ScResId(STR_ACC_CELL_NAME) );
     String sAddress;
     // Document not needed, because only the cell address, but not the tablename is needed
     // always us OOO notation
@@ -239,8 +238,6 @@ sal_Int32
     /*  #i65103# ZoomText merges cell address and contents, e.g. if value 2 is
         contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2".
         Simple solution: Append a space character to the cell address. */
-    //sName.Append( ' ' );
-    //return rtl::OUString(sName);
     return rtl::OUString(sAddress);
 }
 
@@ -254,7 +251,6 @@ uno::Any SAL_CALL
     IsObjectValid();
     uno::Any aAny;
     if (mpDoc)
-        //aAny <<= mpDoc->GetValue(maCellAddress);
     {
         String valStr;
         mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index b53278333916..661cece95055 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -543,7 +543,6 @@ ScAccessibleDataPilotButton::ScAccessibleDataPilotButton(
         ScPivotFieldWindow* pFieldWindow,
         sal_Int32 nIndex)
 //change role frome PUSH_BUTTON to BUTTON_MENU
-    //: ScAccessibleContextBase(rxParent, AccessibleRole::PUSH_BUTTON),
     : ScAccessibleContextBase(rxParent, AccessibleRole::BUTTON_MENU),
     mpFieldWindow(pFieldWindow),
     mnIndex(nIndex)
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 70cb2f812476..8a8c93a658bf 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1625,10 +1625,8 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 
                 mpTempAccEdit = NULL;
                 RemoveChild(mxTempAcc, sal_True);
-                //if (mpAccessibleSpreadsheet)
                 if (mpAccessibleSpreadsheet && mpViewShell->IsActive())
                     mpAccessibleSpreadsheet->GotFocus();
-                //else
                 else if( mpViewShell->IsActive())
                     CommitFocusGained();
             }
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 8046ef27332a..26c679875426 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -283,8 +283,6 @@ ScAccessibleSpreadsheet::~ScAccessibleSpreadsheet()
 {
     if (mpMarkedRanges)
         delete mpMarkedRanges;
-    //if (mpSortedMarkedCells)
-    //  delete mpSortedMarkedCells;
     if (mpViewShell)
         mpViewShell->RemoveAccessibilityObject(*this);
 }
@@ -351,8 +349,6 @@ void ScAccessibleSpreadsheet::CompleteSelectionChanged(sal_Bool bNewState)
     }
     if (mpMarkedRanges)
         DELETEZ(mpMarkedRanges);
-    //if (mpSortedMarkedCells)
-    //  DELETEZ(mpSortedMarkedCells);
     mbHasSelection = bNewState;
 
     AccessibleEventObject aEvent;
@@ -381,11 +377,9 @@ void ScAccessibleSpreadsheet::LostFocus()
 
 void ScAccessibleSpreadsheet::GotFocus()
 {
-    //CommitFocusGained();
     AccessibleEventObject aEvent;
     aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
     aEvent.Source = uno::Reference< XAccessibleContext >(this);
-    //uno::Reference< XAccessible > xNew = mpAccCell;
     uno::Reference< XAccessible > xNew;
     if (IsFormulaMode())
     {
@@ -447,68 +441,6 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
     if (rHint.ISA( SfxSimpleHint ) )
     {
         const SfxSimpleHint& rRef = (const SfxSimpleHint&)rHint;
-        // only notify if child exist, otherwise it is not necessary
-        //if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
-        //{
-        //  if (mpViewShell)
-        //  {
-        //      ScAddress aNewCell = mpViewShell->GetViewData()->GetCurPos();
-        //      sal_Bool bNewMarked(mpViewShell->GetViewData()->GetMarkData().GetTableSelect(aNewCell.Tab()) &&
-        //          (mpViewShell->GetViewData()->GetMarkData().IsMarked() ||
-        //          mpViewShell->GetViewData()->GetMarkData().IsMultiMarked()));
-        //      sal_Bool bNewCellSelected(isAccessibleSelected(aNewCell.Row(), aNewCell.Col()));
-        //      if ((bNewMarked != mbHasSelection) ||
-        //          (!bNewCellSelected && bNewMarked) ||
-        //          (bNewCellSelected && mbHasSelection))
-        //      {
-        //          if (mpMarkedRanges)
-        //              DELETEZ(mpMarkedRanges);
-        //          if (mpSortedMarkedCells)
-        //              DELETEZ(mpSortedMarkedCells);
-        //          AccessibleEventObject aEvent;
-        //          aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
-        //          aEvent.Source = uno::Reference< XAccessibleContext >(this);
-
-        //          mbHasSelection = bNewMarked;
-
-        //          CommitChange(aEvent);
-        //      }
-
-  //              // active descendant changed event (new cell selected)
-  //              bool bFireActiveDescChanged = (aNewCell != maActiveCell) &&
-  //                  (aNewCell.Tab() == maActiveCell.Tab()) && IsFocused();
-
-  //              /*  Remember old active cell and set new active cell.
-  //                  #i82409# always update the class members mpAccCell and
-  //                  maActiveCell, even if the sheet is not focused, e.g. when
-  //                  using the name box in the toolbar. */
-  //              uno::Reference< XAccessible > xOld = mpAccCell;
-  //              mpAccCell->release();
-  //              mpAccCell = GetAccessibleCellAt(aNewCell.Row(), aNewCell.Col());
-  //              mpAccCell->acquire();
-  //              mpAccCell->Init();
-  //              uno::Reference< XAccessible > xNew = mpAccCell;
-  //              maActiveCell = aNewCell;
-
-  //              // #i14108# fire event only if sheet is focused
-  //              if( bFireActiveDescChanged )
-  //              {
-  //                  AccessibleEventObject aEvent;
-  //                  aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
-  //                  aEvent.Source = uno::Reference< XAccessibleContext >(this);
-  //                  aEvent.OldValue <<= xOld;
-  //                  aEvent.NewValue <<= xNew;
-        //          CommitChange(aEvent);
-  //              }
-        //  }
-        //}
-        //else if ((rRef.GetId() == SC_HINT_DATACHANGED))
-        //{
-        //  if (!mbDelIns)
-        //      CommitTableModelChange(maRange.aStart.Row(), maRange.aStart.Col(), maRange.aEnd.Row(), maRange.aEnd.Col(), AccessibleTableModelChangeType::UPDATE);
-        //  else
-        //      mbDelIns = sal_False;
-        //}
         if ((rRef.GetId() == SC_HINT_ACC_CURSORCHANGED))
         {
             if (mpViewShell)
@@ -1391,50 +1323,6 @@ void ScAccessibleSpreadsheet::SelectCell(sal_Int32 nRow, sal_Int32 nCol, sal_Boo
 
     mpViewShell->SelectionChanged();
 }
-//void ScAccessibleSpreadsheet::CreateSortedMarkedCells()
-//{
-//  mpSortedMarkedCells = new std::vector<ScMyAddress>();
-//  mpSortedMarkedCells->reserve(mpMarkedRanges->GetCellCount());
-//  ScRange* pRange = mpMarkedRanges->First();
-//  while (pRange)
-//  {
-//      if (pRange->aStart.Tab() != pRange->aEnd.Tab())
-//      {
-//          if ((maActiveCell.Tab() >= pRange->aStart.Tab()) ||
-//              maActiveCell.Tab() <= pRange->aEnd.Tab())
-//          {
-//              ScRange aRange(*pRange);
-//              aRange.aStart.SetTab(maActiveCell.Tab());
-//              aRange.aEnd.SetTab(maActiveCell.Tab());
-//              AddMarkedRange(aRange);
-//          }
-//          else
-//          {
-//              DBG_ERROR("Range of wrong table");
-//          }
-//      }
-//      else if(pRange->aStart.Tab() == maActiveCell.Tab())
-//          AddMarkedRange(*pRange);
-//      else
-//      {
-//          DBG_ERROR("Range of wrong table");
-//      }
-//      pRange = mpMarkedRanges->Next();
-//  }
-//  std::sort(mpSortedMarkedCells->begin(), mpSortedMarkedCells->end());
-//}
-
-/*void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange)
-{
-    for (SCROW nRow = rRange.aStart.Row(); nRow <= rRange.aEnd.Row(); ++nRow)
-    {
-        for (SCCOL nCol = rRange.aStart.Col(); nCol <= rRange.aEnd.Col(); ++nCol)
-        {
-            ScMyAddress aCell(nCol, nRow, maActiveCell.Tab());
-            mpSortedMarkedCells->push_back(aCell);
-        }
-    }
-}*/
 
     //=====  XServiceInfo  ====================================================
 
@@ -1483,20 +1371,6 @@ void SAL_CALL ScAccessibleSpreadsheet::addEventListener(const uno::Reference<XAc
     ScUnoGuard aGuard;
     IsObjectValid();
     ScAccessibleTableBase::addEventListener(xListener);
-
-/*    if (!mbIsFocusSend)
-    {
-        mbIsFocusSend = sal_True;
-        CommitFocusGained();
-
-        AccessibleEventObject aEvent;
-        aEvent.EventId = AccessibleEventId::ACTIVE_DESCENDANT_CHANGED;
-        aEvent.Source = uno::Reference< XAccessibleContext >(this);
-        aEvent.NewValue <<= getAccessibleCellAt(maActiveCell.Row(), maActiveCell.Col());
-
-        CommitChange(aEvent);
-    }
-*/
 }
 
     //====  internal  =========================================================
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 0110889f6a7e..b1a6aa9af190 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -170,12 +170,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nR
             ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
         if (nEndRow > nRow)
                nCount = nEndRow - nRow + 1;
-    //  if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
-    //      nEndCol, nEndRow, maRange.aStart.Tab()))
-        //{
-    //      if (nEndRow > nRow)
-    //          nCount = nEndRow - nRow + 1;
-        //}
     }
 
     return nCount;
@@ -203,12 +197,6 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32
             ExtendMerge( static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow), nRow, nEndCol, nEndRow, sal_False, sal_False );
         if (nEndCol > nColumn)
                 nCount = nEndCol - nColumn + 1;
-    //  if (mpDoc->ExtendMerge(static_cast<SCCOL>(nColumn), static_cast<SCROW>(nRow),
-    //      nEndCol, nEndRow, maRange.aStart.Tab()))
-        //{
-    //      if (nEndCol > nColumn)
-    //          nCount = nEndCol - nColumn + 1;
-        //}
     }
 
     return nCount;
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index ac0258bc8c5f..cb33b7d93dd5 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1058,7 +1058,6 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell)
 
 
 // ============================================================================
-//ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin)
 ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, sal_Bool isClone)
     :
     mpViewForwarder(NULL),
@@ -1070,7 +1069,6 @@ ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditVi
 {
     // Solution: If the object is cloned, do NOT add notify hdl.
     mbIsCloned = isClone;
-    //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
         mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
 }
@@ -1078,7 +1076,6 @@ ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditVi
 ScAccessibleEditObjectTextData::~ScAccessibleEditObjectTextData()
 {
     // Solution: If the object is cloned, do NOT set notify hdl.
-    //if (mpEditEngine)
     if (mpEditEngine && !mbIsCloned)
         mpEditEngine->SetNotifyHdl(Link());
     if (mpViewForwarder)
@@ -1123,7 +1120,6 @@ SvxTextForwarder* ScAccessibleEditObjectTextData::GetTextForwarder()
         if (!mpEditEngine)
             mpEditEngine = mpEditView->GetEditEngine();
             // Solution: If the object is cloned, do NOT add notify hdl.
-        //if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet())
     if (mpEditEngine && !mpEditEngine->GetNotifyHdl().IsSet()&&!mbIsCloned)
             mpEditEngine->SetNotifyHdl( LINK(this, ScAccessibleEditObjectTextData, NotifyHdl) );
         if(!mpForwarder)
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx
index ecf8d360c9c2..d3928c979b54 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -29,7 +29,6 @@
 #include "viewdata.hxx"
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-//#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index b86484ee8cd3..6a6c02a7f620 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -988,7 +988,6 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType )
                         String aName = ScDrawLayer::GetVisibleName( pObject );
                         if (aName.Len())
                         {
-                            //InsertContent( nType, aName );
                             if( bisInNavigatoeDlg )
                             {
                                 if (nType >= SC_CONTENT_COUNT)
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3e4e992e1f54..9c35ccc33bbf 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3106,7 +3106,6 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
         if( !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) )
         {
             SC_MOD()->EndReference();
-            //return;
         }
         else if( pViewData->GetViewShell()->MoveCursorKeyInput( rKEvt ) )
         {
@@ -3114,7 +3113,6 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt)
                 pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(),
                 pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() );
             SC_MOD()->SetReference( aRef, pViewData->GetDocument() );
-            //return;
         }
         pViewData->GetViewShell()->SelectionChanged();
         return ;
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index f563287fb0b3..d9b65c94dd33 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -432,12 +432,10 @@ com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
     ScAccessibleDocument* pAccessibleDocument =
         new ScAccessibleDocument(GetAccessibleParentWindow()->GetAccessible(),
             pViewData->GetViewShell(), eWhich);
-    //com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > xAccessible = pAccessibleDocument;
     xAcc = pAccessibleDocument;
     SetAccessible(xAcc);
 
     pAccessibleDocument->Init();
-    //return xAccessible;
     return xAcc;
 }
 // MT: Removed Windows::SwitchView() introduced with IA2 CWS.
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index ae1dcdfbc05a..f0832a513dc9 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -77,29 +77,6 @@ static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = {
                     COL_GREEN,          COL_RED,            COL_BLUE,
                     COL_BROWN,          COL_MAGENTA,        COL_CYAN };
 
-//  Hilfsklasse, fuer die Farbzuordnung,
-//  um nicht mehrfach hintereinander denselben User aus der Liste zu suchen
-
-//Move this class declare to Chgtrack.hxx
-/*
-class ScActionColorChanger
-{
-private:
-    const ScAppOptions&     rOpt;
-    const ScStrCollection&  rUsers;
-    String                  aLastUserName;
-    sal_uInt16                  nLastUserIndex;
-    ColorData               nColor;
-
-public:
-                ScActionColorChanger( const ScChangeTrack& rTrack );
-                ~ScActionColorChanger() {}
-
-    void        Update( const ScChangeAction& rAction );
-    ColorData   GetColor() const    { return nColor; }
-};
-*/
-
 //------------------------------------------------------------------
 
 ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) :
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 350428671485..53c5b5f160b7 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1481,11 +1481,9 @@ com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> ScPre
     }
     ScAccessibleDocumentPagePreview* pAccessible =
         new ScAccessibleDocumentPagePreview( GetAccessibleParentWindow()->GetAccessible(), pViewShell );
-    //com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xAccessible = pAccessible;
     xAcc = pAccessible;
     SetAccessible(xAcc);
     pAccessible->Init();
-    //return xAccessible;
     return xAcc;
 }
 // MT: Removed Windows::SwitchView() introduced with IA2 CWS.
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 1eb5957bde86..fa420f83c780 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1616,7 +1616,6 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, sal_Bool bRecord )
 //----------------------------------------------------------------------------
 //  Suchen & Ersetzen
 
-//void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 sal_Bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
                                         sal_Bool bAddUndo, sal_Bool bIsApi )
 {
@@ -1670,7 +1669,6 @@ sal_Bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
                 if ( pOldSelectedTables )
                     delete [] pOldSelectedTables;
                 ErrorMessage(STR_PROTECTIONERR);
-                //return;
                 return sal_False;
             }
         }