[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Andras Timar]

 sw/source/core/uibase/inc/view.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89a08d5528ed70f3c3e5de6143cf403a79e716ca
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 2 14:35:19 2014 -0700

    error C2216: 'override' cannot be used with 'inline'
    
    libreoffice-4-3 is supposed to be buildable vith VS2010...
    
    Change-Id: Id980c709ee167133e2d8ba41902e43d0abe1034f
    Reviewed-on: https://gerrit.libreoffice.org/11777
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 73c9810..30b5889 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -593,8 +593,8 @@ public:
                  SfxShell       *GetCurShell()  { return m_pShell; }
                  SwDocShell     *GetDocShell();
     inline const SwDocShell     *GetDocShell() const;
-    inline virtual       FmFormShell    *GetFormShell()       SAL_OVERRIDE { return m_pFormShell; }
-    inline virtual const FmFormShell    *GetFormShell() const SAL_OVERRIDE { return m_pFormShell; }
+    virtual       FmFormShell    *GetFormShell()       SAL_OVERRIDE { return m_pFormShell; }
+    virtual const FmFormShell    *GetFormShell() const SAL_OVERRIDE { return m_pFormShell; }
 
     // so that in the SubShells' DTors m_pShell can be reset if applicable
     void ResetSubShell()    { m_pShell = 0; }