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

Michael Stahl mstahl at redhat.com
Tue Sep 8 12:45:35 PDT 2015


 sw/inc/docstyle.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 015c21cb486e559b697fec9dde288273866c65a8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 8 21:44:04 2015 +0200

    sw: fix build with GCC 4.6
    
    Change-Id: Ib8294e66cb9482ae2502f4741c90dccac36a117b

diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 275d5e2..8ad216d 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -101,7 +101,7 @@ public:
                                         const bool bResetIndentAttrsAtParagraphStyle = false );
 
     virtual SfxItemSet&     GetItemSet() SAL_OVERRIDE;
-    virtual std::unique_ptr<SfxItemSet> GetItemSetForPreview() override;
+    virtual std::unique_ptr<SfxItemSet> GetItemSetForPreview() SAL_OVERRIDE;
     /** new method for paragraph styles to merge indent attributes of applied list
      style into the given item set, if the list style indent attributes are applicable. */
     void MergeIndentAttrsOfListStyle( SfxItemSet& rSet );


More information about the Libreoffice-commits mailing list