[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

Michael Stahl mstahl at redhat.com
Tue Sep 8 00:58:02 PDT 2015


 sw/source/uibase/app/docstyle.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b9c51bd265908e8bf65cb2a462dd8fd9a88904f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Sep 7 16:21:53 2015 +0200

    sw: fix not-quite-copypaste code in SwDocStyleSheet::FillStyleSheet()
    
    This causes the temporary creation of frame styles to fail.
    
    Change-Id: I5d148ae008660d9c0f457a4c0e9dc256e0dfc49a
    (cherry picked from commit 110dc43d97d559b6369bca308f9dd39fd02e751e)
    Reviewed-on: https://gerrit.libreoffice.org/18380
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 016b1a1..8c0c438 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1779,7 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
     case SFX_STYLE_FAMILY_FRAME:
         pFrameFormat = lcl_FindFrameFormat(rDoc,  aName, this, bCreate);
         bPhysical = 0 != pFrameFormat;
-        if( bFillOnlyInfo && bPhysical )
+        if (bFillOnlyInfo && !bPhysical)
         {
             ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
             bDeleteInfo = true;


More information about the Libreoffice-commits mailing list