diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 23:15:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:32:34 -0600 |
| commit | e23ea87cb395fe8dc3cdf5d6160962bc4b4dcd28 (patch) | |
| tree | 16bbe9faa1ddf4b96c88007a5a0c00bbae9e6aad | |
| parent | a22ae26668b260edb7f724ffcff0abc935b6d64a (diff) | |
Remove visual noise from xmloff
Change-Id: I205d4e555f5b88654a90007eb7ac05bc7b00a904
Reviewed-on: https://gerrit.libreoffice.org/8346
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
59 files changed, 295 insertions, 295 deletions
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index 0de3c493cfe6..a263b9d32fa1 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -23,9 +23,9 @@ #include <xmloff/xmlictxt.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace dom { @@ -62,17 +62,17 @@ public: virtual ~DomBuilderContext(); - // + // access to the DOM tree - // + /** access the DOM tree */ com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument> getTree(); - // + // implement SvXMLImportContext methods: - // + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx index 76d737a86ac3..d7ac07542943 100644 --- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx +++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx @@ -24,7 +24,7 @@ struct SvXMLEnumMapEntry; -// + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx index f17d691e2c1c..d98fd5a5dc4d 100644 --- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx +++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -24,7 +24,7 @@ struct SvXMLEnumMapEntry; -// + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx index 3e52e9336c63..db1f886f7488 100644 --- a/xmloff/inc/XMLRectangleMembersHandler.hxx +++ b/xmloff/inc/XMLRectangleMembersHandler.hxx @@ -24,7 +24,7 @@ struct SvXMLEnumMapEntry; -// + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index ebe54824fca7..6b0ab11f983e 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -68,7 +68,7 @@ using namespace com::sun::star; using namespace ::xmloff::token; // the following class implementations are in this file: -// + // * XMLChartPropHdlFactory // * XMLChartPropertySetMapper // * XMLChartExportPropertyMapper diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index c294447eff36..4b24be9151ed 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -179,9 +179,9 @@ void DomBuilderContext::Characters( const OUString& rCharacters ) } -// + // helper function implementations -// + static Reference<XNode> lcl_createDomInstance() { diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 9d0067f8ceac..ca9bb8b3a95a 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -141,7 +141,7 @@ SERVICE( Oasis2OOoTransformer ); // OOo2Oasis transformer SERVICE( OOo2OasisTransformer ); -// + #ifdef __cplusplus extern "C" { diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index 8e3b8baf304b..1be82e1bf7db 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -497,7 +497,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName ) return sal_True; } - // + // Check if URN matches // :urn:oasis:names:tc:[^:]*:xmlns:[^:]*:1.[^:]* // |---| |---| |-----| diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index fe1172a677f1..16f2e53c4334 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -38,9 +38,9 @@ using ::com::sun::star::xml::sax::XLocator; using ::com::sun::star::xml::sax::SAXParseException; -// + /// ErrorRecord: contains all information for one error -// + class ErrorRecord { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 2228bd05cbe6..aabdef52446e 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -2531,7 +2531,7 @@ sal_Bool SvXMLExport::SetNullDateOnUnitConverter() return mpImpl->mbNullDateInitialized; } -//============================================================================= + void SvXMLElementExport::StartElement( const sal_uInt16 nPrefixKey, diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 46ec380a34da..aae2243e60a3 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1011,9 +1011,9 @@ SchXMLImportHelper* SvXMLImport::CreateChartImport() return new ::xmloff::OFormLayerXMLImport(*this); } -// + // Get or create fill/line/lineend-style-helper -// + const Reference< container::XNameContainer > & SvXMLImport::GetGradientHelper() { diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index 8f813645b279..048d05b1b596 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -21,9 +21,9 @@ using namespace ::com::sun::star; -// + // class XMLNumRulePropHdl -// + XMLNumRulePropHdl::XMLNumRulePropHdl( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > xNumRuleCompare ) : mxNumRuleCompare( xNumRuleCompare ) diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 9167dca243c9..c244896097ef 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -86,7 +86,7 @@ using namespace ::xmloff::token; const XMLPropertyMapEntry aXMLSDProperties[] = { // this entry must be first! this is needed for XMLShapeImportHelper::CreateExternalShapePropMapper - // + // ^^^though CreateExternalShapePropMapper is gone now, hmm^^^ GMAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index be6e0271cd60..ae6e0892f726 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -100,7 +100,7 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix, SvXMLImportContext *pContext = 0L; // some special objects inside presentation:notes context - // ... + // call parent when no own context was created if(!pContext) diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index dfb7e9785d5d..1f1c6f5571fa 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1140,7 +1140,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM } // Process all style and object info -// + void SdXMLStylesContext::EndElement() { if(mbIsAutoStyle) @@ -1203,7 +1203,7 @@ void SdXMLStylesContext::EndElement() // set master-page styles (all with family="presentation" and a special // prefix) on given master-page. -// + void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const { const uno::Reference<container::XNameAccess>& rStyleFamilies = @@ -1230,7 +1230,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co // Process styles list: // set graphic styles (all with family="graphics"). Remember xStyle at list element. -// + void SdXMLStylesContext::ImpSetGraphicStyles() const { if(GetSdImport().GetLocalDocStyleFamilies().is()) try @@ -1299,7 +1299,7 @@ static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pProp } // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles() -// + void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const { sal_Int32 nPrefLen(rPrefix.getLength()); @@ -1476,7 +1476,7 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co return uno::Reference< container::XNameAccess >::query( xLayouts ); } -// + TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); SdXMLMasterStylesContext::SdXMLMasterStylesContext( diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index a8f96c430d50..a338be79bbb5 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -238,7 +238,7 @@ public: }; // office:master-styles context -// + class SdXMLMasterStylesContext : public SvXMLImportContext { ImpMasterPageList maMasterPageList; diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 3a6423170931..31f0186f5bf2 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -82,7 +82,7 @@ namespace xmloff // such form or no such data source, they work with an own formatter. // Even more, time and date fields do not work with a central formatter at all, they have their own one // (which is shared internally, but this is a (hidden) implementation detail.) - // + // To not contaminate the global (document) number formats supplier (which could be obtained from the context), // we have an own one. // (Contaminate means: If a user adds a user-defined format to a formatted field, this format is stored in diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index 4cd5ac03fdcd..5f44d9361c8e 100644 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -// + // class XMLAttributeContainerHandler -// + XMLAttributeContainerHandler::~XMLAttributeContainerHandler() { diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 56bda1afa2cf..675dbd5adfb5 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -26,9 +26,9 @@ using namespace ::com::sun::star::uno; -// + // class XMLEnumPropertyHdl -// + XMLEnumPropertyHdl::~XMLEnumPropertyHdl() { diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 698ec5cbd7dd..8c44c99e6797 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -181,7 +181,7 @@ sal_Bool XMLMarkerStyleExport::exportXML( aBezier)); const basegfx::B2DRange aPolyPolygonRange(aPolyPolygon.getB2DRange()); - ///////////////// + // Viewbox (viewBox="0 0 1500 1000") SdXMLImExViewBox aViewBox( diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 98eb63fe1d68..e9229ebd7f46 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -26,9 +26,9 @@ using namespace ::com::sun::star::uno; -// + // class XMLNamedBoolPropertyHdl -// + XMLNamedBoolPropertyHdl::~XMLNamedBoolPropertyHdl() { diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 19754849c487..6bea28888751 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -28,9 +28,9 @@ using namespace ::com::sun::star::uno; -// + // class XMLWordWrapPropertyHdl -// + XMLWordWrapPropertyHdl::XMLWordWrapPropertyHdl( SvXMLImport* pImport ) : mpImport( pImport ) diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index 32f7abe6a132..af089d7db656 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -// + // class XMLMeasurePropHdl -// + XMLClipPropertyHandler::XMLClipPropertyHandler( bool bODF11 ) : m_bODF11( bODF11 ) diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index f970b59e5998..3abb34e2b3b3 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -49,9 +49,9 @@ SvXMLEnumMapEntry const pXML_Para_Align_Last_Enum[] = { XML_TOKEN_INVALID, 0 } }; -// + // class XMLParaAdjustPropHdl -// + XMLParaAdjustPropHdl::~XMLParaAdjustPropHdl() { @@ -84,9 +84,9 @@ bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return bRet; } -// + // class XMLLastLineAdjustPropHdl -// + XMLLastLineAdjustPropHdl::~XMLLastLineAdjustPropHdl() { diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index a50542beedaf..90885a834b71 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -42,9 +42,9 @@ SvXMLEnumMapEntry pXML_BrushVerticalPos[] = { XML_TOKEN_INVALID, 0 } }; -// + // class XMLBackGraphicPositionPropHdl -// + XMLBackGraphicPositionPropHdl::~XMLBackGraphicPositionPropHdl() { diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index bfe45a8415c2..7ec68c028185 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -78,9 +78,9 @@ static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sa rBorderLine.LineStyle = eStyle; } -// + // class XMLEscapementPropHdl -// + XMLBorderWidthHdl::~XMLBorderWidthHdl() { @@ -161,9 +161,9 @@ bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValu return true; } -// + // class XMLEscapementHeightPropHdl -// + XMLBorderHdl::~XMLBorderHdl() { diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index 88b34d679176..09152ddd7e2a 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -37,9 +37,9 @@ SvXMLEnumMapEntry pXML_BreakTypes[] = { XML_TOKEN_INVALID, 0} }; -// + // class XMLFmtBreakBeforePropHdl -// + XMLFmtBreakBeforePropHdl::~XMLFmtBreakBeforePropHdl() { @@ -107,9 +107,9 @@ bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno::Any return true; } -// + // class XMLFmtBreakBeforePropHdl -// + XMLFmtBreakAfterPropHdl::~XMLFmtBreakAfterPropHdl() { diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 9e03f58b2902..1c28079bf812 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star; -// + // class XMLEscapementPropHdl -// + XMLCharHeightHdl::~XMLCharHeightHdl() { @@ -75,9 +75,9 @@ bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue return !rStrExpValue.isEmpty(); } -// + // class XMLEscapementHeightPropHdl -// + XMLCharHeightPropHdl::~XMLCharHeightPropHdl() { @@ -113,9 +113,9 @@ bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return !rStrExpValue.isEmpty(); } -// + // class XMLEscapementPropHdl -// + XMLCharHeightDiffHdl::~XMLCharHeightDiffHdl() { diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index f1e3a8ce3a52..957370688dc6 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -33,9 +33,9 @@ using namespace ::xmloff::token; #define DFLT_ESC_AUTO_SUPER 101 #define DFLT_ESC_AUTO_SUB -101 -// + // class XMLEscapementPropHdl -// + XMLEscapementPropHdl::~XMLEscapementPropHdl() { @@ -98,9 +98,9 @@ bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return true; } -// + // class XMLEscapementHeightPropHdl -// + XMLEscapementHeightPropHdl::~XMLEscapementHeightPropHdl() { diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index e67a354071c2..c02315fa013d 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -299,11 +299,11 @@ sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vec return bAdded; } -// + // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a given name. // If the name exists already, nothing is done. If a style with a different name and // the same properties exists, a new one is added (like with bDontSeek). -// + sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName ) { @@ -338,9 +338,9 @@ sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, cons return bAdded; } -// + // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list -// + OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties ) const { @@ -448,9 +448,9 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& } } -// + // Retrieve the list of registered names -// + void SvXMLAutoStylePoolP_Impl::GetRegisteredNames( uno::Sequence<sal_Int32>& rFamilies, @@ -556,9 +556,9 @@ bool SvXMLAutoStylePoolP_Impl::AddNamed( return bRet; } -// + // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list -// + OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, const OUString& rParent, @@ -669,9 +669,9 @@ void SvXMLAutoStylePoolP_Impl::exportXML( } } - // + // create string to export for each XML-style. That means for each property-list - // + OUString aStrFamilyName = rFamily.maStrFamilyName; for( size_t i = 0; i < nCount; i++ ) diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 758c05a881f0..06d5faeef081 100644 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx @@ -28,9 +28,9 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -// + // class XMLKerningPropHdl -// + XMLKerningPropHdl::~XMLKerningPropHdl() { diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index b190d3802020..c1b64e5f0254 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_CASEMAP_NORMAL; -// + // class XMLEscapementPropHdl -// + XMLLineHeightHdl::~XMLLineHeightHdl() { @@ -93,9 +93,9 @@ bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue return !rStrExpValue.isEmpty(); } -// + // class XMLLineHeightAtLeastHdl -// + XMLLineHeightAtLeastHdl::~XMLLineHeightAtLeastHdl() { @@ -133,9 +133,9 @@ bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno::Any& return !rStrExpValue.isEmpty(); } -// + // class XMLLineSpacingHdl -// + XMLLineSpacingHdl::~XMLLineSpacingHdl() { diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index bb2a80be8590..25d6b364bad1 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -36,9 +36,9 @@ SvXMLEnumMapEntry const aPostureGenericMapping[] = { XML_TOKEN_INVALID, 0 } }; -// + // class XMLPosturePropHdl -// + XMLPosturePropHdl::~XMLPosturePropHdl() { diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 923013b954cf..139e60835b90 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -// + // class XMLMeasurePropHdl -// + XMLShadowPropHdl::~XMLShadowPropHdl() { diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index 6ba55c9f98e8..a1a22f46551b 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -27,9 +27,9 @@ using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -// + // class XMLFmtSplitPropHdl -// + XMLShadowedPropHdl::~XMLShadowedPropHdl() { diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index 0aa8d9823aa0..e4ec357eecf5 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -23,9 +23,9 @@ using namespace ::com::sun::star; -// + // class XMLFontFamilyNamePropHdl -// + XMLTabStopPropHdl::~XMLTabStopPropHdl() { diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index 0cc662a28c7a..7043194c525e 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -100,9 +100,9 @@ SvXMLEnumMapEntry const pXML_UnderlineWidth_Enum[] = { XML_TOKEN_INVALID, 0 } }; -// + // class XMLUnderlineTypePropHdl -// + XMLUnderlineTypePropHdl::~XMLUnderlineTypePropHdl() { @@ -182,9 +182,9 @@ bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::Any& return bRet; } -// + // class XMLUnderlineStylePropHdl -// + XMLUnderlineStylePropHdl::~XMLUnderlineStylePropHdl() { @@ -269,9 +269,9 @@ bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno::Any return bRet; } -// + // class XMLUnderlineWidthPropHdl -// + XMLUnderlineWidthPropHdl::~XMLUnderlineWidthPropHdl() { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 0b9c2d918ee1..15b6a0dd6fae 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -288,9 +288,9 @@ enum SvXMLStyleElemAttrTokens XML_TOK_ELEM_ATTR_CALENDAR }; -// + // standard colors -// + #define XML_NUMF_COLORCOUNT 10 @@ -308,9 +308,9 @@ static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] = COL_WHITE }; -// + // token maps -// + // maps for SvXMLUnitConverter::convertEnum @@ -361,9 +361,9 @@ static const SvXMLDefaultDateFormat aDefaultDateFormats[] = { NF_DATETIME_SYS_DDMMYYYY_HHMMSS, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, sal_False } }; -// + // SvXMLNumImpData -// + SvXMLNumImpData::SvXMLNumImpData( SvNumberFormatter* pFmt, @@ -599,9 +599,9 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang ) return *pLocaleData; } -// + // SvXMLNumFmtMapContext -// + SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -648,9 +648,9 @@ void SvXMLNumFmtMapContext::EndElement() rParent.AddCondition( sCondition, sName ); } -// + // SvXMLNumFmtPropContext -// + SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -696,9 +696,9 @@ void SvXMLNumFmtPropContext::EndElement() rParent.AddColor( m_nColor ); } -// + // SvXMLNumFmtEmbeddedTextContext -// + SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -895,9 +895,9 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm } } -// + // SvXMLNumFmtElementContext -// + const sal_Int32 MAX_SECOND_DIGITS = 20; // fdo#58539 & gnome#627420: limit number of digits during import @@ -1259,9 +1259,9 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes return NF_INDEX_TABLE_ENTRIES; // invalid } -// + // SvXMLNumFormatContext -// + SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -2138,9 +2138,9 @@ sal_Bool SvXMLNumFormatContext::IsSystemLanguage() return nFormatLang == LANGUAGE_SYSTEM; } -// + // SvXMLNumFmtHelper -// + SvXMLNumFmtHelper::SvXMLNumFmtHelper( const uno::Reference<util::XNumberFormatsSupplier>& rSupp, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 252fc9a85006..1598118e248e 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -467,9 +467,9 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( sal_uInt16 p_nPr GetImport(), p_nPrefix, rLocalName, xAttrList); break; - // + // FillStyles - // + case XML_TOK_STYLES_GRADIENTSTYLES: { pStyle = new XMLGradientStyleContext( GetImport(), p_nPrefix, rLocalName, xAttrList ); diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 69bdd8776534..5fcc75b496c0 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -50,9 +50,9 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -// + // XMLFootnoteConfigHelper -// + /// local helper class for import of quo-vadis and ergo-sum elements class XMLFootnoteConfigHelper : public SvXMLImportContext @@ -110,9 +110,9 @@ void XMLFootnoteConfigHelper::Characters( const OUString& rChars ) } -// + // XMLFootnoteConfigurationImportContext -// + TYPEINIT1( XMLFootnoteConfigurationImportContext, SvXMLStyleContext ); diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 371a6f4ce679..95aab8a2b4b8 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -332,9 +332,9 @@ SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( -// + // maps for the XMLIndexTemplateContext constructor -// + // table of content and user defined index: diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx index 270b446b076e..33d07dc3cabb 100644 --- a/xmloff/source/text/XMLPropertyBackpatcher.cxx +++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx @@ -181,19 +181,19 @@ static OUString const& GetSequenceNumber() return s_SequenceNumber; } -// + // XMLTextImportHelper -// + // Code from XMLTextImportHelper using the XMLPropertyBackpatcher is // implemented here. The reason is that in the unxsols2 environment, // all templates are instatiated as file local (switch // -instances=static), and thus are not accessible from the outside. -// + // The previous solution was to force additional instantiation of // XMLPropertyBackpatcher in txtimp.cxx. This solution combines all // usage of the XMLPropertyBackpatcher in XMLPropertyBackpatcher.cxx // instead. -// + XMLPropertyBackpatcher<sal_Int16>& XMLTextImportHelper::GetFootnoteBP() { diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index 940be018da25..c2bad9924f61 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -1398,18 +1398,18 @@ void XMLSectionExport::ExportIndexTemplateElement( { // a few word here: OOo up to 2.4 uses the field chapter info in Alphabetical index // in a way different from the ODF 1.1/1.0 specification: - // + // ODF1.1/1.0 OOo display in chapter info ODF1.2 // (used in alphabetical index only - // + // number chapter number without pre/postfix plain-number // number-and-name chapter number without pre/postfix plus title plain-number-and-name - // + // with issue i89791 the reading of ODF 1.1 and 1.0 was corrected // this one corrects the writing back from ODF 1.2 to ODF 1.1/1.0 // unfortunately if there is another application which interprets correctly ODF1.1/1.0, // the resulting alphabetical index will be rendered wrong by OOo 2.4 version - // + switch( nChapterFormat ) { case ChapterFormat::DIGIT: diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index aa67367ba566..114319d4c18c 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -225,13 +225,13 @@ void XMLTextExportPropertySetMapper::ContextFontFilter( //next time pFontFamilyNameState is not passed here at all, which gives an //empty sFamilyName resulting in disabling pFontNameState->mnIndex to -1. //That doesn't seem right to me. - // + //So assuming that the main purpose is just to convert the properties in //the main when we can, and to leave them alone when we can't. And with a //secondary purpose to filter out empty font properties, then is would //appear to make sense to base attempting the conversion if we have //both of the major facts of the font description - // + //An alternative solution is to *not* fill the FontAutoStylePool with //every font in the document, but to partition the fonts into the //hard-attribute fonts which go into that pool and the style-attribute diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 643354d5da48..fb8aecce0b89 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -3524,12 +3524,12 @@ OUString XMLTextFieldExport::MakeSequenceRefName( return aBuf.makeStringAndClear(); } -// + // Property accessor helper functions -// + // to be relegated (does that word exist?) to a more appropriate place -// + inline sal_Bool GetBoolProperty( diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index fe4b84ae9e1a..cd24661347d4 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -78,9 +78,9 @@ using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -// + // SO API string constants -// + // service prefix and service anems const sal_Char sAPI_textfield_prefix[] = "com.sun.star.text.TextField."; @@ -609,9 +609,9 @@ void XMLTextFieldImportContext::ForceUpdate( -// + // XMLSenderFieldImportContext -// + TYPEINIT1( XMLSenderFieldImportContext, XMLTextFieldImportContext); @@ -736,9 +736,9 @@ void XMLSenderFieldImportContext::PrepareField( -// + // XMLAuthorFieldImportContext -// + TYPEINIT1( XMLAuthorFieldImportContext, XMLSenderFieldImportContext); @@ -796,9 +796,9 @@ void XMLAuthorFieldImportContext::PrepareField( } -// + // page continuation string -// + TYPEINIT1( XMLPageContinuationImportContext, XMLTextFieldImportContext ); @@ -863,9 +863,9 @@ void XMLPageContinuationImportContext::PrepareField( -// + // page number field -// + TYPEINIT1( XMLPageNumberImportContext, XMLTextFieldImportContext ); @@ -974,9 +974,9 @@ void XMLPageNumberImportContext::PrepareField( -// + // Placeholder -// + TYPEINIT1( XMLPlaceholderFieldImportContext, XMLTextFieldImportContext); @@ -1061,9 +1061,9 @@ void XMLPlaceholderFieldImportContext::PrepareField( } -// + // time field -// + TYPEINIT1( XMLTimeFieldImportContext, XMLTextFieldImportContext); @@ -1206,9 +1206,9 @@ void XMLTimeFieldImportContext::PrepareField( -// + // date field -// + TYPEINIT1( XMLDateFieldImportContext, XMLTimeFieldImportContext ); @@ -1255,9 +1255,9 @@ void XMLDateFieldImportContext::ProcessAttribute( -// + // database field superclass -// + TYPEINIT1( XMLDatabaseFieldImportContext, XMLTextFieldImportContext ); @@ -1399,9 +1399,9 @@ void XMLDatabaseFieldImportContext::PrepareField( -// + // database name field -// + TYPEINIT1( XMLDatabaseNameImportContext, XMLDatabaseFieldImportContext ); @@ -1423,9 +1423,9 @@ void XMLDatabaseNameImportContext::ProcessAttribute( -// + // database next field -// + TYPEINIT1( XMLDatabaseNextImportContext, XMLDatabaseFieldImportContext ); @@ -1490,9 +1490,9 @@ void XMLDatabaseNextImportContext::PrepareField( -// + // database select field -// + TYPEINIT1( XMLDatabaseSelectImportContext, XMLDatabaseNextImportContext ); @@ -1542,9 +1542,9 @@ void XMLDatabaseSelectImportContext::PrepareField( -// + // database display row number field -// + TYPEINIT1( XMLDatabaseNumberImportContext, XMLDatabaseFieldImportContext ); @@ -1617,9 +1617,9 @@ void XMLDatabaseNumberImportContext::PrepareField( -// + // Simple doc info fields -// + TYPEINIT1( XMLSimpleDocInfoImportContext, XMLTextFieldImportContext ); @@ -1761,9 +1761,9 @@ const sal_Char* XMLSimpleDocInfoImportContext::MapTokenToServiceName( } -// + // revision field -// + TYPEINIT1( XMLRevisionDocInfoImportContext, XMLSimpleDocInfoImportContext ); @@ -1806,9 +1806,9 @@ void XMLRevisionDocInfoImportContext::PrepareField( -// + // DocInfo fields with date/time attributes -// + TYPEINIT1( XMLDateTimeDocInfoImportContext, XMLSimpleDocInfoImportContext ); @@ -1915,9 +1915,9 @@ void XMLDateTimeDocInfoImportContext::PrepareField( } -// + // user defined docinfo fields -// + TYPEINIT1( XMLUserDocInfoImportContext, XMLSimpleDocInfoImportContext ); @@ -2003,9 +2003,9 @@ void XMLUserDocInfoImportContext::PrepareField( } -// + // import hidden paragraph fields -// + TYPEINIT1( XMLHiddenParagraphImportContext, XMLTextFieldImportContext ); @@ -2061,9 +2061,9 @@ void XMLHiddenParagraphImportContext::PrepareField( -// + // import conditional text (<text:conditional-text>) -// + TYPEINIT1( XMLConditionalTextImportContext, XMLTextFieldImportContext ); @@ -2149,9 +2149,9 @@ void XMLConditionalTextImportContext::PrepareField( -// + // hidden text -// + TYPEINIT1( XMLHiddenTextImportContext, XMLTextFieldImportContext); @@ -2224,9 +2224,9 @@ void XMLHiddenTextImportContext::PrepareField( -// + // file name fields -// + TYPEINIT1( XMLFileNameImportContext, XMLTextFieldImportContext ); @@ -2314,9 +2314,9 @@ void XMLFileNameImportContext::PrepareField( } -// + // template name field -// + static const SvXMLEnumMapEntry aTemplateDisplayMap[] = { @@ -2374,9 +2374,9 @@ void XMLTemplateNameImportContext::PrepareField( } -// + // import chapter fields -// + TYPEINIT1( XMLChapterImportContext, XMLTextFieldImportContext ); @@ -2453,9 +2453,9 @@ void XMLChapterImportContext::PrepareField( } -// + // counting fields -// + TYPEINIT1( XMLCountFieldImportContext, XMLTextFieldImportContext ); @@ -2554,9 +2554,9 @@ const sal_Char* XMLCountFieldImportContext::MapTokenToServiceName( -// + // page variable import -// + TYPEINIT1( XMLPageVarGetFieldImportContext, XMLTextFieldImportContext ); @@ -2617,9 +2617,9 @@ void XMLPageVarGetFieldImportContext::PrepareField( -// + // page variable set fields -// + TYPEINIT1(XMLPageVarSetFieldImportContext, XMLTextFieldImportContext); @@ -2679,9 +2679,9 @@ void XMLPageVarSetFieldImportContext::PrepareField( -// + // macro fields -// + TYPEINIT1( XMLMacroFieldImportContext, XMLTextFieldImportContext ); @@ -2819,9 +2819,9 @@ void XMLMacroFieldImportContext::PrepareField( -// + // reference field import -// + TYPEINIT1( XMLReferenceFieldImportContext, XMLTextFieldImportContext ); @@ -2959,9 +2959,9 @@ void XMLReferenceFieldImportContext::PrepareField( -// + // field declarations container -// + enum DdeFieldDeclAttrs { @@ -3012,9 +3012,9 @@ SvXMLImportContext * XMLDdeFieldDeclsImportContext::CreateChildContext( -// + // import dde field declaration -// + TYPEINIT1( XMLDdeFieldDeclImportContext, SvXMLImportContext ); @@ -3153,9 +3153,9 @@ void XMLDdeFieldDeclImportContext::StartElement( -// + // DDE field import -// + TYPEINIT1( XMLDdeFieldImportContext, XMLTextFieldImportContext ); @@ -3237,9 +3237,9 @@ void XMLDdeFieldImportContext::PrepareField( } -// + // sheet name fields -// + TYPEINIT1(XMLSheetNameImportContext, XMLTextFieldImportContext); @@ -3268,9 +3268,9 @@ void XMLSheetNameImportContext::PrepareField( } -// + // URL fields (Calc, Impress, Draw) -// + TYPEINIT1(XMLUrlFieldImportContext, XMLTextFieldImportContext); @@ -3589,9 +3589,9 @@ const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( } -// + // Annotation Field -// + TYPEINIT1(XMLAnnotationImportContext, XMLTextFieldImportContext); @@ -3813,9 +3813,9 @@ void XMLAnnotationImportContext::PrepareField( -// + // script field -// + TYPEINIT1(XMLScriptImportContext, XMLTextFieldImportContext); @@ -3879,9 +3879,9 @@ void XMLScriptImportContext::PrepareField( xPropertySet->setPropertyValue(sPropertyScriptType, aAny); } -// + // measure field -// + TYPEINIT1(XMLMeasureFieldImportContext, XMLTextFieldImportContext); @@ -3929,9 +3929,9 @@ void XMLMeasureFieldImportContext::PrepareField( -// + // dropdown field -// + TYPEINIT1( XMLDropDownFieldImportContext, XMLTextFieldImportContext ); diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index f91ab2516f19..2fa6149fe450 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -254,7 +254,7 @@ namespace { //of its parent (try typing 100% vs 200% into the edit style dialog and revisit //your style). So on xml load that ends up meaning 200%, 0 lower. This is a //crock. -// + //On import clear 100% all-margins relative sizes. static bool isNotDefaultRelSize(const XMLPropertyState* pRelState, const UniReference<XMLPropertySetMapper>& rPrMap) diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index c997d09a75d8..04bb4829fe76 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -256,9 +256,9 @@ static int txtparae_bContainsIllegalCharacters = sal_False; #endif // The following map shows which property values are required: -// + // property auto style pass export -// ------------------------------------------------------- + // ParaStyleName if style exists always // ParaConditionalStyleName if style exists always // NumberingRules if style exists always @@ -2501,7 +2501,7 @@ void XMLTextParagraphExport::exportTextMark( sal_Bool bAutoStyles) { // mib said: "Hau wech!" - // + // (Originally, I'd export a span element in case the (book|reference)mark // was formatted. This actually makes a difference in case some pervert // sets a point reference mark in the document and, say, formats it bold. diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 553276a19be8..cf2d43c9f0a0 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -92,9 +92,9 @@ using namespace ::xmloff::token; -// + // XMLVarFieldImportContext: superclass for all variable related fields -// + TYPEINIT1( XMLVarFieldImportContext, XMLTextFieldImportContext ); @@ -286,9 +286,9 @@ void XMLVarFieldImportContext::PrepareField( -// + // variable set fields -// + TYPEINIT1( XMLSetVarFieldImportContext, XMLVarFieldImportContext ); @@ -374,9 +374,9 @@ sal_Bool XMLSetVarFieldImportContext::FindFieldMaster( -// + // sequence field -// + TYPEINIT1( XMLSequenceFieldImportContext, XMLSetVarFieldImportContext ); @@ -447,9 +447,9 @@ void XMLSequenceFieldImportContext::PrepareField( -// + // variable set field -// + TYPEINIT1( XMLVariableSetFieldImportContext, XMLSetVarFieldImportContext ); @@ -483,9 +483,9 @@ void XMLVariableSetFieldImportContext::PrepareField( -// + // variable input field -// + TYPEINIT1( XMLVariableInputFieldImportContext, XMLSetVarFieldImportContext ); @@ -525,9 +525,9 @@ void XMLVariableInputFieldImportContext::PrepareField( -// + // user field -// + TYPEINIT1( XMLUserFieldImportContext, XMLSetVarFieldImportContext ); @@ -547,9 +547,9 @@ XMLUserFieldImportContext::XMLUserFieldImportContext( -// + // user input field -// + TYPEINIT1( XMLUserFieldInputImportContext, XMLVarFieldImportContext ); @@ -580,9 +580,9 @@ void XMLUserFieldInputImportContext::PrepareField( } -// + // variable get field -// + TYPEINIT1( XMLVariableGetFieldImportContext, XMLVarFieldImportContext ); @@ -615,9 +615,9 @@ void XMLVariableGetFieldImportContext::PrepareField( -// + // expression field -// + TYPEINIT1( XMLExpressionFieldImportContext, XMLVarFieldImportContext ); @@ -652,9 +652,9 @@ void XMLExpressionFieldImportContext::PrepareField( -// + // text input field -// + TYPEINIT1( XMLTextInputFieldImportContext, XMLVarFieldImportContext ); @@ -685,9 +685,9 @@ void XMLTextInputFieldImportContext::PrepareField( } -// + // table formula field -// + TYPEINIT1( XMLTableFormulaImportContext, XMLTextFieldImportContext ); @@ -753,17 +753,17 @@ void XMLTableFormulaImportContext::PrepareField( -// + // variable declarations -// + // Should be adapted to XMLVarField-/XMLSetVarFieldImportContext scheme! -// -// + + // declaration containter import (<variable/user-field/sequence-decls>) -// + TYPEINIT1( XMLVariableDeclsImportContext, SvXMLImportContext ); @@ -822,9 +822,9 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext( -// + // declaration import (<variable/user-field/sequence-decl> elements) -// + TYPEINIT1( XMLVariableDeclImportContext, SvXMLImportContext ); @@ -1084,9 +1084,9 @@ sal_Bool XMLVariableDeclImportContext::FindFieldMaster( } -// + // Database Display field import -// + TYPEINIT1( XMLDatabaseDisplayImportContext, XMLDatabaseFieldImportContext ); @@ -1219,9 +1219,9 @@ void XMLDatabaseDisplayImportContext::EndElement() } -// + // value import helper -// + enum ValueType { diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index 0d1f8636e6d3..6740fbca971f 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -50,9 +50,9 @@ public: virtual ~SchemaContext(); - // + // implement TokenContext methods: - // + protected: diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index 4ac1142e1b13..fb05a1ca8900 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -59,9 +59,9 @@ protected: // create mxDataType (if not already present) void CreateDataType(); - // + // implement TokenContext methods: - // + virtual void HandleAttribute( sal_uInt16 nToken, diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index 4422da35bcbb..e3fde9683381 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -52,9 +52,9 @@ public: virtual ~SchemaSimpleTypeContext(); - // + // implement TokenContext methods: - // + protected: diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 9166388ee0d0..da82828d557c 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -23,9 +23,9 @@ #include <xmloff/xmlictxt.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -55,9 +55,9 @@ public: virtual ~TokenContext(); - // + // implement SvXMLImportContext methods: - // + /** call HandleAttribute for each attribute in the token map; * create a warning for all others. Classes that wish to override diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index 69d745ea8da1..8d955a5c5a32 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -52,9 +52,9 @@ public: virtual ~XFormsBindContext(); - // + // implement SvXMLImportContext & TokenContext methods: - // + virtual void StartElement( const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 30d5ff8e28bf..6afcb6f4f360 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -55,12 +55,12 @@ public: virtual ~XFormsInstanceContext(); - // + // implement SvXMLImportContext & TokenContext methods: // We override CreateChildContext, because we want to read // arbitrary DOM elements. For the attributes, we use the // TokenContext mechanism. - // + virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index 0d018e84e262..10c421427d07 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/xforms/XModel2.hpp> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -50,9 +50,9 @@ public: com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel(); - // + // implement SvXMLImportContext & TokenContext methods: - // + virtual void EndElement(); diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index b38c5984f9f8..27ade1e550a4 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Reference.hxx> -// + // forward declarations -// + namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } @@ -51,9 +51,9 @@ public: virtual ~XFormsSubmissionContext(); - // + // implement TokenContext methods: - // + protected: virtual void HandleAttribute( sal_uInt16 nToken, diff --git a/xmloff/source/xforms/xformsapi.hxx b/xmloff/source/xforms/xformsapi.hxx index 1c27b96bc951..558909aa3906 100644 --- a/xmloff/source/xforms/xformsapi.hxx +++ b/xmloff/source/xforms/xformsapi.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSAPI_HXX #define INCLUDED_XMLOFF_SOURCE_XFORMS_XFORMSAPI_HXX -// + // this is a collection of several functions to make dealing with the XForms // API a little easier -// + #include <com/sun/star/uno/Any.hxx> diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index c3629c029f04..7e0004768b61 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -148,9 +148,9 @@ static OUString lcl_getXSDType( SvXMLExport& rExport, const Reference<XPropertySet>& xType ); -// + // the model -// + static const ExportTable aXFormsModelTable[] = { @@ -209,9 +209,9 @@ void exportXFormsModel( SvXMLExport& rExport, exportXFormsSchemas( rExport, xModel ); } -// + // the instance -// + void exportXFormsInstance( SvXMLExport& rExport, const Sequence<PropertyValue>& xInstance ) @@ -250,9 +250,9 @@ void exportXFormsInstance( SvXMLExport& rExport, } -// + // the binding -// + static const ExportTable aXFormsBindingTable[] = { @@ -364,9 +364,9 @@ void exportXFormsBinding( SvXMLExport& rExport, } -// + // the submission -// + static const ExportTable aXFormsSubmissionTable[] = { @@ -398,9 +398,9 @@ void exportXFormsSubmission( SvXMLExport& rExport, -// + // export data types as XSD schema -// + static const ExportTable aDataTypeFacetTable[] = { @@ -596,9 +596,9 @@ void exportXFormsSchemas( SvXMLExport& rExport, -// + // helper functions -// + static void lcl_export( const Reference<XPropertySet>& rPropertySet, SvXMLExport& rExport, @@ -622,9 +622,9 @@ static void lcl_export( const Reference<XPropertySet>& rPropertySet, -// + // any conversion functions -// + template<typename T, void (*FUNC)( OUStringBuffer&, T )> OUString xforms_convert( const Any& rAny ) |