summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-05-30 07:56:17 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-03-16 12:03:01 +0000
commite6a3d1649ce331fd745957f7c0ea039ae27905a6 (patch)
tree8ecb6182364e0b965048011d00df74ab571831ea
parent31ea9876fbb4b5a4faad94aff8ac914c2df9f266 (diff)
Resolves: #i119337# wrong get/setPropertyValue calls in SvxShapeText
(and thus in SvxOle2Shape) Conflicts: svx/source/unodraw/unoshap4.cxx Change-Id: I666f9f7cde22c16f44ce0b636313cfa721293c38
-rw-r--r--svx/inc/svx/unoshape.hxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 36bf13f81a30..6c2a5051d061 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);