You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/25 13:12:32 UTC
svn commit: r1353458 - in /incubator/ooo/branches/AOO34: ./ main/
main/svx/inc/svx/unoshape.hxx main/svx/source/unodraw/unoshap4.cxx
Author: alg
Date: Mon Jun 25 11:12:32 2012
New Revision: 1353458
URL: http://svn.apache.org/viewvc?rev=1353458&view=rev
Log:
#119337# merged change from r1344156 to AOO34 branch
Modified:
incubator/ooo/branches/AOO34/ (props changed)
incubator/ooo/branches/AOO34/main/ (props changed)
incubator/ooo/branches/AOO34/main/svx/inc/svx/unoshape.hxx
incubator/ooo/branches/AOO34/main/svx/source/unodraw/unoshap4.cxx
Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
Merged /incubator/ooo/trunk:r1344156
Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
Merged /incubator/ooo/trunk/main:r1344156
Modified: incubator/ooo/branches/AOO34/main/svx/inc/svx/unoshape.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/svx/inc/svx/unoshape.hxx?rev=1353458&r1=1353457&r2=1353458&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/svx/inc/svx/unoshape.hxx (original)
+++ incubator/ooo/branches/AOO34/main/svx/inc/svx/unoshape.hxx Mon Jun 25 11:12:32 2012
@@ -339,9 +339,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);
Modified: incubator/ooo/branches/AOO34/main/svx/source/unodraw/unoshap4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/svx/source/unodraw/unoshap4.cxx?rev=1353458&r1=1353457&r2=1353458&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/svx/source/unodraw/unoshap4.cxx (original)
+++ incubator/ooo/branches/AOO34/main/svx/source/unodraw/unoshap4.cxx Mon Jun 25 11:12:32 2012
@@ -467,7 +467,7 @@ sal_Bool SvxOle2Shape::createObject( con
::comphelper::IEmbeddedHelper* pPersist = mpModel->GetPersist();
::rtl::OUString aPersistName;
OUString aTmpStr;
- if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
+ if( SvxShape::getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
aPersistName = aTmpStr;
//TODO/LATER: how to cope with creation failure?!
@@ -498,7 +498,7 @@ sal_Bool SvxOle2Shape::createObject( con
}
// connect the object after the visual area is set
- setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
+ SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
// the object is inserted during setting of PersistName property usually
if( pOle2Obj->IsEmpty() )
@@ -561,7 +561,7 @@ sal_Bool SvxOle2Shape::createLink( const
}
// connect the object after the visual area is set
- setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
+ SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
// the object is inserted during setting of PersistName property usually
if ( pOle2Obj->IsEmpty() )