View | Details | Raw Unified | Return to issue 119337
Collapse All | Expand All

(-)main/svx/source/unodraw/unoshap4.cxx (-3 / +3 lines)
Lines 467-473 Link Here
467
    ::comphelper::IEmbeddedHelper*     pPersist = mpModel->GetPersist();
467
    ::comphelper::IEmbeddedHelper*     pPersist = mpModel->GetPersist();
468
    ::rtl::OUString              aPersistName;
468
    ::rtl::OUString              aPersistName;
469
    OUString            aTmpStr;
469
    OUString            aTmpStr;
470
	if( getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
470
	if( SvxShape::getPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ) ) >>= aTmpStr )
471
        aPersistName = aTmpStr;
471
        aPersistName = aTmpStr;
472
472
473
    //TODO/LATER: how to cope with creation failure?!
473
    //TODO/LATER: how to cope with creation failure?!
Lines 498-504 Link Here
498
        }
498
        }
499
499
500
		// connect the object after the visual area is set
500
		// connect the object after the visual area is set
501
        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
501
        SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), Any( aTmpStr = aPersistName ) );
502
502
503
		// the object is inserted during setting of PersistName property usually
503
		// the object is inserted during setting of PersistName property usually
504
		if( pOle2Obj->IsEmpty() )
504
		if( pOle2Obj->IsEmpty() )
Lines 561-567 Link Here
561
        }
561
        }
562
562
563
		// connect the object after the visual area is set
563
		// connect the object after the visual area is set
564
        setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
564
        SvxShape::setPropertyValue( OUString::createFromAscii( UNO_NAME_OLE2_PERSISTNAME ), uno::makeAny( aPersistName ) );
565
565
566
		// the object is inserted during setting of PersistName property usually
566
		// the object is inserted during setting of PersistName property usually
567
		if ( pOle2Obj->IsEmpty() )
567
		if ( pOle2Obj->IsEmpty() )
(-)main/svx/inc/svx/unoshape.hxx (-3 lines)
Lines 339-347 Link Here
339
	virtual void unlock();
339
	virtual void unlock();
340
340
341
protected:
341
protected:
342
    using SvxUnoTextRangeBase::setPropertyValue;
343
    using SvxUnoTextRangeBase::getPropertyValue;
344
345
	// overide these for special property handling in subcasses. Return true if property is handled
342
	// overide these for special property handling in subcasses. Return true if property is handled
346
    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);
343
    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);
347
    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);
344
    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);

Return to issue 119337