diff options
| author | Michael Brauer <mib@openoffice.org> | 2002-11-26 11:35:55 +0000 |
|---|---|---|
| committer | Michael Brauer <mib@openoffice.org> | 2002-11-26 11:35:55 +0000 |
| commit | a01f3b90ee1a9b1fa9c40a0ff5e146761fde8149 (patch) | |
| tree | bca045f80c5a1f6015b487e28e9c45808b210ffc /sw | |
| parent | f677c21b948a2377ad7e8e89bc8e3a73f239eaf5 (diff) | |
#104647#: z-order for OLE oebjects
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unoframe.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 41037760a14c..e3a1979b68ac 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoframe.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: os $ $Date: 2002-03-19 15:59:14 $ + * last change: $Author: mib $ $Date: 2002-11-26 12:35:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,6 +194,7 @@ public: sal_Bool IsDescriptor() const {return bIsDescriptor;} void ResetDescriptor(); + static SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ); }; /*-----------------20.02.98 11:28------------------- diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 2cfde0fb090b..c739dbcb6a85 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoframe.cxx,v $ * - * $Revision: 1.73 $ + * $Revision: 1.74 $ * - * last change: $Author: cmc $ $Date: 2002-10-16 09:21:50 $ + * last change: $Author: mib $ $Date: 2002-11-26 12:35:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1067,7 +1067,7 @@ uno::Reference< XPropertySetInfo > SwXFrame::getPropertySetInfo(void) throw( Ru -----------------------------------------------------------------------*/ -SdrObject *lcl_GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) +SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt ) { SdrObject* pObject = pFmt->FindSdrObject(); if( !pObject ) @@ -1312,7 +1312,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a if( nZOrder >= 0) { SdrObject* pObject = - lcl_GetOrCreateSdrObject( (SwFlyFrmFmt*)pFmt ); + GetOrCreateSdrObject( (SwFlyFrmFmt*)pFmt ); SdrModel *pDrawModel = pDoc->GetDrawModel(); pDrawModel->GetPage(0)-> SetObjectOrdNum(pObject->GetOrdNum(), nZOrder); @@ -2059,7 +2059,7 @@ void SwXFrame::attachToRange(const uno::Reference< XTextRange > & xTextRange) } if( pFmt && pDoc->GetDrawModel() ) - lcl_GetOrCreateSdrObject( pFmt ); + GetOrCreateSdrObject( pFmt ); uno::Any* pOrder; if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) ) setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_Z_ORDER)), *pOrder); |