diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:33:27 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:33:27 +0000 |
| commit | cc04098008329f7db389e6a5c61c6e039c9c2e60 (patch) | |
| tree | ea438178cbb5484529b2345a87259b473cfdea03 /sw/source/filter/xml/xmlexpit.cxx | |
| parent | 94efbf570b4884f7587c149a444aed9db3247c47 (diff) | |
INTEGRATION: CWS oasisbf1 (1.10.54); FILE MERGED
2004/10/15 10:02:11 mib 1.10.54.3: RESYNC: (1.11-1.12); FILE MERGED
2004/09/02 09:27:28 mib 1.10.54.2: RESYNC: (1.10-1.11); FILE MERGED
2004/08/19 10:53:12 mib 1.10.54.1: #i32781#: set insert/style modes by using properties rather than UNOTunnel
Diffstat (limited to 'sw/source/filter/xml/xmlexpit.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlexpit.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 1c4da469991f..7f6c2ee51cb1 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexpit.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2004-08-31 13:53:21 $ + * last change: $Author: hr $ $Date: 2004-11-09 12:33:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,14 +204,14 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, SvXMLItemMapEntry* pEntry = mrMapEntries->getByIndex( nIndex ); // we have a valid map entry here, so lets use it... - if( 0 == (pEntry->nMemberId & MID_FLAG_NO_ITEM_EXPORT) ) + if( 0 == (pEntry->nMemberId & MID_SW_FLAG_NO_ITEM_EXPORT) ) { const SfxPoolItem* pItem = GetItem( rSet, pEntry->nWhichId, nFlags ); // do we have an item? if(pItem) { - if( 0 != (pEntry->nMemberId & MID_FLAG_ELEMENT_ITEM_EXPORT) ) + if( 0 != (pEntry->nMemberId & MID_SW_FLAG_ELEMENT_ITEM_EXPORT) ) { // element items do not add any properties, // we export it later @@ -243,7 +243,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, sal_uInt16 nFlags, const SfxItemSet *pSet ) const { - if( 0 != (rEntry.nMemberId & MID_FLAG_SPECIAL_ITEM_EXPORT) ) + if( 0 != (rEntry.nMemberId & MID_SW_FLAG_SPECIAL_ITEM_EXPORT) ) { if( rItem.ISA( SvXMLAttrContainerItem ) ) { @@ -300,10 +300,10 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, rNamespaceMap, pSet ); } } - else if( 0 == (rEntry.nMemberId & MID_FLAG_ELEMENT_ITEM_EXPORT) ) + else if( 0 == (rEntry.nMemberId & MID_SW_FLAG_ELEMENT_ITEM_EXPORT) ) { OUString aValue; - if( QueryXMLValue(rItem, aValue, rEntry.nMemberId & MID_FLAG_MASK, + if( QueryXMLValue(rItem, aValue, rEntry.nMemberId & MID_SW_FLAG_MASK, rUnitConverter ) ) { OUString sName( @@ -328,7 +328,7 @@ void SvXMLExportItemMapper::exportElementItems( { const sal_uInt16 nElement = rIndexArray.GetObject( nIndex ); SvXMLItemMapEntry* pEntry = mrMapEntries->getByIndex( nElement ); - DBG_ASSERT( 0 != (pEntry->nMemberId & MID_FLAG_ELEMENT_ITEM_EXPORT), + DBG_ASSERT( 0 != (pEntry->nMemberId & MID_SW_FLAG_ELEMENT_ITEM_EXPORT), "wrong mid flag!" ); const SfxPoolItem* pItem = GetItem( rSet, pEntry->nWhichId, nFlags ); @@ -414,7 +414,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLExport& rExport, } /** this method is called for every item that has the - MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ + MID_SW_FLAG_SPECIAL_ITEM_EXPORT flag set */ void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& rAttrList, const SvXMLItemMapEntry& rEntry, const SfxPoolItem& rItem, @@ -426,7 +426,7 @@ void SvXMLExportItemMapper::handleSpecialItem( SvXMLAttributeList& rAttrList, } /** this method is called for every item that has the - MID_FLAG_NO_ITEM_EXPORT flag set */ + MID_SW_FLAG_NO_ITEM_EXPORT flag set */ void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& rAttrList, const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& rUnitConverter, @@ -437,7 +437,7 @@ void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& rAttrList, } /** this method is called for every item that has the - MID_FLAG_ELEMENT_EXPORT flag set */ + MID_SW_FLAG_ELEMENT_EXPORT flag set */ void SvXMLExportItemMapper::handleElementItem( SvXMLExport& rExport, const SvXMLItemMapEntry& rEntry, |