[Libreoffice-commits] .: 2 commits - sw/inc sw/source

[Takeshi Abe]

 sw/inc/IDocumentRedlineAccess.hxx |    3 +--
 sw/source/core/doc/docedt.cxx     |    1 -
 sw/source/core/undo/docundo.cxx   |    2 --
 sw/source/core/undo/undobj.cxx    |    1 -
 sw/source/core/undo/unredln.cxx   |   12 ------------
 sw/source/core/undo/untbl.cxx     |    2 +-
 sw/source/ui/uiview/view2.cxx     |    4 ----
 7 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 3cbbdedd655d3a7c7a37d921ee5a821abbab2cf9
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sun Sep 4 07:55:14 2011 +0900

    removed dead code

diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index b2cc2d7..df2f4ca 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -83,7 +83,6 @@ namespace nsRedlineType_t
 
     // When larger than 128, flags can be inserted.
     const RedlineType_t REDLINE_NO_FLAG_MASK = 0x7F;
-    //const RedlineType_t REDLINE_FLAG_MASK = 0xFF80;
     const RedlineType_t REDLINE_FORM_AUTOFMT = 0x80;// Can be a flag in RedlineType.
 }
 
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 5bafbad..3f15e8c 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1860,7 +1860,6 @@ uno::Any SwDoc::Spell( SwPaM& rPaM,
     uno::Reference< beans::XPropertySet >  xProp( ::GetLinguPropertySet() );
 
     SwSpellArgs      *pSpellArgs = 0;
-    //SwConversionArgs *pConvArgs  = 0;
     if (pConvArgs)
     {
         pConvArgs->SetStart(pSttPos->nNode.GetNode().GetTxtNode(), pSttPos->nContent);
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index bd0ac70..b4a89a3 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -50,8 +50,6 @@
 #include <unobaseclass.hxx>
 #include <limits>
 
-#include <limits>
-
 using namespace ::com::sun::star;
 
 
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 505863f..904aebd 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -289,7 +289,6 @@ void SwUndo::RepeatImpl( ::sw::RepeatContext & )
 
 bool SwUndo::CanRepeatImpl( ::sw::RepeatContext & ) const
 {
-//    return false;
     return ((REPEAT_START <= GetId()) && (GetId() < REPEAT_END));
 }
 
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index d369046..c0879af 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -498,13 +498,6 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext)
             SwRedline* pTmp = new SwRedline( *pRedlData, *pPam );
             ((SwRedlineTbl&)pDoc->GetRedlineTbl()).Insert( pTmp );
             pTmp->InvalidateRange();
-
-/*
-            SwRedlineMode eOld = pDoc->GetRedlineMode();
-            pDoc->SetRedlineMode_intern( eOld & ~REDLINE_IGNORE );
-            pDoc->AppendRedline( new SwRedline( *pRedlData, *pPam ));
-            pDoc->SetRedlineMode_intern( eOld );
-*/
         }
         else if( !( nsRedlineMode_t::REDLINE_IGNORE & GetRedlineMode() ) &&
                 pDoc->GetRedlineTbl().Count() )
@@ -512,9 +505,6 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext)
     }
     else
     {
-//      SwRedlineMode eOld = pDoc->GetRedlineMode();
-//      pDoc->SetRedlineMode_intern( ( eOld & ~REDLINE_IGNORE) | REDLINE_ON );
-
         if( pUnDel2 )
         {
             pUnDel2->UndoImpl(rContext);
@@ -529,8 +519,6 @@ void SwUndoCompDoc::RedoImpl(::sw::UndoRedoContext & rContext)
         ((SwRedlineTbl&)pDoc->GetRedlineTbl()).Insert( pTmp );
         if (pTmp) // #i19649#
             pTmp->InvalidateRange();
-
-//      pDoc->SetRedlineMode_intern( eOld );
     }
 
     SetPaM(*pPam, true);
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 89245c8..7b69a02 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -256,10 +256,6 @@ int SwView::InsertGraphic( const String &rPath, const String &rFilter,
 
 sal_Bool SwView::InsertGraphicDlg( SfxRequest& rReq )
 {
-#ifndef ENABLE_PROP_WITHOUTLINK
-#define ENABLE_PROP_WITHOUTLINK 0x08
-#endif
-
     sal_Bool bReturn = sal_False;
     SwDocShell* pDocShell = GetDocShell();
     sal_uInt16 nHtmlMode = ::GetHtmlMode(pDocShell);
commit 6e8fb811c71870c4594789c5111e59cf613aa99e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Sat Sep 3 18:56:10 2011 +0900

    fix typos in comments

diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index ffa2464..b2cc2d7 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -57,7 +57,7 @@ namespace nsRedlineMode_t
     const RedlineMode_t REDLINE_ON = 0x01;// RedlineMode on
     const RedlineMode_t REDLINE_IGNORE = 0x02;// ignore Redlines
     const RedlineMode_t REDLINE_SHOW_INSERT = 0x10;// show all inserts
-    const RedlineMode_t REDLINE_SHOW_DELETE = 0x20;// show all delets
+    const RedlineMode_t REDLINE_SHOW_DELETE = 0x20;// show all deletes
     const RedlineMode_t REDLINE_SHOW_MASK = REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE;
 
     // For internal management:
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 264735f..1f430a0 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2821,7 +2821,7 @@ SwUndo* SwUndoTblCpyTbl::PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox,
         else
             aInsertEnd.nContent = SwIndex( 0 );
     }
-    // For joined (merged) contents the start of deletionm and end of insertion are identical
+    // For joined (merged) contents the start of deletion and end of insertion are identical
     // otherwise adjacent nodes.
     SwPosition aDeleteStart( rJoin ? aInsertEnd : rPos );
     if( !rJoin )