diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/PageMasterImportContext.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.cxx | 17 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterImportContext.cxx | 18 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterPropHdlFactory.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 14 | ||||
| -rw-r--r-- | xmloff/source/style/prstylei.cxx | 11 | ||||
| -rw-r--r-- | xmloff/source/text/txtexppr.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 6 | ||||
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/text/txtstyli.cxx | 3 |
10 files changed, 24 insertions, 66 deletions
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index 5b08ac8cd7bf..09365e18ed5f 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -27,8 +27,6 @@ class PageStyleContext : public XMLPropStyleContext { private: OUString sPageUsage; - - //UUUU bool m_bIsFillStyleAlreadyConverted : 1; protected: diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 3bec5d6884c5..b66b95d22cba 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -24,8 +24,6 @@ #include <xmloff/PageMasterStyleMap.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/extract.hxx> - -//UUUU #include <xmloff/txtprmap.hxx> using namespace ::com::sun::star; @@ -326,7 +324,6 @@ void XMLPageMasterExportPropMapper::ContextFilter( XMLPropertyState* pPrint = nullptr; - //UUUU XMLPropertyState* pRepeatOffsetX = nullptr; XMLPropertyState* pRepeatOffsetY = nullptr; XMLPropertyState* pHeaderRepeatOffsetX = nullptr; @@ -393,37 +390,31 @@ void XMLPageMasterExportPropMapper::ContextFilter( case CTP_PM_GRID_SNAP_TO_CHARS: pPMGridSnapToChars = pProp; break; case CTP_PM_GRID_SNAP_TO: pPMGridSnapTo = pProp; break; - //UUUU case CTF_PM_REPEAT_OFFSET_X: pRepeatOffsetX = pProp; break; - //UUUU case CTF_PM_REPEAT_OFFSET_Y: pRepeatOffsetY = pProp; break; - //UUUU case CTF_PM_HEADERREPEAT_OFFSET_X: pHeaderRepeatOffsetX = pProp; break; - //UUUU case CTF_PM_HEADERREPEAT_OFFSET_Y: pHeaderRepeatOffsetY = pProp; break; - //UUUU case CTF_PM_FOOTERREPEAT_OFFSET_X: pFooterRepeatOffsetX = pProp; break; - //UUUU case CTF_PM_FOOTERREPEAT_OFFSET_Y: pFooterRepeatOffsetY = pProp; break; - //UUUU Sort out empty entries + // Sort out empty entries case CTF_PM_FILLGRADIENTNAME: case CTF_PM_FILLHATCHNAME: case CTF_PM_FILLBITMAPNAME: @@ -457,7 +448,7 @@ void XMLPageMasterExportPropMapper::ContextFilter( } } - //UUUU These entries need to be reduced to a single one for XML export. + // These entries need to be reduced to a single one for XML export. // Both would be exported as 'draw:tile-repeat-offset' following a percent // value and a 'vertical' or 'horizontal' tag as mark. If both would be active // and both would be exported this would create an XML error (same property twice) @@ -475,7 +466,7 @@ void XMLPageMasterExportPropMapper::ContextFilter( } } - //UUUU Same as above for Header + // Same as above for Header if(pHeaderRepeatOffsetX && pHeaderRepeatOffsetY) { sal_Int32 nOffset(0); @@ -490,7 +481,7 @@ void XMLPageMasterExportPropMapper::ContextFilter( } } - //UUUU Same as above for Footer + // Same as above for Footer if(pFooterRepeatOffsetX && pFooterRepeatOffsetY) { sal_Int32 nOffset(0); diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 1aaee2640818..e92b05c2c8b0 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> -//UUUU +// #include <xmlsdtypes.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <xmloff/xmlerror.hxx> @@ -39,7 +39,7 @@ using namespace ::xmloff::token; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -//UUUU +// using namespace ::com::sun::star::beans; void PageStyleContext::SetAttribute( sal_uInt16 nPrefixKey, @@ -65,7 +65,7 @@ PageStyleContext::PageStyleContext( SvXMLImport& rImport, bool bDefaultStyle) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_PAGE_MASTER, bDefaultStyle), sPageUsage(), - m_bIsFillStyleAlreadyConverted(false) //UUUU + m_bIsFillStyleAlreadyConverted(false) // { } @@ -160,7 +160,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet > & rPropSet) { - //UUUU need to filter out old fill definitions when the new ones are used. The new + // need to filter out old fill definitions when the new ones are used. The new // ones are used when a FillStyle is defined if(!m_bIsFillStyleAlreadyConverted && GetProperties().size()) { @@ -186,7 +186,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet m_bIsFillStyleAlreadyConverted = true; } - //UUUU do not use XMLPropStyleContext::FillPropertySet, we need to handle this ourselves since + // do not use XMLPropStyleContext::FillPropertySet, we need to handle this ourselves since // we have properties which use the MID_FLAG_NO_PROPERTY_IMPORT flag since they need some special // handling rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper(GetFamily()); @@ -225,14 +225,14 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet XML_STYLE_FAMILY_SD_FILL_IMAGE_ID }; - //UUUU Fill PropertySet, but let it handle special properties not itself + // Fill PropertySet, but let it handle special properties not itself xImpPrMap->FillPropertySet(GetProperties(), rPropSet, aContextIDs); // get property set mapper const rtl::Reference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); Reference< XPropertySetInfo > xInfo; - //UUUU handle special attributes which have MID_FLAG_NO_PROPERTY_IMPORT set + // handle special attributes which have MID_FLAG_NO_PROPERTY_IMPORT set for(sal_uInt16 i = 0; aContextIDs[i].nContextID != -1; i++) { sal_Int32 nIndex = aContextIDs[i].nIndex; @@ -260,7 +260,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet rtl::OUString sStyleName; rState.maValue >>= sStyleName; - //UUUU translate the used name from ODF intern to the name used in the Model + // translate the used name from ODF intern to the name used in the Model sStyleName = GetImport().GetStyleDisplayName(aFamilies[i%4], sStyleName); try @@ -296,7 +296,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet OSL_ENSURE(xImpPrMap.is(), "Got no SvXMLImportPropertyMapper (!)"); } - //UUUU old code, replaced by above stuff + // old code, replaced by above stuff // XMLPropStyleContext::FillPropertySet(rPropSet); if (!sPageUsage.isEmpty()) diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index e216566a8c0c..a5047fec91fa 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -28,8 +28,6 @@ #include "PageMasterPropHdl.hxx" #include <xmloff/PageMasterStyleMap.hxx> #include <com/sun/star/text/TextGridMode.hpp> - -//UUUU #include <xmloff/EnumPropertyHdl.hxx> #include <osl/diagnose.h> #include <com/sun/star/drawing/FillStyle.hpp> @@ -41,7 +39,6 @@ using namespace ::xmloff::token; using namespace ::com::sun::star; -//UUUU using namespace ::com::sun::star::drawing; static SvXMLEnumMapEntry<sal_uInt16> const aXML_TextGridMode_ConstantMap[] = @@ -132,7 +129,6 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I aXML_TextGridMode_ConstantMap, XML_NONE ); break; - //UUUU case XML_SW_TYPE_FILLSTYLE: pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap ); break; @@ -153,7 +149,6 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I pHdl = new XMLBitmapRepeatOffsetPropertyHandler(XML_SW_TYPE_BITMAPREPOFFSETX == nType); break; - //UUUU default: { OSL_ENSURE(false, "XMLPropertyHandler missing (!)"); diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index c904decfb8a3..7b11abbd2795 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -20,8 +20,6 @@ #include <xmloff/PageMasterStyleMap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> - -//UUUU #include <xmloff/txtprmap.hxx> using namespace ::xmloff::token; @@ -42,7 +40,7 @@ using namespace ::xmloff::token; const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = { ////////////////////////////////////////////////////////////////////////// - //UUUU Section for 'page-layout-properties' + // Section for 'page-layout-properties' // page master PLMAP( "PageStyleLayout", XML_NAMESPACE_STYLE, XML_PAGE_USAGE, XML_PM_TYPE_PAGESTYLELAYOUT | MID_FLAG_SPECIAL_ITEM, CTF_PM_PAGEUSAGE ), @@ -119,7 +117,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = PLMAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), - //UUUUIndex 65: fill attributes; use PLMAP macro here instead of GMAP, tis list is ordered and it's order is used + //Index 65: fill attributes; use PLMAP macro here instead of GMAP, tis list is ordered and it's order is used // to decide in which section in ODF to export the contained stuff (the PageMasterStyle creates several XML // sections, for Page, Header and Footer). The needed order seems to rely not on filtering, but using sections // based on the order used in this list. @@ -158,7 +156,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = PLMAP( "FootnoteLineStyle", XML_NAMESPACE_STYLE, XML_EMPTY, XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM, CTF_PM_FTN_LINE_STYLE ), ////////////////////////////////////////////////////////////////////////// - //UUUUIndex 92: Section for 'header-style' own section, all members *have* to use CTF_PM_HEADERFLAG in the context entry (the 5th one) + //Index 92: Section for 'header-style' own section, all members *have* to use CTF_PM_HEADERFLAG in the context entry (the 5th one) HFMAP( "HeaderHeight", XML_NAMESPACE_SVG, XML_HEIGHT, XML_TYPE_MEASURE, CTF_PM_HEADERHEIGHT ), HFMAP( "HeaderHeight", XML_NAMESPACE_FO, XML_MIN_HEIGHT, XML_TYPE_MEASURE, CTF_PM_HEADERMINHEIGHT ), HFMAP( "HeaderIsDynamicHeight", XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_BOOL, CTF_PM_HEADERDYNAMIC ), @@ -189,7 +187,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = HFMAP( "HeaderBackGraphicURL", XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, CTF_PM_HEADERGRAPHICURL ), HFMAP( "HeaderDynamicSpacing", XML_NAMESPACE_STYLE, XML_DYNAMIC_SPACING, XML_TYPE_BOOL, CTF_PM_HEADERFLAG ), - //UUUUIndex 121: Header DrawingLayer FillAttributes + //Index 121: Header DrawingLayer FillAttributes // Use HFMAP to get XML_TYPE_PROP_HEADER_FOOTER ORed to the 4th entry // Names have to begin with 'Header', all 5th entries need to be ORed with the CTF_PM_HEADERFLAG HFMAP( "HeaderFillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SW_TYPE_FILLSTYLE, CTF_PM_HEADERFLAG ), @@ -214,7 +212,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = HFMAP( "HeaderFillBitmapOffsetY", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_PM_HEADERREPEAT_OFFSET_Y ), ////////////////////////////////////////////////////////////////////////// - //UUUUIndex 141: Section for 'footer-style' own section, all members *have* to use CTF_PM_FOOTERFLAG in the context entry (the 5th one) + //Index 141: Section for 'footer-style' own section, all members *have* to use CTF_PM_FOOTERFLAG in the context entry (the 5th one) HFMAP( "FooterHeight", XML_NAMESPACE_SVG, XML_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FOOTERHEIGHT ), HFMAP( "FooterHeight", XML_NAMESPACE_FO, XML_MIN_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FOOTERMINHEIGHT ), HFMAP( "FooterIsDynamicHeight", XML_NAMESPACE_STYLE, XML__EMPTY, XML_TYPE_BOOL, CTF_PM_FOOTERDYNAMIC ), @@ -245,7 +243,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = HFMAP( "FooterBackGraphicURL", XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE, XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM, CTF_PM_FOOTERGRAPHICURL ), HFMAP( "FooterDynamicSpacing", XML_NAMESPACE_STYLE, XML_DYNAMIC_SPACING, XML_TYPE_BOOL, CTF_PM_FOOTERFLAG ), - //UUUUIndex 170: Footer DrawingLayer FillAttributes + //Index 170: Footer DrawingLayer FillAttributes // Use HFMAP to get XML_TYPE_PROP_HEADER_FOOTER ORed to the 4th entry // Names have to begin with 'Footer', all 5th entries need to be ORed with the CTF_PM_FOOTERFLAG HFMAP( "FooterFillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SW_TYPE_FILLSTYLE, CTF_PM_FOOTERFLAG ), diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index bc00a86c944c..079bea84c086 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -40,8 +40,6 @@ #include <xmloff/xmltypes.hxx> #include <xmloff/maptype.hxx> #include <comphelper/sequence.hxx> - -//UUUU #include <com/sun/star/drawing/FillStyle.hpp> using namespace ::com::sun::star; @@ -52,8 +50,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::xmloff::token; - -//UUUU using namespace com::sun::star::drawing; void XMLPropStyleContext::SetAttribute( sal_uInt16 nPrefixKey, @@ -273,7 +269,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); OSL_ENSURE(xImpPrMap.is(), "There is no import prop mapper"); - //UUUU need to filter out old fill definitions when the new ones are used. The new + // need to filter out old fill definitions when the new ones are used. The new // ones are used when a FillStyle is defined const bool bTakeCareOfDrawingLayerFillStyle(xImpPrMap.is() && GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH); bool bDrawingLayerFillStylesUsed(false); @@ -293,7 +289,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) if( pSvXMLStylesContext->IsAutomaticStyle() && ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT || GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) ) { - //UUUU Need to translate StyleName from temp MapNames to names + // Need to translate StyleName from temp MapNames to names // used in already imported items (already exist in the pool). This // is required for AutomaticStyles since these do *not* use FillPropertySet // and thus just trigger CheckSpecialContext in XMLTextStyleContext::FillPropertySet @@ -534,7 +530,6 @@ void XMLPropStyleContext::Finish( bool bOverwrite ) } } -//UUUU bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist( const OUString& rFillStyleTag) const { @@ -580,7 +575,6 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist( return false; } -//UUUU void XMLPropStyleContext::deactivateOldFillStyleDefinitions( const OldFillStyleDefinitionSet& rHashSetOfTags) { @@ -607,7 +601,6 @@ void XMLPropStyleContext::deactivateOldFillStyleDefinitions( } } -//UUUU void XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToStyleDisplayNames() { if(maProperties.size()) diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 71131c2fb4e8..65fd45d877b5 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -33,8 +33,6 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/maptype.hxx> #include "XMLSectionFootnoteConfigExport.hxx" - -//UUUU #include <xmlsdtypes.hxx> using namespace ::com::sun::star; @@ -664,7 +662,6 @@ void XMLTextExportPropertySetMapper::ContextFilter( XMLPropertyState* pAllParaMargin = nullptr; XMLPropertyState* pAllMargin = nullptr; - //UUUU XMLPropertyState* pRepeatOffsetX = nullptr; XMLPropertyState* pRepeatOffsetY = nullptr; @@ -810,17 +807,14 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_PARAMARGINALL: pAllParaMargin = propertyState; break; case CTF_MARGINALL: pAllMargin = propertyState; break; - //UUUU case CTF_REPEAT_OFFSET_X: pRepeatOffsetX = propertyState; break; - //UUUU case CTF_REPEAT_OFFSET_Y: pRepeatOffsetY = propertyState; break; - //UUUU case CTF_FILLGRADIENTNAME: case CTF_FILLHATCHNAME: case CTF_FILLBITMAPNAME: @@ -838,7 +832,6 @@ void XMLTextExportPropertySetMapper::ContextFilter( } } - //UUUU if( pRepeatOffsetX && pRepeatOffsetY ) { sal_Int32 nOffset = 0; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index b3712ea3fb7f..fc6514d4c3a8 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -50,8 +50,6 @@ #include "txtprhdl.hxx" #include <com/sun/star/text/WrapInfluenceOnPosition.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> - -//UUUU #include <xmloff/EnumPropertyHdl.hxx> #include "XMLFillBitmapSizePropertyHandler.hxx" #include "XMLBitmapLogicalSizePropertyHandler.hxx" @@ -64,8 +62,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; using namespace ::xmloff::token; - -//UUUU using namespace ::com::sun::star::drawing; static SvXMLEnumMapEntry<sal_uInt16> const pXML_HoriPos_Enum[] = @@ -1295,7 +1291,6 @@ static const XMLPropertyHandler *GetPropertyHandler pHdl = new XMLConstantsPropertyHandler( pXML_VerticalAlign_Enum, XML_TOKEN_INVALID ); break; - //UUUU case XML_SW_TYPE_FILLSTYLE: pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap); break; @@ -1316,7 +1311,6 @@ static const XMLPropertyHandler *GetPropertyHandler pHdl = new XMLBitmapRepeatOffsetPropertyHandler(XML_SW_TYPE_BITMAPREPOFFSETX == nType); break; - //UUUU default: { OSL_ENSURE(false, "XMLPropertyHandler missing (!)"); diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index eaaff4690d98..99861f5a8c03 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -25,8 +25,6 @@ #include <xmloff/maptype.hxx> #include <xmloff/xmltypes.hxx> #include "txtprhdl.hxx" - -//UUUU #include <xmlsdtypes.hxx> using namespace ::com::sun::star; @@ -82,7 +80,6 @@ using namespace ::xmloff::token; #define M_END() \ { nullptr, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false } -//UUUU #define MAP_(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false } #define GMAP(name,prefix,token,type,context) MAP_(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context) @@ -91,7 +88,7 @@ XMLPropertyMapEntry const aXMLParaPropMap[] = // RES_UNKNOWNATR_CONTAINER MP_E( "ParaUserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), - //UUUU fill attributes for paragraph backgrounds + // fill attributes for paragraph backgrounds // #i125045# moved to the front to be able to exclude these in lcl_txtprmap_getMap // for TextPropMap::SHAPE_PARA to not have these double for Shapes (which already have these) GMAP( "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SW_TYPE_FILLSTYLE, 0 ), @@ -759,7 +756,7 @@ XMLPropertyMapEntry const aXMLFramePropMap[] = MG_E( "BackGraphicFilter",STYLE, FILTER_NAME, MID_FLAG_SPECIAL_ITEM|XML_TYPE_STRING, CTF_BACKGROUND_FILTER ), MG_E( "BackGraphicURL", STYLE, BACKGROUND_IMAGE, MID_FLAG_ELEMENT_ITEM|XML_TYPE_STRING, CTF_BACKGROUND_URL ), - //UUUU fill attributes + // fill attributes GMAP( "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SW_TYPE_FILLSTYLE, 0 ), GMAP( "FillColor", XML_NAMESPACE_DRAW, XML_FILL_COLOR, XML_TYPE_COLOR, 0 ), GMAP( "FillColor2", XML_NAMESPACE_DRAW, XML_SECONDARY_FILL_COLOR, XML_TYPE_COLOR, 0 ), diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 7c3a11913b19..de594dca7a6d 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -51,7 +51,6 @@ #include <utility> #include <vector> -//UUUU #include <xmlsdtypes.hxx> #include <xmloff/xmlerror.hxx> @@ -532,7 +531,7 @@ void XMLTextStyleContext::FillPropertySet( rtl::OUString sStyleName; rState.maValue >>= sStyleName; - //UUUU translate the used name from ODF intern to the name used in the Model + // translate the used name from ODF intern to the name used in the Model sStyleName = GetImport().GetStyleDisplayName(aFamilies[i - 7], sStyleName); if(bAutomatic) |