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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 17 17:06:12 UTC 2019


 sw/source/filter/ww8/ww8atr.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 34a151cbb926f78640360760ec6ccc2265538255
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Apr 17 15:34:08 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Apr 17 19:05:14 2019 +0200

    Better fix for 6340daac7b99c65249363a4bb61c492de31ef5d6
    
    ..."Revert broken loplugin:sequentialassign change"
    
    Change-Id: Icb6f27be6bab35db02fc67ce5478e47bb8faa68b
    Reviewed-on: https://gerrit.libreoffice.org/70883
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 528634646659..886ea9dbc904 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3225,8 +3225,8 @@ void AttributeOutputBase::TextFlyContent( const SwFormatFlyCnt& rFlyContent )
 {
     if ( auto pTextNd = dynamic_cast< const SwContentNode *>( GetExport().m_pOutFormatNode )  )
     {
-        Point aLayPos;
-        aLayPos = pTextNd->FindLayoutRect( false, &aLayPos ).Pos();
+        Point const origin;
+        Point aLayPos = pTextNd->FindLayoutRect( false, &origin ).Pos();
 
         SwPosition aPos( *pTextNd );
         ww8::Frame aFrame( *rFlyContent.GetFrameFormat(), aPos );


More information about the Libreoffice-commits mailing list