diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-01-26 19:04:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-26 19:04:30 +0200 |
| commit | 87192f1a4ae64f5374d277509f0d2e4a1aad6015 (patch) | |
| tree | a6aa525518f7331b4db9024ac39bf136355b19e4 /dbaccess | |
| parent | 3f42c99fedb4502386a65a106c1552859d951c0e (diff) | |
Workaround for MSVC error C2216: 'override' cannot be used with 'inline'
That error is as such apparently bogus, but using 'inline' is
pointless cargo cult there anyway, so drop it.
Change-Id: I37b826050006e853db724248bac4f22cceece792
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/inc/FieldControls.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index e65afbacad31..b0392e8d802d 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -46,7 +46,7 @@ namespace dbaui public: inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual inline bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -77,7 +77,7 @@ namespace dbaui inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - virtual inline bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -111,7 +111,7 @@ namespace dbaui inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - virtual inline bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } |