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

[Stephan Bergmann]

 dbaccess/source/ui/app/AppSwapWindow.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a7a9e81c772c86dbc8a2a62694a3f7dc23789df3
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Mar 27 20:58:06 2014 +0100

    Work around MSC "'override' cannot be used with 'inline'" bug
    
    Change-Id: I5d2fcf6ba90892abf55cbf61b760c2fbbe33c412

diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx 
b/dbaccess/source/ui/app/AppSwapWindow.hxx
index dc6a7ec..bc24248 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -46,13 +46,13 @@ namespace dbaui
         // window overloads
         virtual void Resize() SAL_OVERRIDE;
 
-        inline sal_Bool isCutAllowed() SAL_OVERRIDE      { return sal_False; }
-        inline sal_Bool isCopyAllowed() SAL_OVERRIDE     { return sal_False; }
-        inline sal_Bool isPasteAllowed() SAL_OVERRIDE    { return sal_False; }
+        sal_Bool isCutAllowed() SAL_OVERRIDE      { return sal_False; }
+        sal_Bool isCopyAllowed() SAL_OVERRIDE     { return sal_False; }
+        sal_Bool isPasteAllowed() SAL_OVERRIDE    { return sal_False; }
         virtual sal_Bool hasChildPathFocus() SAL_OVERRIDE { return 
HasChildPathFocus(); }
-        inline void copy() SAL_OVERRIDE  { }
-        inline void cut() SAL_OVERRIDE   { }
-        inline void paste() SAL_OVERRIDE { }
+        void copy() SAL_OVERRIDE  { }
+        void cut() SAL_OVERRIDE   { }
+        void paste() SAL_OVERRIDE { }
 
         inline sal_uLong                    GetEntryCount() const { return 
m_aIconControl.GetEntryCount(); }
         inline SvxIconChoiceCtrlEntry*  GetEntry( sal_uLong nPos ) const { 
return m_aIconControl.GetEntry(nPos); }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits