delete code that was commented out

Change-Id: I86f53763305682946098ece4fd6d58bcfdc5a73f
Reviewed-on: https://gerrit.libreoffice.org/6083
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

8 files changed, 2 insertions, 49 deletions

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 7d4a8094f6b0..2af2290c9f98 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -376,7 +376,6 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
     }
 
     // #i96644#
-    // SwDataChanged aTmp( *pPam );
     std::auto_ptr< SwDataChanged > pDataChanged;
     if ( bSendDataChangedEvents )
     {
@@ -696,8 +695,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
             {
                 // Set auto flag. Only in the template it's without auto!
                 SwFmtPageDesc aNew( *pDesc );
-                // 38479: AutoFlag is now being set in the WrtShell
-                // aNew.SetAuto();
 
                 // Tables now also know line breaks
                 if( 0 == (nFlags & nsSetAttrMode::SETATTR_APICALL) &&
@@ -1874,7 +1871,6 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl )
 
     if(rColl.IsAssignedToListLevelOfOutlineStyle())
         pNewColl->AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//<-end,zhaojianwei
-    //<-end
     pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() );
     pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() );
 
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 52f3b1d4fc95..5df1a8094c99 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2075,7 +2075,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
     {
         if ( !pTxtNd->IsCountedInList() == !bDel)
         {
-            sal_Bool bOldNum = bDel; // == pTxtNd->IsCounted();
+            sal_Bool bOldNum = bDel;
             sal_Bool bNewNum = bDel ? sal_False : sal_True;
             pTxtNd->SetCountedInList(bNewNum ? true : false);
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index cc6cd9c356b5..015136b1254a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1139,7 +1139,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     const SwPosition *pStt = aOriginal.GetMark();
     const SwPosition *pEnd = aOriginal.GetPoint();
 
-//    SwUndoTxtToTbl* pUndo = 0;
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
     if (bUndo)
     {
@@ -3520,13 +3519,6 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
     aFndBox.SetTableLines( rTbl );
     aFndBox.DelFrms( rTbl );
 
-    // TL_CHART2: since chart currently does not want to get informed about
-    // additional rows/cols there is no need for a modified event in the
-    // remaining first table. Also, if it is required it  should be done
-    // after the merging and not here...
-    // pDoc->UpdateCharts( rTbl.GetFrmFmt()->GetName() );
-
-
     // TL_CHART2:
     // tell the charts about the table to be deleted and have them use their own data
     GetDoc()->CreateChartInternalDataProviders( &rDelTbl );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 750a6499ea0e..074b146c57c8 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3839,7 +3839,6 @@ int SwTxtNode::GetActualListLevel() const
 
 void SwTxtNode::SetListRestart( bool bRestart )
 {
-//    CreateNum()->SetRestart(bRestart);
     if ( !bRestart )
     {
         // attribute not contained in paragraph style's attribute set. Thus,
@@ -3856,7 +3855,6 @@ void SwTxtNode::SetListRestart( bool bRestart )
 
 bool SwTxtNode::IsListRestart() const
 {
-//    return GetNum() ? GetNum()->IsRestart() : false;
     const SfxBoolItem& aIsRestartItem =
         dynamic_cast<const SfxBoolItem&>(GetAttr( RES_PARATR_LIST_ISRESTART ));
 
@@ -3885,7 +3883,6 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const
 
 void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber nNumber )
 {
-//    CreateNum()->SetStart(nNumber);
     const bool bChanged( HasAttrListRestartValue()
                          ? GetAttrListRestartValue() != nNumber
                          : nNumber != USHRT_MAX );
@@ -3922,7 +3919,6 @@ SwNumberTree::tSwNumTreeNumber SwTxtNode::GetAttrListRestartValue() const
 
 SwNumberTree::tSwNumTreeNumber SwTxtNode::GetActualListStartValue() const
 {
-//    return GetNum() ? GetNum()->GetStart() : 1;
     SwNumberTree::tSwNumTreeNumber nListRestartValue = 1;
 
     if ( IsListRestart() && HasAttrListRestartValue() )
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 2c1586dbfad6..a4c3b05560fc 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -338,8 +338,6 @@ void SwUnoCursorHelper::SetCrsrAttr(SwPaM & rPam,
     }
     else
     {
-//          if( !HasSelection() )
-//              UpdateAttr();
         pDoc->InsertItemSet( rPam, rSet, nFlags );
     }
     //#outline level,add by zhaojianwei
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index c13402764d34..9331b06b2446 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1408,7 +1408,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
         aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
     }
     // --> OD #i117339# - trigger import only for own formats
-//    if( aMed.IsStorage() )
     bool bImport( false );
     {
         if ( aMed.IsStorage() )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4e772a46892d..139bc560471a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1984,7 +1984,6 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
         }
         if(bToxIsAuthorities)
         {
-            //
             SwWrtShell& rSh = pTOXDlg->GetWrtShell();
             const SwAuthorityFieldType* pFType = (const SwAuthorityFieldType*)
                                     rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
@@ -2118,14 +2117,12 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn)
     {
         SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectEntry());
         SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR);
-        // TODO: WrtShell?
-//      SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
         Window* pDefDlgParent = Application::GetDefDialogParent();
         Application::SetDefDialogParent( pBtn );
         ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell().
         GetView().GetViewFrame()->GetDispatcher()->Execute(
         SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL,
-            &aStyle, &aFamily/*, &aShell*/, 0L);
+            &aStyle, &aFamily, 0L);
         Application::SetDefDialogParent( pDefDlgParent );
     }
     return 0;
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index c87aaa1f6493..d00f84557a9f 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -761,31 +761,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
                _aVisArea.Height()- nY <= aObjArea.Height()&&
                _aVisArea.Height()+ nY >= aObjArea.Height() ))
         {
-            // TODO/LATER: MISCSTATUS_RESIZEONPRINTERCHANGE
-            /*
-            if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & nMisc )
-            {
-                //This type of objects should never be resized.
-                //If this request comes from the Writer core (inaktive Object
-                //ist resized), the Object should be resized too.
-                //If this request comes from the Object itself, the Frame
-                //in the Writer core should be resized.
-                if ( pFlyPrtRect )      //Request from core?
-                {
-                    xObj->SetVisArea( OutputDevice::LogicToLogic(
-                        pFlyPrtRect->SVRect(), MAP_TWIP, xObj->GetMapUnit() ));
-                }
-                else
-                {
-                    SwRect aTmp( Point( LONG_MIN, LONG_MIN ), _aVisArea );
-                    RequestObjectResize( aTmp, xObj );
-                }
-                // The rest will be done, because we need to come back anyway,
-                // possibly even recursively.
-                return;
-            }
-            else*/
-
             if ( nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE )
             {
                 // the object must not be scaled,