mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS swlists01 (1.42.190); FILE MERGED

Browse Source 
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 <SwFmt> interface
This commit is contained in:
Rüdiger Timm
2008-06-13 08:33:03 +00:00
parent d296bf1a4a
commit f5b7de18f1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sw/source/core/doc/docdraw.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: docdraw.cxx,v $ * $RCSfile: docdraw.cxx,v $
* $Revision: 1.44 $ * $Revision: 1.45 $
* *
* This file is part of OpenOffice.org. * 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->SetFmtAttr( SwFmtHoriOrient( nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME ) );
_pFrmFmt->SetAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); _pFrmFmt->SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
// --> OD 2005-03-11 #i44334#, #i44681# - positioning attributes already set // --> OD 2005-03-11 #i44334#, #i44681# - positioning attributes already set
_pFrmFmt->PosAttrSet(); _pFrmFmt->PosAttrSet();
// <-- // <--
@@ -288,7 +288,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
pFmt = MakeDrawFrmFmt( String::CreateFromAscii( pFmt = MakeDrawFrmFmt( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "DrawObject" )), RTL_CONSTASCII_STRINGPARAM( "DrawObject" )),
GetDfltFrmFmt() ); GetDfltFrmFmt() );
pFmt->SetAttr( aAnch ); pFmt->SetFmtAttr( aAnch );
// --> OD 2004-10-25 #i36010# - set layout direction of the position // --> OD 2004-10-25 #i36010# - set layout direction of the position
pFmt->SetPositionLayoutDir( pFmt->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
@@ -378,7 +378,7 @@ void SwDoc::UnGroupSelection( SdrView& rDrawView )
SdrObject* pSubObj = pLst->GetObj( i2 ); SdrObject* pSubObj = pLst->GetObj( i2 );
SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm, SwDrawFrmFmt *pFmt = MakeDrawFrmFmt( sDrwFmtNm,
GetDfltFrmFmt() ); GetDfltFrmFmt() );
pFmt->SetAttr( aAnch ); pFmt->SetFmtAttr( aAnch );
// --> OD 2004-10-25 #i36010# - set layout direction of the position // --> OD 2004-10-25 #i36010# - set layout direction of the position
pFmt->SetPositionLayoutDir( pFmt->SetPositionLayoutDir(
text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); text::PositionLayoutDir::PositionInLayoutDirOfAnchor );