diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-10-02 14:35:19 -0700 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-03 06:06:02 +0000 |
| commit | 89a08d5528ed70f3c3e5de6143cf403a79e716ca (patch) | |
| tree | 9923e78b77a6c36bef1f192c4e244382bb5441b0 | |
| parent | 813a0de2e133da55a0450a9d24ec10e040bc5cd6 (diff) | |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | sw/source/core/uibase/inc/view.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index 73c9810cda3a..30b588997997 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; } |