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

[Chris Sherlock]

 sw/source/core/text/txtfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d310b03e1ae6729144e149c0b25f94a54db7c33
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Tue Jan 12 20:19:40 2016 +1100

    tdf#39468 translate OSL_ENSURE German text
    
    Change-Id: I41d66f7b19217d0ba7780c1a999bc1289a6d3234
    Reviewed-on: https://gerrit.libreoffice.org/21387
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 8e13867..0cc84d9 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1756,7 +1756,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
                 // line has to be formatted, so that the first line of the Follow can flow up.
                 // Which had flowed to the next page to be together with the footnote (this is
                 // especially true for areas with columns)
-                OSL_ENSURE( GetFollow(), "PREP_FTN_GONE darf nur vom Follow gerufen werden" );
+                OSL_ENSURE( GetFollow(), "PREP_FTN_GONE may only be called by Follow" );
                 sal_Int32 nPos = GetFollow()->GetOfst();
                 if( IsFollow() && GetOfst() == nPos )       // If we don't have a mass of text, we call our
                     FindMaster()->Prepare( PREP_FTN_GONE ); // Master's Prepare