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

INTEGRATION: CWS impressodf12 (1.74.12); FILE MERGED

Browse Source 
2008/04/28 11:23:26 cl 1.74.12.5: fixed linux compiler warnings
2008/04/25 09:01:02 cl 1.74.12.4: RESYNC: (1.74-1.75); FILE MERGED
2008/04/21 15:31:49 tl 1.74.12.3: #i35937# EditEngine/outliner changes regarding number format and bullets
2008/04/17 08:48:37 cl 1.74.12.2: #i35937# removed unused code for old binary versions
2008/04/10 16:50:53 cl 1.74.12.1: #i35937# allow paragraph depth of -1 to switch of numbering
This commit is contained in:
Rüdiger Timm
2008-06-06 11:28:14 +00:00
parent d4b830b6b1
commit 00a0010146
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
svx/source/editeng/impedit4.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: impedit4.cxx,v $
* $Revision: 1.75 $
* $Revision: 1.76 $
*
* This file is part of OpenOffice.org.
*
@@ -764,20 +764,25 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
break;
case EE_PARA_OUTLLEVEL:
{
rOutput << "\\level";
sal_uInt16 nLevel = ((const SfxUInt16Item&)rItem).GetValue();
rOutput.WriteNumber( nLevel );
sal_Int16 nLevel = ((const SfxInt16Item&)rItem).GetValue();
if( nLevel >= 0 )
{
rOutput << "\\level";
rOutput.WriteNumber( nLevel );
}
}
break;
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
{
// const ContentNode *pNode = aEditDoc.GetObject( nPara );
rOutput << sRTF_FI;
short nTxtFirst = ((const SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst();
nTxtFirst = (short)LogicToTwips( nTxtFirst );
rOutput.WriteNumber( nTxtFirst );
rOutput << sRTF_LI;
sal_uInt16 nTxtLeft = (USHORT)((const SvxLRSpaceItem&)rItem).GetTxtLeft();
sal_uInt16 nTxtLeft = static_cast< sal_uInt16 >(((const SvxLRSpaceItem&)rItem).GetTxtLeft());
nTxtLeft = (sal_uInt16)LogicToTwips( nTxtLeft );
rOutput.WriteNumber( nTxtLeft );
rOutput << sRTF_RI;
@@ -1092,26 +1097,6 @@ EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemP
// Die Absatzattribute...
pC->GetParaAttribs().Set( pNode->GetContentAttribs().GetItems() );
// Seit der 5.1 werden im Outliner die LRSpaceItems anders interpretiert.
// Damit sie in einer 5.0 und aelter richtig sind, muss das Flag
// richtig gesetzt sein...
sal_Bool bOutliner = aStatus.IsAnyOutliner();
for ( sal_uInt16 n = 0; n <=1; n++ )
{
sal_uInt16 nItemId = n ? EE_PARA_LRSPACE : EE_PARA_OUTLLRSPACE;
if ( pC->GetParaAttribs().GetItemState( nItemId ) == SFX_ITEM_ON )
{
const SvxLRSpaceItem& rItem = (const SvxLRSpaceItem&) pC->GetParaAttribs().Get( nItemId );
if ( rItem.IsBulletFI() != bOutliner )
{
SvxLRSpaceItem aNewItem( rItem );
aNewItem.SetBulletFI( bOutliner );
pC->GetParaAttribs().Put( aNewItem );
}
}
}
// Das StyleSheet...
if ( pNode->GetStyleSheet() )
{