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

[Michael Stahl]

 editeng/source/editeng/impedit.cxx  |    2 +-
 sw/source/core/txtnode/atrflyin.cxx |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b5c26668a04e275c2cb015e0890cf74e7054997d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 30 12:26:12 2017 +0200

    editeng: tweak comment
    
    Change-Id: I587fafea157a02d2c903dda4b85448b1fe349c3e

diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index b28cb1023e8e..9d2f03c3f585 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1140,7 +1140,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
             aVisDocStartPos.Move( -nRealDiffX, -nRealDiffY );
         else
             aVisDocStartPos.Move( -nRealDiffY, nRealDiffX );
-        // Aligned value of the move does not necessarily result in aligned
+        // Move by aligned value does not necessarily result in aligned
         // rectangle ...
         aVisDocStartPos = pOutWin->LogicToPixel( aVisDocStartPos );
         aVisDocStartPos = pOutWin->PixelToLogic( aVisDocStartPos );
commit f5686d57d8e1cf8df2e41d1b2802340f255412a7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 30 11:00:10 2017 +0200

    sw: convert to assert in atrflyin.cxx
    
    Change-Id: I0cf6615e343b54ee5b4c212fe365dcf16234ff08

diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index ee79239ac192..eca7534bcbba 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -91,7 +91,7 @@ SwTextFlyCnt::SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStartPos )
 void SwTextFlyCnt::CopyFlyFormat( SwDoc* pDoc )
 {
     SwFrameFormat* pFormat = GetFlyCnt().GetFrameFormat();
-    OSL_ENSURE( pFormat, "von welchem Format soll ich eine Kopie erzeugen?" );
+    assert(pFormat);
     // The FlyFrameFormat must be copied - CopyLayoutFormat
     // (DocumentLayoutManager.cxx) creates the FlyFrameFormat and copies the
     // content.
@@ -118,7 +118,7 @@ void SwTextFlyCnt::CopyFlyFormat( SwDoc* pDoc )
         else
         {
             pos.nContent.Assign( nullptr, 0 );
-            OSL_ENSURE( false, "CopyFlyFormat: Was fuer ein Anker?" );
+            assert(false);
         }
         aAnchor.SetAnchor( &pos );
     }
@@ -215,7 +215,7 @@ SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame_( const SwFrame *pCurrFrame )
     }
 
     SwIterator<SwFlyFrame,SwFormat> aIter( *GetFlyCnt().pFormat );
-    OSL_ENSURE( pCurrFrame->IsTextFrame(), "SwTextFlyCnt::GetFlyFrame_ for TextFrames only." );
+    assert(pCurrFrame->IsTextFrame());
     SwFrame* pFrame = aIter.First();
     if ( pFrame )
     {