diff options
Diffstat (limited to 'xmloff/source/text')
136 files changed, 803 insertions, 898 deletions
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index ab947fa614..c3ffd7fffc 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _XMLOFF_XMLANCHORTYPEPROPHDL_HXX #define _XMLOFF_XMLANCHORTYPEPROPHDL_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif #include <xmloff/xmlprhdl.hxx> @@ -52,3 +51,5 @@ public: }; #endif // _XMLOFF_XMLANCHORTYPEPROPHDL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoMarkFileContext.cxx b/xmloff/source/text/XMLAutoMarkFileContext.cxx index a0ec4151ab..a35f4876e1 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.cxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ void XMLAutoMarkFileContext::StartElement( } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index 8ca3b9816e..9b72819ea1 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index 9b7a5869aa..80adbf72cb 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ SvXMLImportContext* XMLAutoTextContainerEventImport::CreateChildContext( else return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 6b2b8c25ba..e8702d32bb 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 2760648f51..844ad549c7 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,14 +38,10 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_UNO_EXCEPTION_HPP #include <com/sun/star/uno/Exception.hpp> -#endif // #110680# -//#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ //#include <comphelper/processfactory.hxx> -//#endif #include <rtl/ustrbuf.hxx> #include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> @@ -161,7 +158,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum ) // get filter component Reference< xml::sax::XDocumentHandler > xTmpDocHandler( xFactory->createInstanceWithArguments( - OUString::createFromAscii("com.sun.star.comp.Oasis2OOoTransformer"), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Oasis2OOoTransformer")), aArgs), UNO_QUERY); OSL_ENSURE( xTmpDocHandler.is(), "can't instantiate OASIS transformer component" ); @@ -295,3 +292,4 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance( return (cppu::OWeakObject*)new XMLAutoTextEventExport(rSMgr,EXPORT_ALL); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx index f351ae7e59..216e23eefd 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.hxx +++ b/xmloff/source/text/XMLAutoTextEventExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx index 37df4f162e..ad00180313 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextEventImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,4 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance( return (cppu::OWeakObject*)new XMLAutoTextEventImport(rSMgr); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx index a7fbdf6ac0..a3f0525219 100644 --- a/xmloff/source/text/XMLAutoTextEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextEventImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,4 @@ protected: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLCalculationSettingsContext.cxx b/xmloff/source/text/XMLCalculationSettingsContext.cxx index 61f519bfd1..e149afde33 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.cxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ void XMLCalculationSettingsContext::EndElement() } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLCalculationSettingsContext.hxx b/xmloff/source/text/XMLCalculationSettingsContext.hxx index 97b3c50994..cd3b7b4f35 100644 --- a/xmloff/source/text/XMLCalculationSettingsContext.hxx +++ b/xmloff/source/text/XMLCalculationSettingsContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index bed9a8f2a8..1efd6dcf6c 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ void XMLChangeElementImportContext::EndElement() GetImport().GetTextImport()->SetInsideDeleteContext(sal_False); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index e6b27156c8..6daa849668 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index bfdac74601..7aeb967452 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ void XMLChangeImportContext::StartElement( // else: ignore } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index 4b46471f35..22afa34f3b 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index 653d73844e..009a66fcbd 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ void XMLChangeInfoContext::EndElement() sCommentBuffer.makeStringAndClear(), sDateTimeBuffer.makeStringAndClear()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index 803d1997d6..ec1cc03710 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 47aa8e2f9d..2cd50aab74 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,7 +95,7 @@ void XMLChangedRegionImportContext::StartElement( } else if( IsXMLToken( sLocalName, XML_MERGE_LAST_PARAGRAPH ) ) { - sal_Bool bTmp; + bool bTmp; if( SvXMLUnitConverter::convertBool(bTmp, sValue) ) { bMergeLastPara = bTmp; @@ -194,3 +195,5 @@ void XMLChangedRegionImportContext::UseRedlineText() // else: leave as is } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index 1d7d142dcc..924bda2a72 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index 88a2ad93e4..7ef08ec5b7 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ SvXMLImportContext* XMLFootnoteBodyImportContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index 57980fac15..7528a5f373 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 10c99f4291..31688cef73 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,9 +39,7 @@ #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> @@ -197,7 +196,7 @@ enum XMLFtnConfigToken XML_TOK_FTNCONFIG_POSITION }; -static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = +static SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = { { XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME, XML_TOK_FTNCONFIG_CITATION_STYLENAME }, { XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME, XML_TOK_FTNCONFIG_ANCHOR_STYLENAME }, @@ -229,7 +228,7 @@ const SvXMLTokenMap& return *pAttrTokenMap; } -static SvXMLEnumMapEntry __READONLY_DATA aFootnoteNumberingMap[] = +static SvXMLEnumMapEntry const aFootnoteNumberingMap[] = { { XML_PAGE, FootnoteNumbering::PER_PAGE }, { XML_CHAPTER, FootnoteNumbering::PER_CHAPTER }, @@ -344,11 +343,8 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( return pContext; } - -// --> OD 2005-01-31 #i40597# - rename method <CreateAndInsertLate(..)> to -// <Finish(..)> +// Rename method <CreateAndInsertLate(..)> to <Finish(..)> (#i40597#) void XMLFootnoteConfigurationImportContext::Finish( sal_Bool bOverwrite ) -// <-- { if (bOverwrite) @@ -455,3 +451,5 @@ void XMLFootnoteConfigurationImportContext::SetEndNotice( { sEndNotice = sText; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 665cb3da7f..9afab7e033 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ enum XMLFootnoteChildToken { XML_TOK_FTN_NOTE_BODY }; -static __FAR_DATA SvXMLTokenMapEntry aFootnoteChildTokenMap[] = +static SvXMLTokenMapEntry aFootnoteChildTokenMap[] = { { XML_NAMESPACE_TEXT, XML_NOTE_CITATION, XML_TOK_FTN_NOTE_CITATION }, @@ -241,3 +242,5 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index 5bb783aae6..a4379e7ca0 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index 2922b69d3d..a99eacdd92 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,7 +109,7 @@ void XMLIndexAlphabeticalSourceContext::ProcessAttribute( enum IndexSourceParamEnum eParam, const OUString& rValue) { - sal_Bool bTmp; + bool bTmp; switch (eParam) { @@ -269,3 +270,5 @@ SvXMLImportContext* XMLIndexAlphabeticalSourceContext::CreateChildContext( xAttrList); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 2e6b637a8e..a6ba716795 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 4604f27e31..a443b9ea08 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,7 +124,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute( } else if( IsXMLToken(sLocalName, XML_NUMBERED_ENTRIES) ) { - sal_Bool bTmp; + bool bTmp; if( SvXMLUnitConverter::convertBool(bTmp, sValue) ) { bNumberedEntries = bTmp; @@ -131,7 +132,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute( } else if( IsXMLToken(sLocalName, XML_SORT_BY_POSITION) ) { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sValue)) { bSortByPosition = bTmp; @@ -184,7 +185,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext } else if ( IsXMLToken( sLocalName, XML_SORT_ASCENDING ) ) { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool( bTmp, xAttrList->getValueByIndex(nAttr))) { @@ -295,3 +296,5 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(sal_Bool) } // else: can't even get Factory -> ignore } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx index b9da94ac9c..e574436429 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ void XMLIndexBibliographyEntryContext::FillPropertyValues( aAny <<= nBibliographyInfo; rValues[nIndex].Value = aAny; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index eed54482ad..471a8302dc 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index 6abde4c35a..1872def466 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ SvXMLImportContext* XMLIndexBibliographySourceContext::CreateChildContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 64207c2b03..eb12a2dbbd 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index c3ce18b3c4..64e7a051dc 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ SvXMLImportContext* XMLIndexBodyContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 933d6183d9..ecc2f317cb 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ inline sal_Bool XMLIndexBodyContext::HasContent() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx index 99177d599d..24f5254f12 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,7 +145,9 @@ void XMLIndexChapterInfoEntryContext::StartElement( if (bChapterInfoOK) { nValues++; - // --> OD 2008-06-26 #i89791# + /* Some of the index chapter information attributes written to ODF 1.1 + and 1.2 don't reflect the displaying (#i89791#) + */ if ( !bTOC ) { bool bConvert( false ); @@ -203,3 +206,5 @@ void XMLIndexChapterInfoEntryContext::FillPropertyValues( rValues[nIndex].Value = aAny; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index a7398d3144..2b80c88098 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index 50f3de71c7..e0133dc7c4 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ SvXMLImportContext* XMLIndexIllustrationSourceContext::CreateChildContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index ddb18d759c..74a205f34c 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx index efe8cfbc04..49029c8763 100644 --- a/xmloff/source/text/XMLIndexMarkExport.cxx +++ b/xmloff/source/text/XMLIndexMarkExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -265,3 +266,5 @@ void XMLIndexMarkExport::GetID( sBuf.appendAscii(sPrefix, sizeof(sPrefix)-1); sBuf.append(nId); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexMarkExport.hxx b/xmloff/source/text/XMLIndexMarkExport.hxx index f98a03d60b..2aeb754ee5 100644 --- a/xmloff/source/text/XMLIndexMarkExport.hxx +++ b/xmloff/source/text/XMLIndexMarkExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index 67f98f3f1d..f5eabce234 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,7 +101,7 @@ void XMLIndexObjectSourceContext::ProcessAttribute( { switch (eParam) { - sal_Bool bTmp; + bool bTmp; case XML_TOK_INDEXSOURCE_USE_OTHER_OBJECTS: if (SvXMLUnitConverter::convertBool(bTmp, rValue)) @@ -188,3 +189,5 @@ SvXMLImportContext* XMLIndexObjectSourceContext::CreateChildContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 0956fb15a6..18795e945f 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index c065cb2a6f..fdfc37d464 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,5 @@ void XMLIndexSimpleEntryContext::FillPropertyValues( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 0c42ec5eee..b76b126588 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 4747bbaa65..42784e4cf6 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,7 +59,7 @@ using ::com::sun::star::xml::sax::XAttributeList; const sal_Char sAPI_CreateFromChapter[] = "CreateFromChapter"; const sal_Char sAPI_IsRelativeTabstops[] = "IsRelativeTabstops"; -static __FAR_DATA SvXMLTokenMapEntry aIndexSourceTokenMap[] = +static SvXMLTokenMapEntry aIndexSourceTokenMap[] = { { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, @@ -215,7 +216,7 @@ void XMLIndexSourceBaseContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_RELATIVE_TABS: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, rValue)) { bRelativeTabs = bTmp; @@ -275,3 +276,5 @@ SvXMLImportContext* XMLIndexSourceBaseContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index 96379d5612..29c6610c65 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx index dcbe6315f0..fd1ad830e5 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ void XMLIndexSpanEntryContext::FillPropertyValues( rValues[nValues-1].Value = aAny; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index 6d1cfc1b39..954faeea3d 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index fc1fc7d7f5..5022dafd7f 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,7 +94,7 @@ static const XMLTokenEnum aIndexSourceElementMap[] = XML_ILLUSTRATION_INDEX_SOURCE }; -SvXMLEnumMapEntry __READONLY_DATA aIndexTypeMap[] = +SvXMLEnumMapEntry const aIndexTypeMap[] = { { XML_TABLE_OF_CONTENT, TEXT_INDEX_TOC }, { XML_ALPHABETICAL_INDEX, TEXT_INDEX_ALPHABETICAL }, @@ -165,7 +166,7 @@ void XMLIndexTOCContext::StartElement( } else if ( IsXMLToken( sLocalName, XML_PROTECTED ) ) { - sal_Bool bTmp; + bool bTmp; if ( SvXMLUnitConverter::convertBool( bTmp, xAttrList->getValueByIndex(nAttr) ) ) { @@ -380,3 +381,5 @@ SvXMLImportContext* XMLIndexTOCContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index a43bd23dbc..392e457223 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index 843fb8a0e8..2be57b3a72 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,7 +116,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_USE_OUTLINE_LEVEL: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, rValue)) { bUseOutline = bTmp; @@ -126,7 +127,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_USE_INDEX_MARKS: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, rValue)) { bUseMarks = bTmp; @@ -136,7 +137,7 @@ void XMLIndexTOCSourceContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_USE_INDEX_SOURCE_STYLES: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, rValue)) { bUseParagraphStyles = bTmp; @@ -194,3 +195,5 @@ SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext( xAttrList); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index 957dd27e8b..33d5dc3493 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index b8d869a039..5f96083510 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,5 @@ SvXMLImportContext *XMLIndexTOCStylesContext::CreateChildContext( return SvXMLImportContext::CreateChildContext(p_nPrefix, rLocalName, xAttrList); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index 85fed72501..d3be1f888c 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,10 +32,7 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/uno/Reference.h> -#ifndef __SGI_STL_VECTOR #include <vector> -#endif - namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -95,3 +93,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 949ec38184..356deaafc8 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,7 +114,7 @@ void XMLIndexTabStopEntryContext::StartElement( // #i21237# else if ( IsXMLToken( sLocalName, XML_WITH_TAB ) ) { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttr)) bWithTab = bTmp; } @@ -172,3 +173,5 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( DBG_ASSERT( nNextEntry == rValues.getLength(), "length incorrectly precumputed!" ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index c2f90af135..ca18acbaec 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 85ac8f094c..738eb23a54 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexReplace.hpp> -#ifndef _COM_SUN_STAR_TEXT_REFERENCEFIELD_PART_HPP #include <com/sun/star/text/ReferenceFieldPart.hpp> -#endif #include "XMLIndexTemplateContext.hxx" #include "XMLIndexTitleTemplateContext.hxx" #include "XMLIndexTOCStylesContext.hxx" @@ -87,7 +86,7 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext() { } -static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = +static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] = { { XML_TEXT, ReferenceFieldPart::TEXT }, @@ -105,7 +104,7 @@ void XMLIndexTableSourceContext::ProcessAttribute( enum IndexSourceParamEnum eParam, const OUString& rValue) { - sal_Bool bTmp; + bool bTmp; switch (eParam) { @@ -186,3 +185,5 @@ SvXMLImportContext* XMLIndexTableSourceContext::CreateChildContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index 3c851a8a9f..d89ac3c845 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index e97ddded62..803e4560f2 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -502,3 +503,4 @@ const sal_Bool aAllowedTokenTypesTable[] = sal_False // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 01c6baf386..cf82864b8d 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx index 5af3301e9a..a9bca1a22a 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ void XMLIndexTitleTemplateContext::Characters( { sContent.append(sString); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 81e37fcda9..ff18dad1e2 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index 84995120b4..e50fcc1154 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,7 +108,7 @@ void XMLIndexUserSourceContext::ProcessAttribute( enum IndexSourceParamEnum eParam, const OUString& rValue) { - sal_Bool bTmp; + bool bTmp; switch (eParam) { @@ -229,3 +230,5 @@ SvXMLImportContext* XMLIndexUserSourceContext::CreateChildContext( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 23bf46376a..31f9bb57b1 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx index 5bffeff47c..16af7a8212 100644 --- a/xmloff/source/text/XMLLineNumberingExport.cxx +++ b/xmloff/source/text/XMLLineNumberingExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,7 +65,7 @@ XMLLineNumberingExport::XMLLineNumberingExport(SvXMLExport& rExp) { } -SvXMLEnumMapEntry __READONLY_DATA aLineNumberPositionMap[] = +SvXMLEnumMapEntry const aLineNumberPositionMap[] = { { XML_LEFT, style::LineNumberPosition::LEFT }, { XML_RIGHT, style::LineNumberPosition::RIGHT }, @@ -210,3 +211,5 @@ void XMLLineNumberingExport::Export() } // can't even get supplier: don't save -> default } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx index 1ff609018b..4a8bc28dae 100644 --- a/xmloff/source/text/XMLLineNumberingExport.hxx +++ b/xmloff/source/text/XMLLineNumberingExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 6379d56b83..cd588dde9d 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,7 +139,7 @@ void XMLLineNumberingImportContext::ProcessAttribute( enum LineNumberingToken eToken, OUString sValue) { - sal_Bool bTmp; + bool bTmp; sal_Int32 nTmp; switch (eToken) @@ -320,3 +321,4 @@ void XMLLineNumberingImportContext::SetSeparatorIncrement( nSeparatorIncrement = nIncr; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx index 364a8c71d2..8b9508cf85 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ void XMLLineNumberingSeparatorImportContext::EndElement() { rLineNumberingContext.SetSeparatorText(sSeparatorBuf.makeStringAndClear()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index c9337a1b5a..2d2a0acb18 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index 9c2a4ddad2..7913e74b89 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx index 32eb453a8d..c52c07b1c6 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.hxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,8 @@ #ifndef _XMLOFF_XMLPROPERTYBACKPATCHER_HXX #define _XMLOFF_XMLPROPERTYBACKPATCHER_HXX -#ifndef __SGI_STL_MAP #include <map> -#endif - -#ifndef __SGI_STL_VECTOR #include <vector> -#endif #include <comphelper/stl_types.hxx> namespace rtl { class OUString; } @@ -154,3 +150,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 44975a32ea..18484d8072 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -670,3 +671,5 @@ void XMLRedlineExport::WriteComment(const OUString& rComment) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 8801a11036..41061cb355 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 60682cc63a..8145304a43 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -392,7 +393,7 @@ void XMLSectionExport::ExportIndexHeaderStart( } -SvXMLEnumStringMapEntry __READONLY_DATA aIndexTypeMap[] = +SvXMLEnumStringMapEntry const aIndexTypeMap[] = { ENUM_STRING_MAP_ENTRY( "com.sun.star.text.ContentIndex", TEXT_SECTION_TYPE_TOC ), ENUM_STRING_MAP_ENTRY( "com.sun.star.text.DocumentIndex", TEXT_SECTION_TYPE_ALPHABETICAL ), @@ -895,7 +896,7 @@ void XMLSectionExport::ExportBaseIndexSource( aAny = xLevelTemplates->getByIndex(i); aAny >>= aTemplateSequence; - // export the sequence (abort export if an error occured; #91214#) + // export the sequence (abort export if an error occurred; #91214#) sal_Bool bResult = ExportIndexTemplate(eType, i, rPropertySet, aTemplateSequence); if ( !bResult ) @@ -1158,7 +1159,7 @@ enum TemplateParamEnum TOK_TPARAM_BIBLIOGRAPHY_DATA }; -SvXMLEnumStringMapEntry __READONLY_DATA aTemplateTypeMap[] = +SvXMLEnumStringMapEntry const aTemplateTypeMap[] = { ENUM_STRING_MAP_ENTRY( "TokenEntryNumber", TOK_TTYPE_ENTRY_NUMBER ), ENUM_STRING_MAP_ENTRY( "TokenEntryText", TOK_TTYPE_ENTRY_TEXT ), @@ -1172,7 +1173,7 @@ SvXMLEnumStringMapEntry __READONLY_DATA aTemplateTypeMap[] = ENUM_STRING_MAP_END() }; -SvXMLEnumStringMapEntry __READONLY_DATA aTemplateParamMap[] = +SvXMLEnumStringMapEntry const aTemplateParamMap[] = { ENUM_STRING_MAP_ENTRY( "TokenType", TOK_TPARAM_TOKEN_TYPE ), ENUM_STRING_MAP_ENTRY( "CharacterStyleName", TOK_TPARAM_CHAR_STYLE ), @@ -1188,7 +1189,7 @@ SvXMLEnumStringMapEntry __READONLY_DATA aTemplateParamMap[] = ENUM_STRING_MAP_END() }; -SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataFieldMap[] = +SvXMLEnumMapEntry const aBibliographyDataFieldMap[] = { { XML_ADDRESS, BibliographyDataField::ADDRESS }, { XML_ANNOTE, BibliographyDataField::ANNOTE }, @@ -1928,3 +1929,5 @@ void XMLSectionExport::ExportMasterDocHeadingDummies() bHeadingDummiesExported = sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionExport.hxx b/xmloff/source/text/XMLSectionExport.hxx index dee65c1c56..c3c95b7d0c 100644 --- a/xmloff/source/text/XMLSectionExport.hxx +++ b/xmloff/source/text/XMLSectionExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -364,3 +365,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 2d2e1671f1..46d01c12d1 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <com/sun/star/style/NumberingType.hpp> #include <xmloff/maptype.hxx> -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #include <xmloff/nmspmap.hxx> #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> @@ -200,3 +199,5 @@ void XMLSectionFootnoteConfigExport::exportXML( sal_True, sal_True); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx index c0243fc51c..71ff0427c5 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index b6bc22892b..89e0bc4b6c 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -193,3 +194,5 @@ void XMLSectionFootnoteConfigImport::StartElement( XMLPropertyState aEndState( nIndex, aAny ); rProperties.push_back( aEndState ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index 2db1232da9..667cffe2b6 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 03adbea011..bc402adedf 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,7 +81,7 @@ enum XMLSectionToken XML_TOK_SECTION_IS_HIDDEN }; -static __FAR_DATA SvXMLTokenMapEntry aSectionTokenMap[] = +static SvXMLTokenMapEntry aSectionTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_SECTION_XMLID }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_SECTION_STYLE_NAME }, @@ -312,7 +313,7 @@ void XMLSectionImportContext::ProcessAttributes( break; case XML_TOK_SECTION_IS_HIDDEN: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttr)) { bIsCurrentlyVisible = !bTmp; @@ -326,7 +327,7 @@ void XMLSectionImportContext::ProcessAttributes( break; case XML_TOK_SECTION_PROTECT: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttr)) { bProtect = bTmp; @@ -404,3 +405,4 @@ SvXMLImportContext* XMLSectionImportContext::CreateChildContext( return pContext; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 196aeebe57..330497ed8f 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index 070943afa9..8efb923fd1 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,7 +87,7 @@ enum XMLSectionSourceDDEToken XML_TOK_SECTION_IS_AUTOMATIC_UPDATE }; -static __FAR_DATA SvXMLTokenMapEntry aSectionSourceDDETokenMap[] = +static SvXMLTokenMapEntry aSectionSourceDDETokenMap[] = { { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_SECTION_DDE_APPLICATION }, @@ -128,7 +129,7 @@ void XMLSectionSourceDDEImportContext::StartElement( break; case XML_TOK_SECTION_IS_AUTOMATIC_UPDATE: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool( bTmp, xAttrList->getValueByIndex(nAttr))) { @@ -184,3 +185,5 @@ SvXMLImportContext* XMLSectionSourceDDEImportContext::CreateChildContext( // ignore -> default context return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index e38cf9f40c..fe15dca0a4 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 5a5b12f03d..c917511194 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,7 +74,7 @@ enum XMLSectionSourceToken XML_TOK_SECTION_TEXT_SECTION_NAME }; -static __FAR_DATA SvXMLTokenMapEntry aSectionSourceTokenMap[] = +static SvXMLTokenMapEntry aSectionSourceTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF }, { XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME }, @@ -154,3 +155,5 @@ SvXMLImportContext* XMLSectionSourceImportContext::CreateChildContext( // ignore -> default context return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index b93bcedcc8..b9d6a2a91d 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index 44ef2826ff..1850fc62c9 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,4 @@ void XMLStringBufferImportContext::EndElement() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index a8565e0045..97227cb3db 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ XMLTextCharStyleNamesElementExport::~XMLTextCharStyleNamesElementExport() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx index 5463a62b3d..0782267166 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index aabf756f12..f843cc57d1 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ enum SvXMLSepTokenMapAttrs XML_TOK_COLUMN_SEP_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] = +static SvXMLTokenMapEntry aColAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_COLUMN_WIDTH }, { XML_NAMESPACE_FO, XML_START_INDENT, XML_TOK_COLUMN_MARGIN_LEFT }, @@ -78,7 +79,7 @@ static __FAR_DATA SvXMLTokenMapEntry aColAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] = +static SvXMLTokenMapEntry aColSepAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_WIDTH, XML_TOK_COLUMN_SEP_WIDTH }, { XML_NAMESPACE_STYLE, XML_COLOR, XML_TOK_COLUMN_SEP_COLOR }, @@ -87,7 +88,7 @@ static __FAR_DATA SvXMLTokenMapEntry aColSepAttrTokenMap[] = XML_TOKEN_MAP_END }; -SvXMLEnumMapEntry __READONLY_DATA pXML_Sep_Align_Enum[] = +SvXMLEnumMapEntry const pXML_Sep_Align_Enum[] = { { XML_TOP, VerticalAlignment_TOP }, { XML_MIDDLE, VerticalAlignment_MIDDLE }, @@ -501,3 +502,5 @@ void XMLTextColumnsContext::EndElement( ) XMLElementPropertyContext::EndElement(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx index 01f4627645..b22af2581e 100644 --- a/xmloff/source/text/XMLTextColumnsExport.cxx +++ b/xmloff/source/text/XMLTextColumnsExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ void XMLTextColumnsExport::exportXML( const Any& rAny ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 366091f90b..d79b6509ba 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,7 +121,7 @@ inline XMLTextFrameContextHyperlink_Impl::XMLTextFrameContextHyperlink_Impl( { } -// --> OD 2009-07-22 #i73249# +// Implement Title/Description Elements UI (#i73249#) class XMLTextFrameTitleOrDescContext_Impl : public SvXMLImportContext { OUString& mrTitleOrDesc; @@ -158,7 +159,6 @@ void XMLTextFrameTitleOrDescContext_Impl::Characters( const OUString& rText ) { mrTitleOrDesc += rText; } -// <-- // ------------------------------------------------------------------------ @@ -382,11 +382,8 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext const ::rtl::OUString sAnchorPageNo; const ::rtl::OUString sGraphicURL; const ::rtl::OUString sGraphicFilter; - // --> OD 2009-07-22 #i73249# -// const ::rtl::OUString sAlternativeText; const ::rtl::OUString sTitle; const ::rtl::OUString sDescription; - // <-- const ::rtl::OUString sFrameStyleName; const ::rtl::OUString sGraphicRotation; const ::rtl::OUString sTextBoxServiceName; @@ -462,9 +459,10 @@ public: const ::rtl::OUString& rName, const ::rtl::OUString& rTargetFrameName, sal_Bool bMap ); - // --> OD 2009-07-22 #i73249# + + // Implement Title/Description Elements UI (#i73249#) void SetTitle( const ::rtl::OUString& rTitle ); - // <-- + void SetDesc( const ::rtl::OUString& rDesc ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { return eAnchorType; } @@ -833,11 +831,8 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( , sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")) , sGraphicURL(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) , sGraphicFilter(RTL_CONSTASCII_USTRINGPARAM("GraphicFilter")) -// --> OD 2009-07-22 #i73249# -//, sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")) , sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")) , sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")) -// <-- , sFrameStyleName(RTL_CONSTASCII_USTRINGPARAM("FrameStyleName")) , sGraphicRotation(RTL_CONSTASCII_USTRINGPARAM("GraphicRotation")) , sTextBoxServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")) @@ -1144,15 +1139,13 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext( } } } - // --> OD 2009-08-17 #i100480# - // correction of condition which also avoids warnings. + // Correction of condition which also avoids warnings. (#i100480#) if( !pContext && ( XML_TEXT_FRAME_OBJECT == nType && ( ( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_DOCUMENT ) ) || ( XML_NAMESPACE_MATH == nPrefix && IsXMLToken( rLocalName, XML_MATH ) ) ) ) ) - // <-- { if( !xPropSet.is() && !bCreateFailed ) { @@ -1282,7 +1275,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, } } -// --> OD 2009-07-22 #i73249# +// Implement Title/Description Elements UI (#i73249#) void XMLTextFrameContext_Impl::SetTitle( const OUString& rTitle ) { if ( xPropSet.is() ) @@ -1306,7 +1299,6 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc ) } } } -// <-- //----------------------------------------------------------------------------------------------------- @@ -1345,14 +1337,12 @@ XMLTextFrameContext::XMLTextFrameContext( : SvXMLImportContext( rImport, nPrfx, rLName ) , m_xAttrList( new SvXMLAttributeList( xAttrList ) ) , m_pHyperlink( 0 ) -// --> OD 2009-07-22 #i73249# + // Implement Title/Description Elements UI (#i73249#) , m_sTitle() , m_sDesc() -// <-- , m_eDefaultAnchorType( eATyp ) - // --> OD 2006-03-10 #i51726# + // Shapes in Writer cannot be named via context menu (#i51726#) , m_HasAutomaticStyleWithoutParentStyle( sal_False ) - // <-- , m_bSupportsReplacement( sal_False ) { sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -1363,9 +1353,8 @@ XMLTextFrameContext::XMLTextFrameContext( OUString aLocalName; sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); - // --> OD 2006-03-10 #i51726# // New distinguish attribute between Writer objects and Draw objects is: - // Draw objects have an automatic style without a parent style + // Draw objects have an automatic style without a parent style (#i51726#) if ( XML_NAMESPACE_DRAW == nPrefix && IsXMLToken( aLocalName, XML_STYLE_NAME ) ) { @@ -1382,7 +1371,6 @@ XMLTextFrameContext::XMLTextFrameContext( } } } - // <-- else if ( XML_NAMESPACE_TEXT == nPrefix && IsXMLToken( aLocalName, XML_ANCHOR_TYPE ) ) { @@ -1411,11 +1399,6 @@ void XMLTextFrameContext::EndElement() { pImpl->CreateIfNotThere(); - // --> OD 2009-07-22 #i73249# -// // alternative text -// if( m_sDesc.getLength() ) -// pImpl->SetDesc( m_sDesc ); - // svg:title if( m_sTitle.getLength() ) { pImpl->SetTitle( m_sTitle ); @@ -1424,7 +1407,6 @@ void XMLTextFrameContext::EndElement() { pImpl->SetDesc( m_sDesc ); } - // <-- if( m_pHyperlink ) { @@ -1467,11 +1449,10 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( if( USHRT_MAX != nFrameType ) { - // --> OD 2006-03-10 #i51726# + // Shapes in Writer cannot be named via context menu (#i51726#) if ( ( XML_TEXT_FRAME_TEXTBOX == nFrameType || XML_TEXT_FRAME_GRAPHIC == nFrameType ) && m_HasAutomaticStyleWithoutParentStyle ) - // <-- { Reference < XShapes > xShapes; pContext = GetImport().GetShapeImport()->CreateFrameChildContext( @@ -1542,11 +1523,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( // the child is a writer frame if( XML_NAMESPACE_SVG == p_nPrefix ) { - // --> OD 2009-07-22 #i73249# -// bool bOld = SvXMLImport::OOo_2x >= GetImport().getGeneratorVersion(); -// if( IsXMLToken( rLocalName, bOld ? XML_DESC : XML_TITLE ) ) -// pContext = new XMLTextFrameDescContext_Impl( GetImport(), p_nPrefix, rLocalName, -// xAttrList, m_sDesc ); + // Implement Title/Description Elements UI (#i73249#) const bool bOld = SvXMLImport::OOo_2x >= GetImport().getGeneratorVersion(); if ( bOld ) { @@ -1575,7 +1552,6 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( m_sDesc ); } } - // <-- } else if( XML_NAMESPACE_DRAW == p_nPrefix ) { @@ -1665,7 +1641,6 @@ Reference < XTextContent > XMLTextFrameContext::GetTextContent() const return xTxtCntnt; } -// --> OD 2004-08-24 #33242# Reference < XShape > XMLTextFrameContext::GetShape() const { Reference < XShape > xShape; @@ -1678,4 +1653,5 @@ Reference < XShape > XMLTextFrameContext::GetShape() const return xShape; } -// <-- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index ed66c43555..68ff6f518b 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #ifndef _XMLTEXTFRAMECONTEXT_HXX #define _XMLTEXTFRAMECONTEXT_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif #include <xmloff/xmlictxt.hxx> namespace com { namespace sun { namespace star { @@ -50,20 +49,19 @@ class XMLTextFrameContext : public SvXMLImportContext SvXMLAttributeList *m_pAttrList; XMLTextFrameContextHyperlink_Impl *m_pHyperlink; - // --> OD 2009-07-22 #i73249# + // Implement Title/Description Elements UI (#i73249#) ::rtl::OUString m_sTitle; - // <-- ::rtl::OUString m_sDesc; ::com::sun::star::text::TextContentAnchorType m_eDefaultAnchorType; - // --> OD 2006-03-10 #i51726# - // The <draw:name> can longer be used to distinguish Writer graphic/text box - // objects and Draw graphic/text box objects. - // The new distinguish attribute is the parent style of the automatic style - // of the object. All Draw objects have an automatic style without a parent style. + /* The <draw:name> can longer be used to distinguish Writer graphic/text box + objects and Draw graphic/text box objects. + The new distinguish attribute is the parent style of the automatic style + of the object. All Draw objects have an automatic style without a parent style. + (#i51726#) + */ sal_Bool m_HasAutomaticStyleWithoutParentStyle; - // <-- sal_Bool m_bSupportsReplacement; sal_Bool CreateIfNotThere(); @@ -98,11 +96,13 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > GetTextContent() const; - // --> OD 2004-08-24 #i33242# + + // Frame "to character": anchor moves from first to last char after saving (#i33242#) ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > GetShape() const; - // <-- }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index 22577c3b81..897334cc97 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,7 +89,7 @@ XMLTextFrameHyperlinkContext::XMLTextFrameHyperlinkContext( break; case XML_TOK_TEXT_HYPERLINK_SERVER_MAP: { - sal_Bool bTmp; + bool bTmp; if( rImport.GetMM100UnitConverter().convertBool( bTmp, rValue ) ) { @@ -171,7 +172,7 @@ Reference < XTextContent > XMLTextFrameHyperlinkContext::GetTextContent() const return xTxt; } -// --> OD 2004-08-24 #33242# +// Frame "to character": anchor moves from first to last char after saving (#i33242#) Reference < drawing::XShape > XMLTextFrameHyperlinkContext::GetShape() const { Reference < drawing::XShape > xShape; @@ -183,6 +184,5 @@ Reference < drawing::XShape > XMLTextFrameHyperlinkContext::GetShape() const return xShape; } -// <-- - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index 7fdd058a54..9a4d614558 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,12 +29,8 @@ #ifndef _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX #define _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_XTEXTFRAME_HPP #include <com/sun/star/text/XTextFrame.hpp> -#endif #include <xmloff/xmlictxt.hxx> namespace com { namespace sun { namespace star { @@ -73,13 +70,16 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); ::com::sun::star::text::TextContentAnchorType GetAnchorType() const; + ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > GetTextContent() const; - // --> OD 2004-08-24 #i33242# + + // Frame "to character": anchor moves from first to last char after saving (#i33242#) ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > GetShape() const; - // <-- }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 8b5f19988f..554d713bc2 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <xmloff/nmspmap.hxx> #include "xmloff/xmlnmspe.hxx" #include "XMLTextHeaderFooterContext.hxx" -#ifndef _XMLOFF_TEXTTABLECONTEXT_HXX_ #include <xmloff/XMLTextTableContext.hxx> -#endif #include <xmloff/xmlimp.hxx> @@ -62,12 +61,12 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa sal_Bool bFooter, sal_Bool bLft ) : SvXMLImportContext( rImport, nPrfx, rLName ), xPropSet( rPageStylePropSet ), - sOn( OUString::createFromAscii( bFooter ? "FooterIsOn" : "HeaderIsOn" ) ), - sShareContent( OUString::createFromAscii( bFooter ? "FooterIsShared" - : "HeaderIsShared" ) ), - sText( OUString::createFromAscii( bFooter ? "FooterText" : "HeaderText" ) ), - sTextLeft( OUString::createFromAscii( bFooter ? "FooterTextLeft" - : "HeaderTextLeft" ) ), + sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsOn" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsOn" )) ), + sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterIsShared" )) + : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderIsShared" )) ), + sText( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterText" )) : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderText" )) ), + sTextLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM( "FooterTextLeft" )) + : OUString(RTL_CONSTASCII_USTRINGPARAM( "HeaderTextLeft" )) ), bInsertContent( sal_True ), bLeft( bLft ) { @@ -196,3 +195,4 @@ void XMLTextHeaderFooterContext::EndElement() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 18d5c262ef..94b9251c85 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -317,3 +318,4 @@ void XMLTextListAutoStylePool::exportXML() const } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 7a0a84f392..c7bac027fd 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,20 +65,13 @@ XMLTextListBlockContext::XMLTextListBlockContext( const sal_Bool bRestartNumberingAtSubList ) : SvXMLImportContext( rImport, nPrfx, rLName ) , mrTxtImport( rTxtImp ) -// --> OD 2008-04-22 #refactorlists# , msListStyleName() -// <-- , mxParentListBlock( ) , mnLevel( 0 ) -// --> OD 2008-05-07 #refactorlists# -//, mbRestartNumbering( sal_True ) , mbRestartNumbering( sal_False ) -// <-- , mbSetDefaults( sal_False ) -// --> OD 2008-04-22 #refactorlists# , msListId() , msContinueListId() -// <-- { static ::rtl::OUString s_PropNameDefaultListId( RTL_CONSTASCII_USTRINGPARAM("DefaultListId")); @@ -92,9 +86,7 @@ XMLTextListBlockContext::XMLTextListBlockContext( // Inherit style name from parent list, as well as the flags whether // numbering must be restarted and formats have to be created. OUString sParentListStyleName; - // --> OD 2008-11-27 #158694# sal_Bool bParentRestartNumbering( sal_False ); - // <-- if( mxParentListBlock.Is() ) { XMLTextListBlockContext *pParent = @@ -103,26 +95,17 @@ XMLTextListBlockContext::XMLTextListBlockContext( sParentListStyleName = msListStyleName; mxNumRules = pParent->GetNumRules(); mnLevel = pParent->GetLevel() + 1; - // --> OD 2008-05-07 #refactorlists# -// mbRestartNumbering = pParent->IsRestartNumbering(); mbRestartNumbering = pParent->IsRestartNumbering() || bRestartNumberingAtSubList; - // <-- - // --> OD 2008-11-27 #158694# bParentRestartNumbering = pParent->IsRestartNumbering(); - // <-- mbSetDefaults = pParent->mbSetDefaults; - // --> OD 2008-04-22 #refactorlists# msListId = pParent->GetListId(); msContinueListId = pParent->GetContinueListId(); - // <-- } const SvXMLTokenMap& rTokenMap = mrTxtImport.GetTextListBlockAttrTokenMap(); - // --> OD 2008-05-07 #refactorlists# bool bIsContinueNumberingAttributePresent( false ); - // <-- sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { @@ -138,23 +121,19 @@ XMLTextListBlockContext::XMLTextListBlockContext( case XML_TOK_TEXT_LIST_BLOCK_XMLID: sXmlId = rValue; //FIXME: there is no UNO API for lists - // --> OD 2008-07-31 #i92221# - xml:id is also the list ID + // xml:id is also the list ID (#i92221#) if ( mnLevel == 0 ) // root <list> element { msListId = rValue; } - // <-- break; case XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING: mbRestartNumbering = !IsXMLToken(rValue, XML_TRUE); - // --> OD 2008-05-07 #refactorlists# bIsContinueNumberingAttributePresent = true; - // <-- break; case XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME: msListStyleName = rValue; break; - // --> OD 2008-04-22 #refactorlists# case XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST: if ( mnLevel == 0 ) // root <list> element { @@ -170,11 +149,10 @@ XMLTextListBlockContext::XMLTextListBlockContext( if( !mxNumRules.is() ) return; - // --> OD 2008-04-23 #refactorlists# if ( mnLevel == 0 ) // root <list> element { XMLTextListsHelper& rTextListsHelper( mrTxtImport.GetTextListHelper() ); - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#) ::rtl::OUString sListStyleDefaultListId; { uno::Reference< beans::XPropertySet > xNumRuleProps( mxNumRules, UNO_QUERY ); @@ -193,7 +171,6 @@ XMLTextListBlockContext::XMLTextListBlockContext( } } } - // <-- if ( msListId.getLength() == 0 ) // no text:id property found { sal_Int32 nUPD( 0 ); @@ -202,9 +179,10 @@ XMLTextListBlockContext::XMLTextListBlockContext( if ( rImport.IsTextDocInOOoFileFormat() || ( bBuildIdFound && nUPD == 680 ) ) { - // handling former documents written by OpenOffice.org: - // use default list id of numbering rules instance, if existing - // --> OD 2008-08-15 #i92811# + /* handling former documents written by OpenOffice.org: + use default list id of numbering rules instance, if existing + (#i92811#) + */ if ( sListStyleDefaultListId.getLength() != 0 ) { msListId = sListStyleDefaultListId; @@ -215,7 +193,6 @@ XMLTextListBlockContext::XMLTextListBlockContext( mbRestartNumbering = sal_True; } } - // <-- } if ( msListId.getLength() == 0 ) { @@ -259,14 +236,12 @@ XMLTextListBlockContext::XMLTextListBlockContext( if ( !rTextListsHelper.IsListProcessed( msListId ) ) { - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#) rTextListsHelper.KeepListAsProcessed( msListId, msListStyleName, msContinueListId, sListStyleDefaultListId ); - // <-- } } - // <-- // Remember this list block. mrTxtImport.GetTextListHelper().PushListContext( this ); @@ -322,7 +297,6 @@ SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( return pContext; } -// --> OD 2008-04-22 #refactorlists# const ::rtl::OUString& XMLTextListBlockContext::GetListId() const { return msListId; @@ -332,5 +306,5 @@ const ::rtl::OUString& XMLTextListBlockContext::GetContinueListId() const { return msContinueListId; } -// <-- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index b62e07e777..ae9ebc3ff9 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,18 +51,15 @@ class XMLTextListBlockContext : public SvXMLImportContext sal_Bool mbRestartNumbering; sal_Bool mbSetDefaults; - // --> OD 2008-04-22 #refactorlists# // text:id property of <list> element, only valid for root <list> element ::rtl::OUString msListId; // text:continue-list property of <list> element, only valid for root <list> element ::rtl::OUString msContinueListId; - // <-- public: TYPEINFO(); - // --> OD 2008-05-07 #refactorlists# // add optional parameter <bRestartNumberingAtSubList> XMLTextListBlockContext( SvXMLImport& rImport, @@ -71,7 +69,6 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const sal_Bool bRestartNumberingAtSubList = sal_False ); - // <-- virtual ~XMLTextListBlockContext(); virtual void EndElement(); @@ -90,12 +87,11 @@ public: ::com::sun::star::container::XIndexReplace >& GetNumRules() const { return mxNumRules; } - // --> OD 2008-04-22 #refactorlists# const ::rtl::OUString& GetListId() const; const ::rtl::OUString& GetContinueListId() const; - // <-- - }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 4ccc9c4750..663782a49e 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,15 +37,11 @@ #include "txtlists.hxx" #include "XMLTextListBlockContext.hxx" #include <xmloff/txtimp.hxx> -// --> OD 2008-05-08 #refactorlists# #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/style/XStyle.hpp> #include <xmloff/xmlnumi.hxx> -// <-- - #include "XMLTextListItemContext.hxx" - using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -64,10 +61,8 @@ XMLTextListItemContext::XMLTextListItemContext( : SvXMLImportContext( rImport, nPrfx, rLName ), rTxtImport( rTxtImp ), nStartValue( -1 ), - // --> OD 2008-05-07 #refactorlists# mnSubListCount( 0 ), mxNumRulesOverride() - // <-- { static ::rtl::OUString s_NumberingRules( RTL_CONSTASCII_USTRINGPARAM("NumberingRules")); @@ -88,7 +83,6 @@ XMLTextListItemContext::XMLTextListItemContext( if( nTmp >= 0 && nTmp <= SHRT_MAX ) nStartValue = (sal_Int16)nTmp; } - // --> OD 2008-05-08 #refactorlists# else if ( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( aLocalName, XML_STYLE_OVERRIDE ) ) { @@ -126,7 +120,6 @@ XMLTextListItemContext::XMLTextListItemContext( } } } - // <-- else if ( (XML_NAMESPACE_XML == nPrefix) && IsXMLToken(aLocalName, XML_ID) ) { @@ -175,16 +168,11 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext( break; case XML_TOK_TEXT_LIST: - // --> OD 2008-05-07 #refactorlists# -// pContext = new XMLTextListBlockContext( GetImport(), rTxtImport, -// nPrefix, rLocalName, -// xAttrList ); ++mnSubListCount; pContext = new XMLTextListBlockContext( GetImport(), rTxtImport, nPrefix, rLocalName, xAttrList, (mnSubListCount > 1) ); - // <-- break; } @@ -194,4 +182,4 @@ SvXMLImportContext *XMLTextListItemContext::CreateChildContext( return pContext; } - +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 5415210ccc..ac4c6bdbb2 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,13 +39,11 @@ class XMLTextListItemContext : public SvXMLImportContext sal_Int16 nStartValue; - // --> OD 2008-05-07 #refactorlists# // quantity of <text:list> child elements sal_Int16 mnSubListCount; // list style instance for text::style-override property ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > mxNumRulesOverride; - // <-- public: @@ -70,7 +69,6 @@ public: sal_Bool HasStartValue() const { return -1 != nStartValue; } sal_Int16 GetStartValue() const { return nStartValue; } - // --> OD 2008-05-08 #refactorlists# inline sal_Bool HasNumRulesOverride() const { return mxNumRulesOverride.is(); @@ -84,3 +82,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 5a3a737a53..0432046e28 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,6 +65,8 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; +using rtl::OUString; + XMLFieldParamImportContext::XMLFieldParamImportContext( SvXMLImport& rImport, @@ -125,7 +128,7 @@ enum lcl_MarkType { TypeReference, TypeReferenceStart, TypeReferenceEnd, TypeFieldmark, TypeFieldmarkStart, TypeFieldmarkEnd }; -static SvXMLEnumMapEntry __READONLY_DATA lcl_aMarkTypeMap[] = +static SvXMLEnumMapEntry const lcl_aMarkTypeMap[] = { { XML_REFERENCE_MARK, TypeReference }, { XML_REFERENCE_MARK_START, TypeReferenceStart }, @@ -183,7 +186,7 @@ void XMLTextMarkImportContext::StartElement( { if (m_sBookmarkName.getLength() == 0) { - m_sBookmarkName = ::rtl::OUString::createFromAscii("Unknown"); + m_sBookmarkName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown")); } m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName ); } @@ -483,3 +486,4 @@ sal_Bool XMLTextMarkImportContext::FindName( return bNameOK; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index bd03d72edb..beb11fcef0 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 3ef9a98410..b62363d5c5 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -291,3 +292,5 @@ void XMLTextMasterPageContext::Finish( sal_Bool bOverwrite ) } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx index 361cb0dbd4..2eecd2ed25 100644 --- a/xmloff/source/text/XMLTextMasterPageExport.cxx +++ b/xmloff/source/text/XMLTextMasterPageExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,4 @@ void XMLTextMasterPageExport::exportMasterPageContent( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx index 4f957ea425..8a98545ea9 100644 --- a/xmloff/source/text/XMLTextMasterStylesContext.cxx +++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,12 +36,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include <xmloff/XMLTextMasterPageContext.hxx> -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include <xmloff/XMLTextMasterStylesContext.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -100,3 +97,5 @@ SvXMLStyleContext *XMLTextMasterStylesContext::CreateStyleStyleChildContext( { return 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index f56d067c90..ba8c066a67 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,7 +47,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; -// --> OD 2008-05-08 #refactorlists# // Complete refactoring of the class and enhancement of the class for lists. XMLTextNumRuleInfo::XMLTextNumRuleInfo() : msNumberingRules(RTL_CONSTASCII_USTRINGPARAM("NumberingRules")) @@ -57,10 +57,8 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() , msNumberingIsOutline(RTL_CONSTASCII_USTRINGPARAM("NumberingIsOutline")) , msPropNameListId(RTL_CONSTASCII_USTRINGPARAM("ListId")) , msPropNameStartWith(RTL_CONSTASCII_USTRINGPARAM("StartWith")) - // --> OD 2008-11-26 #158694# , msContinueingPreviousSubTree(RTL_CONSTASCII_USTRINGPARAM("ContinueingPreviousSubTree")) , msListLabelStringProp(RTL_CONSTASCII_USTRINGPARAM("ListLabelString")) - // <-- , mxNumRules() , msNumRulesName() , msListId() @@ -74,20 +72,17 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo() Reset(); } -// --> OD 2006-09-27 #i69627# +// Written OpenDocument file format doesn't fit to the created text document (#i69627#) void XMLTextNumRuleInfo::Set( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & xTextContent, const sal_Bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, - // --> OD 2008-11-26 #158694# const sal_Bool bExportTextNumberElement ) - // <-- { Reset(); - // --> OD 2006-09-27 #i69627# + // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbOutlineStyleAsNormalListStyle = bOutlineStyleAsNormalListStyle; - // <-- Reference< XPropertySet > xPropSet( xTextContent, UNO_QUERY ); Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); @@ -110,7 +105,7 @@ void XMLTextNumRuleInfo::Set( mnListLevel = 0; } - // --> OD 2008-12-17 #i97312# + // Assertion saving writer document (#i97312#) if ( mxNumRules.is() && mxNumRules->getCount() < 1 ) { DBG_ASSERT( false, @@ -118,7 +113,6 @@ void XMLTextNumRuleInfo::Set( Reset(); return; } - // <-- // --> OD 2010-01-13 #b6912256# if ( mnListLevel < 0 ) @@ -148,7 +142,6 @@ void XMLTextNumRuleInfo::Set( } if( mxNumRules.is() && !bSuppressListStyle ) - // <-- { // First try to find the numbering rules in the list auto style pool. // If not found, the numbering rules instance has to be named. @@ -171,13 +164,11 @@ void XMLTextNumRuleInfo::Set( xPropSet->getPropertyValue( msPropNameListId ) >>= msListId; } - // --> OD 2008-11-26 #158694# mbContinueingPreviousSubTree = sal_False; if( xPropSetInfo->hasPropertyByName( msContinueingPreviousSubTree ) ) { xPropSet->getPropertyValue( msContinueingPreviousSubTree ) >>= mbContinueingPreviousSubTree; } - // <-- mbIsNumbered = sal_True; if( xPropSetInfo->hasPropertyByName( msNumberingIsNumber ) ) @@ -224,14 +215,12 @@ void XMLTextNumRuleInfo::Set( } } - // --> OD 2008-11-26 #158694# msListLabelString = ::rtl::OUString(); if ( bExportTextNumberElement && xPropSetInfo->hasPropertyByName( msListLabelStringProp ) ) { xPropSet->getPropertyValue( msListLabelStringProp ) >>= msListLabelString; } - // <-- // paragraph's list level range is [0..9] representing list levels [1..10] ++mnListLevel; @@ -258,4 +247,5 @@ sal_Bool XMLTextNumRuleInfo::BelongsToSameList( const XMLTextNumRuleInfo& rCmp ) return bRet; } -// <-- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextNumRuleInfo.hxx b/xmloff/source/text/XMLTextNumRuleInfo.hxx index 448ef39efd..2c487c2ced 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.hxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,10 +55,8 @@ class XMLTextNumRuleInfo const ::rtl::OUString msNumberingIsOutline; const ::rtl::OUString msPropNameListId; const ::rtl::OUString msPropNameStartWith; - // --> OD 2008-11-26 #158694# const ::rtl::OUString msContinueingPreviousSubTree; const ::rtl::OUString msListLabelStringProp; - // <-- // numbering rules instance and its name ::com::sun::star::uno::Reference < @@ -72,31 +71,25 @@ class XMLTextNumRuleInfo sal_Bool mbIsRestart; // numbering rules' attributes - // --> OD 2008-05-07 #refactorlists# sal_Int16 mnListLevelStartValue; - // <-- - // --> OD 2006-09-27 #i69627# + // Written OpenDocument file format doesn't fit to the created text document (#i69627#) sal_Bool mbOutlineStyleAsNormalListStyle; - // <-- - // --> OD 2008-11-26 #158694# sal_Bool mbContinueingPreviousSubTree; ::rtl::OUString msListLabelString; - // <-- + public: XMLTextNumRuleInfo(); inline XMLTextNumRuleInfo& operator=( const XMLTextNumRuleInfo& rInfo ); - // --> OD 2008-11-26 #158694# void Set( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContnt, const sal_Bool bOutlineStyleAsNormalListStyle, const XMLTextListAutoStylePool& rListAutoPool, const sal_Bool bExportTextNumberElement ); - // <-- inline void Reset(); inline const ::rtl::OUString& GetNumRulesName() const @@ -148,7 +141,6 @@ public: return rCmp.msNumRulesName == msNumRulesName; } - // --> OD 2008-11-26 #158694# inline sal_Bool IsContinueingPreviousSubTree() const { return mbContinueingPreviousSubTree; @@ -157,7 +149,6 @@ public: { return msListLabelString; } - // <-- }; inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=( @@ -170,13 +161,10 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=( mnListLevel = rInfo.mnListLevel; mbIsNumbered = rInfo.mbIsNumbered; mbIsRestart = rInfo.mbIsRestart; - // --> OD 2006-09-27 #i69627# + // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbOutlineStyleAsNormalListStyle = rInfo.mbOutlineStyleAsNormalListStyle; - // <-- - // --> OD 2008-11-26 #158694# mbContinueingPreviousSubTree = rInfo.mbContinueingPreviousSubTree; msListLabelString = rInfo.msListLabelString; - // <-- return *this; } @@ -188,13 +176,12 @@ inline void XMLTextNumRuleInfo::Reset() msListId = ::rtl::OUString(); mnListStartValue = -1; mnListLevel = 0; - // --> OD 2006-09-27 #i69627# + // Written OpenDocument file format doesn't fit to the created text document (#i69627#) mbIsNumbered = mbIsRestart = mbOutlineStyleAsNormalListStyle = sal_False; - // <-- - // --> OD 2008-11-26 #158694# mbContinueingPreviousSubTree = sal_False; msListLabelString = ::rtl::OUString(); - // <-- } #endif // _XMLOFF_XMLTEXTNUMRULEINFO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 056037ac89..8470aea7ca 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,13 +34,9 @@ #include "XMLBackgroundImageContext.hxx" #include "XMLSectionFootnoteConfigImport.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif #include "xmltabi.hxx" -#ifndef _XMLOFF_TXTDROPI_HXX #include "txtdropi.hxx" -#endif using ::rtl::OUString; @@ -156,3 +153,4 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index e6f3d743df..15a18c184a 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ public: #endif // _XMLOFF_XMLTEXTPROPERTYSETCONTEXT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 9978517d7e..b2c309a22c 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <com/sun/star/text/XTextContent.hpp> -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _XMLOFF_XMLTIMP_HXX_ #include <xmloff/xmlimp.hxx> -#endif #include <xmloff/txtimp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> @@ -164,3 +161,5 @@ void XMLTextShapeImportHelper::addShape( break; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index d254d84786..b5115a7861 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTSSUPPLIER_HPP #include <com/sun/star/document/XEventsSupplier.hpp> #endif #include "xmloff/xmlnmspe.hxx" @@ -39,13 +39,9 @@ #include "XMLShapePropertySetContext.hxx" #include "XMLTextColumnsContext.hxx" #include "XMLBackgroundImageContext.hxx" -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif -#ifndef _XMLOFF_XMLTEXTSHAPESTYLECONTEXT_HXX #include <xmloff/XMLTextShapeStyleContext.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -253,3 +249,5 @@ void XMLTextShapeStyleContext::Finish( sal_Bool bOverwrite ) { XMLPropStyleContext::Finish( bOverwrite ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx index e7a551e28d..5eae3a5cb6 100644 --- a/xmloff/source/text/XMLTextTableContext.cxx +++ b/xmloff/source/text/XMLTextTableContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ XMLTextTableContext::XMLTextTableContext( XMLTextTableContext::~XMLTextTableContext() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index 6005bcb6e2..598e5efc84 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,7 +78,7 @@ void XMLTrackedChangesImportContext::StartElement( { if ( IsXMLToken( sLocalName, XML_TRACK_CHANGES ) ) { - sal_Bool bTmp; + bool bTmp; if( SvXMLUnitConverter::convertBool( bTmp, xAttrList->getValueByIndex(i)) ) { @@ -114,3 +115,5 @@ SvXMLImportContext* XMLTrackedChangesImportContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index 323b747c7d..b906ffe97b 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx index 43f18fe375..0b090b26db 100644 --- a/xmloff/source/text/txtdrope.cxx +++ b/xmloff/source/text/txtdrope.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,4 @@ void XMLTextDropCapExport::exportXML( const Any& rAny, +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx index 682dd3969c..b6faee61c5 100644 --- a/xmloff/source/text/txtdrope.hxx +++ b/xmloff/source/text/txtdrope.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx index ef6ddecdf5..e7f708e07e 100644 --- a/xmloff/source/text/txtdropi.cxx +++ b/xmloff/source/text/txtdropi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,7 +55,7 @@ enum SvXMLTokenMapDropAttrs XML_TOK_DROP_END=XML_TOK_UNKNOWN }; -static __FAR_DATA SvXMLTokenMapEntry aDropAttrTokenMap[] = +static SvXMLTokenMapEntry aDropAttrTokenMap[] = { { XML_NAMESPACE_STYLE, XML_LINES, XML_TOK_DROP_LINES }, { XML_NAMESPACE_STYLE, XML_LENGTH, XML_TOK_DROP_LENGTH }, @@ -152,3 +153,4 @@ void XMLTextDropCapImportContext::EndElement() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 4584cd1a7e..19c83ba6b0 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index d148d78b0a..16ec08ece7 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include <tools/debug.hxx> #include <xmloff/txtprmap.hxx> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> @@ -408,13 +409,12 @@ void XMLTextExportPropertySetMapper::ContextFilter( XMLPropertyState* pHoriOrientRelState = NULL; XMLPropertyState* pHoriOrientRelFrameState = NULL; XMLPropertyState* pHoriOrientMirrorState = NULL; - // --> OD 2004-08-09 #i28749# - horizontal position and relation for shapes + // Horizontal position and relation for shapes (#i28749#) XMLPropertyState* pShapeHoriOrientState = NULL; XMLPropertyState* pShapeHoriOrientMirroredState = NULL; XMLPropertyState* pShapeHoriOrientRelState = NULL; XMLPropertyState* pShapeHoriOrientRelFrameState = NULL; XMLPropertyState* pShapeHoriOrientMirrorState = NULL; - // <-- // vertical position and relation XMLPropertyState* pVertOrientState = NULL; @@ -424,13 +424,12 @@ void XMLTextExportPropertySetMapper::ContextFilter( XMLPropertyState* pVertOrientRelFrameState = NULL; XMLPropertyState* pVertOrientRelAsCharState = NULL; - // --> OD 2004-08-09 #i28749# - vertical position and relation for shapes + // Vertical position and relation for shapes (#i28749#) XMLPropertyState* pShapeVertOrientState = NULL; XMLPropertyState* pShapeVertOrientAtCharState = NULL; XMLPropertyState* pShapeVertOrientRelState = NULL; XMLPropertyState* pShapeVertOrientRelPageState = NULL; XMLPropertyState* pShapeVertOrientRelFrameState = NULL; - // <-- // filter underline color XMLPropertyState* pUnderlineState = NULL; @@ -521,7 +520,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_VERTICALREL_FRAME: pVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; case CTF_VERTICALREL_ASCHAR: pVertOrientRelAsCharState = propertie; bNeedsAnchor = sal_True; break; - // --> OD 2004-08-09 #i28749# - handle new CTFs for shape positioning properties + // Handle new CTFs for shape positioning properties (#i28749#) case CTF_SHAPE_HORIZONTALPOS: pShapeHoriOrientState = propertie; bNeedsAnchor = sal_True; break; case CTF_SHAPE_HORIZONTALPOS_MIRRORED: pShapeHoriOrientMirroredState = propertie; bNeedsAnchor = sal_True; break; case CTF_SHAPE_HORIZONTALREL: pShapeHoriOrientRelState = propertie; bNeedsAnchor = sal_True; break; @@ -532,8 +531,6 @@ void XMLTextExportPropertySetMapper::ContextFilter( case CTF_SHAPE_VERTICALREL: pShapeVertOrientRelState = propertie; bNeedsAnchor = sal_True; break; case CTF_SHAPE_VERTICALREL_PAGE: pShapeVertOrientRelPageState = propertie; bNeedsAnchor = sal_True; break; case CTF_SHAPE_VERTICALREL_FRAME: pShapeVertOrientRelFrameState = propertie; bNeedsAnchor = sal_True; break; - // <-- - case CTF_FONTNAME: pFontNameState = propertie; break; case CTF_FONTFAMILYNAME: pFontFamilyNameState = propertie; break; case CTF_FONTSTYLENAME: pFontStyleNameState = propertie; break; @@ -692,7 +689,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( { if( pLeftBorderWidthState && pRightBorderWidthState && pTopBorderWidthState && pBottomBorderWidthState ) { - table::BorderLine aLeft, aRight, aTop, aBottom; + table::BorderLine2 aLeft, aRight, aTop, aBottom; pLeftBorderWidthState->maValue >>= aLeft; pRightBorderWidthState->maValue >>= aRight; @@ -700,10 +697,13 @@ void XMLTextExportPropertySetMapper::ContextFilter( pBottomBorderWidthState->maValue >>= aBottom; if( aLeft.Color == aRight.Color && aLeft.InnerLineWidth == aRight.InnerLineWidth && aLeft.OuterLineWidth == aRight.OuterLineWidth && aLeft.LineDistance == aRight.LineDistance && + aLeft.LineStyle == aRight.LineStyle && aLeft.Color == aTop.Color && aLeft.InnerLineWidth == aTop.InnerLineWidth && aLeft.OuterLineWidth == aTop.OuterLineWidth && aLeft.LineDistance == aTop.LineDistance && + aLeft.LineStyle == aTop.LineStyle && aLeft.Color == aBottom.Color && aLeft.InnerLineWidth == aBottom.InnerLineWidth && - aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance ) + aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance && + aLeft.LineStyle == aBottom.LineStyle ) { pLeftBorderWidthState->mnIndex = -1; pLeftBorderWidthState->maValue.clear(); @@ -765,7 +765,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( { if( pLeftBorderState && pRightBorderState && pTopBorderState && pBottomBorderState ) { - table::BorderLine aLeft, aRight, aTop, aBottom; + table::BorderLine2 aLeft, aRight, aTop, aBottom; pLeftBorderState->maValue >>= aLeft; pRightBorderState->maValue >>= aRight; @@ -773,10 +773,13 @@ void XMLTextExportPropertySetMapper::ContextFilter( pBottomBorderState->maValue >>= aBottom; if( aLeft.Color == aRight.Color && aLeft.InnerLineWidth == aRight.InnerLineWidth && aLeft.OuterLineWidth == aRight.OuterLineWidth && aLeft.LineDistance == aRight.LineDistance && + aLeft.LineStyle == aRight.LineStyle && aLeft.Color == aTop.Color && aLeft.InnerLineWidth == aTop.InnerLineWidth && aLeft.OuterLineWidth == aTop.OuterLineWidth && aLeft.LineDistance == aTop.LineDistance && + aLeft.LineStyle == aTop.LineStyle && aLeft.Color == aBottom.Color && aLeft.InnerLineWidth == aBottom.InnerLineWidth && - aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance ) + aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance && + aLeft.LineStyle == aBottom.LineStyle ) { pLeftBorderState->mnIndex = -1; pLeftBorderState->maValue.clear(); @@ -926,7 +929,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( pVertOrientRelAsCharState->mnIndex = -1; } - // --> OD 2004-08-09 #i28749# - states for shape positioning properties + // States for shape positioning properties (#i28749#) if ( eAnchor != TextContentAnchorType_AS_CHARACTER && ( GetExport().getExportFlags() & EXPORT_OASIS ) == 0 ) { @@ -985,7 +988,6 @@ void XMLTextExportPropertySetMapper::ContextFilter( if( pShapeVertOrientRelFrameState && TextContentAnchorType_AT_FRAME != eAnchor ) pShapeVertOrientRelFrameState->mnIndex = -1; } - // <-- // list style name: remove list style if it is the default outline style if( pListStyleName != NULL ) @@ -1024,3 +1026,5 @@ bool lcl_IsOutlineStyle(const SvXMLExport &rExport, const OUString & rName) return rName == sOutlineName; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index d797a18ec6..4b6e67d811 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include "txtdrope.hxx" #include "xmloff/xmltabe.hxx" #include "XMLTextColumnsExport.hxx" -#ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX #include "XMLBackgroundImageExport.hxx" -#endif class SvXMLExport; class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper @@ -96,3 +95,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 7b0224ede3..a9a2c08de7 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,77 +94,77 @@ using namespace ::com::sun::star::container; using namespace ::xmloff::token; -static sal_Char __READONLY_DATA FIELD_SERVICE_SENDER[] = "ExtendedUser"; -static sal_Char __READONLY_DATA FIELD_SERVICE_AUTHOR[] = "Author"; -static sal_Char __READONLY_DATA FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; -static sal_Char __READONLY_DATA FIELD_SERVICE_GETEXP[] = "GetExpression"; -static sal_Char __READONLY_DATA FIELD_SERVICE_SETEXP[] = "SetExpression"; -static sal_Char __READONLY_DATA FIELD_SERVICE_USER[] = "User"; -static sal_Char __READONLY_DATA FIELD_SERVICE_INPUT[] = "Input"; -static sal_Char __READONLY_DATA FIELD_SERVICE_USERINPUT[] = "InputUser"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DATETIME[] = "DateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DB_DISPLAY[] = "Database"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DB_NAME[] = "DatabaseName"; -static sal_Char __READONLY_DATA FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; -static sal_Char __READONLY_DATA FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; -static sal_Char __READONLY_DATA FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; -static sal_Char __READONLY_DATA FIELD_SERVICE_FILE_NAME[] = "FileName"; -static sal_Char __READONLY_DATA FIELD_SERVICE_CHAPTER[] = "Chapter"; -static sal_Char __READONLY_DATA FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; -static sal_Char __READONLY_DATA FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_WORD_COUNT[] = "WordCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; -static sal_Char __READONLY_DATA FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; -static sal_Char __READONLY_DATA FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; -static sal_Char __READONLY_DATA FIELD_SERVICE_SHEET_NAME[] = "SheetName"; -static sal_Char __READONLY_DATA FIELD_SERVICE_MACRO[] = "Macro"; -static sal_Char __READONLY_DATA FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DDE[] = "DDE"; -static sal_Char __READONLY_DATA FIELD_SERVICE_URL[] = "URL"; -static sal_Char __READONLY_DATA FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; -static sal_Char __READONLY_DATA FIELD_SERVICE_SCRIPT[] = "Script"; -static sal_Char __READONLY_DATA FIELD_SERVICE_ANNOTATION[] = "Annotation"; -static sal_Char __READONLY_DATA FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; -static sal_Char __READONLY_DATA FIELD_SERVICE_META[] = "MetadataField"; -static sal_Char __READONLY_DATA FIELD_SERVICE_MEASURE[] = "Measure"; -static sal_Char __READONLY_DATA FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; -static sal_Char __READONLY_DATA FIELD_SERVICE_DROP_DOWN[] = "DropDown"; - -SvXMLEnumStringMapEntry __READONLY_DATA aFieldServiceNameMapping[] = +static sal_Char const FIELD_SERVICE_SENDER[] = "ExtendedUser"; +static sal_Char const FIELD_SERVICE_AUTHOR[] = "Author"; +static sal_Char const FIELD_SERVICE_JUMPEDIT[] = "JumpEdit"; +static sal_Char const FIELD_SERVICE_GETEXP[] = "GetExpression"; +static sal_Char const FIELD_SERVICE_SETEXP[] = "SetExpression"; +static sal_Char const FIELD_SERVICE_USER[] = "User"; +static sal_Char const FIELD_SERVICE_INPUT[] = "Input"; +static sal_Char const FIELD_SERVICE_USERINPUT[] = "InputUser"; +static sal_Char const FIELD_SERVICE_DATETIME[] = "DateTime"; +static sal_Char const FIELD_SERVICE_PAGENUMBER[] = "PageNumber"; +static sal_Char const FIELD_SERVICE_DB_NEXT[] = "DatabaseNextSet"; +static sal_Char const FIELD_SERVICE_DB_SELECT[] = "DatabaseNumberOfSet"; +static sal_Char const FIELD_SERVICE_DB_NUMBER[] = "DatabaseSetNumber"; +static sal_Char const FIELD_SERVICE_DB_DISPLAY[] = "Database"; +static sal_Char const FIELD_SERVICE_DB_NAME[] = "DatabaseName"; +static sal_Char const FIELD_SERVICE_CONDITIONAL_TEXT[] = "ConditionalText"; +static sal_Char const FIELD_SERVICE_HIDDEN_TEXT[] = "HiddenText"; +static sal_Char const FIELD_SERVICE_HIDDEN_PARAGRAPH[] = "HiddenParagraph"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR[] = "DocInfo.ChangeAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_AUTHOR2[] = "docinfo.ChangeAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME[] = "DocInfo.ChangeDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CHANGE_DATE_TIME2[] = "docinfo.ChangeDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME[] = "DocInfo.EditTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_EDIT_TIME2[] = "docinfo.EditTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION[] = "DocInfo.Description"; +static sal_Char const FIELD_SERVICE_DOC_INFO_DESCRIPTION2[] = "docinfo.Description"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR[] = "DocInfo.CreateAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_AUTHOR2[] = "docinfo.CreateAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME[] = "DocInfo.CreateDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CREATE_DATE_TIME2[] = "docinfo.CreateDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM[] = "DocInfo.Custom"; +static sal_Char const FIELD_SERVICE_DOC_INFO_CUSTOM2[] = "docinfo.Custom"; +static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR[] = "DocInfo.PrintAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_AUTHOR2[] = "docinfo.PrintAuthor"; +static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME[] = "DocInfo.PrintDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_PRINT_DATE_TIME2[] = "docinfo.PrintDateTime"; +static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS[] = "DocInfo.KeyWords"; +static sal_Char const FIELD_SERVICE_DOC_INFO_KEY_WORDS2[] = "docinfo.KeyWords"; +static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT[] = "DocInfo.Subject"; +static sal_Char const FIELD_SERVICE_DOC_INFO_SUBJECT2[] = "docinfo.Subject"; +static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE[] = "DocInfo.Title"; +static sal_Char const FIELD_SERVICE_DOC_INFO_TITLE2[] = "docinfo.Title"; +static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION[] = "DocInfo.Revision"; +static sal_Char const FIELD_SERVICE_DOC_INFO_REVISION2[] = "docinfo.Revision"; +static sal_Char const FIELD_SERVICE_FILE_NAME[] = "FileName"; +static sal_Char const FIELD_SERVICE_CHAPTER[] = "Chapter"; +static sal_Char const FIELD_SERVICE_TEMPLATE_NAME[] = "TemplateName"; +static sal_Char const FIELD_SERVICE_PAGE_COUNT[] = "PageCount"; +static sal_Char const FIELD_SERVICE_PARAGRAPH_COUNT[] = "ParagraphCount"; +static sal_Char const FIELD_SERVICE_WORD_COUNT[] = "WordCount"; +static sal_Char const FIELD_SERVICE_CHARACTER_COUNT[] = "CharacterCount"; +static sal_Char const FIELD_SERVICE_TABLE_COUNT[] = "TableCount"; +static sal_Char const FIELD_SERVICE_GRAPHIC_COUNT[] = "GraphicObjectCount"; +static sal_Char const FIELD_SERVICE_OBJECT_COUNT[] = "EmbeddedObjectCount"; +static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_SET[] = "ReferencePageSet"; +static sal_Char const FIELD_SERVICE_REFERENCE_PAGE_GET[] = "ReferencePageGet"; +static sal_Char const FIELD_SERVICE_SHEET_NAME[] = "SheetName"; +static sal_Char const FIELD_SERVICE_MACRO[] = "Macro"; +static sal_Char const FIELD_SERVICE_GET_REFERENCE[] = "GetReference"; +static sal_Char const FIELD_SERVICE_DDE[] = "DDE"; +static sal_Char const FIELD_SERVICE_URL[] = "URL"; +static sal_Char const FIELD_SERVICE_BIBLIOGRAPHY[] = "Bibliography"; +static sal_Char const FIELD_SERVICE_SCRIPT[] = "Script"; +static sal_Char const FIELD_SERVICE_ANNOTATION[] = "Annotation"; +static sal_Char const FIELD_SERVICE_COMBINED_CHARACTERS[] = "CombinedCharacters"; +static sal_Char const FIELD_SERVICE_META[] = "MetadataField"; +static sal_Char const FIELD_SERVICE_MEASURE[] = "Measure"; +static sal_Char const FIELD_SERVICE_TABLE_FORMULA[] = "TableFormula"; +static sal_Char const FIELD_SERVICE_DROP_DOWN[] = "DropDown"; + +SvXMLEnumStringMapEntry const aFieldServiceNameMapping[] = { ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_SENDER, FIELD_ID_SENDER ), ENUM_STRING_MAP_ENTRY( FIELD_SERVICE_AUTHOR, FIELD_ID_AUTHOR ), @@ -1908,7 +1909,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( sal_Int32 i = 0; for( set<OUString>::iterator aSetIter = rOurMasters.begin(); aSetIter != rOurMasters.end(); - aSetIter++, i++ ) + ++aSetIter, ++i ) { aFieldMasters[i] = *aSetIter; } @@ -1989,7 +1990,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( for (vector<OUString>::iterator aVarIter = aVarName.begin(); aVarIter != aVarName.end(); - aVarIter++) { + ++aVarIter) { OUString sName = *aVarIter; @@ -2048,7 +2049,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( for (vector<OUString>::iterator aSeqIter = aSeqName.begin(); aSeqIter != aSeqName.end(); - aSeqIter++) { + ++aSeqIter) { OUString sName = *aSeqIter; @@ -2090,7 +2091,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( for (vector<OUString>::iterator aUserIter = aUserName.begin(); aUserIter != aUserName.end(); - aUserIter++) { + ++aUserIter) { OUString sName = *aUserIter; @@ -2141,7 +2142,7 @@ void XMLTextFieldExport::ExportFieldDeclarations( for (vector<OUString>::iterator aDdeIter = aDdeName.begin(); aDdeIter != aDdeName.end(); - aDdeIter++) + ++aDdeIter) { OUString sName = *aDdeIter; @@ -2689,7 +2690,7 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName, } -SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataTypeMap[] = +SvXMLEnumMapEntry const aBibliographyDataTypeMap[] = { { XML_ARTICLE, BibliographyDataType::ARTICLE }, { XML_BOOK, BibliographyDataType::BOOK }, @@ -3166,7 +3167,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceType(sal_Int16 nType) // XML_TEMPLATE is default eElement = XML_TEMPLATE; break; - // --> OD 2007-09-14 #i81002# + // Core implementation for direct cross-references (#i81002#) case ReferenceFieldPart::NUMBER: eElement = XML_NUMBER; break; @@ -3176,7 +3177,6 @@ enum XMLTokenEnum XMLTextFieldExport::MapReferenceType(sal_Int16 nType) case ReferenceFieldPart::NUMBER_FULL_CONTEXT: eElement = XML_NUMBER_ALL_SUPERIOR; break; - // <-- default: DBG_ERROR("unknown reference type"); eElement = XML_TEMPLATE; @@ -3617,3 +3617,5 @@ inline Sequence<OUString> const GetStringSequenceProperty( aAny >>= aSequence; return aSequence; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index bf842baa11..5cbcb67be8 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -713,8 +714,8 @@ void XMLSenderFieldImportContext::ProcessAttribute( if (XML_TOK_TEXTFIELD_FIXED == nAttrToken) { // set bVal - sal_Bool bVal; - sal_Bool bRet = GetImport().GetMM100UnitConverter(). + bool bVal; + bool bRet = GetImport().GetMM100UnitConverter(). convertBool(bVal, sAttrValue); // set bFixed if successfull @@ -821,7 +822,7 @@ void XMLAuthorFieldImportContext::PrepareField( TYPEINIT1( XMLPageContinuationImportContext, XMLTextFieldImportContext ); -static SvXMLEnumMapEntry __READONLY_DATA lcl_aSelectPageAttrMap[] = +static SvXMLEnumMapEntry const lcl_aSelectPageAttrMap[] = { { XML_PREVIOUS, PageNumberType_PREV }, { XML_CURRENT, PageNumberType_CURRENT }, @@ -1132,7 +1133,7 @@ void XMLTimeFieldImportContext::ProcessAttribute( } case XML_TOK_TEXTFIELD_FIXED: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bFixed = bTmp; @@ -1683,7 +1684,7 @@ void XMLSimpleDocInfoImportContext::ProcessAttribute( { if (XML_TOK_TEXTFIELD_FIXED == nAttrToken) { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bFixed = bTmp; @@ -1994,7 +1995,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( { if (!bValid) { - SetServiceName(OUString::createFromAscii( sAPI_docinfo_custom ) ); + SetServiceName(OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_docinfo_custom )) ); aName = sAttrValue; bValid = sal_True; } @@ -2076,7 +2077,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute( } else if (XML_TOK_TEXTFIELD_IS_HIDDEN == nAttrToken) { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bIsHidden = bTmp; @@ -2150,7 +2151,7 @@ void XMLConditionalTextImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_CURRENT_VALUE: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bCurrentValue = bTmp; @@ -2231,7 +2232,7 @@ void XMLHiddenTextImportContext::ProcessAttribute( break; case XML_TOK_TEXTFIELD_IS_HIDDEN: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bIsHidden = bTmp; @@ -2298,7 +2299,7 @@ void XMLFileNameImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_FIXED: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bFixed = bTmp; @@ -2680,7 +2681,7 @@ void XMLPageVarSetFieldImportContext::ProcessAttribute( { case XML_TOK_TEXTFIELD_ACTIVE: { - sal_Bool bTmp; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sAttrValue)) { bActive = bTmp; @@ -2799,23 +2800,19 @@ void XMLMacroFieldImportContext::PrepareField( sal_Int32 nLength = aValues.getLength(); for( sal_Int32 i = 0; i < nLength; i++ ) { - if ( aValues[i].Name.equalsAsciiL( "ScriptType", - sizeof("ScriptType")-1 ) ) + if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ScriptType")) ) { // ignore ScriptType } - else if ( aValues[i].Name.equalsAsciiL( "Library", - sizeof("Library")-1 ) ) + else if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Library")) ) { aValues[i].Value >>= sLibraryName; } - else if ( aValues[i].Name.equalsAsciiL( "MacroName", - sizeof("MacroName")-1 ) ) + else if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MacroName")) ) { aValues[i].Value >>= sMacroName; } - if ( aValues[i].Name.equalsAsciiL( "Script", - sizeof("Script")-1 ) ) + if ( aValues[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Script")) ) { aValues[i].Value >>= sScriptURL; } @@ -2877,7 +2874,7 @@ XMLReferenceFieldImportContext::XMLReferenceFieldImportContext( { } -static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = +static SvXMLEnumMapEntry const lcl_aReferenceTypeTokenMap[] = { { XML_PAGE, ReferenceFieldPart::PAGE}, { XML_CHAPTER, ReferenceFieldPart::CHAPTER }, @@ -2886,11 +2883,10 @@ static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = { XML_CATEGORY_AND_VALUE, ReferenceFieldPart::CATEGORY_AND_NUMBER }, { XML_CAPTION, ReferenceFieldPart::ONLY_CAPTION }, { XML_VALUE, ReferenceFieldPart::ONLY_SEQUENCE_NUMBER }, - // --> OD 2007-09-14 #i81002# + // Core implementation for direct cross-references (#i81002#) { XML_NUMBER, ReferenceFieldPart::NUMBER }, { XML_NUMBER_NO_SUPERIOR, ReferenceFieldPart::NUMBER_NO_CONTEXT }, { XML_NUMBER_ALL_SUPERIOR, ReferenceFieldPart::NUMBER_FULL_CONTEXT }, - // <-- { XML_TOKEN_INVALID, 0 } }; @@ -3009,7 +3005,7 @@ enum DdeFieldDeclAttrs XML_TOK_DDEFIELD_UPDATE }; -static __FAR_DATA SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = +static SvXMLTokenMapEntry aDdeDeclAttrTokenMap[] = { { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_DDEFIELD_NAME }, { XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION, XML_TOK_DDEFIELD_APPLICATION }, @@ -3113,7 +3109,7 @@ void XMLDdeFieldDeclImportContext::StartElement( break; case XML_TOK_DDEFIELD_UPDATE: { - sal_Bool bTmp; + bool bTmp; if ( SvXMLUnitConverter::convertBool( bTmp, xAttrList->getValueByIndex(i)) ) { @@ -3137,7 +3133,7 @@ void XMLDdeFieldDeclImportContext::StartElement( UNO_QUERY); if( xFactory.is() ) { - /* #i6432# There might be multiple occurances of one DDE + /* #i6432# There might be multiple occurrences of one DDE declaration if it is used in more than one of header/footer/body. createInstance will throw an exception if we try to create the second, third, etc. instance of such a @@ -3382,7 +3378,7 @@ XMLBibliographyFieldImportContext::XMLBibliographyFieldImportContext( } // TODO: this is the same map as is used in the text field export -SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataTypeMap[] = +SvXMLEnumMapEntry const aBibliographyDataTypeMap[] = { { XML_ARTICLE, BibliographyDataType::ARTICLE }, { XML_BOOK, BibliographyDataType::BOOK }, @@ -3902,7 +3898,7 @@ void XMLMeasureFieldImportContext::PrepareField( { Any aAny; aAny <<= mnKind; - xPropertySet->setPropertyValue(OUString::createFromAscii("Kind"), aAny); + xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Kind")), aAny); } @@ -3959,7 +3955,7 @@ bool lcl_ProcessLabel( const SvXMLImport& rImport, } else if( IsXMLToken( sLocalName, XML_CURRENT_SELECTED ) ) { - sal_Bool bTmp; + bool bTmp; if( SvXMLUnitConverter::convertBool( bTmp, sValue ) ) rIsSelected = bTmp; } @@ -4062,7 +4058,7 @@ XMLHeaderFieldImportContext::XMLHeaderFieldImportContext( const ::rtl::OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_header, nPrfx, sLocalName ) { - sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix ); + sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix )); bValid = sal_True; } @@ -4086,7 +4082,7 @@ XMLFooterFieldImportContext::XMLFooterFieldImportContext( const ::rtl::OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_footer, nPrfx, sLocalName ) { - sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix ); + sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix )); bValid = sal_True; } @@ -4111,7 +4107,7 @@ XMLDateTimeFieldImportContext::XMLDateTimeFieldImportContext( const ::rtl::OUString& sLocalName) /// element name w/o prefix : XMLTextFieldImportContext(rImport, rHlp, sAPI_datetime, nPrfx, sLocalName ) { - sServicePrefix = OUString::createFromAscii( sAPI_presentation_prefix ); + sServicePrefix = OUString(RTL_CONSTASCII_USTRINGPARAM( sAPI_presentation_prefix )); bValid = sal_True; } @@ -4127,3 +4123,5 @@ void XMLDateTimeFieldImportContext::PrepareField( ::com::sun::star::beans::XPropertySet> &) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx index 924dad41a1..906369e936 100644 --- a/xmloff/source/text/txtftne.cxx +++ b/xmloff/source/text/txtftne.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,9 +61,7 @@ #include <xmloff/xmlnume.hxx> #include "XMLTextCharStyleNamesElementExport.hxx" #include <xmloff/XMLEventExport.hxx> -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -391,3 +390,5 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper( } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 882d760b82..a33369fb69 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,11 +92,8 @@ #include "XMLCalculationSettingsContext.hxx" #include <xmloff/formsimp.hxx> #include "XMLNumberStylesImport.hxx" -// --> OD 2006-10-12 #i69629# +// XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) #include <com/sun/star/beans/XPropertyState.hpp> -// <-- - -// --> OD 2008-04-25 #refactorlists# #include <txtlists.hxx> // <-- #include <xmloff/odffields.hxx> @@ -132,7 +130,6 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] = { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_TEXT_FRAME_PAGE }, { XML_NAMESPACE_DRAW, XML_A, XML_TOK_DRAW_A_PAGE }, { XML_NAMESPACE_TABLE,XML_TABLE, XML_TOK_TABLE_TABLE }, -// { XML_NAMESPACE_TABLE,XML_SUB_TABLE, XML_TOK_TABLE_SUBTABLE }, { XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS, XML_TOK_TEXT_VARFIELD_DECLS }, { XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, XML_TOK_TEXT_USERFIELD_DECLS }, { XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS, XML_TOK_TEXT_SEQUENCE_DECLS }, @@ -160,7 +157,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] = +static SvXMLTokenMapEntry aTextPElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN }, { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP }, @@ -336,7 +333,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] = +static SvXMLTokenMapEntry aTextPAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_P_XMLID }, { XML_NAMESPACE_XHTML, XML_ABOUT, XML_TOK_TEXT_P_ABOUT }, @@ -354,7 +351,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = +static SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID }, { XML_NAMESPACE_TEXT, XML_LIST_ID, @@ -369,27 +366,26 @@ static __FAR_DATA SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = +static SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] = { { XML_NAMESPACE_XML , XML_ID, XML_TOK_TEXT_LIST_BLOCK_XMLID }, { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME }, { XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING, XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING }, - // --> OD 2008-04-22 #refactorlists# { XML_NAMESPACE_TEXT, XML_CONTINUE_LIST, XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = +static SvXMLTokenMapEntry aTextListBlockElemTokenMap[] = { { XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER }, { XML_NAMESPACE_TEXT, XML_LIST_ITEM, XML_TOK_TEXT_LIST_ITEM }, XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = +static SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME }, { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME }, @@ -421,7 +417,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFrameAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] = +static SvXMLTokenMapEntry aTextContourAttrTokenMap[] = { { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_CONTOUR_WIDTH }, { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_CONTOUR_HEIGHT }, @@ -432,7 +428,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextContourAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = +static SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF }, { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME }, @@ -444,7 +440,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = XML_TOKEN_MAP_END }; -static __FAR_DATA SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = +static SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER }, { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER }, @@ -1000,7 +996,6 @@ XMLTextImportHelper::XMLTextImportHelper( } } } - // <-- } Reference< XStyleFamiliesSupplier > xFamiliesSupp( rModel, UNO_QUERY ); @@ -1361,12 +1356,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, return bConverted ? sChars.makeStringAndClear() : rChars; } -// --> OD 2006-10-12 #i69629# -// helper method to determine, if a paragraph style has a list style (inclusive -// an empty one) inherits a list style (inclusive an empty one) from one of its parents -// --> OD 2007-01-29 #i73973# -// apply special case, that found list style equals the chapter numbering, also -// to the found list styles of the parent styles. +/* Helper method to determine, if a paragraph style has a list style (inclusive + an empty one) inherits a list style (inclusive an empty one) from one of its parents (#i69629#) +*/ +/* Apply special case, that found list style equals the chapter numbering, also + to the found list styles of the parent styles. (#i73973#) +*/ sal_Bool lcl_HasListStyle( OUString sStyleName, const Reference < XNameContainer >& xParaStyles, SvXMLImport& rImport, @@ -1408,14 +1403,11 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, } else { - // --> OD 2007-12-07 #i77708# + // Tools.Outline settings lost on Save (#i77708#) sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); - // --> OD 2008-03-19 #i86058# -// rImport.getBuildIds( nUPD, nBuild ); + // Don't use UPD for versioning: xmloff/source/text/txtstyli.cxx and txtimp.cxx (#i86058#) const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild ); - // <-- - // <-- // search list style at parent Reference<XStyle> xStyle( xPropState, UNO_QUERY ); while ( xStyle.is() ) @@ -1447,8 +1439,7 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, { // list style found bRet = sal_True; - // --> OD 2007-01-29 #i73973# - // special case: the found list style equals the chapter numbering + // Special case: the found list style equals the chapter numbering (#i73973#) Reference< XPropertySet > xPropSet( xPropState, UNO_QUERY ); if ( xPropSet.is() ) { @@ -1459,11 +1450,10 @@ sal_Bool lcl_HasListStyle( OUString sStyleName, { bRet = sal_False; } - // --> OD 2007-12-07 #i77708# - // special handling for text documents from OOo version prior OOo 2.4 - // --> OD 2008-03-19 #i86058# - // check explicitly on certain versions and on import of - // text documents in OpenOffice.org file format + // Special handling for text documents from OOo version prior OOo 2.4 (#i77708#) + /* Check explicitly on certain versions and on import of + text documents in OpenOffice.org file format (#i86058#) + */ else if ( sListStyle.getLength() == 0 && ( rImport.IsTextDocInOOoFileFormat() || ( bBuildIdFound && @@ -1496,9 +1486,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( sal_Bool bPara, sal_Bool bOutlineLevelAttrFound, sal_Int8 nOutlineLevel, - // --> OD 2007-08-17 #i80724# + // Numberings/Bullets in table not visible aftzer save/reload (#i80724#) sal_Bool bSetListAttrs ) - // <-- { static ::rtl::OUString s_ParaStyleName( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName")); @@ -1563,9 +1552,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( sStyleName = OUString(); } - // --> OD 2008-09-10 #i70748# - // The outline level needs to be only applied as list level, if the heading - // is not inside a list and if it by default applies the outline style. + /* The outline level needs to be only applied as list level, if the heading + is not inside a list and if it by default applies the outline style. (#i70748#) + */ bool bApplyOutlineLevelAsListLevel( false ); // --> OD 2007-08-17 #i80724# if (bSetListAttrs && bPara @@ -1596,13 +1585,11 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if (!pListItem) { bNumberingIsNumber = false; // list-header } - // --> OD 2008-05-08 #refactorlists# // consider text:style-override property of <text:list-item> xNewNumRules.set( (pListItem != 0 && pListItem->HasNumRulesOverride()) ? pListItem->GetNumRulesOverride() : pListBlock->GetNumRules() ); - // <-- nLevel = static_cast<sal_Int8>(pListBlock->GetLevel()); if ( pListItem && pListItem->HasStartValue() ) { @@ -1625,8 +1612,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( if (pListBlock || pNumberedParagraph) { - // --> OD 2009-08-24 #i101349# - // Assure that list style of automatic paragraph style is applied at paragraph. + // Assure that list style of automatic paragraph style is applied at paragraph. (#i101349#) sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet(); if ( !bApplyNumRules ) { @@ -1656,7 +1642,6 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( } if ( bApplyNumRules ) - // <-- { // #102607# This may except when xNewNumRules contains // a Writer-NumRule-Implementation bug gets applied to @@ -1711,20 +1696,19 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( makeAny(sListId) ); } } - // <-- GetTextListHelper().SetListItem( (XMLTextListItemContext *)0 ); } else { - // If the paragraph is not in a list but its style, remove it from - // the list. - // --> OD 2005-10-25 #126347# - do not remove it, if the list - // of the style is the chapter numbering rule. + /* If the paragraph is not in a list but its style, remove it from + the list. Do not remove it, if the list of the style is + the chapter numbering rule. + */ if( xNumRules.is() ) { bool bRemove( true ); - // --> OD 2008-12-17 #i70748# - special handling for document from OOo 2.x + // Special handling for document from OOo 2.x (#i70748#) sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild ); @@ -1745,19 +1729,16 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xNumNamed->getName() == xChapterNumNamed->getName() ) { bRemove = false; - // --> OD 2008-09-10 #i70748# + // RFE: inserting headings into text documents (#i70748#) bApplyOutlineLevelAsListLevel = true; - // <-- } } } - // <-- if ( bRemove ) { xPropSet->setPropertyValue( s_NumberingRules, Any() ); } } - // <-- } } @@ -1852,8 +1833,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( } // outline level; set after list style has been set - // --> OD 2005-08-25 #i53198# - // Complete re-worked and corrected: + // Complete re-worked and corrected: (#i53198#) // - set outline level at paragraph // - set numbering level at paragraph, if none is already set // - assure that style is marked as an outline style for the corresponding @@ -1861,11 +1841,10 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( // - DO NOT set type of numbering rule to outline. // - DO NOT set numbering rule directly at the paragraph. - // --> OD 2008-12-09 #i70748# - // Some minor rework and adjust access to paragraph styles + // Some minor rework and adjust access to paragraph styles (#i70748#) if ( bPara ) { - // --> OD 2009-08-18 #i103817# + // Headings not numbered anymore in 3.1 (#i103817#) sal_Int16 nCurrentOutlineLevelInheritedFromParagraphStyle = 0; const bool bHasOutlineLevelProp( xPropSetInfo->hasPropertyByName(s_OutlineLevel)); @@ -1874,11 +1853,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xPropSet->getPropertyValue(s_OutlineLevel) >>= nCurrentOutlineLevelInheritedFromParagraphStyle; } - // <-- - //if ( bPara && nOutlineLevel != -1 ) //#outline level,removed by zhaojianwei - if ( nOutlineLevel > 0 ) //add by zhaojianwei + if ( nOutlineLevel > 0 ) { - //#outline level,removed by zhaojianwei if ( bHasOutlineLevelProp ) { // In case that the value equals the value of its paragraph style @@ -1888,9 +1864,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xPropSet->setPropertyValue( s_OutlineLevel, makeAny( static_cast<sal_Int16>(nOutlineLevel) ) ); } - }//<-end,zhaojianwei + } - // --> OD 2008-09-10 #i70748# + // RFE: inserting headings into text documents (#i70748#) if ( bApplyOutlineLevelAsListLevel ) { sal_Int16 nNumLevel = -1; @@ -1917,10 +1893,9 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); - // --> OD 2007-12-19 #152540# const bool bBuildIdFound = rImport.getBuildIds( nUPD, nBuild ); - // --> OD 2007-07-25 #i73509# - // --> OD 2008-03-19 #i86058# - check explicitly on certain versions + // Lost outline numbering in master document (#i73509#) + // Check explicitly on certain versions (#i86058#) if ( rImport.IsTextDocInOOoFileFormat() || ( bBuildIdFound && ( nUPD == 645 || nUPD == 641 ) ) ) @@ -1931,36 +1906,11 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( { bOutlineStyleCandidate = bOutlineLevelAttrFound; } - // <-- -// else -// { -// Reference< XPropertyState > xStylePropState( -// xParaStyles->getByName( sStyleName ), UNO_QUERY ); -// if ( xStylePropState.is() && -// xStylePropState->getPropertyState( sNumberingStyleName ) == PropertyState_DIRECT_VALUE ) -// { -// bOutlineStyleCandidate = false; -// } -// // --> OD 2007-01-11 #i73361# -// // The automatic paragraph style doesn't have to be considered. -// // else if ( pStyle && /* automatic paragraph style */ -// // pStyle->IsListStyleSet() ) -// // { -// // bOutlineStyleCandidate = false; -// // } -// // <-- -// else -// { -// bOutlineStyleCandidate = true; -// } -// } - if ( bOutlineStyleCandidate ) { AddOutlineStyleCandidate( nOutlineLevel, sStyleName ); } - // --> OD 2009-08-18 #i103817# - // Assure that heading applies the outline style + // Assure that heading applies the outline style (#i103817#) if ( ( !pStyle || !pStyle->IsListStyleSet() ) && !bOutlineStyleCandidate && m_pImpl->m_xChapterNumbering.is()) @@ -1978,11 +1928,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( makeAny(static_cast<sal_Int8>(nOutlineLevel - 1))); } } - // <-- } - // <-- } - //-> #outlinelevel added by zhaojianwei //handle for text:p,if the paragraphstyle outlinelevel is set to[1~10] else if( bHasOutlineLevelProp ) { @@ -1992,9 +1939,8 @@ OUString XMLTextImportHelper::SetStyleAndAttrs( xPropSet->setPropertyValue(s_OutlineLevel, makeAny( static_cast<sal_Int16>(nZero) )); } - }//<-end,zhaojianwei + } } - // <-- return sStyleName; } @@ -2548,9 +2494,6 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( } } -// if( !pContext ) -// pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); - // handle open redlines if ( (XML_TOK_TEXT_CHANGE != nToken) && (XML_TOK_TEXT_CHANGE_END != nToken) && diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 6d49c7ad0b..b1398cfdc6 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include <tools/debug.hxx> #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontPitch.hpp> -#include <com/sun/star/table/BorderLine.hpp> +#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> #include <tools/string.hxx> @@ -52,7 +53,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; -sal_Bool XMLTextImportPropertyMapper::handleSpecialItem( +bool XMLTextImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rValue, @@ -438,12 +439,12 @@ void XMLTextImportPropertyMapper::finished( sal_Bool bHasBorder = sal_False; if( pBorders[i] ) { - table::BorderLine aBorderLine; + table::BorderLine2 aBorderLine; pBorders[i]->maValue >>= aBorderLine; if( pBorderWidths[i] ) { - table::BorderLine aBorderLineWidth; + table::BorderLine2 aBorderLineWidth; pBorderWidths[i]->maValue >>= aBorderLineWidth; aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth; @@ -492,10 +493,10 @@ void XMLTextImportPropertyMapper::finished( #else if( pBorders[i] && pBorderWidths[i] ) { - table::BorderLine aBorderLine; + table::BorderLine2 aBorderLine; pBorders[i]->maValue >>= aBorderLine; - table::BorderLine aBorderLineWidth; + table::BorderLine2 aBorderLineWidth; pBorderWidths[i]->maValue >>= aBorderLineWidth; aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth; @@ -726,3 +727,4 @@ void XMLTextImportPropertyMapper::finished( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 82735fdf59..88640d1cc1 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,9 +52,8 @@ XMLTextListsHelper::XMLTextListsHelper() : mpProcessedLists( 0 ), msLastProcessedListId(), msListStyleOfLastProcessedList(), - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#) mpMapListIdToListStyleDefaultListId( 0 ), - // <-- mpContinuingLists( 0 ), mpListStack( 0 ) { @@ -66,13 +66,12 @@ XMLTextListsHelper::~XMLTextListsHelper() mpProcessedLists->clear(); delete mpProcessedLists; } - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#)# if ( mpMapListIdToListStyleDefaultListId ) { mpMapListIdToListStyleDefaultListId->clear(); delete mpMapListIdToListStyleDefaultListId; } - // <-- if ( mpContinuingLists ) { mpContinuingLists->clear(); @@ -143,7 +142,7 @@ void XMLTextListsHelper::SetListItem( XMLTextListItemContext *i_pListItem ) } } -// --> OD 2008-08-15 #i92811# - handling for parameter <sListStyleDefaultListId> +// Handling for parameter <sListStyleDefaultListId> (#i92811#) void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, ::rtl::OUString sListStyleName, ::rtl::OUString sContinueListId, @@ -168,7 +167,7 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, msLastProcessedListId = sListId; msListStyleOfLastProcessedList = sListStyleName; - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#) if ( sListStyleDefaultListId.getLength() != 0 ) { if ( mpMapListIdToListStyleDefaultListId == 0 ) @@ -185,7 +184,6 @@ void XMLTextListsHelper::KeepListAsProcessed( ::rtl::OUString sListId, aListIdMapData; } } - // <-- } sal_Bool XMLTextListsHelper::IsListProcessed( const ::rtl::OUString sListId ) const @@ -240,15 +238,13 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con ::rtl::OUString XMLTextListsHelper::GenerateNewListId() const { - // --> OD 2008-08-06 #i92478# - ::rtl::OUString sTmpStr( ::rtl::OUString::createFromAscii( "list" ) ); - // <-- + // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) + ::rtl::OUString sTmpStr( RTL_CONSTASCII_USTRINGPARAM( "list" ) ); sal_Int64 n = Time().GetTime(); n += Date().GetDate(); n += rand(); - // --> OD 2008-08-06 #i92478# + // Value of xml:id in element <text:list> has to be a valid ID type (#i92478#) sTmpStr += ::rtl::OUString::valueOf( n ); - // <-- long nHitCount = 0; ::rtl::OUString sNewListId( sTmpStr ); @@ -265,8 +261,7 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con return sNewListId; } -// --> OD 2008-08-15 #i92811# -// provide list id for a certain list block for import +// Provide list id for a certain list block for import (#i92811#) ::rtl::OUString XMLTextListsHelper::GetListIdForListBlock( XMLTextListBlockContext& rListBlock ) { ::rtl::OUString sListBlockListId( rListBlock.GetContinueListId() ); @@ -296,7 +291,6 @@ const ::rtl::OUString& XMLTextListsHelper::GetListStyleOfLastProcessedList() con return sListBlockListId; } -// <-- void XMLTextListsHelper::StoreLastContinuingList( ::rtl::OUString sListId, ::rtl::OUString sContinuingListId ) @@ -470,15 +464,6 @@ XMLTextListsHelper::MakeNumRule( uno::Any any = rNumStyles->getByName( sDisplayStyleName ); any >>= xStyle; - // --> OD 2008-05-07 #refactorlists# - no longer needed -// // If the style has not been used, the restart numbering has -// // to be set never. -// if ( mbRestartNumbering && !xStyle->isInUse() ) -// { -// mbRestartNumbering = sal_False; -// } - // <-- - uno::Reference< beans::XPropertySet > xPropSet( xStyle, uno::UNO_QUERY ); any = xPropSet->getPropertyValue(s_NumberingRules); @@ -491,18 +476,11 @@ XMLTextListsHelper::MakeNumRule( if( pListStyle ) { xNumRules = pListStyle->GetNumRules(); - // --> OD 2008-05-07 #refactorlists# - no longer needed -// sal_Bool bUsed = mxNumRules.is(); - // <-- if( !xNumRules.is() ) { pListStyle->CreateAndInsertAuto(); xNumRules = pListStyle->GetNumRules(); } - // --> OD 2008-05-07 #refactorlists# - no longer needed -// if( mbRestartNumbering && !bUsed ) -// mbRestartNumbering = sal_False; - // <-- } } } @@ -539,3 +517,4 @@ XMLTextListsHelper::MakeNumRule( return xNumRules; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index afc95d1b74..a7ed16d2e7 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,7 +53,7 @@ #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/XNumberingRulesSupplier.hpp> -#include <com/sun/star/text/XChapterNumberingSupplier.hpp>//#outline level,add by zhaojianwei +#include <com/sun/star/text/XChapterNumberingSupplier.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextContent.hpp> @@ -117,9 +118,11 @@ #include "XMLTextCharStyleNamesElementExport.hxx" #include <comphelper/stlunosequence.hxx> -// --> OD 2008-04-25 #refactorlists# +#include <xmloff/odffields.hxx> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/document/XStorageBasedDocument.hpp> #include <txtlists.hxx> -// <-- #include <com/sun/star/rdf/XMetadatable.hpp> using ::rtl::OUString; @@ -173,9 +176,9 @@ namespace static bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent) { - static const OUString sTextFrameService = OUString::createFromAscii("com.sun.star.text.TextFrame"); - static const OUString sTextGraphicService = OUString::createFromAscii("com.sun.star.text.TextGraphicObject"); - static const OUString sTextEmbeddedService = OUString::createFromAscii("com.sun.star.text.TextEmbeddedObject"); + static const OUString sTextFrameService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextFrame")); + static const OUString sTextGraphicService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject")); + static const OUString sTextEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")); Reference<XShape> xShape(xTxtContent, UNO_QUERY); if(!xShape.is()) return false; @@ -228,8 +231,21 @@ namespace static const OUString our_sAnchorType; static const OUString our_sAnchorFrame; }; - const OUString BoundFrames::our_sAnchorType = OUString::createFromAscii("AnchorType"); - const OUString BoundFrames::our_sAnchorFrame = OUString::createFromAscii("AnchorFrame"); + const OUString BoundFrames::our_sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); + const OUString BoundFrames::our_sAnchorFrame(RTL_CONSTASCII_USTRINGPARAM("AnchorFrame")); + + class FieldParamExporter + { + public: + FieldParamExporter(SvXMLExport* const pExport, Reference<XNameContainer> xFieldParams) + : m_pExport(pExport) + , m_xFieldParams(xFieldParams) + { }; + void Export(); + + private: + SvXMLExport* const m_pExport; + const Reference<XNameContainer> m_xFieldParams; class FieldParamExporter { @@ -320,10 +336,8 @@ enum eParagraphPropertyNamesEnumAuto static const sal_Char* aParagraphPropertyNames[] = { "NumberingIsNumber", - "NumberingStyleName", //#outline level,add by zhaojianwei - - //"ParaChapterNumberingLevel", //#outline level,remove by zhaojianwei - "OutlineLevel", //<-end,add by zhaojianwei + "NumberingStyleName", + "OutlineLevel", "ParaConditionalStyleName", "ParaStyleName", "TextSection", @@ -333,9 +347,8 @@ static const sal_Char* aParagraphPropertyNames[] = enum eParagraphPropertyNamesEnum { NUMBERING_IS_NUMBER = 0, - PARA_NUMBERING_STYLENAME = 1, //#outline level,add by zhaojianwei - //PARA_CHAPTER_NUMERBING_LEVEL = 1, //#outline level,remove by zhaojianwei - PARA_OUTLINE_LEVEL=2, //<-end.add by zhaojianwei + PARA_NUMBERING_STYLENAME = 1, + PARA_OUTLINE_LEVEL=2, PARA_CONDITIONAL_STYLE_NAME = 3, PARA_STYLE_NAME = 4, TEXT_SECTION = 5 @@ -523,7 +536,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, ->hasPropertyByName( sIsAutomatic ) ) { bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue(); - // --> OD 2007-01-12 #i73361# - check on outline style + // Check on outline style (#i73361#) const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) ); if ( bAdd && xNumPropSet->getPropertySetInfo() @@ -531,7 +544,6 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, { bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue()); } - // <-- } else { @@ -641,7 +653,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, ->hasPropertyByName( sIsAutomatic ) ) { bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue(); - // --> OD 2007-01-12 #i73361# - check on outline style + // Check on outline style (#i73361#) const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) ); if ( bAdd && xNumPropSet->getPropertySetInfo() @@ -649,7 +661,6 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, { bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue()); } - // <-- } else { @@ -819,7 +830,6 @@ OUString XMLTextParagraphExport::FindTextStyle( } -// --> OD 2008-04-25 #refactorlists# // adjustments to support lists independent from list style void XMLTextParagraphExport::exportListChange( const XMLTextNumRuleInfo& rPrevInfo, @@ -828,13 +838,11 @@ void XMLTextParagraphExport::exportListChange( // end a list if ( rPrevInfo.GetLevel() > 0 ) { - bool bRootListToBeClosed = false; sal_Int16 nListLevelsToBeClosed = 0; if ( !rNextInfo.BelongsToSameList( rPrevInfo ) || rNextInfo.GetLevel() <= 0 ) { // close complete previous list - bRootListToBeClosed = true; nListLevelsToBeClosed = rPrevInfo.GetLevel(); } else if ( rPrevInfo.GetLevel() > rNextInfo.GetLevel() ) @@ -902,10 +910,8 @@ void XMLTextParagraphExport::exportListChange( bool bExportListStyle( true ); bool bRestartNumberingAtContinuedRootList( false ); sal_Int16 nRestartValueForContinuedRootList( -1 ); - // --> OD 2008-11-26 #158694# bool bContinueingPreviousSubList = !bRootListToBeStarted && rNextInfo.IsContinueingPreviousSubTree(); - // <-- do { GetExport().CheckAttrList(); @@ -917,11 +923,12 @@ void XMLTextParagraphExport::exportListChange( eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 && sListId.getLength() > 0 ) { - // --> OD 2008-07-31 #i92221# + /* Property text:id at element <text:list> has to be + replaced by property xml:id (#i92221#) + */ GetExport().AddAttribute( XML_NAMESPACE_XML, XML_ID, sListId ); - // <-- } mpTextListsHelper->KeepListAsProcessed( sListId, sListStyleName, @@ -935,11 +942,12 @@ void XMLTextParagraphExport::exportListChange( eODFDefaultVersion >= SvtSaveOptions::ODFVER_012 && sListId.getLength() > 0 ) { - // --> OD 2008-07-31 #i92221# + /* Property text:id at element <text:list> has to be + replaced by property xml:id (#i92221#) + */ GetExport().AddAttribute( XML_NAMESPACE_XML, XML_ID, sNewListId ); - // <-- } const ::rtl::OUString sContinueListId = @@ -950,10 +958,9 @@ void XMLTextParagraphExport::exportListChange( sNewListId ); if ( sListStyleName == mpTextListsHelper->GetListStyleOfLastProcessedList() && - // --> OD 2008-08-15 #i92811# + // Inconsistent behavior regarding lists (#i92811#) sContinueListId == mpTextListsHelper->GetLastProcessedListId() && - // <-- !rNextInfo.IsRestart() ) { GetExport().AddAttribute( XML_NAMESPACE_TEXT, @@ -1000,14 +1007,12 @@ void XMLTextParagraphExport::exportListChange( bExportListStyle = false; } - // --> OD 2008-11-26 #158694# if ( bContinueingPreviousSubList ) { GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING, XML_TRUE ); bContinueingPreviousSubList = false; } - // <-- enum XMLTokenEnum eLName = XML_LIST; @@ -1028,9 +1033,9 @@ void XMLTextParagraphExport::exportListChange( // <text:list-header> or <text:list-item> GetExport().CheckAttrList(); - // --> OD 2009-06-24 #i97309# - // export start value in case of <bRestartNumberingAtContinuedRootList> - // at correct list item + /* Export start value in case of <bRestartNumberingAtContinuedRootList> + at correct list item (#i97309#) + */ if ( nListLevelsToBeOpened == 1 ) { if ( rNextInfo.HasStartValue() ) @@ -1050,7 +1055,6 @@ void XMLTextParagraphExport::exportListChange( bRestartNumberingAtContinuedRootList = false; } } - // <-- eLName = ( rNextInfo.IsNumbered() || nListLevelsToBeOpened > 1 ) ? XML_LIST_ITEM @@ -1063,7 +1067,6 @@ void XMLTextParagraphExport::exportListChange( pListElements->Insert( pElem, pListElements->Count() ); - // --> OD 2008-11-26 #158694# // export of <text:number> element for last opened <text:list-item>, if requested if ( GetExport().exportTextNumberElement() && eLName == XML_LIST_ITEM && nListLevelsToBeOpened == 1 && // last iteration --> last opened <text:list-item> @@ -1078,8 +1081,6 @@ void XMLTextParagraphExport::exportListChange( GetExport().Characters( rNextInfo.ListLabelString() ); GetExport().EndElement( aTextNumberElem, sal_True ); } - // <-- - --nListLevelsToBeOpened; } while ( nListLevelsToBeOpened > 0 ); } @@ -1150,7 +1151,6 @@ void XMLTextParagraphExport::exportListChange( pListElements->Insert( pElem, pListElements->Count() ); - // --> OD 2008-11-26 #158694# // export of <text:number> element for <text:list-item>, if requested if ( GetExport().exportTextNumberElement() && rNextInfo.ListLabelString().getLength() > 0 ) @@ -1164,10 +1164,8 @@ void XMLTextParagraphExport::exportListChange( GetExport().Characters( rNextInfo.ListLabelString() ); GetExport().EndElement( aTextNumberElem, sal_True ); } - // <-- } } -// <-- XMLTextParagraphExport::XMLTextParagraphExport( SvXMLExport& rExp, @@ -1178,31 +1176,20 @@ XMLTextParagraphExport::XMLTextParagraphExport( pBoundFrameSets(new BoundFrameSets(GetExport().GetModel())), pFieldExport( 0 ), pListElements( 0 ), - // --> OD 2008-05-07 #refactorlists# - no longer needed -// pExportedLists( 0 ), - // <-- pListAutoPool( new XMLTextListAutoStylePool( this->GetExport() ) ), pSectionExport( NULL ), pIndexMarkExport( NULL ), - pRedlineExport( NULL ), pHeadingStyles( NULL ), - bProgress( sal_False ), bBlock( sal_False ), - bOpenRuby( sal_False ), - // --> OD 2008-04-25 #refactorlists# mpTextListsHelper( 0 ), maTextListsHelperStack(), - // <-- - sActualSize(RTL_CONSTASCII_USTRINGPARAM("ActualSize")), - // --> OD 2009-07-22 #i73249# -// sAlternativeText(RTL_CONSTASCII_USTRINGPARAM("AlternativeText")), + // Implement Title/Description Elements UI (#i73249#) sTitle(RTL_CONSTASCII_USTRINGPARAM("Title")), sDescription(RTL_CONSTASCII_USTRINGPARAM("Description")), - // <-- sAnchorCharStyleName(RTL_CONSTASCII_USTRINGPARAM("AnchorCharStyleName")), sAnchorPageNo(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")), sAnchorType(RTL_CONSTASCII_USTRINGPARAM("AnchorType")), @@ -1346,10 +1333,7 @@ XMLTextParagraphExport::XMLTextParagraphExport( "", XML_NAMESPACE_STYLE, GetXMLToken(XML_TEXT_COMBINE)); pFieldExport = new XMLTextFieldExport( rExp, new XMLPropertyState( nIndex, uno::makeAny(sal_True) ) ); - - // --> OD 2008-05-08 #refactorlists# PushNewTextListsHelper(); - // <-- } XMLTextParagraphExport::~XMLTextParagraphExport() @@ -1360,19 +1344,13 @@ XMLTextParagraphExport::~XMLTextParagraphExport() delete pSectionExport; delete pFieldExport; delete pListElements; - // --> OD 2008-05-07 #refactorlists# - no longer needed -// delete pExportedLists; - // <-- delete pListAutoPool; #ifdef DBG_UTIL txtparae_bContainsIllegalCharacters = sal_False; #endif - // --> OD 2008-04-25 #refactorlists# - // also deletes <mpTextListsHelper> PopTextListsHelper(); DBG_ASSERT( maTextListsHelperStack.size() == 0, "misusage of text lists helper stack - it is not empty. Serious defect - please inform OD" ); - // <-- } SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateShapeExtPropMapper( @@ -1537,7 +1515,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { Reference < XPropertySet > xSet( xTextField, UNO_QUERY ); Reference < XText > xText; - Any a = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("TextRange") ); + Any a = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")) ); a >>= xText; if ( xText.is() ) { @@ -1638,9 +1616,8 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { Reference< XIndexAccess > xNumberingRules = xNumberingRulesSupp->getNumberingRules(); nCount = xNumberingRules->getCount(); - // --> OD 2007-01-12 #i73361# + // Custom outline assignment lost after re-importing sxw (#i73361#) const OUString sNumberingIsOutline( RTL_CONSTASCII_USTRINGPARAM( "NumberingIsOutline" ) ); - // <-- for( sal_Int32 i = 0; i < nCount; ++i ) { Reference< XIndexReplace > xNumRule( xNumberingRules->getByIndex( i ), UNO_QUERY ); @@ -1661,14 +1638,13 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres ->hasPropertyByName( sIsAutomatic ) ) { bAdd = *(sal_Bool *)xNumPropSet->getPropertyValue( sIsAutomatic ).getValue(); - // --> OD 2007-01-12 #i73361# - check on outline style + // Check on outline style (#i73361#) if ( bAdd && xNumPropSet->getPropertySetInfo() ->hasPropertyByName( sNumberingIsOutline ) ) { bAdd = !(*(sal_Bool *)xNumPropSet->getPropertyValue( sNumberingIsOutline ).getValue()); } - // <-- } else { @@ -1828,17 +1804,14 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration( } else { - // --> OD 2006-09-27 #i69627# - // --> OD 2008-04-24 #refactorlists# - // pass list auto style pool to <XMLTextNumRuleInfo> instance - // --> OD 2008-11-26 #158694# - // pass info about request to export <text:number> element - // to <XMLTextNumRuleInfo> instance + /* Pass list auto style pool to <XMLTextNumRuleInfo> instance + Pass info about request to export <text:number> element + to <XMLTextNumRuleInfo> instance (#i69627#) + */ aNextNumInfo.Set( xTxtCntnt, GetExport().writeOutlineStyleAsNormalListStyle(), GetListAutoStylePool(), GetExport().exportTextNumberElement() ); - // <-- exportListAndSectionChange( xCurrentTextSection, aPropSetHelper, TEXT_SECTION, xTxtCntnt, @@ -2038,24 +2011,19 @@ void XMLTextParagraphExport::exportParagraph( } } - //if( rPropSetHelper.hasProperty( PARA_CHAPTER_NUMERBING_LEVEL ) ) //#outline level,zhaojianwei - if( rPropSetHelper.hasProperty( PARA_OUTLINE_LEVEL ) ) //<-end + if( rPropSetHelper.hasProperty( PARA_OUTLINE_LEVEL ) ) { if( xMultiPropSet.is() ) - //rPropSetHelper.getValue( PARA_CHAPTER_NUMERBING_LEVEL, //#outline level,zhaojianwei - rPropSetHelper.getValue( PARA_OUTLINE_LEVEL, //<-end + rPropSetHelper.getValue( PARA_OUTLINE_LEVEL, xMultiPropSet ) >>= nOutlineLevel; else - //rPropSetHelper.getValue( PARA_CHAPTER_NUMERBING_LEVEL, //#outline level,zhaojianwei - rPropSetHelper.getValue( PARA_OUTLINE_LEVEL, //<-end + rPropSetHelper.getValue( PARA_OUTLINE_LEVEL, xPropSet ) >>= nOutlineLevel; - //if( -1 != nOutlineLevel ) //#outline level,zhaojianwei - if( 0 < nOutlineLevel ) //<-end,zhaojianwei + if( 0 < nOutlineLevel ) { OUStringBuffer sTmp; - //sTmp.append( sal_Int32( nOutlineLevel + 1 ) ); //#outline level,zhaojianwei - sTmp.append( sal_Int32( nOutlineLevel) ); //<-end,zhaojianwei + sTmp.append( sal_Int32( nOutlineLevel) ); GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, sTmp.makeStringAndClear() ); @@ -2080,7 +2048,7 @@ void XMLTextParagraphExport::exportParagraph( - bool bAssignedtoOutlineStyle = false;//#outline level,add by zhaojianwei + bool bAssignedtoOutlineStyle = false; { Reference< XChapterNumberingSupplier > xCNSupplier( GetExport().GetModel(), UNO_QUERY ); @@ -2098,11 +2066,9 @@ void XMLTextParagraphExport::exportParagraph( bAssignedtoOutlineStyle = ( sListStyleName == sOutlineName ); } } + } - } //<end,zhaojianwei - - //if( ! bIsNumber ) //#outline level,removed by zhaojianwei - if( ! bIsNumber && bAssignedtoOutlineStyle ) //#outline level,add by zhaojianwei + if( ! bIsNumber && bAssignedtoOutlineStyle ) GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_IS_LIST_HEADER, XML_TRUE ); @@ -2137,11 +2103,11 @@ void XMLTextParagraphExport::exportParagraph( ("NumberingStartValue")); - sal_Int32 nStartValue = 0; - if (xPropSetInfo-> hasPropertyByName(sNumberingStartValue)) { + sal_Int32 nStartValue = 0; + xPropSet->getPropertyValue(sNumberingStartValue) >>= nStartValue; @@ -2211,8 +2177,7 @@ void XMLTextParagraphExport::exportParagraph( { sal_Bool bPrevCharIsSpace = sal_True; enum XMLTokenEnum eElem = - //-1 == nOutlineLevel ? XML_P : XML_H; //#outline level,zhaojianwei - 0 < nOutlineLevel ? XML_H : XML_P; //<-end,zhaojianwei + 0 < nOutlineLevel ? XML_H : XML_P; SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem, sal_True, sal_False ); if( bHasContentEnum ) @@ -2326,12 +2291,14 @@ void XMLTextParagraphExport::exportTextRangeEnumeration( { FieldParamExporter(&GetExport(), xFormField->getParameters()).Export(); } - GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False); } else if (sType.equals(sTextFieldEnd)) { - GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_END, sal_False); - GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_END, sal_False); + if ( GetExport().getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST ) + { + GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_END, sal_False); + GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_END, sal_False); + } } else if (sType.equals(sTextFieldStartEnd)) { @@ -2435,7 +2402,7 @@ void XMLTextParagraphExport::exportSoftPageBreak( void XMLTextParagraphExport::exportTextMark( const Reference<XPropertySet> & rPropSet, - const OUString sProperty, + const OUString& rProperty, const enum XMLTokenEnum pElements[], sal_Bool bAutoStyles) { @@ -2450,7 +2417,7 @@ void XMLTextParagraphExport::exportTextMark( if (!bAutoStyles) { // name element - Reference<XNamed> xName(rPropSet->getPropertyValue(sProperty), UNO_QUERY); + Reference<XNamed> xName(rPropSet->getPropertyValue(rProperty), UNO_QUERY); GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xName->getName()); @@ -2716,10 +2683,9 @@ void XMLTextParagraphExport::exportAnyTextFrame( { if( FT_EMBEDDED == eType ) _collectTextEmbeddedAutoStyles( xPropSet ); - // --> OD 2004-08-09 #i28745# - no text frame style for shapes + // No text frame style for shapes (#i28745#) else if ( FT_SHAPE != eType ) Add( XML_STYLE_FAMILY_TEXT_FRAME, xPropSet ); - // <-- if( pRangePropSet && lcl_txtpara_isBoundAsChar( xPropSet, xPropSet->getPropertySetInfo() ) ) @@ -2869,10 +2835,8 @@ void XMLTextParagraphExport::_exportTextFrame( // image map GetExport().GetImageMapExport().Export( rPropSet ); - // --> OD 2009-07-22 #i73249# - // svg:title and svg:desc + // svg:title and svg:desc (#i73249#) exportTitleAndDescription( rPropSet, rPropSetInfo ); - // <-- } void XMLTextParagraphExport::exportContour( @@ -3064,10 +3028,8 @@ void XMLTextParagraphExport::_exportTextGraphic( // image map GetExport().GetImageMapExport().Export( rPropSet ); - // --> OD 2009-07-22 #i73249# - // svg:title and svg:desc + // svg:title and svg:desc (#i73249#) exportTitleAndDescription( rPropSet, rPropSetInfo ); - // <-- // draw:contour exportContour( rPropSet, rPropSetInfo ); @@ -3097,7 +3059,7 @@ void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rP GetExport().GetImageMapExport().Export( rPropSet ); } -// --> OD 2009-07-22 #i73249# +// Implement Title/Description Elements UI (#i73249#) void XMLTextParagraphExport::exportTitleAndDescription( const Reference < XPropertySet > & rPropSet, const Reference < XPropertySetInfo > & rPropSetInfo ) @@ -3128,7 +3090,6 @@ void XMLTextParagraphExport::exportTitleAndDescription( } } } -// <-- void XMLTextParagraphExport::setTextEmbeddedGraphicURL( const Reference < XPropertySet >&, @@ -3145,130 +3106,6 @@ sal_Bool XMLTextParagraphExport::addHyperlinkAttributes( OUString sHRef, sName, sTargetFrame, sUStyleName, sVStyleName; sal_Bool bServerMap = sal_False; -/* bool bHyperLinkURL = false; - bool bHyperLinkName = false; - bool bHyperLinkTarget = false; - bool bServer = false; - bool bUnvisitedCharStyleName = false; - bool bVisitedCharStyleName = false; - - const Reference< XMultiPropertySet > xMultiPropertySet( rPropSet, UNO_QUERY ); - if ( xMultiPropertySet.is() ) - { - sal_uInt32 nCount = 0; - Sequence< OUString > aPropertyNames( 6 ); - OUString* pArray = aPropertyNames.getArray(); - - if ( rPropSetInfo->hasPropertyByName( sServerMap ) ) - { - bServer = true; - pArray[ nCount++ ] = sServerMap; - } - if ( rPropSetInfo->hasPropertyByName( sHyperLinkName ) ) - { - bHyperLinkName = true; - pArray[ nCount++ ] = sHyperLinkName; - } - if ( rPropSetInfo->hasPropertyByName( sHyperLinkTarget ) ) - { - bHyperLinkTarget = true; - pArray[ nCount++ ] = sHyperLinkTarget; - } - if ( rPropSetInfo->hasPropertyByName( sHyperLinkURL ) ) - { - bHyperLinkURL = true; - pArray[ nCount++ ] = sHyperLinkURL; - } - if ( rPropSetInfo->hasPropertyByName( sUnvisitedCharStyleName ) ) - { - bUnvisitedCharStyleName = true; - pArray[ nCount++ ] = sUnvisitedCharStyleName; - } - if ( rPropSetInfo->hasPropertyByName( sVisitedCharStyleName ) ) - { - bVisitedCharStyleName = true; - pArray[ nCount++ ] = sVisitedCharStyleName; - } - - aPropertyNames.realloc( nCount ); - - if ( nCount ) - { - Sequence< PropertyState > aPropertyStates( nCount ); - PropertyState* pStateArray = aPropertyStates.getArray(); - - if ( rPropState.is() ) - aPropertyStates = rPropState->getPropertyStates( aPropertyNames ); - - Sequence< Any > aPropertyValues ( xMultiPropertySet->getPropertyValues( aPropertyNames ) ); - Any* pValueArray = aPropertyValues.getArray(); - - sal_uInt32 nIdx = 0; - - if ( bServer ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - bServerMap = *(sal_Bool *)pValueArray[ nIdx ].getValue(); - if( bServerMap ) - bExport = sal_True; - } - ++nIdx; - } - if ( bHyperLinkName ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - pValueArray[ nIdx ] >>= sName; - if( sName.getLength() > 0 ) - bExport = sal_True; - } - ++nIdx; - } - if ( bHyperLinkTarget ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - pValueArray[ nIdx ] >>= sTargetFrame; - if( sTargetFrame.getLength() ) - bExport = sal_True; - } - ++nIdx; - } - if ( bHyperLinkURL ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - pValueArray[ nIdx ] >>= sHRef; - if( sHRef.getLength() > 0 ) - bExport = sal_True; - } - ++nIdx; - } - if ( bUnvisitedCharStyleName ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - pValueArray[ nIdx ] >>= sUStyleName; - if( sUStyleName.getLength() ) - bExport = sal_True; - } - ++nIdx; - } - if ( bVisitedCharStyleName ) - { - if ( !rPropState.is() || PropertyState_DIRECT_VALUE == pStateArray[ nIdx ] ) - { - pValueArray[ nIdx ] >>= sVStyleName; - if( sVStyleName.getLength() ) - bExport = sal_True; - } - ++nIdx; - } - } - } - else - {*/ if( rPropSetInfo->hasPropertyByName( sHyperLinkURL ) && ( !rPropState.is() || PropertyState_DIRECT_VALUE == rPropState->getPropertyState( sHyperLinkURL ) ) ) @@ -3853,7 +3690,6 @@ sal_Int32 XMLTextParagraphExport::GetHeadingLevel( const OUString& rStyleName ) return -1; } -// --> OD 2008-05-08 #refactorlists# void XMLTextParagraphExport::PushNewTextListsHelper() { mpTextListsHelper = new XMLTextListsHelper(); @@ -3870,4 +3706,5 @@ void XMLTextParagraphExport::PopTextListsHelper() mpTextListsHelper = maTextListsHelperStack.back(); } } -// <-- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 80d0b112f0..434bf8d1fe 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -918,8 +919,8 @@ void XMLMetaImportContext::InsertMeta( const uno::Reference<rdf::XMetadatable> xMeta( XMLTextMarkImportContext::CreateAndInsertMark( GetImport(), - OUString::createFromAscii( - "com.sun.star.text.InContentMetadata"), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.text.InContentMetadata")), OUString(), i_xInsertionRange, m_XmlId), uno::UNO_QUERY); @@ -997,8 +998,8 @@ void XMLMetaFieldImportContext::InsertMeta( const Reference<XPropertySet> xPropertySet( XMLTextMarkImportContext::CreateAndInsertMark( GetImport(), - OUString::createFromAscii( - "com.sun.star.text.textfield.MetadataField"), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.text.textfield.MetadataField")), OUString(), i_xInsertionRange, m_XmlId), UNO_QUERY); @@ -1015,11 +1016,11 @@ void XMLMetaFieldImportContext::InsertMeta( if (-1 != nKey) { static ::rtl::OUString sPropertyIsFixedLanguage( - ::rtl::OUString::createFromAscii("IsFixedLanguage") ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFixedLanguage")) ); Any any; any <<= nKey; xPropertySet->setPropertyValue( - OUString::createFromAscii("NumberFormat"), any); + OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")), any); if ( xPropertySet->getPropertySetInfo()-> hasPropertyByName( sPropertyIsFixedLanguage ) ) { @@ -1540,7 +1541,8 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute( } else if ( IsXMLToken( sLocalName, XML_MAIN_ENTRY ) ) { - sal_Bool bMainEntry = sal_False, bTmp; + sal_Bool bMainEntry = sal_False; + bool bTmp; if (SvXMLUnitConverter::convertBool(bTmp, sValue)) bMainEntry = bTmp; @@ -1751,11 +1753,10 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext( new XMLTextFrameContext( rImport, nPrefix, rLocalName, xAttrList, TextContentAnchorType_AS_CHARACTER ); - // --> OD 2004-08-24 #i33242# - remove check for text content. + // Remove check for text content. (#i33242#) // Check for text content is done on the processing of the hint if( TextContentAnchorType_AT_CHARACTER == pTextFrameContext->GetAnchorType() ) - // <-- { rHints.Insert( new XMLTextFrameHint_Impl( pTextFrameContext, xAnchorPos ), @@ -1904,15 +1905,14 @@ XMLParaContext::XMLParaContext( m_bHaveAbout(false), nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ), pHints( 0 ), - // --> OD 2007-07-25 #i73509# + // Lost outline numbering in master document (#i73509#) mbOutlineLevelAttrFound( sal_False ), - // <-- bIgnoreLeadingSpace( sal_True ), bHeading( bHead ), bIsListHeader( false ), bIsRestart (false), - nStartValue(0) - ,nStarFontsConvFlags( 0 ) + nStartValue(0), + nStarFontsConvFlags( 0 ) { const SvXMLTokenMap& rTokenMap = GetImport().GetTextImport()->GetTextPAttrTokenMap(); @@ -1970,14 +1970,13 @@ XMLParaContext::XMLParaContext( nTmp = 127; nOutlineLevel = (sal_Int8)nTmp; } - // --> OD 2007-07-25 #i73509# + // Lost outline numbering in master document (#i73509#) mbOutlineLevelAttrFound = sal_True; - // <-- } break; case XML_TOK_TEXT_P_IS_LIST_HEADER: { - sal_Bool bBool; + bool bBool; if( SvXMLUnitConverter::convertBool( bBool, rValue ) ) { bIsListHeader = bBool; @@ -1986,7 +1985,7 @@ XMLParaContext::XMLParaContext( break; case XML_TOK_TEXT_P_RESTART_NUMBERING: { - sal_Bool bBool; + bool bBool; if (SvXMLUnitConverter::convertBool(bBool, rValue)) { bIsRestart = bBool; @@ -2075,15 +2074,14 @@ XMLParaContext::~XMLParaContext() OUString const sCellParaStyleName(xTxtImport->GetCellParaStyleDefault()); if( sCellParaStyleName.getLength() > 0 ) { - // --> OD 2007-08-16 #i80724# - // suppress handling of outline and list attributes, - // because of side effects of method <SetStyleAndAttrs(..)> + /* Suppress handling of outline and list attributes, + because of side effects of method <SetStyleAndAttrs(..)> (#i80724#) + */ xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sCellParaStyleName, sal_True, sal_False, -1, // suppress outline handling sal_False ); // suppress list attributes handling - // <-- } // #103445# for headings without style name, find the proper style @@ -2091,13 +2089,12 @@ XMLParaContext::~XMLParaContext() xTxtImport->FindOutlineStyleName( sStyleName, nOutlineLevel ); // set style and hard attributes at the previous paragraph - // --> OD 2007-07-25 #i73509# - add paramter <mbOutlineLevelAttrFound> + // Add paramter <mbOutlineLevelAttrFound> (#i73509#) sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sStyleName, sal_True, mbOutlineLevelAttrFound, bHeading ? nOutlineLevel : -1 ); - // <-- // handle list style header if (bHeading && (bIsListHeader || bIsRestart)) @@ -2212,21 +2209,23 @@ XMLParaContext::~XMLParaContext() { const XMLTextFrameHint_Impl *pFHint = (const XMLTextFrameHint_Impl *)pHint; - // --> OD 2004-08-24 #i33242# - check for text content + // Check for text content (#i33242#) Reference < XTextContent > xTextContent = pFHint->GetTextContent(); if ( xTextContent.is() ) { - // OD 2004-04-20 #i26791# + /* Core impl. of the unification of drawing objects and + Writer fly frames (#i26791#) + */ Reference<XTextRange> xRange(xAttrCursor, UNO_QUERY); if ( pFHint->IsBoundAtChar() ) { xTextContent->attach( xRange ); } } - // <-- - // --> OD 2004-08-24 #i33242# - consider, that hint can - // also contain a shape - e.g. drawing object of type 'Text'. + /* Consider, that hint can also contain a shape - + e.g. drawing object of type 'Text'. (#i33242#) + */ else { Reference < XShape > xShape = pFHint->GetShape(); @@ -2252,16 +2251,16 @@ XMLParaContext::~XMLParaContext() } } } - // <-- } break; - // --> DVO, OD 2004-07-14 #i26791# + /* Core impl. of the unification of drawing objects and + Writer fly frames (#i26791#) + */ case XML_HINT_DRAW: { const XMLDrawHint_Impl *pDHint = static_cast<const XMLDrawHint_Impl*>(pHint); - // --> OD 2004-08-24 #i33242# - improvement: hint directly - // provides the shape. + // Improvement: hint directly provides the shape. (#i33242#) Reference < XShape > xShape = pDHint->GetShape(); if ( xShape.is() ) { @@ -2283,11 +2282,8 @@ XMLParaContext::~XMLParaContext() xPropSet->setPropertyValue(sTextRange, aPos); } } - // <-- } break; - // <-- - default: DBG_ASSERT( !this, "What's this" ); break; @@ -2444,3 +2440,5 @@ SvXMLImportContext *XMLNumberedParaContext::CreateChildContext( return pContext; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 979b869f8c..a2bdfb7a53 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,9 +55,8 @@ class XMLParaContext : public SvXMLImportContext bool m_bHaveAbout; sal_Int8 nOutlineLevel; XMLHints_Impl *pHints; - // --> OD 2007-07-25 #i73509# + // Lost outline numbering in master document (#i73509#) sal_Bool mbOutlineLevelAttrFound; - // <-- sal_Bool bIgnoreLeadingSpace; sal_Bool bHeading; sal_Bool bIsListHeader; @@ -129,3 +129,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index 1c9ddc5cbc..a285f9dcfd 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,9 +49,8 @@ using namespace ::xmloff::token; #define XML_HINT_HYPERLINK 3 #define XML_HINT_INDEX_MARK 5 #define XML_HINT_TEXT_FRAME 6 -// --> DVO, OD 2004-07-14 #i26791# +// Core impl. of the unification of drawing objects and Writer fly frames (#i26791#) #define XML_HINT_DRAW 7 -// <-- class XMLHint_Impl { @@ -237,7 +237,7 @@ public: return xTxt; } - // --> OD 2004-08-24 #i33242# + // Frame "to character": anchor moves from first to last char after saving (#i33242#) Reference < drawing::XShape > GetShape() const { Reference < drawing::XShape > xShape; @@ -249,7 +249,6 @@ public: return xShape; } - // <-- sal_Bool IsBoundAtChar() const { @@ -267,7 +266,7 @@ public: } }; -// --> DVO, OD 2004-07-14 #i26791# +// Core impl. of the unification of drawing objects and Writer fly frames (#i26791#) class XMLDrawHint_Impl : public XMLHint_Impl { SvXMLImportContextRef xContext; @@ -285,12 +284,12 @@ public: { } - // --> OD 2004-08-24 #i33242# + // Frame "to character": anchor moves from first to last char after saving (#i33242#) Reference < drawing::XShape > GetShape() const { return static_cast<SvXMLShapeContext*>(&xContext)->getShape(); } - // <-- }; -// <-- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 3def1262f6..82cb761595 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,13 +49,9 @@ #include "XMLAnchorTypePropHdl.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> #include "XMLClipPropertyHandler.hxx" -#ifndef _XMLOFF_XMLTEXTCOLUMNSPPROPERTYHANDLER_HXX #include "XMLTextColumnsPropertyHandler.hxx" -#endif #include <xmloff/NamedBoolPropertyHdl.hxx> -#ifndef _XMLOFF_TXTPRHDL_HXX #include "txtprhdl.hxx" -#endif // OD 2004-05-05 #i28701# #include <com/sun/star/text/WrapInfluenceOnPosition.hpp> @@ -75,7 +72,7 @@ using namespace ::xmloff::token; // --------------------------------------------------------------------------- -SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPos_Enum[] = +SvXMLEnumMapEntry const pXML_HoriPos_Enum[] = { { XML_FROM_LEFT, HoriOrientation::NONE }, { XML_FROM_INSIDE, HoriOrientation::NONE }, // import only @@ -87,7 +84,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPos_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPosMirrored_Enum[] = +SvXMLEnumMapEntry const pXML_HoriPosMirrored_Enum[] = { { XML_FROM_INSIDE, HoriOrientation::NONE }, { XML_INSIDE, HoriOrientation::LEFT }, @@ -96,7 +93,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriPosMirrored_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRel_Enum[] = +SvXMLEnumMapEntry const pXML_HoriRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -114,7 +111,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRelFrame_Enum[] = +SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, @@ -128,7 +125,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriRelFrame_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_HoriMirror_Enum[] = +SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] = { { XML_FROM_LEFT, sal_False }, { XML_FROM_INSIDE, sal_True }, @@ -140,7 +137,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_HoriMirror_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertPos_Enum[] = +SvXMLEnumMapEntry const pXML_VertPos_Enum[] = { { XML_FROM_TOP, VertOrientation::NONE }, { XML_TOP, VertOrientation::TOP }, @@ -156,7 +153,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertPos_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertPosAtChar_Enum[] = +SvXMLEnumMapEntry const pXML_VertPosAtChar_Enum[] = { { XML_FROM_TOP, VertOrientation::NONE }, { XML_TOP, VertOrientation::TOP }, @@ -171,7 +168,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertPosAtChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertRel_Enum[] = +SvXMLEnumMapEntry const pXML_VertRel_Enum[] = { { XML_PARAGRAPH, RelOrientation::FRAME }, { XML_PARAGRAPH_CONTENT, RelOrientation::PRINT_AREA }, @@ -186,7 +183,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRel_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelPage_Enum[] = +SvXMLEnumMapEntry const pXML_VertRelPage_Enum[] = { { XML_PAGE, RelOrientation::FRAME }, { XML_PAGE_CONTENT, RelOrientation::PRINT_AREA }, @@ -195,14 +192,14 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelPage_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelFrame_Enum[] = +SvXMLEnumMapEntry const pXML_VertRelFrame_Enum[] = { { XML_FRAME, RelOrientation::FRAME }, { XML_FRAME_CONTENT, RelOrientation::PRINT_AREA }, { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] = +SvXMLEnumMapEntry const pXML_VertRelAsChar_Enum[] = { { XML_BASELINE, VertOrientation::TOP }, { XML_BASELINE, VertOrientation::CENTER }, // export only @@ -216,7 +213,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VertRelAsChar_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_RubyAdjust_Enum[] = +SvXMLEnumMapEntry const pXML_RubyAdjust_Enum[] = { { XML_LEFT, RubyAdjust_LEFT }, { XML_CENTER, RubyAdjust_CENTER }, @@ -226,7 +223,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_RubyAdjust_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] = +SvXMLEnumMapEntry const pXML_FontRelief_Enum[] = { { XML_NONE, FontRelief::NONE }, { XML_ENGRAVED, FontRelief::ENGRAVED }, @@ -234,7 +231,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FontRelief_Enum[] = { XML_TOKEN_INVALID, 0 } }; -SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = +SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = { { XML_TOP, ParagraphVertAlign::TOP }, { XML_MIDDLE, ParagraphVertAlign::CENTER }, @@ -245,14 +242,12 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = }; // OD 2004-05-05 #i28701# -SvXMLEnumMapEntry __READONLY_DATA pXML_WrapInfluenceOnPosition_Enum[] = +SvXMLEnumMapEntry const pXML_WrapInfluenceOnPosition_Enum[] = { - // --> OD 2004-10-18 #i35017# - tokens have been renamed and - // <XML_ITERATIVE> has been added + // Tokens have been renamed and <XML_ITERATIVE> has been added (#i35017#) { XML_ONCE_SUCCESSIVE, WrapInfluenceOnPosition::ONCE_SUCCESSIVE }, { XML_ONCE_CONCURRENT, WrapInfluenceOnPosition::ONCE_CONCURRENT }, { XML_ITERATIVE, WrapInfluenceOnPosition::ITERATIVE }, - // <-- { XML_TOKEN_INVALID, 0 } }; @@ -475,7 +470,7 @@ XMLParagraphOnlyPropHdl_Impl::~XMLParagraphOnlyPropHdl_Impl() // --------------------------------------------------------------------------- -SvXMLEnumMapEntry __READONLY_DATA pXML_Wrap_Enum[] = +SvXMLEnumMapEntry const pXML_Wrap_Enum[] = { { XML_NONE, WrapTextMode_NONE }, { XML_RUN_THROUGH, WrapTextMode_THROUGHT }, @@ -622,7 +617,7 @@ XMLFrameProtectPropHdl_Impl::~XMLFrameProtectPropHdl_Impl() // --------------------------------------------------------------------------- -SvXMLEnumMapEntry __READONLY_DATA pXML_Anchor_Enum[] = +SvXMLEnumMapEntry const pXML_Anchor_Enum[] = { { XML_CHAR, TextContentAnchorType_AT_CHARACTER }, { XML_PAGE, TextContentAnchorType_AT_PAGE }, @@ -857,12 +852,12 @@ sal_Bool XMLGrfMirrorPropHdl_Impl::exportXML( rStrExpValue = sVal; } else if( bHori && - // --> OD 2005-05-12 #i49139# - // XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES - // are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD. + /* XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES + are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD. + (#i49139#) + */ ( IsXMLToken( rStrExpValue, XML_HORIZONTAL_ON_EVEN ) || IsXMLToken( rStrExpValue, XML_HORIZONTAL_ON_ODD ) )) - // <-- { rStrExpValue = GetXMLToken( XML_HORIZONTAL ); } @@ -890,7 +885,7 @@ XMLGrfMirrorPropHdl_Impl::~XMLGrfMirrorPropHdl_Impl() // --------------------------------------------------------------------------- -SvXMLEnumMapEntry __READONLY_DATA pXML_Emphasize_Enum[] = +SvXMLEnumMapEntry const pXML_Emphasize_Enum[] = { { XML_NONE, FontEmphasis::NONE }, { XML_DOT, FontEmphasis::DOT_ABOVE }, @@ -1345,16 +1340,12 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler pHdl = new XMLGrfMirrorPropHdl_Impl( XML_VERTICAL, sal_False ); break; case XML_TYPE_TEXT_MIRROR_HORIZONTAL_LEFT: - // --> OD 2005-05-12 #i49139# - // XML_HORIZONTAL_ON_LEFT_PAGES is replaced by XML_HORIZONTAL_ON_EVEN. + // XML_HORIZONTAL_ON_LEFT_PAGES is replaced by XML_HORIZONTAL_ON_EVEN. (#i49139#) pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_EVEN, sal_True ); - // <-- break; case XML_TYPE_TEXT_MIRROR_HORIZONTAL_RIGHT: - // --> OD 2005-05-12 #i49139# - // XML_HORIZONTAL_ON_RIGHT_PAGES is replaced by XML_HORIZONTAL_ON_ODD. + // XML_HORIZONTAL_ON_RIGHT_PAGES is replaced by XML_HORIZONTAL_ON_ODD. (#i49139#) pHdl = new XMLGrfMirrorPropHdl_Impl( XML_HORIZONTAL_ON_ODD, sal_True ); - // <-- break; case XML_TYPE_TEXT_CLIP: pHdl = new XMLClipPropertyHandler( sal_False ); @@ -1490,3 +1481,4 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx index f1f1a78820..48ca7b4be3 100644 --- a/xmloff/source/text/txtprhdl.hxx +++ b/xmloff/source/text/txtprhdl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index ebb03dfa55..8cf954a868 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,12 +31,8 @@ #include <tools/debug.hxx> #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_TXTPRHDL_HXX #include "txtprhdl.hxx" -#endif -#ifndef _XMLOFF_TXTPRMAP_HXX #include <xmloff/txtprmap.hxx> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -740,10 +737,10 @@ XMLPropertyMapEntry aXMLShapePropMap[] = MG_E( "SurroundAnchorOnly", STYLE, NUMBER_WRAPPED_PARAGRAPHS, XML_TYPE_TEXT_PARAGRAPH_ONLY, CTF_WRAP_PARAGRAPH_ONLY ), MG_E( "SurroundContour", STYLE, WRAP_CONTOUR, XML_TYPE_BOOL, CTF_WRAP_CONTOUR ), MG_E( "ContourOutside", STYLE, WRAP_CONTOUR_MODE, XML_TYPE_TEXT_WRAP_OUTSIDE, CTF_WRAP_CONTOUR_MODE ), - // --> OD 2004-08-09 #i28749# - use own CTF ids for positioning attributes + // Use own CTF ids for positioning attributes (#i28749#) // RES_VERT_ORIENT MG_E( "VertOrient", STYLE, VERTICAL_POS, XML_TYPE_TEXT_VERTICAL_POS, CTF_SHAPE_VERTICALPOS ), - // OD 2004-04-16 #i26791# - add property for at-character anchored shapes + // Add property for at-character anchored shapes (#i26791#) MG_E( "VertOrient", STYLE, VERTICAL_POS, XML_TYPE_TEXT_VERTICAL_POS_AT_CHAR, CTF_SHAPE_VERTICALPOS_ATCHAR ), MG_E( "VertOrient", STYLE, VERTICAL_REL, XML_TYPE_TEXT_VERTICAL_REL_AS_CHAR|MID_FLAG_MULTI_PROPERTY, CTF_VERTICALREL_ASCHAR ), MG_E( "VertOrientRelation", STYLE, VERTICAL_REL, XML_TYPE_TEXT_VERTICAL_REL, CTF_SHAPE_VERTICALREL ), @@ -755,13 +752,12 @@ XMLPropertyMapEntry aXMLShapePropMap[] = MG_E( "HoriOrient", STYLE, HORIZONTAL_POS, XML_TYPE_TEXT_HORIZONTAL_POS_MIRRORED|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_SHAPE_HORIZONTALPOS_MIRRORED ), MG_E( "HoriOrientRelation", STYLE, HORIZONTAL_REL, XML_TYPE_TEXT_HORIZONTAL_REL, CTF_SHAPE_HORIZONTALREL ), MG_E( "HoriOrientRelation", STYLE, HORIZONTAL_REL, XML_TYPE_TEXT_HORIZONTAL_REL_FRAME|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_SHAPE_HORIZONTALREL_FRAME ), - // <-- - // OD 2004-05-05 #i28701# - RES_WRAP_INFLUENCE_ON_OBJPOS + // RES_WRAP_INFLUENCE_ON_OBJPOS (#i28701#) MG_ED( "WrapInfluenceOnPosition", DRAW, WRAP_INFLUENCE_ON_POSITION, XML_TYPE_WRAP_INFLUENCE_ON_POSITION, 0 ), // UserDefinedAttributes is already contained in the map this one is // chained to. - // RES_FOLLOW_TEXT_FLOW - OD 2004-04-21 #i26791# + // RES_FOLLOW_TEXT_FLOW (#i26791#) MG_ED( "IsFollowingTextFlow", STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0 ), M_END() @@ -807,12 +803,8 @@ XMLPropertyMapEntry aXMLSectionPropMap[] = MS_E( "EndnoteNumberingSuffix", TEXT, _EMPTY, MID_FLAG_SPECIAL_ITEM|XML_TYPE_STRING, CTF_SECTION_ENDNOTE_NUM_SUFFIX ), MS_E( "EndnoteIsCollectAtTextEnd", TEXT, NOTES_CONFIGURATION, MID_FLAG_ELEMENT_ITEM|XML_TYPE_BOOL, CTF_SECTION_ENDNOTE_END ), MS_E( "UserDefinedAttributes", TEXT, XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), - - // --> FME 2004-06-22 #114856# edit in readonly sections // RES_EDIT_IN_READONLY MS_E( "EditInReadonly", STYLE, EDITABLE, XML_TYPE_BOOL, 0 ), - // <-- - M_END() }; @@ -901,3 +893,5 @@ XMLTextPropertySetMapper::XMLTextPropertySetMapper( sal_uInt16 nType ) : XMLTextPropertySetMapper::~XMLTextPropertySetMapper() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx index facbcde223..2a3380aca3 100644 --- a/xmloff/source/text/txtsecte.cxx +++ b/xmloff/source/text/txtsecte.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#ifndef _XMLOFF_TXTPARAE_HXX #include <xmloff/txtparae.hxx> -#endif #include <tools/debug.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -59,9 +58,7 @@ #include "XMLTextNumRuleInfo.hxx" #include "XMLSectionExport.hxx" #include "XMLRedlineExport.hxx" -#ifndef _XMLOFF_MULTIPROPERTYSETHELPER_HXX #include "MultiPropertySetHelper.hxx" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::text; @@ -256,3 +253,4 @@ void XMLTextParagraphExport::exportListAndSectionChange( rPrevSection.set(rNextSection); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 099fa0c64f..c9a73e042a 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,17 +109,6 @@ void XMLTextParagraphExport::exportStyleAttributes( GetExport().EncodeStyleName( sName ) ); } } - //sal_Int32 nOutlineLevel = //#outline level, zhaojianwei, moved to styleexp.cxx - XMLStyleExport::exportStyle(¡¡) - // GetExport().GetTextParagraphExport()->GetHeadingLevel( rStyle->getName() ); - //if( nOutlineLevel != -1 ) - //{ - // OUStringBuffer sTmp; - // sTmp.append( static_cast<sal_Int32>(nOutlineLevel+1L) ); - // GetExport().AddAttribute( XML_NAMESPACE_STYLE, - // XML_DEFAULT_OUTLINE_LEVEL, - // sTmp.makeStringAndClear() ); - //} - if( bProgress ) { ProgressBarHelper *pProgress = GetExport().GetProgressBarHelper(); @@ -182,3 +172,5 @@ void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg ) bProgress = bOldProg; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 18dccdc915..084bbdbfbb 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,7 +73,7 @@ using namespace ::com::sun::star::container; //using namespace ::com::sun::star::text; using namespace ::xmloff::token; -static __FAR_DATA SvXMLEnumMapEntry aCategoryMap[] = +static SvXMLEnumMapEntry aCategoryMap[] = { { XML_TEXT, ParagraphStyleCategory::TEXT }, { XML_CHAPTER, ParagraphStyleCategory::CHAPTER }, @@ -98,9 +99,8 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey, else if( IsXMLToken( rLocalName, XML_LIST_STYLE_NAME ) ) { sListStyleName = rValue; - // --> OD 2006-09-21 #i69523# + // Inherited paragraph style lost information about unset numbering (#i69523#) mbListStyleSet = sal_True; - // <-- } else if( IsXMLToken( rLocalName, XML_MASTER_PAGE_NAME ) ) { @@ -119,8 +119,7 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey, { sal_Int32 nTmp; if( SvXMLUnitConverter::convertNumber( nTmp, rValue ) && - // nTmp > 0 && nTmp < 256 ) //#outline level, removed by zhaojianwei - 0 <= nTmp && nTmp <= 10 ) //<-end,add by zhaojianwei + 0 <= nTmp && nTmp <= 10 ) nOutlineLevel = static_cast< sal_Int8 >( nTmp ); } else @@ -145,17 +144,15 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport, , sIsAutoUpdate( RTL_CONSTASCII_USTRINGPARAM( "IsAutoUpdate" ) ) , sCategory( RTL_CONSTASCII_USTRINGPARAM( "Category" ) ) , sNumberingStyleName( RTL_CONSTASCII_USTRINGPARAM( "NumberingStyleName" ) ) -, sOutlineLevel(RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) )//#outline level,add by zhaojianwei +, sOutlineLevel(RTL_CONSTASCII_USTRINGPARAM( "OutlineLevel" ) ) , sDropCapCharStyleName( RTL_CONSTASCII_USTRINGPARAM( "DropCapCharStyleName" ) ) , sPageDescName( RTL_CONSTASCII_USTRINGPARAM( "PageDescName" ) ) -//, nOutlineLevel( 0 ) // removed by zhaojianwei -, nOutlineLevel( -1 ) //<-end, add by zhaojianwei +, nOutlineLevel( -1 ) , bAutoUpdate( sal_False ) , bHasMasterPageName( sal_False ) , bHasCombinedCharactersLetter( sal_False ) -// --> OD 2006-09-21 #i69523# -, mbListStyleSet( sal_False ) -// <-- +// Inherited paragraph style lost information about unset numbering (#i69523#) +, mbListStyleSet( sal_False ) , pEventContext( NULL ) { } @@ -253,13 +250,12 @@ void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite ) pEventContext->ReleaseRef(); } - // --> OD 2006-10-12 #i69629# + // XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#) if ( nOutlineLevel > 0 ) { GetImport().GetTextImport()->AddOutlineStyleCandidate( nOutlineLevel, GetDisplayName() ); } - // <-- } void XMLTextStyleContext::SetDefaults( ) @@ -285,23 +281,19 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite ) XMLPropStyleContext::Finish( bOverwrite ); Reference < XStyle > xStyle = GetStyle(); - // --> OD 2006-09-21 #i69523# - // consider set empty list style -// if ( !( sListStyleName.getLength() || + // Consider set empty list style (#i69523#) if ( !( mbListStyleSet || - nOutlineLevel >= 0 || //#outline level,add by zhaojianwei + nOutlineLevel >= 0 || sDropCapTextStyleName.getLength() || bHasMasterPageName ) || !xStyle.is() || !( bOverwrite || IsNew() ) ) return; - // <-- Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - //#outline level,add by zhaojianwei if( xPropSetInfo->hasPropertyByName( sOutlineLevel )) { Any aAny; @@ -311,24 +303,19 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite ) xPropSet->setPropertyValue( sOutlineLevel, aAny ); } } - //<-end,zhaojianwei - - // --> OD 2006-09-21 #i69523# - // consider set empty list style -// if( sListStyleName.getLength() ) + // Consider set empty list style (#i69523#) if ( mbListStyleSet && xPropSetInfo->hasPropertyByName( sNumberingStyleName ) ) { - // --> OD 2006-10-12 #i70223# - // Only for text document from version prior OOo 2.1 resp. SO 8 PU5: - // - Do not apply list style, if paragraph style has a default outline - // level > 0 and thus, will be assigned to the corresponding list - // level of the outline style. + /* Only for text document from version prior OOo 2.1 resp. SO 8 PU5: + - Do not apply list style, if paragraph style has a default outline + level > 0 and thus, will be assigned to the corresponding list + level of the outline style. (#i70223#) + */ bool bApplyListStyle( true ); if ( nOutlineLevel > 0 ) { - // --> OD 2007-12-19 #152540# if ( GetImport().IsTextDocInOOoFileFormat() ) { bApplyListStyle = false; @@ -337,17 +324,14 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite ) { sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); - // --> OD 2008-03-19 #i86058# - // check explicitly on certain versions + // Check explicitly on certain versions (#i86058#) if ( GetImport().getBuildIds( nUPD, nBuild ) && ( ( nUPD == 641 ) || ( nUPD == 645 ) || // prior OOo 2.0 ( nUPD == 680 && nBuild <= 9073 ) ) ) // OOo 2.0 - OOo 2.0.4 { bApplyListStyle = false; } - // <-- } - // <-- } if ( bApplyListStyle ) @@ -378,9 +362,7 @@ void XMLTextStyleContext::Finish( sal_Bool bOverwrite ) } } } - // <-- } - // <-- if( sDropCapTextStyleName.getLength() ) { @@ -577,3 +559,5 @@ void XMLTextStyleContext::FillPropertySet( } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 76641e2dc3..4fa51a086d 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -342,7 +343,7 @@ void XMLSetVarFieldImportContext::EndElement() { // create field/Service Reference<XPropertySet> xPropSet; - if (CreateField(xPropSet, OUString::createFromAscii(sAPI_textfield_prefix) + GetServiceName())) + if (CreateField(xPropSet, OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_textfield_prefix)) + GetServiceName())) { Reference<XDependentTextField> xDepTextField(xPropSet, UNO_QUERY); if (xDepTextField.is()) @@ -994,7 +995,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( aAny = xMaster->getPropertyValue( // sPropertySubType - OUString::createFromAscii(sAPI_sub_type) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)) ); sal_Int16 nType = 0; aAny >>= nType; @@ -1071,7 +1072,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( aAny <<= sName; xMaster->setPropertyValue( // sPropertyName - OUString::createFromAscii(sAPI_name) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_name)) , aAny); if (eVarType != VarTypeUserField) { @@ -1082,7 +1083,7 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( SetVariableType::SEQUENCE); xMaster->setPropertyValue( // sPropertySubType - OUString::createFromAscii(sAPI_sub_type) + OUString(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)) , aAny); } // else : user field: no subtype @@ -1249,7 +1250,7 @@ enum ValueType XML_VALUE_TYPE_BOOLEAN }; -static SvXMLEnumMapEntry __READONLY_DATA aValueTypeMap[] = +static SvXMLEnumMapEntry const aValueTypeMap[] = { { XML_FLOAT, XML_VALUE_TYPE_FLOAT }, { XML_CURRENCY, XML_VALUE_TYPE_CURRENCY }, @@ -1373,7 +1374,7 @@ void XMLValueImportHelper::ProcessAttribute( case XML_TOK_TEXTFIELD_BOOL_VALUE: { - sal_Bool bTmp; + bool bTmp; sal_Bool bRet = SvXMLUnitConverter::convertBool(bTmp,sAttrValue); if (bRet) { bFloatValueOK = sal_True; @@ -1472,3 +1473,4 @@ void XMLValueImportHelper::PrepareField( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |