[Libreoffice-commits] core.git: dbaccess/source

[Tor Lillqvist]

 dbaccess/source/ui/inc/FieldControls.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 87192f1a4ae64f5374d277509f0d2e4a1aad6015
Author: Tor Lillqvist <t...@collabora.com>
Date:   Sun Jan 26 19:04:30 2014 +0200

    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

diff --git a/dbaccess/source/ui/inc/FieldControls.hxx 
b/dbaccess/source/ui/inc/FieldControls.hxx
index e65afba..b0392e8 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; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits