[Libreoffice-commits] core.git: sw/source

Stephan Bergmann sbergman at redhat.com
Fri Oct 11 09:52:42 PDT 2013


 sw/source/core/undo/undel.cxx  |    2 ++
 sw/source/core/undo/unins.cxx  |    1 +
 sw/source/core/undo/unovwr.cxx |    3 +++
 3 files changed, 6 insertions(+)

New commits:
commit 4ee0bbff0ebb88a249321c74e32b61f4c7eb3878
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 11 18:51:42 2013 +0200

    -Werror,-Wunused-variable
    
    Change-Id: Ia7fa834e3d9bf8578dcdc667fbe97ce58606704b

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index 34e9fcb..766ed61 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -789,6 +789,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
                 OUString const ins( pTxtNd->InsertText(*pEndStr, aPos.nContent,
                         IDocumentContentOperations::INS_NOHINTEXPAND) );
                 assert(ins.getLength() == pEndStr->Len()); // must succeed
+                (void) ins;
                 // METADATA: restore
                 pTxtNd->RestoreMetadata(m_pMetadataUndoEnd);
             }
@@ -883,6 +884,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
                 OUString const ins( pTxtNd->InsertText(*pSttStr, aPos.nContent,
                         IDocumentContentOperations::INS_NOHINTEXPAND) );
                 assert(ins.getLength() == pSttStr->Len()); // must succeed
+                (void) ins;
                 // METADATA: restore
                 pTxtNd->RestoreMetadata(m_pMetadataUndoStart);
             }
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 5145aaa..3f3a00e 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -730,6 +730,7 @@ void SwUndoReplace::Impl::UndoImpl(::sw::UndoRedoContext & rContext)
     {
         OUString const ins( pNd->InsertText( m_sOld, aIdx ) );
         assert(ins.getLength() == m_sOld.getLength()); // must succeed
+        (void) ins;
     }
 
     if( pHistory )
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index b7559c2..6a2fc8a 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -157,6 +157,7 @@ sal_Bool SwUndoOverwrite::CanGrouping( SwDoc* pDoc, SwPosition& rPos,
     OUString const ins( pDelTxtNd->InsertText(OUString(cIns), rPos.nContent,
             IDocumentContentOperations::INS_EMPTYEXPAND) );
     assert(ins.getLength() == 1); // check in SwDoc::Overwrite => cannot fail
+    (void) ins;
     aInsStr.Insert( cIns );
 
     if( !bInsChar )
@@ -210,6 +211,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
             OUString aTmpStr(aDelStr.GetChar(n));
             OUString const ins( pTxtNd->InsertText(aTmpStr, rIdx) );
             assert(ins.getLength() == 1); // cannot fail
+        (void) ins;
             rIdx -= 2;
             pTxtNd->EraseText( rIdx, 1 );
             rIdx += 2;
@@ -282,6 +284,7 @@ void SwUndoOverwrite::RedoImpl(::sw::UndoRedoContext & rContext)
                 pTxtNd->InsertText( OUString(aInsStr.GetChar(n)), rIdx,
                 IDocumentContentOperations::INS_EMPTYEXPAND) );
         assert(ins.getLength() == 1); // cannot fail
+        (void) ins;
         if( n < aDelStr.Len() )
         {
             rIdx -= 2;


More information about the Libreoffice-commits mailing list