[Libreoffice-commits] core.git: svx/inc

[Armin Le Grand]

 svx/inc/svx/unoshape.hxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e6a3d1649ce331fd745957f7c0ea039ae27905a6
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 30 07:56:17 2012 +0000

    Resolves: #i119337# wrong get/setPropertyValue calls in SvxShapeText
    
    (and thus in SvxOle2Shape)
    
    Conflicts:
    	svx/source/unodraw/unoshap4.cxx
    
    Change-Id: I666f9f7cde22c16f44ce0b636313cfa721293c38

diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 36bf13f..6c2a505 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -321,9 +321,6 @@ protected:
     virtual void unlock();
 
 protected:
-    using SvxUnoTextRangeBase::setPropertyValue;
-    using SvxUnoTextRangeBase::getPropertyValue;
-
     // overide these for special property handling in subcasses. Return true if property is handled
     virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);