[Libreoffice-commits] .: binfilter/inc

Caolán McNamara caolan at kemper.freedesktop.org
Tue Mar 29 06:06:10 PDT 2011


 binfilter/inc/bf_svx/unoshape.hxx    |   16 ++++++++++++++++
 binfilter/inc/bf_svx/unotext.hxx     |    2 ++
 binfilter/inc/bf_xmloff/xmlcnitm.hxx |    1 +
 3 files changed, 19 insertions(+)

New commits:
commit 49dbe63926186624448426e5bcd6fc1a422de2de
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 28 21:09:33 2011 +0100

    silence some -Woverloaded-virtual

diff --git a/binfilter/inc/bf_svx/unoshape.hxx b/binfilter/inc/bf_svx/unoshape.hxx
index 472422d..057b839 100644
--- a/binfilter/inc/bf_svx/unoshape.hxx
+++ b/binfilter/inc/bf_svx/unoshape.hxx
@@ -419,6 +419,10 @@ namespace binfilter {
 ***********************************************************************/
 class SvxShapeControl : public ::com::sun::star::drawing::XControlShape, public SvxShapeText
 {
+protected:
+    using SvxUnoTextRangeBase::setPropertyValue;
+    using SvxUnoTextRangeBase::getPropertyValue;
+
 private:
 
     void convertPropertyName( const ::rtl::OUString& rApiName, ::rtl::OUString& rInternalName, sal_Bool& rNeedsConversion );
@@ -504,6 +508,10 @@ private:
     ::com::sun::star::drawing::PolygonKind ePolygonKind;
     XPolyPolygon aEmptyPoly;
 
+protected:
+    using SvxUnoTextRangeBase::setPropertyValue;
+    using SvxUnoTextRangeBase::getPropertyValue;
+
 public:
     SvxShapePolyPolygon( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::beans::PropertyVetoException);
     virtual ~SvxShapePolyPolygon() throw();
@@ -531,6 +539,10 @@ private:
     ::com::sun::star::drawing::PolygonKind ePolygonKind;
     XPolyPolygon aEmptyPoly;
 
+protected:
+    using SvxUnoTextRangeBase::setPropertyValue;
+    using SvxUnoTextRangeBase::getPropertyValue;
+
 public:
     SvxShapePolyPolygonBezier( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew ) throw();
     virtual ~SvxShapePolyPolygonBezier() throw();
@@ -553,6 +565,10 @@ public:
 ***********************************************************************/
 class SvxGraphicObject : public SvxShapeText
 {
+protected:
+    using SvxUnoTextRangeBase::setPropertyValue;
+    using SvxUnoTextRangeBase::getPropertyValue;
+
 public:
     SvxGraphicObject( SdrObject* pObj ) throw();
     virtual ~SvxGraphicObject() throw();
diff --git a/binfilter/inc/bf_svx/unotext.hxx b/binfilter/inc/bf_svx/unotext.hxx
index afa7075..b6dd46c 100644
--- a/binfilter/inc/bf_svx/unotext.hxx
+++ b/binfilter/inc/bf_svx/unotext.hxx
@@ -493,6 +493,8 @@ private:
     BOOL bDisposing;
 
 protected:
+    using SvxUnoTextRangeBase::setPropertyValue;
+    using SvxUnoTextRangeBase::getPropertyValue;
     static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > maTypeSequence;
 
 public:
diff --git a/binfilter/inc/bf_xmloff/xmlcnitm.hxx b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
index ff4008e..708efd2 100644
--- a/binfilter/inc/bf_xmloff/xmlcnitm.hxx
+++ b/binfilter/inc/bf_xmloff/xmlcnitm.hxx
@@ -53,6 +53,7 @@ public:
     virtual ~SvXMLAttrContainerItem();
 
     virtual int operator==( const SfxPoolItem& ) const;
+    using SfxPoolItem::Compare;
     virtual int	Compare( const SfxPoolItem &rWith ) const;
 
     virtual SfxItemPresentation GetPresentation(


More information about the Libreoffice-commits mailing list