Kaydet (Commit) 87192f1a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 3f42c99f
...@@ -46,7 +46,7 @@ namespace dbaui ...@@ -46,7 +46,7 @@ namespace dbaui
public: public:
inline OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); 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; } short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; } OUString GetHelp() const { return m_strHelpText; }
...@@ -77,7 +77,7 @@ namespace dbaui ...@@ -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, short nPosition = -1, WinBits nWinStyle = 0);
inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); 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; } short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; } OUString GetHelp() const { return m_strHelpText; }
...@@ -111,7 +111,7 @@ namespace dbaui ...@@ -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, short nPosition = -1, WinBits nWinStyle = 0);
inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); 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; } short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; } OUString GetHelp() const { return m_strHelpText; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment