[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2

Jan-Marek Glogowski glogow at fbihome.de
Wed Mar 2 09:37:48 UTC 2016


 include/sfx2/dinfdlg.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae13b1bd066263b6b3506fa262ab4808e675bc98
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Mar 2 10:03:01 2016 +0100

    GCC 4.6 still doesn't do "override"
    
    But you can use SAL_OVERRIDE instead - once again.
    
    Change-Id: Ifbf49f30b788e9eed96fd13cca885101a366bf16
    Reviewed-on: https://gerrit.libreoffice.org/22825
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index ec846d6..31e769e 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -650,7 +650,7 @@ protected:
 public:
     SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
     virtual ~SfxCmisPropertiesPage();
-    virtual void dispose() override;
+    virtual void dispose() SAL_OVERRIDE;
 
     static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* );
 };


More information about the Libreoffice-commits mailing list