From f5b7de18f1fae8b47c6fcb51e446776af404f38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 13 Jun 2008 08:33:03 +0000 Subject: [PATCH] INTEGRATION: CWS swlists01 (1.42.190); FILE MERGED 2008/05/08 16:28:02 od 1.42.190.2: RESYNC: (1.42-1.44); FILE MERGED 2008/03/06 10:44:25 od 1.42.190.1: #i86732# refactoring due to revised interface --- sw/source/core/doc/docdraw.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 8feb8a3b6945..61d35ece9df6 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docdraw.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.45 $ * * This file is part of OpenOffice.org. * @@ -200,8 +200,8 @@ void lcl_AdjustPositioningAttr( SwDrawFrmFmt* _pFrmFmt, } } - _pFrmFmt->SetAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) ); - _pFrmFmt->SetAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); + _pFrmFmt->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) ); + _pFrmFmt->SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); // --> OD 2005-03-11 #i44334#, #i44681# - positioning attributes already set _pFrmFmt->PosAttrSet(); // <-- @@ -288,7 +288,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) pFmt = MakeDrawFrmFmt( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "DrawObject" )), GetDfltFrmFmt() ); - pFmt->SetAttr( aAnch ); + pFmt->SetFmtAttr( aAnch ); // --> OD 2004-10-25 #i36010# - set layout direction of the position pFmt->SetPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); @@ -378,7 +378,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView ) SdrObject* pSubObj = pLst->GetObj( i2 ); SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm, GetDfltFrmFmt() ); - pFmt->SetAttr( aAnch ); + pFmt->SetFmtAttr( aAnch ); // --> OD 2004-10-25 #i36010# - set layout direction of the position pFmt->SetPositionLayoutDir( text::PositionLayoutDir::PositionInLayoutDirOfAnchor );