[Libreoffice-commits] .: 2 commits - fpicker/source

[Lubos Lunak]

 fpicker/source/unx/kde/makefile.mk         |    4 ++++
 fpicker/source/unx/kde4/KDE4FilePicker.hxx |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 786e2da789b3ef3be08197c767063f6e7b6521b3
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Apr 11 11:29:20 2011 +0200

    silence virtual overriden warning

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index e1b8a15..53cc2cf 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -150,6 +150,7 @@ public:
     // XEventListener
 
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject &rEvent ) throw( ::com::sun::star::uno::RuntimeException );
+    using cppu::WeakComponentImplHelperBase::disposing;
 
     // XServiceInfo
 
commit 1e323fc084ca738607664d6a75961afaacf12025
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Apr 11 11:27:29 2011 +0200

    -Wno-shadow for KDE sources
    
    KDE builds without this warning, so headers trigger it a lot.

diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index e1bc4db..20b27d5 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -48,6 +48,10 @@ dummy:
 
 CFLAGS+= $(KDE_CFLAGS)
 
+.IF "$(COM)" == "GCC"
+CFLAGSCXX+=-Wno-shadow
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SLOFILES =\