remove code that was commented out more than three years ago

Change-Id: I8bc53b5d940be73d8b4142a72fb247c4e3af2e17

14 files changed, 9 insertions, 86 deletions

diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index 9549df223cea..ad50e95d9ffb 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -278,8 +278,6 @@ bool lcl_getCellRangeAddressFromXMLString(
 
 } // anonymous namespace
 
-//namespace chart
-//{
 namespace XMLRangeHelper
 {
 
@@ -386,6 +384,5 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
 }
 
 } //  namespace XMLRangeHelper
-//} //  namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 8182f2696c36..f28dc1bb1df0 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -27,8 +27,6 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-//namespace chart
-//{
 namespace XMLRangeHelper
 {
 
@@ -63,7 +61,6 @@ CellRange getCellRangeFromXMLString( const OUString & rXMLString );
 OUString getXMLStringFromCellRange( const CellRange & rRange );
 
 } //  namespace XMLRangeHelper
-//} //  namespace chart
 
 // INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
 #endif
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 9b08e0e72e02..1120ef08cacc 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -155,12 +155,6 @@ uno::Reference<text::XTextContent> SwXBookmark::CreateXBookmark(
     uno::Reference<text::XTextContent> xBookmark(pMarkBase->GetXBookmark());
     if (!xBookmark.is())
     {
-        // FIXME: These belong in XTextFieldsSupplier
-        //if (dynamic_cast< ::sw::mark::TextFieldmark* >(&rBkmk))
-        //    pXBkmk = new SwXFieldmark(false, &rBkmk, pDoc);
-        //else if (dynamic_cast< ::sw::mark::CheckboxFieldmark* >(&rBkmk))
-        //    pXBkmk = new SwXFieldmark(true, &rBkmk, pDoc);
-        //else
         OSL_ENSURE(
             dynamic_cast< ::sw::mark::IBookmark* >(&rBookmark) || IDocumentMarkAccess::GetType(rBookmark) == IDocumentMarkAccess::ANNOTATIONMARK,
             "<SwXBookmark::GetObject(..)>"
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 070de39118a5..4718c47df4f4 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -49,7 +49,6 @@
 
 using namespace ::com::sun::star;
 
-//static
 void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc )
 {
     if (!pDoc)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 942a6388c086..25fc8b19b199 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -593,7 +593,6 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
                 xProjProv = new SwVbaProjectNameProvider;
                             pDoc->SetVBATemplateToProjectCache( xProjProv );
                         }
-            //xRet =  (cppu::OWeakObject*)xProjProv;
             xRet = xProjProv;
         }
 #endif
@@ -709,11 +708,6 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
             xRet = (cppu::OWeakObject*)pNewStyle;
         }
         break;
-//      SW_SERVICE_DUMMY_5
-//      SW_SERVICE_DUMMY_6
-//      SW_SERVICE_DUMMY_7
-//      SW_SERVICE_DUMMY_8
-//      SW_SERVICE_DUMMY_9
         case SW_SERVICE_FIELDTYPE_DATETIME:
         case SW_SERVICE_FIELDTYPE_USER:
         case SW_SERVICE_FIELDTYPE_SET_EXP:
@@ -1084,7 +1078,6 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
     if(pFmts->empty())
         return;
     // #i104937#
-//    const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()];
     const size_t nSize = pFmts->size();
     ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin());
     // #i104937#
@@ -1093,7 +1086,6 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
     std::set<SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
 
     for( size_t i = 0; i < nSize; ++i )
-//    for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt)
     {
         // #i104937#
         pFmt = (*pFmts)[i];
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 8c5c93721bec..8f34ce48994e 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -304,8 +304,6 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , const SwTxtNode* pNode  )
 {
     PropertyState eNewState = PropertyState_DIRECT_VALUE;
-//    PropertyState_DEFAULT_VALUE
-//    PropertyState_AMBIGUOUS_VALUE
     bool bDone = true;
     switch(rEntry.nWID)
     {
@@ -427,7 +425,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                     {
                         *pAny <<= pTxtNd->GetListId();
                     }
-                    else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/
+                    else
                     {
                         sal_Bool bIsRestart = pTxtNd->IsListRestart();
                         pAny->setValue(&bIsRestart, ::getBooleanCppuType());
@@ -450,7 +448,7 @@ bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                     {
                         *pAny <<= OUString();
                     }
-                    else /*if(rEntry.nWID == UNO_NAME_PARA_IS_NUMBERING_RESTART)*/
+                    else
                         *pAny <<= false;
                 }
             }
@@ -860,10 +858,9 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                 // no start of a new list
                 pDoc->SetNumRule( rPam, *pRule, false );
             }
-            // #i103817#
-            // outline numbering
             else
             {
+                // #i103817#
                 // outline numbering
                 UnoActionContext aAction(pDoc);
                 SwNumRule* pRule = pDoc->GetOutlineNumRule();
@@ -912,7 +909,6 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
     switch(rEntry.nWID)
     {
         case FN_UNO_PARA_STYLE :
-//          lcl_SetTxtFmtColl(aValue, pUnoCrsr);
         break;
         case FN_UNO_PAGE_STYLE :
         break;
@@ -937,7 +933,6 @@ void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPa
         case FN_UNO_NUM_LEVEL  :
         break;
         case FN_UNO_NUM_RULES:
-//          lcl_setNumberingProperty(aValue, pUnoCrsr);
         break;
         case FN_UNO_CHARFMT_SEQUENCE:
         {
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index e1e89f9f4aca..d72ddc83a455 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -781,7 +781,7 @@ uno::Reference< drawing::XShapeGroup >  SwXDrawPage::group(const uno::Reference<
                     SwDrawContact* pContact = pDoc->GroupSelection( *pPage->GetDrawView() );
                     pDoc->ChgAnchor(
                         pPage->GetDrawView()->GetMarkedObjectList(),
-                        FLY_AT_PARA/*int eAnchorId*/,
+                        FLY_AT_PARA,
                         true, false );
 
                     pPage->GetDrawView()->UnmarkAll();
@@ -815,7 +815,7 @@ void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeG
 
             pDoc->UnGroupSelection( *pPage->GetDrawView() );
             pDoc->ChgAnchor( pPage->GetDrawView()->GetMarkedObjectList(),
-                        FLY_AT_PARA/*int eAnchorId*/,
+                        FLY_AT_PARA,
                         true, false );
             pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
             pPage->RemovePageView();
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 4f5425e4d1c8..2a0d52748082 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1828,7 +1828,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
             sal_uInt16 nSubType = DS_PAGE;
             switch (m_pImpl->m_nServiceId)
             {
-//                  case SW_SERVICE_FIELDTYPE_PAGE_COUNT            : break;
                 case SW_SERVICE_FIELDTYPE_PARAGRAPH_COUNT       : nSubType = DS_PARA; break;
                 case SW_SERVICE_FIELDTYPE_WORD_COUNT            : nSubType = DS_WORD; break;
                 case SW_SERVICE_FIELDTYPE_CHARACTER_COUNT       : nSubType = DS_CHAR; break;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index f42d8451e547..8f48a107b882 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1553,7 +1553,6 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             if(pIdx)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
-//              SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
                 SwGrfNode* pGrfNode = aIdx.GetNode().GetGrfNode();
                 if(!pGrfNode)
                 {
@@ -2080,19 +2079,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
             aAny <<= OUString(SwStyleNameMapper::GetProgName(pFmt->DerivedFrom()->GetName(), nsSwGetPoolIdFromName::GET_POOLID_FRMFMT ) );
         }
         // #i73249#
-        // Attribute AlternativeText was never published.
-        // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
-//        else if(eType != FLYCNTTYPE_FRM &&
-//                FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID)
-//        {
-//            const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
-//            if(pIdx)
-//            {
-//                SwNodeIndex aIdx(*pIdx, 1);
-//                SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-//                aAny <<= OUString(pNoTxt->GetAlternateText());
-//            }
-//        }
         else if( FN_UNO_TITLE == pEntry->nWID )
         {
             SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
@@ -2116,8 +2102,6 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
             {
                 SwNodeIndex aIdx(*pIdx, 1);
                 // --> OD #i85105#
-//                SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-//                Size aActSize = ((SwGrfNode*)pNoTxt)->GetTwipSize();
                 Size aActSize;
                 {
                     SwGrfNode* pGrfNode = dynamic_cast<SwGrfNode*>(aIdx.GetNode().GetNoTxtNode());
@@ -2493,19 +2477,6 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
                 }
             }
             // #i73249#
-            // Attribute AlternativeText was never published.
-            // Now it has been replaced by Attribute Title - valid for all <SwXFrame> instances
-//            else if( eType != FLYCNTTYPE_FRM && FN_UNO_ALTERNATIVE_TEXT == pEntry->nWID )
-//            {
-//                const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx();
-//                if(pIdx)
-//                {
-//                    SwNodeIndex aIdx(*pIdx, 1);
-//                    SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode();
-//                    pNoTxt->SetAlternateText(aEmptyOUStr);
-//                }
-//            }
-            // New attribute Title
             else if( FN_UNO_TITLE == pEntry->nWID )
             {
                 SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
@@ -2906,10 +2877,6 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                 }
                 if ( xIPObj.is() )
                 {
-                    //TODO/LATER: MISCSTATUS_RESIZEONPRINTERCHANGE
-                    //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xIPObj->GetMiscStatus() && pDoc->getPrinter( false ) )
-                    //    xIPObj->OnDocumentPrinterChanged( pDoc->getPrinter( false ) );
-
                     UnoActionContext aAction(pDoc);
                     pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
                     if(!bSizeFound)
@@ -3271,11 +3238,6 @@ uno::Reference< container::XEnumeration >  SwXTextFrame::createEnumeration(void)
         ::std::auto_ptr<SwUnoCrsr> pUnoCursor(
                 GetDoc()->CreateUnoCrsr(aPos, false));
         pUnoCursor->Move(fnMoveForward, fnGoNode);
-//      // no Cursor in protected sections
-//      SwCrsrSaveState aSave( *pUnoCrsr );
-//      if(pUnoCrsr->IsInProtectTable(true) ||
-//          pUnoCrsr->IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ))
-//          throw  uno::RuntimeException() );
         aRef = new SwXParagraphEnumeration(this, pUnoCursor, CURSOR_FRAME);
     }
     return aRef;
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f615e97d084f..411fdda9f8a4 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -500,7 +500,6 @@ throw (uno::RuntimeException, std::exception)
     sal_uInt16 nObjectType = SW_SERVICE_TYPE_INDEX;
     switch (m_pImpl->m_eTOXType)
     {
-//      case TOX_INDEX:             break;
         case TOX_USER:          nObjectType = SW_SERVICE_USER_INDEX;
         break;
         case TOX_CONTENT:       nObjectType = SW_SERVICE_CONTENT_INDEX;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index e1c99dc5a1d2..be5ca9f6c7bf 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -620,9 +620,6 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional)
 {
     static const sal_uLong nMaxLookup = 1000;
     SwFmtColl *pFmt = 0;
-
-//  if ( GetCrsrCnt() > nMaxLookup )
-//      return 0;
     bool bError = false;
     SwPaM *pTmpCrsr = &rPaM;
     do
@@ -2725,7 +2722,6 @@ bool SwUnoCursorHelper::ConvertSortProperties(
     for (sal_Int32 n = 0; n < rDescriptor.getLength(); ++n)
     {
         uno::Any aValue( pProperties[n].Value );
-//      String sPropName = pProperties[n].Name;
         const OUString& rPropName = pProperties[n].Name;
 
         // old and new sortdescriptor
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index dc8d6363e80b..bbc0474aad0d 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -800,9 +800,6 @@ throw (uno::RuntimeException)
                             rTxtNode, &pAttrSet, *pEntry, bAttrSetFetched );
                 rResult.State  = eState;
 
-//                if (bDirectValuesOnly  &&  PropertyState_DIRECT_VALUE != eState)
-//                    rResult.Result = beans::TolerantPropertySetResultType::NO_DIRECT_VALUE;
-//                else
                 rResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
                 if (!bDirectValuesOnly ||
                     (beans::PropertyState_DIRECT_VALUE == eState))
@@ -940,7 +937,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
 }
 
 static beans::PropertyState lcl_SwXParagraph_getPropertyState(
-    // SwUnoCrsr& rUnoCrsr,
     const SwTxtNode& rTxtNode,
     const SwAttrSet** ppSet,
     const SfxItemPropertySimpleEntry& rEntry,
@@ -1182,7 +1178,6 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
 
             pTemp->SetMark();
             *pTemp->GetPoint() = aEnd;
-            //pTemp->Exchange();
 
             SwUnoCursorHelper::SelectPam(*pTemp, true);
 
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index acc576db54d5..89b662d3f843 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -1432,7 +1432,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
                             pStates[i] = beans::PropertyState_DIRECT_VALUE;
                         }
                     }
-                    else //if(RES_BACKGROUND == pEntry->nWID)
+                    else
                     {
                         if (!m_pImpl->m_pProps->m_pBrushItem.get())
                         {
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 4a3a717e1855..adca8759989c 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1337,7 +1337,7 @@ SwXText::Impl::finishOrAppendParagraph(
             aEx.Message = sMessage;
             throw aEx;
         }
-        else // if(bRuntimeException)
+        else
         {
             uno::RuntimeException aEx;
             aEx.Message = sMessage;
@@ -1384,8 +1384,6 @@ SwXText::insertTextPortion(
     OUString sMessage;
     m_pImpl->m_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_INSERT, NULL);
 
-//        SwPaM aPam(*pStartNode->EndOfSectionNode());
-    //aPam.Move( fnMoveBackward, fnGoNode );
     SwUnoCrsr *const pCursor = pTextCursor->GetCursor();
     m_pImpl->m_pDoc->DontExpandFmt( *pCursor->Start() );
 
@@ -1426,7 +1424,7 @@ SwXText::insertTextPortion(
             aEx.Message = sMessage;
             throw aEx;
         }
-        else //if(bRuntimeException)
+        else
         {
             uno::RuntimeException aEx;
             aEx.Message = sMessage;
@@ -1771,7 +1769,7 @@ SwXText::convertToTextFrame(
             aEx.Message = sMessage;
             throw aEx;
         }
-        else //if(bRuntimeException)
+        else
         {
             uno::RuntimeException aEx;
             aEx.Message = sMessage;