diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 07:57:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 07:57:19 +0000 |
| commit | b6914fce813101c8be141c29877544bc10543a3f (patch) | |
| tree | e1d11970059915a237da3d30a91c4896e6ef9b64 /xmloff | |
| parent | 867d2b9a2c864506bc8edc7efe71b9a91658bb8e (diff) | |
INTEGRATION: CWS sw30bf13_DEV300 (1.143.22.1.2); FILE MERGED
2008/08/15 14:04:37 od 1.143.22.1.2.1: #i92811# - import of lists:
-- assure that the first list with a certain list style uses
the internal list style's default list id as its list id
- export of lists:
-- correct export of property text::continue-numbering
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index b4fc30952c44..d8d149f27023 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtimp.cxx,v $ - * $Revision: 1.144 $ + * $Revision: 1.145 $ * * This file is part of OpenOffice.org. * @@ -1080,21 +1080,15 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( // --> OD 2008-04-23 #refactorlists# if ( xPropSetInfo->hasPropertyByName( sPropNameListId ) ) { - const ::rtl::OUString sContinueListId( pListBlock->GetContinueListId() ); - if ( sContinueListId.getLength() != 0 ) + // --> OD 2008-08-15 #i92811# + const ::rtl::OUString sListBlockListId( + mpTextListsHelper->GetListIdForListBlock( *pListBlock ) ); + if ( sListBlockListId.getLength() != 0 ) { xPropSet->setPropertyValue( sPropNameListId, - makeAny( sContinueListId ) ); - } - else - { - const ::rtl::OUString sListBlockListId( pListBlock->GetListId() ); - if ( sListBlockListId.getLength() != 0 ) - { - xPropSet->setPropertyValue( sPropNameListId, - makeAny( sListBlockListId ) ); - } + makeAny( sListBlockListId ) ); } + // <-- } // <-- SetListItem( (XMLTextListItemContext *)0 ); @@ -2348,12 +2342,17 @@ void XMLTextImportHelper::ResetOpenRedlineId() } // --> OD 2008-04-25 #refactorlists# +// --> OD 2008-08-15 #i92811# void XMLTextImportHelper::KeepListAsProcessed( ::rtl::OUString sListId, ::rtl::OUString sListStyleName, - ::rtl::OUString sContinueListId ) + ::rtl::OUString sContinueListId, + ::rtl::OUString sListStyleDefaultListId ) { - mpTextListsHelper->KeepListAsProcessed( sListId, sListStyleName, sContinueListId ); + mpTextListsHelper->KeepListAsProcessed( sListId, sListStyleName, + sContinueListId, + sListStyleDefaultListId ); } +// <-- sal_Bool XMLTextImportHelper::IsListProcessed( const ::rtl::OUString sListId ) const { |