summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2013-08-09 20:04:34 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-08-10 14:55:06 +0000
commit4f360266cd1335861c182493bde6ade0e67b753b (patch)
tree94fbebf42ab561d68b659fa0c0f80ab85abef2d8
parent9c8831244062202e9066b97be7082e72e1194866 (diff)
fdo#62475 removed pointless comments
Change-Id: I176886fbc9f3d9e2b8ad2308ac2b127d9c68d9a6 Reviewed-on: https://gerrit.libreoffice.org/5331 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
-rw-r--r--xmloff/inc/SchXMLExport.hxx2
-rw-r--r--xmloff/inc/SchXMLImport.hxx6
-rw-r--r--xmloff/inc/XMLBasicExportFilter.hxx3
-rw-r--r--xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx1
-rw-r--r--xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx2
-rw-r--r--xmloff/inc/XMLChartPropertySetMapper.hxx9
-rw-r--r--xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx1
-rw-r--r--xmloff/inc/XMLNumberStylesImport.hxx1
-rw-r--r--xmloff/inc/XMLRectangleMembersHandler.hxx1
-rw-r--r--xmloff/inc/animationimport.hxx1
-rw-r--r--xmloff/inc/animimp.hxx1
-rw-r--r--xmloff/inc/forms/form_handler_factory.hxx6
-rw-r--r--xmloff/inc/forms/property_handler.hxx10
-rw-r--r--xmloff/inc/forms/property_ids.hxx6
-rw-r--r--xmloff/inc/xexptran.hxx14
-rw-r--r--xmloff/inc/xmlversion.hxx6
-rw-r--r--xmloff/source/chart/ColorPropertySet.cxx5
-rw-r--r--xmloff/source/chart/MultiPropertySetHandler.hxx26
-rw-r--r--xmloff/source/chart/PropertyMap.hxx4
-rw-r--r--xmloff/source/chart/PropertyMaps.cxx10
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx25
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.hxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx14
-rw-r--r--xmloff/source/chart/SchXMLChartContext.hxx4
-rw-r--r--xmloff/source/chart/SchXMLEnumConverter.cxx7
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx42
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx45
-rw-r--r--xmloff/source/chart/SchXMLLegendContext.cxx4
-rw-r--r--xmloff/source/chart/SchXMLLegendContext.hxx2
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx15
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.hxx17
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx6
-rw-r--r--xmloff/source/chart/SchXMLSeriesHelper.cxx2
-rw-r--r--xmloff/source/chart/SchXMLTableContext.cxx39
-rw-r--r--xmloff/source/chart/SchXMLTableContext.hxx16
-rw-r--r--xmloff/source/chart/SchXMLTextListContext.cxx4
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx5
-rw-r--r--xmloff/source/chart/contexts.cxx10
-rw-r--r--xmloff/source/chart/contexts.hxx12
-rw-r--r--xmloff/source/chart/transporttypes.hxx6
-rw-r--r--xmloff/source/core/DocumentSettingsContext.cxx27
-rw-r--r--xmloff/source/core/ProgressBarHelper.cxx6
-rw-r--r--xmloff/source/core/PropertySetMerger.cxx3
-rw-r--r--xmloff/source/core/RDFaExportHelper.cxx7
-rw-r--r--xmloff/source/core/RDFaImportHelper.cxx9
-rw-r--r--xmloff/source/core/XMLBase64ImportContext.cxx7
-rw-r--r--xmloff/source/core/XMLBasicExportFilter.cxx23
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectImportContext.cxx4
-rw-r--r--xmloff/source/core/unoatrcn.cxx4
-rw-r--r--xmloff/source/core/xmlexp.cxx23
-rw-r--r--xmloff/source/core/xmlimp.cxx13
-rw-r--r--xmloff/source/core/xmlmultiimagehelper.cxx6
-rw-r--r--xmloff/source/core/xmltkmap.cxx4
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx4
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx7
-rw-r--r--xmloff/source/draw/XMLShapePropertySetContext.cxx4
-rw-r--r--xmloff/source/draw/XMLShapeStyleContext.cxx4
-rw-r--r--xmloff/source/draw/animationimport.cxx16
-rw-r--r--xmloff/source/draw/animimp.cxx9
-rw-r--r--xmloff/source/draw/descriptionimp.cxx4
-rw-r--r--xmloff/source/draw/descriptionimp.hxx1
-rw-r--r--xmloff/source/draw/eventimp.cxx12
-rw-r--r--xmloff/source/draw/eventimp.hxx1
-rw-r--r--xmloff/source/draw/layerimp.hxx1
-rw-r--r--xmloff/source/draw/numithdl.cxx1
-rw-r--r--xmloff/source/draw/propimp0.cxx10
-rw-r--r--xmloff/source/draw/propimp0.hxx2
-rw-r--r--xmloff/source/draw/sdpropls.cxx22
-rw-r--r--xmloff/source/draw/sdpropls.hxx21
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx61
-rw-r--r--xmloff/source/draw/sdxmlexp_impl.hxx9
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx71
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx10
-rw-r--r--xmloff/source/draw/shapeexport.cxx54
-rw-r--r--xmloff/source/draw/shapeexport2.cxx51
-rw-r--r--xmloff/source/draw/shapeexport3.cxx10
-rw-r--r--xmloff/source/draw/shapeexport4.cxx4
-rw-r--r--xmloff/source/draw/shapeimport.cxx41
-rw-r--r--xmloff/source/draw/xexptran.cxx38
-rw-r--r--xmloff/source/draw/ximp3dobject.cxx55
-rw-r--r--xmloff/source/draw/ximp3dobject.hxx6
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx15
-rw-r--r--xmloff/source/draw/ximp3dscene.hxx2
-rw-r--r--xmloff/source/draw/ximpbody.cxx14
-rw-r--r--xmloff/source/draw/ximpbody.hxx3
-rw-r--r--xmloff/source/draw/ximpgrp.cxx12
-rw-r--r--xmloff/source/draw/ximpgrp.hxx2
-rw-r--r--xmloff/source/draw/ximplink.cxx12
-rw-r--r--xmloff/source/draw/ximplink.hxx2
-rw-r--r--xmloff/source/draw/ximpnote.cxx15
-rw-r--r--xmloff/source/draw/ximpnote.hxx2
-rw-r--r--xmloff/source/draw/ximppage.cxx14
-rw-r--r--xmloff/source/draw/ximppage.hxx2
-rw-r--r--xmloff/source/draw/ximpshap.cxx153
-rw-r--r--xmloff/source/draw/ximpshap.hxx20
-rw-r--r--xmloff/source/draw/ximpshow.cxx7
-rw-r--r--xmloff/source/draw/ximpshow.hxx1
-rw-r--r--xmloff/source/draw/ximpstyl.cxx57
-rw-r--r--xmloff/source/draw/ximpstyl.hxx9
-rw-r--r--xmloff/source/forms/attriblistmerge.cxx15
-rw-r--r--xmloff/source/forms/attriblistmerge.hxx7
-rw-r--r--xmloff/source/forms/callbacks.hxx10
-rw-r--r--xmloff/source/forms/controlelement.cxx7
-rw-r--r--xmloff/source/forms/controlelement.hxx6
-rw-r--r--xmloff/source/forms/controlpropertyhdl.cxx32
-rw-r--r--xmloff/source/forms/controlpropertymap.cxx13
-rw-r--r--xmloff/source/forms/controlpropertymap.hxx7
-rw-r--r--xmloff/source/forms/elementexport.cxx77
-rw-r--r--xmloff/source/forms/elementexport.hxx12
-rw-r--r--xmloff/source/forms/elementimport.cxx134
-rw-r--r--xmloff/source/forms/elementimport.hxx45
-rw-r--r--xmloff/source/forms/elementimport_impl.hxx9
-rw-r--r--xmloff/source/forms/eventexport.cxx13
-rw-r--r--xmloff/source/forms/eventexport.hxx7
-rw-r--r--xmloff/source/forms/eventimport.cxx13
-rw-r--r--xmloff/source/forms/eventimport.hxx8
-rw-r--r--xmloff/source/forms/formattributes.cxx31
-rw-r--r--xmloff/source/forms/formattributes.hxx8
-rw-r--r--xmloff/source/forms/formcellbinding.cxx33
-rw-r--r--xmloff/source/forms/formcellbinding.hxx6
-rw-r--r--xmloff/source/forms/formenums.cxx5
-rw-r--r--xmloff/source/forms/formenums.hxx6
-rw-r--r--xmloff/source/forms/formevents.cxx6
-rw-r--r--xmloff/source/forms/formevents.hxx6
-rw-r--r--xmloff/source/forms/formlayerexport.cxx25
-rw-r--r--xmloff/source/forms/formlayerimport.cxx16
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx34
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.hxx6
-rw-r--r--xmloff/source/forms/handler/form_handler_factory.cxx8
-rw-r--r--xmloff/source/forms/handler/property_handler_base.cxx6
-rw-r--r--xmloff/source/forms/handler/property_handler_base.hxx6
-rw-r--r--xmloff/source/forms/handler/vcl_date_handler.cxx11
-rw-r--r--xmloff/source/forms/handler/vcl_date_handler.hxx6
-rw-r--r--xmloff/source/forms/handler/vcl_time_handler.cxx11
-rw-r--r--xmloff/source/forms/handler/vcl_time_handler.hxx6
-rw-r--r--xmloff/source/forms/ifacecompare.hxx6
-rw-r--r--xmloff/source/forms/layerexport.cxx48
-rw-r--r--xmloff/source/forms/layerexport.hxx6
-rw-r--r--xmloff/source/forms/layerimport.cxx26
-rw-r--r--xmloff/source/forms/layerimport.hxx6
-rw-r--r--xmloff/source/forms/logging.cxx9
-rw-r--r--xmloff/source/forms/logging.hxx6
-rw-r--r--xmloff/source/forms/officeforms.cxx20
-rw-r--r--xmloff/source/forms/officeforms.hxx9
-rw-r--r--xmloff/source/forms/property_description.hxx13
-rw-r--r--xmloff/source/forms/property_group.hxx6
-rw-r--r--xmloff/source/forms/property_meta_data.cxx24
-rw-r--r--xmloff/source/forms/property_meta_data.hxx4
-rw-r--r--xmloff/source/forms/propertyexport.cxx31
-rw-r--r--xmloff/source/forms/propertyexport.hxx9
-rw-r--r--xmloff/source/forms/propertyimport.cxx40
-rw-r--r--xmloff/source/forms/propertyimport.hxx17
-rw-r--r--xmloff/source/forms/valueproperties.cxx11
-rw-r--r--xmloff/source/forms/valueproperties.hxx7
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx5
-rw-r--r--xmloff/source/meta/xmlmetae.cxx9
-rw-r--r--xmloff/source/meta/xmlmetai.cxx9
-rw-r--r--xmloff/source/meta/xmlversion.cxx18
-rw-r--r--xmloff/source/script/xmlbasici.cxx28
-rw-r--r--xmloff/source/script/xmlbasici.hxx6
-rw-r--r--xmloff/source/script/xmlscripti.cxx22
-rw-r--r--xmloff/source/style/AttributeContainerHandler.cxx2
-rw-r--r--xmloff/source/style/DashStyle.cxx8
-rw-r--r--xmloff/source/style/DrawAspectHdl.cxx4
-rw-r--r--xmloff/source/style/EnumPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/FillStyleContext.cxx20
-rw-r--r--xmloff/source/style/FillStyleContext.hxx6
-rw-r--r--xmloff/source/style/GradientStyle.cxx10
-rw-r--r--xmloff/source/style/HatchStyle.cxx8
-rw-r--r--xmloff/source/style/MarkerStyle.cxx10
-rw-r--r--xmloff/source/style/NamedBoolPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/PageHeaderFooterContext.cxx3
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx6
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.hxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdl.cxx17
-rw-r--r--xmloff/source/style/PageMasterPropHdl.hxx11
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.cxx6
-rw-r--r--xmloff/source/style/PageMasterPropHdlFactory.hxx3
-rw-r--r--xmloff/source/style/PageMasterPropMapper.cxx5
-rw-r--r--xmloff/source/style/PageMasterPropMapper.hxx3
-rw-r--r--xmloff/source/style/PageMasterStyleMap.cxx3
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx11
-rw-r--r--xmloff/source/style/WordWrapPropertyHdl.cxx2
-rw-r--r--xmloff/source/style/XMLClipPropertyHandler.cxx2
-rw-r--r--xmloff/source/style/XMLPageExport.cxx4
-rw-r--r--xmloff/source/style/adjushdl.cxx2
-rw-r--r--xmloff/source/style/backhdl.cxx2
-rw-r--r--xmloff/source/style/bordrhdl.cxx6
-rw-r--r--xmloff/source/style/breakhdl.cxx3
-rw-r--r--xmloff/source/style/cdouthdl.cxx13
-rw-r--r--xmloff/source/style/chrhghdl.cxx5
-rw-r--r--xmloff/source/style/chrlohdl.cxx10
-rw-r--r--xmloff/source/style/csmaphdl.cxx7
-rw-r--r--xmloff/source/style/durationhdl.cxx4
-rw-r--r--xmloff/source/style/escphdl.cxx4
-rw-r--r--xmloff/source/style/fonthdl.cxx15
-rw-r--r--xmloff/source/style/impastp1.cxx8
-rw-r--r--xmloff/source/style/impastp2.cxx8
-rw-r--r--xmloff/source/style/impastp3.cxx13
-rw-r--r--xmloff/source/style/impastp4.cxx23
-rw-r--r--xmloff/source/style/impastpl.hxx15
-rw-r--r--xmloff/source/style/kernihdl.cxx2
-rw-r--r--xmloff/source/style/lspachdl.cxx4
-rw-r--r--xmloff/source/style/opaquhdl.cxx6
-rw-r--r--xmloff/source/style/postuhdl.cxx2
-rw-r--r--xmloff/source/style/prhdlfac.cxx11
-rw-r--r--xmloff/source/style/shadwhdl.cxx2
-rw-r--r--xmloff/source/style/shdwdhdl.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx3
-rw-r--r--xmloff/source/style/tabsthdl.cxx1
-rw-r--r--xmloff/source/style/undlihdl.cxx7
-rw-r--r--xmloff/source/style/weighhdl.cxx5
-rw-r--r--xmloff/source/style/xmlbahdl.cxx69
-rw-r--r--xmloff/source/style/xmlexppr.cxx26
-rw-r--r--xmloff/source/style/xmlnumfe.cxx53
-rw-r--r--xmloff/source/style/xmlnumfi.cxx33
-rw-r--r--xmloff/source/style/xmlnumi.cxx14
-rw-r--r--xmloff/source/style/xmlprmap.cxx14
-rw-r--r--xmloff/source/style/xmlstyle.cxx13
-rw-r--r--xmloff/source/table/XMLTableExport.cxx38
-rw-r--r--xmloff/source/table/XMLTableImport.cxx73
-rw-r--r--xmloff/source/text/XMLTextColumnsContext.cxx9
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx10
-rw-r--r--xmloff/source/text/XMLTextMasterStylesContext.cxx3
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx4
-rw-r--r--xmloff/source/text/txtparae.cxx11
-rw-r--r--xmloff/source/text/txtparai.cxx44
-rw-r--r--xmloff/source/text/txtparaimphint.hxx4
-rw-r--r--xmloff/source/text/txtprhdl.cxx42
-rw-r--r--xmloff/source/transform/ChartOASISTContext.cxx3
-rw-r--r--xmloff/source/transform/ChartOOoTContext.cxx3
-rw-r--r--xmloff/source/transform/DlgOASISTContext.cxx3
-rw-r--r--xmloff/source/transform/EventOASISTContext.cxx3
-rw-r--r--xmloff/source/transform/EventOOoTContext.cxx3
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.cxx3
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx16
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx16
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.cxx4
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx6
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx11
-rw-r--r--xmloff/source/transform/TransformerActions.hxx7
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.cxx9
242 files changed, 12 insertions, 3313 deletions
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index a585eecb46f9..9c97966f2455 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -32,9 +32,7 @@ namespace com { namespace sun { namespace star {
}
}}}
-// ------------------------------------------
// export class for a complete chart document
-// ------------------------------------------
class SchXMLExport : public SvXMLExport
{
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index d1e7b85dc159..b9e3c0aabe84 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -26,11 +26,11 @@
#include <xmloff/prhdlfac.hxx>
#include <xmloff/families.hxx>
-/* ----------------------------------------
+/*
these enums are used for the
SvXMLTokenMapEntries to distinguish
the tokens in switch-directives
- ----------------------------------------*/
+*/
enum SchXMLDocElemTokenMap
{
@@ -82,8 +82,6 @@ enum SchXMLSeriesElemTokenMap
XML_TOK_SERIES_ERROR_INDICATOR
};
-// ----------------------------------------
-
enum SchXMLChartAttrMap
{
XML_TOK_CHART_HREF,
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index 795b8d15d58c..1bd2c2ec46dc 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -23,10 +23,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <cppuhelper/implbase1.hxx>
-
-// =============================================================================
// class XMLBasicExportFilter
-// =============================================================================
typedef ::cppu::WeakImplHelper1<
::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE;
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index afed18063218..22d96e51e9f5 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -24,7 +24,6 @@
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/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index a42281ebbff5..54e28e180940 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -24,8 +24,6 @@
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/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index b5655c0db6fa..5d353833a124 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -25,13 +25,10 @@
#include <xmloff/xmlimppr.hxx>
#include <xmloff/xmlimp.hxx>
-
extern const XMLPropertyMapEntry aXMLChartPropMap[];
class SvXMLExport;
-// ----------------------------------------
-
class XMLChartPropHdlFactory : public XMLPropertyHandlerFactory
{
private:
@@ -42,8 +39,6 @@ public:
virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const;
};
-// ----------------------------------------
-
class XMLChartPropertySetMapper : public XMLPropertySetMapper
{
public:
@@ -51,8 +46,6 @@ public:
~XMLChartPropertySetMapper();
};
-// ----------------------------------------
-
class XMLChartExportPropertyMapper : public SvXMLExportPropertyMapper
{
private:
@@ -95,8 +88,6 @@ public:
com::sun::star::chart2::XChartDocument > xChartDoc );
};
-// ----------------------------------------
-
class XMLChartImportPropertyMapper : public SvXMLImportPropertyMapper
{
private:
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 6f562179434e..3b57c55db3de 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -24,7 +24,6 @@
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/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index afc000e6b4a3..c7a2c941d01f 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlnumfi.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-//////////////////////////////////////////////////////////////////////////////
// presentations:animations
struct SdXMLFixedDataStyle;
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 8c1be6c4c439..1f478af704b2 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -24,7 +24,6 @@
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/animationimport.hxx b/xmloff/inc/animationimport.hxx
index eacbea8b3c42..b905c8701ba8 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/animations/XAnimationNode.hpp>
-//////////////////////////////////////////////////////////////////////////////
// presentations:animations
namespace xmloff
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 2b381700b2e1..e0d45b92772b 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -25,7 +25,6 @@
class AnimImpImpl;
-//////////////////////////////////////////////////////////////////////////////
// presentations:animations
class XMLAnimationsContext : public SvXMLImportContext
diff --git a/xmloff/inc/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx
index 01f1a22f57ba..f29a5f9c630e 100644
--- a/xmloff/inc/forms/form_handler_factory.hxx
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -22,23 +22,17 @@
#include "forms/property_handler.hxx"
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= FormHandlerFactory
- //==================================================================================================================
class FormHandlerFactory
{
public:
static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId );
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 25c3d4544ea6..a727f6b664f4 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -29,16 +29,12 @@
#include <map>
#include <vector>
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues;
- //==================================================================================================================
//= IPropertyHandler
- //==================================================================================================================
class IPropertyHandler : public ::rtl::IReference
{
public:
@@ -60,19 +56,13 @@ namespace xmloff
virtual ~IPropertyHandler() { }
};
- //==================================================================================================================
//= PPropertyHandler
- //==================================================================================================================
typedef ::rtl::Reference< IPropertyHandler > PPropertyHandler;
- //==================================================================================================================
//= PropertyHandlerFactory
- //==================================================================================================================
typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId );
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_HANDLER_HXX
diff --git a/xmloff/inc/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
index f3e9e9a1e05d..48a06e67e88f 100644
--- a/xmloff/inc/forms/property_ids.hxx
+++ b/xmloff/inc/forms/property_ids.hxx
@@ -20,14 +20,10 @@
#ifndef XMLOFF_PROPERTY_IDS_HXX
#define XMLOFF_PROPERTY_IDS_HXX
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= PropertyId
- //==================================================================================================================
enum PropertyId
{
PID_DATE_MIN,
@@ -42,9 +38,7 @@ namespace xmloff
PID_INVALID
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_IDS_HXX
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index b17b85c63415..52c426718bc9 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -30,7 +30,6 @@
#include <vector>
-//////////////////////////////////////////////////////////////////////////////
// predeclarations
struct ImpSdXMLExpTransObj2DBase;
@@ -46,13 +45,9 @@ namespace basegfx
class B3DHomMatrix;
} // end of namespace basegfx
-//////////////////////////////////////////////////////////////////////////////
-
typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseList;
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImExTransform2D
{
ImpSdXMLExpTransObj2DBaseList maList;
@@ -74,8 +69,6 @@ public:
void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv);
};
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImExTransform3D
{
ImpSdXMLExpTransObj3DBaseList maList;
@@ -98,8 +91,6 @@ public:
void SetString(const OUString& rNew, const SvXMLUnitConverter& rConv);
};
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImExViewBox
{
OUString msString;
@@ -119,8 +110,6 @@ public:
const OUString& GetExportString();
};
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImExPointsElement
{
OUString msString;
@@ -143,8 +132,6 @@ public:
const com::sun::star::drawing::PointSequenceSequence& GetPointSequenceSequence() const { return maPoly; }
};
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImExSvgDElement
{
OUString msString;
@@ -179,7 +166,6 @@ public:
const com::sun::star::drawing::FlagSequenceSequence& GetFlagSequenceSequence() const { return maPoly.Flags; }
};
-
#endif // _XEXPTRANSFORM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 95ff607683c2..0a96bdece5e1 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -32,7 +32,6 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
-// ------------------------------------------------------------------------
class XMLVersionListExport : public SvXMLExport
{
private:
@@ -51,7 +50,6 @@ public:
void _ExportContent() {}
};
-// ------------------------------------------------------------------------
class XMLVersionListImport : public SvXMLImport
{
private:
@@ -77,7 +75,6 @@ public:
GetList() { return maVersions; }
};
-// ------------------------------------------------------------------------
class XMLVersionListContext : public SvXMLImportContext
{
private:
@@ -100,7 +97,6 @@ public:
};
-// ------------------------------------------------------------------------
class XMLVersionContext: public SvXMLImportContext
{
private:
@@ -121,8 +117,6 @@ public:
~XMLVersionContext();
};
-
-// ------------------------------------------------------------------------
class XMLVersionListPersistence : public ::cppu::WeakImplHelper1< ::com::sun::star::document::XDocumentRevisionListPersistence >
{
public:
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index e171214592e5..da9701365a90 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ColorPropertySet.hxx"
#include <cppuhelper/implbase1.hxx>
@@ -29,8 +28,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::RuntimeException;
-// ================================================================================
-
namespace
{
class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper1<
@@ -80,8 +77,6 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
} // anonymous namespace
-// ================================================================================
-
namespace xmloff
{
namespace chart
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index ba0b96483280..53e42c8ded35 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
-
/** @descr MultiPropertySetHandler handles the two slightly different
interfaces XPropertySet and XMultiPorpertySet for accessing
properties of an object.
@@ -60,9 +59,6 @@ public:
const OUString msName;
};
-
-
-
/** @descr For every property type there will be one instantiation of this
template class with its own and type specific version of SetValue.
*/
@@ -89,9 +85,6 @@ private:
T & mrValue;
};
-
-
-
/** @descr Function object for comparing two OUStrings.
*/
class OUStringComparison
@@ -104,9 +97,6 @@ public:
}
};
-
-
-
/** @descr This class lets you get the values from an object that either
supports the interface XPropertySet or XMultiPropertySet. If it
supports both interfaces then XMultiPropertySet is preferred.
@@ -184,19 +174,12 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> mxObject;
};
-
-
-//===== Inline implementation of the methods declared above ==========================
-
MultiPropertySetHandler::MultiPropertySetHandler (::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface> xObject)
: mxObject (xObject)
{
}
-
-
-
MultiPropertySetHandler::~MultiPropertySetHandler (void)
{
::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
@@ -204,8 +187,6 @@ MultiPropertySetHandler::~MultiPropertySetHandler (void)
delete I->second;
}
-
-
sal_Bool MultiPropertySetHandler::GetProperties (void)
{
::std::map< OUString, PropertyWrapperBase*, OUStringComparison>::iterator I;
@@ -219,9 +200,6 @@ sal_Bool MultiPropertySetHandler::GetProperties (void)
return sal_True;
}
-
-
-
sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Sequence<
OUString> & rNameList)
{
@@ -247,9 +225,6 @@ sal_Bool MultiPropertySetHandler::MultiGet (const ::com::sun::star::uno::Se
return sal_True;
}
-
-
-
sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Sequence<
OUString> & rNameList)
{
@@ -273,7 +248,6 @@ sal_Bool MultiPropertySetHandler::SingleGet (const ::com::sun::star::uno::Se
return sal_True;
}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index fb2a52266319..2757756122cc 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -92,11 +92,9 @@
#define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010 }
-// ---------------------------------------------------------
// PropertyMap for Chart properties drawing- and
// textproperties are added later using the chaining
// mechanism
-// ---------------------------------------------------------
// only create maps once!
// this define is set in PropertyMaps.cxx
@@ -222,9 +220,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_ENTRY_END
};
-// ----------------------------------------
// maps for enums to XML attributes
-// ----------------------------------------
SvXMLEnumMapEntry aXMLChartAxisLabelPositionEnumMap[] =
{
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index a21bced60927..ce07cbd7b4e8 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
// include PropertyMap.hxx with this define
// to create the maps
#ifndef _PROPERTYMAP_HXX_
@@ -76,8 +75,6 @@ using namespace ::xmloff::token;
// * XMLChartImportPropertyMapper
// * SchXMLStyleExport
-// ----------------------------------------
-
XMLChartPropHdlFactory::~XMLChartPropHdlFactory()
{
}
@@ -166,8 +163,6 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32
return pHdl;
}
-// ----------------------------------------
-
XMLChartPropertySetMapper::XMLChartPropertySetMapper() :
XMLPropertySetMapper( aXMLChartPropMap, new XMLChartPropHdlFactory )
{
@@ -177,8 +172,6 @@ XMLChartPropertySetMapper::~XMLChartPropertySetMapper()
{
}
-// ----------------------------------------
-
XMLChartExportPropertyMapper::XMLChartExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper,
SvXMLExport& rExport) :
SvXMLExportPropertyMapper( rMapper ),
@@ -506,8 +499,6 @@ void XMLChartExportPropertyMapper::setChartDoc( uno::Reference< chart2::XChartDo
mxChartDoc = xChartDoc;
}
-// ----------------------------------------
-
XMLChartImportPropertyMapper::XMLChartImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper,
const SvXMLImport& _rImport ) :
SvXMLImportPropertyMapper( rMapper, const_cast< SvXMLImport & >( _rImport )),
@@ -662,7 +653,6 @@ bool XMLChartImportPropertyMapper::handleSpecialItem(
}
}
-
// if we didn't handle it, the parent should
if( !bRet )
{
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 7844ae53bdf9..9f5a6d6ac454 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include "SchXMLAxisContext.hxx"
@@ -52,9 +51,6 @@ using namespace com::sun::star;
using com::sun::star::uno::Reference;
-//----------------------------------------
-//----------------------------------------
-
static SvXMLEnumMapEntry aXMLAxisDimensionMap[] =
{
{ XML_X, SCH_XML_AXIS_X },
@@ -71,9 +67,6 @@ static SvXMLEnumMapEntry aXMLAxisTypeMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-//----------------------------------------
-//----------------------------------------
-
class SchXMLCategoriesContext : public SvXMLImportContext
{
private:
@@ -88,10 +81,6 @@ public:
virtual void StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-//----------------------------------------
-//----------------------------------------
-
-
class DateScaleContext : public SvXMLImportContext
{
public:
@@ -106,10 +95,6 @@ private:
Reference< beans::XPropertySet > m_xAxisProps;
};
-
-//----------------------------------------
-//----------------------------------------
-
SchXMLAxisContext::SchXMLAxisContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName,
Reference< chart::XDiagram > xDiagram,
@@ -449,7 +434,6 @@ void SchXMLAxisContext::CreateAxis()
return;
}
-
m_xAxisProps = Reference<beans::XPropertySet>( lcl_getChartAxis( m_aCurrentAxis, m_xDiagram ), uno::UNO_QUERY );
if( m_bAddMissingXAxisForNetCharts && m_aCurrentAxis.eDimension==SCH_XML_AXIS_Y && m_aCurrentAxis.nAxisIndex==0 )
@@ -607,7 +591,6 @@ void SchXMLAxisContext::SetAxisTitle()
}
}
-//-----------------------------------------------------------------------
namespace
{
enum AxisChildTokens
@@ -728,8 +711,6 @@ void SchXMLAxisContext::EndElement()
SetAxisTitle();
}
-// ========================================
-
namespace
{
@@ -867,8 +848,6 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc
}
}
-// ========================================
-
SchXMLCategoriesContext::SchXMLCategoriesContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
@@ -902,8 +881,6 @@ void SchXMLCategoriesContext::StartElement( const Reference< xml::sax::XAttribut
}
}
-// ========================================
-
DateScaleContext::DateScaleContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
@@ -1033,6 +1010,4 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList >
m_xAxisProps->setPropertyValue("TimeIncrement", uno::makeAny( aIncrement ) );
}
-// ========================================
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index b166e97d254b..984598397eed 100644
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -22,8 +22,6 @@
#include "SchXMLImport.hxx"
#include "transporttypes.hxx"
-// ----------------------------------------
-
class SchXMLAxisContext : public SvXMLImportContext
{
public:
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 9331e241f892..04291e1f2afc 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "SchXMLChartContext.hxx"
#include "SchXMLImport.hxx"
#include "SchXMLLegendContext.hxx"
@@ -57,7 +56,6 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
-
using namespace com::sun::star;
using namespace ::xmloff::token;
using com::sun::star::uno::Reference;
@@ -221,8 +219,6 @@ uno::Sequence< sal_Int32 > lcl_getNumberSequenceFromString( const OUString& rStr
} // anonymous namespace
-// ----------------------------------------
-
SchXMLChartContext::SchXMLChartContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
@@ -480,7 +476,6 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
nOldSeriesCount = nMaxOldSeriesIndex+1;
}
-
//initialize new series styles
::std::map< Reference< chart2::XDataSeries >, sal_Int32 >::const_iterator aSeriesMapIt( aSeriesMap.begin() );
::std::map< Reference< chart2::XDataSeries >, sal_Int32 >::const_iterator aSeriesMapEnd( aSeriesMap.end() );
@@ -582,7 +577,6 @@ bool lcl_SpecialHandlingForDonutChartNeeded(
} // anonymous namespace
-
static void lcl_ApplyDataFromRectangularRangeToDiagram(
const uno::Reference< chart2::XChartDocument >& xNewDoc
, const OUString& rRectangularRange
@@ -661,7 +655,6 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram(
}
}
-
uno::Reference< chart2::data::XDataSource > xDataSource(
xDataProvider->createDataSource( aArgs ));
@@ -1105,7 +1098,6 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext(
return pContext;
}
-
/*
With a locked controller the following is done here:
1. Hide title, subtitle, and legend.
@@ -1144,8 +1136,6 @@ void SchXMLChartContext::InitChart(
}
}
-// ----------------------------------------
-
SchXMLTitleContext::SchXMLTitleContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport,
const OUString& rLocalName,
OUString& rTitle,
@@ -1197,7 +1187,6 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut
}
}
-
if( mxTitleShape.is())
{
if( bHasXPosition && bHasYPosition )
@@ -1237,7 +1226,4 @@ SvXMLImportContext* SchXMLTitleContext::CreateChildContext(
return pContext;
}
-// ----------------------------------------
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index 1e86bb3c4552..124ddc8660a3 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -45,8 +45,6 @@ namespace com { namespace sun { namespace star {
}
}}}
-// ----------------------------------------
-
struct SeriesDefaultsAndStyles
{
//default values for series:
@@ -133,8 +131,6 @@ private:
void MergeSeriesForStockChart();
};
-// ----------------------------------------
-
class SchXMLTitleContext : public SvXMLImportContext
{
private:
diff --git a/xmloff/source/chart/SchXMLEnumConverter.cxx b/xmloff/source/chart/SchXMLEnumConverter.cxx
index 9350f8676267..8e1e5da0c703 100644
--- a/xmloff/source/chart/SchXMLEnumConverter.cxx
+++ b/xmloff/source/chart/SchXMLEnumConverter.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
namespace
{
-//-----------------------------------------------------------------------
SvXMLEnumMapEntry aXMLLegendPositionEnumMap[] =
{
@@ -54,8 +53,6 @@ struct TheLegendPositionPropertyHdl : public rtl::Static< XMLLegendPositionPrope
{
};
-//-----------------------------------------------------------------------
-
SvXMLEnumMapEntry aXMLLegendExpansionEnumMap[] =
{
{ XML_WIDE, chart::ChartLegendExpansion_WIDE },
@@ -77,12 +74,8 @@ struct TheLegendExpansionPropertyHdl : public rtl::Static< XMLLegendExpansionPro
{
};
-//-----------------------------------------------------------------------
-
}//end anonymous namespace
-//-----------------------------------------------------------------------
-
XMLEnumPropertyHdl& SchXMLEnumConverter::getLegendPositionConverter()
{
return TheLegendPositionPropertyHdl::get();
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index da7e24e25838..15b7278e019a 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include <xmloff/xmlprmap.hxx>
@@ -101,7 +100,6 @@
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/container/XChild.hpp>
-
#include "MultiPropertySetHandler.hxx"
#include "PropertyMap.hxx"
@@ -114,9 +112,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
using ::std::vector;
-// ========================================
// class SchXMLExportHelper_Impl
-// ========================================
class SchXMLExportHelper_Impl
{
@@ -728,7 +724,6 @@ template< class T >
typename T::value_type m_fDefaultValue;
};
-
typedef ::std::map< sal_Int32, SchXMLExportHelper_Impl::tLabelValuesDataPair >
lcl_DataSequenceMap;
@@ -777,7 +772,6 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
}
}
-
lcl_TableData lcl_getDataForLocalTable(
const SchXMLExportHelper_Impl::tDataSequenceCont & aSequencesToExport,
const Reference< chart2::XAnyDescriptionAccess >& xAnyDescriptionAccess,
@@ -998,9 +992,7 @@ struct SchXMLDataPointStruct
SchXMLDataPointStruct() : mnRepeat( 1 ) {}
};
-// ========================================
// class SchXMLExportHelper
-// ========================================
SchXMLExportHelper::SchXMLExportHelper( SvXMLExport& rExport, SvXMLAutoStylePoolP& rASPool )
: m_pImpl( new SchXMLExportHelper_Impl( rExport, rASPool ) )
@@ -1046,7 +1038,6 @@ void SchXMLExportHelper_Impl::exportAutoStyles()
}
// private methods
-// ---------------
SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
SvXMLExport& rExport,
@@ -1218,9 +1209,8 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
// chart element
- // -------------
-
SvXMLElementExport* pElChart = 0;
+
// get property states for autostyles
if( mxExpPropMapper.is())
{
@@ -1302,8 +1292,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
aPropertyStates.clear();
// title element
- // -------------
-
if( bHasMainTitle )
{
// get property states for autostyles
@@ -1345,8 +1333,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
// subtitle element
- // ----------------
-
if( bHasSubTitle )
{
// get property states for autostyles
@@ -1389,7 +1375,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
// legend element
- // --------------
if( bHasLegend )
{
// get property states for autostyles
@@ -1468,12 +1453,10 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
// plot-area element
- // -----------------
if( xDiagram.is())
exportPlotArea( xDiagram, xNewDiagram, aPageSize, bExportContent, bIncludeTable );
// export additional shapes
- // ------------------------
if( xDocPropSet.is() )
{
if( bExportContent )
@@ -1551,7 +1534,6 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
// table element
// (is included as subelement of chart)
- // ------------------------------------
if( bExportContent )
{
// #85929# always export table, otherwise clipboard may loose data
@@ -1584,7 +1566,6 @@ static void lcl_exportComplexLabel( const Sequence< uno::Any >& rComplexLabel, S
void SchXMLExportHelper_Impl::exportTable()
{
// table element
- // -------------
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NAME, msTableName );
try
@@ -1883,7 +1864,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
msStringBuffer.setLength( 0 );
// plot-area element
- // -----------------
SvXMLElementExport* pElPlotArea = 0;
// get property states for autostyles
@@ -2018,11 +1998,9 @@ void SchXMLExportHelper_Impl::exportPlotArea(
aPropertyStates.clear();
// axis elements
- // -------------
exportAxes( xDiagram, xNewDiagram, bExportContent );
// series elements
- // ---------------
Reference< chart2::XAxis > xSecondYAxis = lcl_getAxis( lcl_getCooSys( xNewDiagram ), XML_Y, false );
exportSeries( xNewDiagram, rPageSize, bExportContent, xSecondYAxis.is() );
@@ -2102,8 +2080,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
// wall and floor element
- // ----------------------
-
Reference< chart::X3DDisplay > xWallFloorSupplier( xDiagram, uno::UNO_QUERY );
if( mxExpPropMapper.is() &&
xWallFloorSupplier.is())
@@ -2134,8 +2110,6 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
// floor element
- // -------------
-
// remove property states for autostyles
aPropertyStates.clear();
@@ -3259,7 +3233,6 @@ void SchXMLExportHelper_Impl::exportDataPoints(
OUString( "VaryColorsByPoint" )) >>= bVaryColorsByPoint;
}
-
sal_Int32 nSize = aDataPointSeq.getLength();
SAL_WARN_IF( nSize > nSeriesLength, "xmloff.chart", "Too many point attributes" );
@@ -3488,7 +3461,6 @@ void SchXMLExportHelper_Impl::addSize( const awt::Size & rSize, bool bIsOOoNames
msString = msStringBuffer.makeStringAndClear();
mrExport.AddAttribute( bIsOOoNamespace ? XML_NAMESPACE_CHART_EXT : XML_NAMESPACE_SVG , XML_WIDTH, msString );
-
mrExport.GetMM100UnitConverter().convertMeasureToXML(
msStringBuffer, rSize.Height);
msString = msStringBuffer.makeStringAndClear();
@@ -3534,9 +3506,7 @@ void SchXMLExportHelper_Impl::exportText( const OUString& rText, bool bConvertTa
SchXMLTools::exportText( mrExport, rText, bConvertTabsLFs );
}
-// ========================================
// class SchXMLExport
-// ========================================
SchXMLExport::SchXMLExport(
const Reference< uno::XComponentContext >& xContext,
@@ -3550,7 +3520,6 @@ SchXMLExport::SchXMLExport(
_GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
}
-
SchXMLExport::~SchXMLExport()
{
// stop progress view
@@ -3722,8 +3691,6 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
}
}
-// export components ========================================
-
// first version: everything goes in one storage
Sequence< OUString > SAL_CALL SchXMLExport_getSupportedServiceNames() throw()
@@ -3765,8 +3732,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Re
(EXPORT_ALL ^ ( EXPORT_SETTINGS | EXPORT_MASTERSTYLES | EXPORT_SCRIPTS )) | EXPORT_OASIS );
}
-// ============================================================
-
// multiple storage version: one for content / styles / meta
Sequence< OUString > SAL_CALL SchXMLExport_Styles_getSupportedServiceNames() throw()
@@ -3805,8 +3770,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(c
return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), EXPORT_STYLES | EXPORT_OASIS );
}
-// ------------------------------------------------------------
-
Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw()
{
const OUString aServiceName( "com.sun.star.comp.Chart.XMLContentExporter" );
@@ -3843,8 +3806,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(
return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_FONTDECLS | EXPORT_OASIS );
}
-// ------------------------------------------------------------
-
// Oasis format
Sequence< OUString > SAL_CALL SchXMLExport_Oasis_Meta_getSupportedServiceNames() throw()
{
@@ -3863,7 +3824,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(con
return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), EXPORT_META | EXPORT_OASIS );
}
-
// XServiceInfo
OUString SAL_CALL SchXMLExport::getImplementationName() throw( uno::RuntimeException )
{
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 3c43f5feaa79..749ff732faff 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "SchXMLImport.hxx"
#include "SchXMLChartContext.hxx"
#include "contexts.hxx"
@@ -76,34 +75,12 @@ private:
};
} // anonymous namespace
-/* ----------------------------------------
- TokenMaps for distinguishing different
- tokens in different contexts
- ----------------------------------------*/
+ // TokenMaps for distinguishing different
+ // tokens in different contexts
-// ----------------------------------------
// element maps
-// ----------------------------------------
-
-
-
-
-
-
-// ----------------------------------------
// attribute maps
-// ----------------------------------------
-
-
-
-
-
-
-
-
-
-// ========================================
SchXMLImportHelper::SchXMLImportHelper() :
mpAutoStyles( 0 ),
@@ -172,9 +149,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
return pContext;
}
-/* ----------------------------------------
- get various token maps
- ----------------------------------------*/
+// get various token maps
const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap()
{
@@ -281,8 +256,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap()
return *mpSeriesElemTokenMap;
}
-// ----------------------------------------
-
const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap()
{
if( ! mpChartAttrTokenMap )
@@ -395,8 +368,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
return *mpRegEquationAttrTokenMap;
}
-// ----------------------------------------
-
//static
void SchXMLImportHelper::DeleteDataSeries(
const Reference< chart2::XDataSeries > & xSeries,
@@ -520,8 +491,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
return xResult;
}
-// ========================================
-
// #110680#
SchXMLImport::SchXMLImport(
const Reference< uno::XComponentContext >& xContext,
@@ -673,8 +642,6 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
}
}
-// export components ========================================
-
// first version: everything comes from one storage
Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw()
@@ -695,8 +662,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Referenc
return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr));
}
-// ============================================================
-
// multiple storage version: one for content / styles / meta
Sequence< OUString > SAL_CALL SchXMLImport_Styles_getSupportedServiceNames() throw()
@@ -717,8 +682,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const R
return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_STYLES );
}
-// ------------------------------------------------------------
-
Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw()
{
const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisContentImporter" );
@@ -737,8 +700,6 @@ Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const
return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), IMPORT_CONTENT | IMPORT_AUTOSTYLES | IMPORT_FONTDECLS );
}
-// ------------------------------------------------------------
-
Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw()
{
const OUString aServiceName( "com.sun.star.comp.Chart.XMLOasisMetaImporter" );
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 0d0fe40a7986..592167c3e4ed 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -35,8 +35,6 @@ using namespace com::sun::star;
using com::sun::star::uno::Reference;
-//----------------------------------------
-
namespace
{
@@ -81,8 +79,6 @@ struct theLegendAttributeTokenMap : public rtl::Static< LegendAttributeTokenMap,
}//end anonymous namespace
-//----------------------------------------
-
SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper, SvXMLImport& rImport, const OUString& rLocalName ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
mrImportHelper( rImpHelper )
diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx
index 980af704bc82..f2f8f383e5d6 100644
--- a/xmloff/source/chart/SchXMLLegendContext.hxx
+++ b/xmloff/source/chart/SchXMLLegendContext.hxx
@@ -21,8 +21,6 @@
#include "SchXMLImport.hxx"
-// ----------------------------------------
-
class SchXMLLegendContext : public SvXMLImportContext
{
public:
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 684be432b6b1..070614e1afc8 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include "SchXMLPlotAreaContext.hxx"
@@ -624,8 +623,6 @@ void SchXMLPlotAreaContext::EndElement()
SchXMLAxisContext::CorrectAxisPositions( uno::Reference< chart2::XChartDocument >( mrImportHelper.GetChartDocument(), uno::UNO_QUERY ), maChartTypeServiceName, GetImport().GetODFVersion(), m_bAxisPositionAttributeImported );
}
-// ========================================
-
SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList,
const ::com::sun::star::uno::Reference<
@@ -676,8 +673,6 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
mrIndex += nRepeat;
}
-// ========================================
-
SchXMLPositonAttributesHelper::SchXMLPositonAttributesHelper( SvXMLImport& rImporter )
: m_rImport( rImporter )
, m_aPosition(0,0)
@@ -756,7 +751,6 @@ bool SchXMLPositonAttributesHelper::readPositioningAttribute( sal_uInt16 nPrefix
return bReturn;
}
-
void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
{
if( pPropStyleContext && pStylesCtxt )
@@ -769,8 +763,6 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS
}
}
-// ========================================
-
SchXMLCoordinateRegionContext::SchXMLCoordinateRegionContext(
SvXMLImport& rImport
, sal_uInt16 nPrefix
@@ -800,8 +792,6 @@ void SchXMLCoordinateRegionContext::StartElement( const uno::Reference< xml::sax
}
}
-// ========================================
-
SchXMLWallFloorContext::SchXMLWallFloorContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
@@ -863,8 +853,6 @@ void SchXMLWallFloorContext::StartElement( const uno::Reference< xml::sax::XAttr
}
}
-// ========================================
-
SchXMLStockContext::SchXMLStockContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
@@ -935,8 +923,6 @@ void SchXMLStockContext::StartElement( const uno::Reference< xml::sax::XAttribut
}
}
-// ========================================
-
static void lcl_setErrorBarSequence ( const uno::Reference< chart2::XChartDocument > &xDoc,
const uno::Reference< beans::XPropertySet > &xBarProp,
const OUString &aXMLRange,
@@ -1190,7 +1176,6 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
xBarProp->setPropertyValue("ShowPositiveError",uno::makeAny(sal_True));
xBarProp->setPropertyValue("ShowNegativeError",uno::makeAny(sal_True));
-
// first import defaults from parent style
SetErrorBarPropertiesFromStyleName( maSeriesStyleName, xBarProp, mrImportHelper, aPosRange, aNegRange );
SetErrorBarPropertiesFromStyleName( sAutoStyleName, xBarProp, mrImportHelper, aPosRange, aNegRange );
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 7fee620af78c..692c2443514f 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -42,8 +42,6 @@ namespace com { namespace sun { namespace star {
class XAttributeList;
}}}}}
-// ----------------------------------------
-
class SchXML3DSceneAttributesHelper : public SdXML3DSceneAttributesHelper
{
public:
@@ -56,8 +54,6 @@ private:
SchXML3DSceneAttributesHelper();
};
-// ----------------------------------------
-
class SchXMLPositonAttributesHelper
{
public:
@@ -71,7 +67,6 @@ public:
bool isAutomatic() const;
::com::sun::star::awt::Rectangle getRectangle() const;
-
private:
bool hasSize() const;
bool hasPosition() const;
@@ -89,8 +84,6 @@ private:
sal_Bool m_bAutoPosition;
};
-// ----------------------------------------
-
class SchXMLPlotAreaContext : public SvXMLImportContext
{
public:
@@ -149,8 +142,6 @@ private:
::com::sun::star::awt::Size maChartSize;
};
-//----------------------------------------
-
class SchXMLDataPointContext : public SvXMLImportContext
{
private:
@@ -171,8 +162,6 @@ public:
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
-
class SchXMLCoordinateRegionContext : public SvXMLImportContext
{
public:
@@ -188,8 +177,6 @@ private:
SchXMLPositonAttributesHelper& m_rPositioning;
};
-// ----------------------------------------
-
class SchXMLWallFloorContext : public SvXMLImportContext
{
public:
@@ -215,8 +202,6 @@ public:
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
-
class SchXMLStockContext : public SvXMLImportContext
{
public:
@@ -243,8 +228,6 @@ public:
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
-
class SchXMLStatisticsObjectContext : public SvXMLImportContext
{
public:
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 16635727bc15..e881298abe17 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "SchXMLSeries2Context.hxx"
#include "SchXMLPlotAreaContext.hxx"
#include "SchXMLRegressionCurveObjectContext.hxx"
@@ -62,8 +61,6 @@ using namespace ::xmloff::token;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-// ================================================================================
-
namespace
{
@@ -254,8 +251,6 @@ XMLPropStyleContext* lcl_GetStylePropContext(
} // anonymous namespace
-// ================================================================================
-
SchXMLSeries2Context::SchXMLSeries2Context(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport, const OUString& rLocalName,
@@ -455,7 +450,6 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib
tSchXMLLSequencesPerIndex::value_type(
tSchXMLIndexWithPart( m_rGlobalSeriesImportInfo.nCurrentDataIndex, SCH_XML_PART_LABEL ), xLabeledSeq ));
-
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeq( &xLabeledSeq, 1 );
Reference< chart2::data::XDataSink > xSink( m_xSeries, uno::UNO_QUERY_THROW );
xSink->setData( aSeq );
diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx
index 61f7ee1c241a..f433bf100938 100644
--- a/xmloff/source/chart/SchXMLSeriesHelper.cxx
+++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx
@@ -36,8 +36,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-// ----------------------------------------
-
::std::vector< Reference< chart2::XDataSeries > >
SchXMLSeriesHelper::getDataSeriesFromDiagram(
const Reference< chart2::XDiagram > & xDiagram )
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index ffc0e3bb37d6..902dad163ca5 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include "SchXMLTableContext.hxx"
@@ -213,11 +212,7 @@ template< typename T >
} // anonymous namespace
-
-// ----------------------------------------
// class SchXMLTableContext
-// ----------------------------------------
-
SchXMLTableContext::SchXMLTableContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
const OUString& rLName,
@@ -412,14 +407,8 @@ void SchXMLTableContext::setColumnPermutation( const uno::Sequence< sal_Int32 >
}
}
-// ========================================
// classes for columns
-// ========================================
-
-// ----------------------------------------
// class SchXMLTableColumnsContext
-// ----------------------------------------
-
SchXMLTableColumnsContext::SchXMLTableColumnsContext(
SvXMLImport& rImport,
const OUString& rLocalName,
@@ -451,10 +440,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext(
return pContext;
}
-// ----------------------------------------
// class SchXMLTableColumnContext
-// ----------------------------------------
-
SchXMLTableColumnContext::SchXMLTableColumnContext(
SvXMLImport& rImport,
const OUString& rLocalName,
@@ -513,14 +499,8 @@ SchXMLTableColumnContext::~SchXMLTableColumnContext()
{
}
-// ========================================
// classes for rows
-// ========================================
-
-// ----------------------------------------
// class SchXMLTableRowsContext
-// ----------------------------------------
-
SchXMLTableRowsContext::SchXMLTableRowsContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
@@ -556,10 +536,7 @@ SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext(
return pContext;
}
-// ----------------------------------------
// class SchXMLTableRowContext
-// ----------------------------------------
-
SchXMLTableRowContext::SchXMLTableRowContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
@@ -603,9 +580,6 @@ SvXMLImportContext* SchXMLTableRowContext::CreateChildContext(
return pContext;
}
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------
-
class SchXMLRangeSomewhereContext : public SvXMLImportContext
{
//#i113950# previously the range was exported to attribute text:id,
@@ -631,17 +605,8 @@ public:
virtual void EndElement();
};
-//---------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------
-
-// ========================================
// classes for cells and their content
-// ========================================
-
-// ----------------------------------------
// class SchXMLTableCellContext
-// ----------------------------------------
-
SchXMLTableCellContext::SchXMLTableCellContext(
SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
@@ -752,8 +717,6 @@ void SchXMLTableCellContext::EndElement()
mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ].aRangeId = maRangeId;
}
-// ========================================
-
static void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< uno::Any >& rComplexLabel )
{
if( rCell.eType == SCH_CELL_TYPE_STRING )
@@ -1155,8 +1118,6 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
}
-//---------------------------------------------------------------------------------------------------
-
SchXMLRangeSomewhereContext::SchXMLRangeSomewhereContext( SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 864fa4e07059..f6b212b8dbcf 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -35,8 +35,6 @@ namespace com { namespace sun { namespace star {
class XChartDocument;
}}}}
-// ========================================
-
class SchXMLTableContext : public SvXMLImportContext
{
private:
@@ -66,8 +64,6 @@ public:
void setColumnPermutation( const ::com::sun::star::uno::Sequence< sal_Int32 > & rPermutation );
};
-// ----------------------------------------
-
class SchXMLTableHelper
{
private:
@@ -90,11 +86,7 @@ public:
::com::sun::star::chart::ChartDataRowSource eDataRowSource );
};
-// ========================================
-
-// ----------------------------------------
// classes for columns
-// ----------------------------------------
/** With this context all column elements are parsed to
determine the index of the column containing
@@ -118,8 +110,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
-
class SchXMLTableColumnContext : public SvXMLImportContext
{
private:
@@ -133,9 +123,7 @@ public:
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
// classes for rows
-// ----------------------------------------
class SchXMLTableRowsContext : public SvXMLImportContext
{
@@ -156,8 +144,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
-
class SchXMLTableRowContext : public SvXMLImportContext
{
private:
@@ -177,9 +163,7 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ----------------------------------------
// classes for cells and their content
-// ----------------------------------------
class SchXMLTableCellContext : public SvXMLImportContext
{
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
index fbf15a2481ec..d0424c7485c6 100644
--- a/xmloff/source/chart/SchXMLTextListContext.cxx
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "SchXMLImport.hxx"
#include "SchXMLTextListContext.hxx"
#include "SchXMLParagraphContext.hxx"
@@ -31,7 +30,6 @@ using ::com::sun::star::uno::Reference;
using namespace com::sun::star;
using namespace ::xmloff::token;
-//-------------------------------------------------
class SchXMLListItemContext : public SvXMLImportContext
{
public:
@@ -81,8 +79,6 @@ SvXMLImportContext* SchXMLListItemContext::CreateChildContext(
return pContext;
}
-//-------------------------------------------------
-
SchXMLTextListContext::SchXMLTextListContext(
SvXMLImport& rImport
, const OUString& rLocalName
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index bc0b6bedab6c..b3c8660c9069 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "SchXMLTools.hxx"
#include <rtl/ustrbuf.hxx>
@@ -128,8 +127,6 @@ Reference< chart2::data::XDataSequence > lcl_createNewSequenceFromCachedXMLRange
} // anonymous namespace
-// ----------------------------------------
-
namespace SchXMLTools
{
@@ -200,7 +197,6 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
return g_aChartTypeNameMap;
}
-
OUString GetNewChartTypeName( const OUString & rOldChartTypeName )
{
OUString aNew(rOldChartTypeName);
@@ -503,7 +499,6 @@ void CreateCategories(
}
}
-
uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext* pPropStyleContext, const SvXMLStylesContext* pStylesCtxt )
{
uno::Any aRet;
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index 80dd860f9a02..74bad3daa544 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -31,8 +31,6 @@
using namespace com::sun::star;
using namespace ::xmloff::token;
-// ==================================================
-
class SchXMLBodyContext_Impl : public SvXMLImportContext
{
private:
@@ -71,8 +69,6 @@ SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext(
rLocalName );
}
-// ==================================================
-
SchXMLDocContext::SchXMLDocContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
@@ -134,8 +130,6 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext(
return pContext;
}
-// ==================================================
-
SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl(
SchXMLImportHelper& i_rImpHelper,
SchXMLImport& i_rImport,
@@ -150,7 +144,6 @@ SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl(
SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { }
-
SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
@@ -167,8 +160,6 @@ SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext(
}
}
-// ----------------------------------------
-
SchXMLBodyContext::SchXMLBodyContext( SchXMLImportHelper& rImpHelper,
SvXMLImport& rImport,
sal_uInt16 nPrefix,
@@ -217,5 +208,4 @@ SvXMLImportContext* SchXMLBodyContext::CreateChildContext(
return pContext;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index 4a7b830a8740..b728b4526808 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -30,13 +30,11 @@ namespace com { namespace sun { namespace star { namespace xml { namespace sax {
class XAttributeList;
}}}}}
-/* ========================================
-
+/*
These contexts are only nedded by
SchXMLImport not by the SchXMLImportHelper
that is also used by other applications
-
- ======================================== */
+*/
class SchXMLDocContext : public virtual SvXMLImportContext
{
@@ -59,8 +57,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ========================================
-
// context for flat file xml format
class SchXMLFlatDocContext_Impl
: public SchXMLDocContext, public SvXMLMetaDocumentContext
@@ -79,8 +75,6 @@ public:
const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& i_xAttrList);
};
-// ========================================
-
class SchXMLBodyContext : public SvXMLImportContext
{
private:
@@ -101,8 +95,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
};
-// ========================================
-
#endif // _SCH_XML_CONTEXTS_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 65afd19eaa27..0060154a47ae 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -89,8 +89,6 @@ typedef ::std::multimap< tSchXMLIndexWithPart,
bool operator < ( const tSchXMLIndexWithPart & rFirst, const tSchXMLIndexWithPart & rSecond );
-// ----------------------------------------
-
struct SchNumericCellRangeAddress
{
sal_Int32 nRow1, nRow2;
@@ -108,8 +106,6 @@ struct SchNumericCellRangeAddress
}
};
-// ----------------------------------------
-
enum SchXMLAxisDimension
{
SCH_XML_AXIS_X = 0,
@@ -129,8 +125,6 @@ struct SchXMLAxis
SchXMLAxis() : eDimension( SCH_XML_AXIS_UNDEF ), nAxisIndex( 0 ), bHasCategories( false ) {}
};
-// ----------------------------------------
-
struct GlobalSeriesImportInfo
{
GlobalSeriesImportInfo( sal_Bool& rAllRangeAddressesAvailable )
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index b741d51e796d..72b7bef32d14 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -119,8 +119,6 @@ uno::Reference<container::XIndexContainer> XMLMyList::GetIndexContainer()
return xIndexContainer;
}
-//=============================================================================
-
class XMLConfigBaseContext : public SvXMLImportContext
{
protected:
@@ -137,8 +135,6 @@ public:
void AddPropertyValue() { maProps.push_back(maProp); }
};
-//=============================================================================
-
class XMLConfigItemContext : public SvXMLImportContext
{
OUString msType;
@@ -168,8 +164,6 @@ public:
virtual void ManipulateConfigItem();
};
-//=============================================================================
-
class XMLConfigItemSetContext : public XMLConfigBaseContext
{
public:
@@ -188,8 +182,6 @@ public:
virtual void EndElement();
};
-//=============================================================================
-
class XMLConfigItemMapNamedContext : public XMLConfigBaseContext
{
public:
@@ -208,8 +200,6 @@ public:
virtual void EndElement();
};
-//=============================================================================
-
class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext
{
private:
@@ -233,8 +223,6 @@ public:
virtual void EndElement();
};
-//=============================================================================
-
SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
@@ -278,7 +266,6 @@ SvXMLImportContext *CreateSettingsContext(SvXMLImport& rImport, sal_uInt16 p_nPr
return pContext;
}
-//=============================================================================
namespace
{
struct SettingsGroup
@@ -307,8 +294,6 @@ struct XMLDocumentSettingsContext_Data
::std::list< SettingsGroup > aDocSpecificSettings;
};
-//=============================================================================
-
XMLDocumentSettingsContext::XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& )
: SvXMLImportContext( rImport, nPrfx, rLName )
@@ -455,8 +440,6 @@ void XMLDocumentSettingsContext::EndElement()
}
}
-//=============================================================================
-
XMLConfigBaseContext::XMLConfigBaseContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, com::sun::star::uno::Any& rTempAny,
XMLConfigBaseContext* pTempBaseContext)
@@ -472,8 +455,6 @@ XMLConfigBaseContext::~XMLConfigBaseContext()
{
}
-//=============================================================================
-
XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference<
@@ -504,8 +485,6 @@ void XMLConfigItemSetContext::EndElement()
mpBaseContext->AddPropertyValue();
}
-//=============================================================================
-
XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -583,7 +562,6 @@ void XMLConfigItemContext::Characters( const OUString& rChars )
msValue += rChars;
}
-
void XMLConfigItemContext::EndElement()
{
if (mpBaseContext)
@@ -694,9 +672,6 @@ void XMLConfigItemContext::ManipulateConfigItem()
}
}
-
-//=============================================================================
-
XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>&,
@@ -730,8 +705,6 @@ void XMLConfigItemMapNamedContext::EndElement()
}
}
-//=============================================================================
-
XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference<
diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx
index 18a24c799cef..4c7b8fd9084c 100644
--- a/xmloff/source/core/ProgressBarHelper.cxx
+++ b/xmloff/source/core/ProgressBarHelper.cxx
@@ -17,12 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-
-
-
-
-//___________________________________________________________________
#include <xmloff/ProgressBarHelper.hxx>
#include <tools/debug.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 43355a5925b4..0369e32e860b 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include "PropertySetMerger.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -64,9 +63,7 @@ public:
virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(RuntimeException);
};
-// --------------------------------------------------------------------
// Interface implementation
-// --------------------------------------------------------------------
PropertySetMergerImpl::PropertySetMergerImpl( Reference< XPropertySet > rPropSet1, Reference< XPropertySet > rPropSet2 )
: mxPropSet1( rPropSet1 )
diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index eb7936047b09..d2b830fead3f 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "RDFaExportHelper.hxx"
#include "xmloff/xmlnmspe.hxx"
@@ -52,7 +51,6 @@
#include <functional>
#include <algorithm>
-
using namespace ::com::sun::star;
namespace xmloff {
@@ -103,9 +101,6 @@ getRelativeReference(SvXMLExport const& rExport, OUString const& rURI)
return relativeURI;
}
-
-////////////////////////////////////////////////////////////////////////////
-
RDFaExportHelper::RDFaExportHelper(SvXMLExport & i_rExport)
: m_rExport(i_rExport), m_xRepository(0), m_Counter(0)
{
@@ -131,8 +126,6 @@ RDFaExportHelper::LookupBlankNode(
return rEntry;
}
-////////////////////////////////////////////////////////////////////////////
-
void
RDFaExportHelper::AddRDFa(
uno::Reference<rdf::XMetadatable> const & i_xMetadatable)
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 3ff61d1b9055..1e8aea45f7f5 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "RDFaImportHelper.hxx"
#include <xmloff/xmlimp.hxx>
@@ -45,7 +44,6 @@
#include <functional>
#include <algorithm>
-
using namespace ::com::sun::star;
namespace xmloff {
@@ -148,9 +146,6 @@ struct SAL_DLLPRIVATE RDFaEntry
{ }
};
-////////////////////////////////////////////////////////////////////////////
-
-
static inline bool isWS(const sal_Unicode i_Char)
{
return ('\t' == i_Char) || ('\n' == i_Char) || ('\r' == i_Char)
@@ -264,8 +259,6 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const & i_rURIOrSafeCURIE) const
}
}
-////////////////////////////////////////////////////////////////////////////
-
uno::Reference< rdf::XBlankNode >
RDFaInserter::LookupBlankNode(OUString const & i_rNodeId )
{
@@ -391,8 +384,6 @@ void RDFaInserter::InsertRDFaEntry(
}
}
-////////////////////////////////////////////////////////////////////////////
-
RDFaImportHelper::RDFaImportHelper(const SvXMLImport & i_rImport)
: m_rImport(i_rImport)
{
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx
index 22a6f464b6b9..72b9893288e0 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/io/XOutputStream.hpp>
#include <sax/tools/converter.hxx>
@@ -25,16 +24,12 @@
#include <xmloff/xmlimp.hxx>
#include <xmloff/XMLBase64ImportContext.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::io;
-//-----------------------------------------------------------------------------
-
TYPEINIT1( XMLBase64ImportContext, SvXMLImportContext );
-
XMLBase64ImportContext::XMLBase64ImportContext(
SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList >&,
@@ -48,7 +43,6 @@ XMLBase64ImportContext::~XMLBase64ImportContext()
{
}
-
void XMLBase64ImportContext::EndElement()
{
xOut->closeOutput();
@@ -79,5 +73,4 @@ void XMLBase64ImportContext::Characters( const OUString& rChars )
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLBasicExportFilter.cxx b/xmloff/source/core/XMLBasicExportFilter.cxx
index abc408cc4e55..eb3f0eceb38a 100644
--- a/xmloff/source/core/XMLBasicExportFilter.cxx
+++ b/xmloff/source/core/XMLBasicExportFilter.cxx
@@ -22,25 +22,18 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
-// =============================================================================
// XMLBasicExportFilter
-// =============================================================================
XMLBasicExportFilter::XMLBasicExportFilter( const Reference< xml::sax::XDocumentHandler >& rxHandler )
:m_xHandler( rxHandler )
{
}
-// -----------------------------------------------------------------------------
-
XMLBasicExportFilter::~XMLBasicExportFilter()
{
}
-// -----------------------------------------------------------------------------
// XDocumentHandler
-// -----------------------------------------------------------------------------
void XMLBasicExportFilter::startDocument()
throw (xml::sax::SAXException, RuntimeException)
@@ -48,16 +41,12 @@ void XMLBasicExportFilter::startDocument()
// do nothing, filter this
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::endDocument()
throw (xml::sax::SAXException, RuntimeException)
{
// do nothing, filter this
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::startElement( const OUString& aName,
const Reference< xml::sax::XAttributeList >& xAttribs )
throw (xml::sax::SAXException, RuntimeException)
@@ -66,8 +55,6 @@ void XMLBasicExportFilter::startElement( const OUString& aName,
m_xHandler->startElement( aName, xAttribs );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::endElement( const OUString& aName )
throw (xml::sax::SAXException, RuntimeException)
{
@@ -75,8 +62,6 @@ void XMLBasicExportFilter::endElement( const OUString& aName )
m_xHandler->endElement( aName );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::characters( const OUString& aChars )
throw (xml::sax::SAXException, RuntimeException)
{
@@ -84,8 +69,6 @@ void XMLBasicExportFilter::characters( const OUString& aChars )
m_xHandler->characters( aChars );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces )
throw (xml::sax::SAXException, RuntimeException)
{
@@ -93,8 +76,6 @@ void XMLBasicExportFilter::ignorableWhitespace( const OUString& aWhitespaces )
m_xHandler->ignorableWhitespace( aWhitespaces );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::processingInstruction( const OUString& aTarget,
const OUString& aData )
throw (xml::sax::SAXException, RuntimeException)
@@ -103,8 +84,6 @@ void XMLBasicExportFilter::processingInstruction( const OUString& aTarget,
m_xHandler->processingInstruction( aTarget, aData );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicExportFilter::setDocumentLocator( const Reference< xml::sax::XLocator >& xLocator )
throw (xml::sax::SAXException, RuntimeException)
{
@@ -112,6 +91,4 @@ void XMLBasicExportFilter::setDocumentLocator( const Reference< xml::sax::XLocat
m_xHandler->setDocumentLocator( xLocator );
}
-// -----------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index a3b000443dcf..562ddee37f7b 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -32,7 +32,6 @@
#include "xmloff/XMLFilterServiceNames.h"
#include "XMLEmbeddedObjectImportContext.hxx"
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
@@ -135,8 +134,6 @@ void XMLEmbeddedObjectImportContext_Impl::Characters( const OUString& rChars )
xHandler->characters( rChars );
}
-//-----------------------------------------------------------------------------
-
TYPEINIT1( XMLEmbeddedObjectImportContext, SvXMLImportContext );
sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
@@ -145,7 +142,6 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent(
if( !rComp.is() || sFilterService.isEmpty() )
return sal_False;
-
Sequence<Any> aArgs( 0 );
Reference< XComponentContext > xContext( GetImport().GetComponentContext() );
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index f479ba51e9ab..d5a3f34b129a 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -27,12 +27,9 @@
#include "xmloff/unoatrcn.hxx"
-
using namespace ::com::sun::star;
-// --------------------------------------------------------------------
// Interface implementation
-// --------------------------------------------------------------------
uno::Reference< uno::XInterface > SvUnoAttributeContainer_CreateInstance()
{
@@ -278,5 +275,4 @@ sal_Bool SvUnoAttributeContainer::supportsService(const OUString& ServiceName)
return sal_False;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1dfb82ee5716..a8955ca52df8 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -88,7 +88,6 @@
#include <comphelper/xmltools.hxx>
-
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -139,8 +138,6 @@ const XMLServiceMapEntry_Impl aServiceMap[] =
{ 0, 0, 0, 0 }
};
-//==============================================================================
-
class SAL_DLLPRIVATE SettingsExportFacade : public ::xmloff::XMLSettingsExportContext
{
public:
@@ -205,8 +202,6 @@ Reference< XComponentContext > SettingsExportFacade::GetComponentContext() const
return m_rExport.getComponentContext();
}
-//==============================================================================
-
class SvXMLExportEventListener : public cppu::WeakImplHelper1<
com::sun::star::lang::XEventListener >
{
@@ -241,8 +236,6 @@ void SAL_CALL SvXMLExportEventListener::disposing( const lang::EventObject& )
}
}
-//==============================================================================
-
class SAL_DLLPRIVATE SvXMLExport_Impl
{
public:
@@ -299,8 +292,6 @@ SvXMLExport_Impl::SvXMLExport_Impl()
mxUriReferenceFactory = uri::UriReferenceFactory::create( comphelper::getProcessComponentContext() );
}
-//==============================================================================
-
void SvXMLExport::SetDocHandler( const uno::Reference< xml::sax::XDocumentHandler > &rHandler )
{
mxHandler = rHandler;
@@ -594,8 +585,6 @@ SvXMLExport::~SvXMLExport()
delete mpImpl;
}
-///////////////////////////////////////////////////////////////////////
-
// XExporter
void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )
throw(lang::IllegalArgumentException, uno::RuntimeException)
@@ -881,7 +870,6 @@ void SAL_CALL SvXMLExport::setName( const OUString& )
// do nothing, because it is not possible to set the FilterName
}
-
// XServiceInfo
OUString SAL_CALL SvXMLExport::getImplementationName( ) throw(uno::RuntimeException)
{
@@ -905,8 +893,6 @@ uno::Sequence< OUString > SAL_CALL SvXMLExport::getSupportedServiceNames( )
return aSeq;
}
-///////////////////////////////////////////////////////////////////////
-
OUString
SvXMLExport::EnsureNamespace(OUString const & i_rNamespace,
OUString const & i_rPreferredPrefix)
@@ -953,8 +939,6 @@ SvXMLExport::EnsureNamespace(OUString const & i_rNamespace,
return sPrefix;
}
-///////////////////////////////////////////////////////////////////////
-
void SvXMLExport::AddAttributeASCII( sal_uInt16 nPrefixKey,
const sal_Char *pName,
const sal_Char *pValue )
@@ -1422,8 +1406,6 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
nPos = mpNamespaceMap->GetNextKey( nPos );
}
-
-
// office:version = ...
if( !mbExtended )
{
@@ -1519,7 +1501,6 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
ImplExportContent();
}
-
mxHandler->endDocument();
if( bOwnGraphicResolver )
@@ -1944,7 +1925,6 @@ sal_Int32 SvXMLExport::dataStyleForceSystemLanguage(sal_Int32 nFormat) const
? mpNumExport->ForceSystemLanguage( nFormat ) : nFormat;
}
-
OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectURL )
{
OUString sRet( rGraphicObjectURL );
@@ -2381,7 +2361,6 @@ void SvXMLExport::IgnorableWhitespace()
}
}
-
void SvXMLExport::SetError(
sal_Int32 nId,
const Sequence<OUString>& rMsgParams,
@@ -2565,8 +2544,6 @@ sal_Bool SvXMLExport::SetNullDateOnUnitConverter()
return mpImpl->mbNullDateInitialized;
}
-//=============================================================================
-
void SvXMLElementExport::StartElement( SvXMLExport& rExp,
sal_uInt16 nPrefixKey,
const OUString& rLName,
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d7f43baed9e1..d59d8b868e91 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -62,7 +62,6 @@
using ::com::sun::star::beans::XPropertySetInfo;
-
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -115,8 +114,6 @@ sal_Char const sXML_np__text_old[] = "__text";
sal_Char const sXML_np__table_old[] = "__table";
sal_Char const sXML_np__meta_old[] = "__meta";
-
-
class SvXMLImportEventListener : public cppu::WeakImplHelper1<
com::sun::star::lang::XEventListener >
{
@@ -823,8 +820,6 @@ void SvXMLImport::SetStatistics(const uno::Sequence< beans::NamedValue> &)
GetProgressBarHelper()->SetReference(0);
}
-///////////////////////////////////////////////////////////////////////
-
// XImporter
void SAL_CALL SvXMLImport::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc )
throw(lang::IllegalArgumentException, uno::RuntimeException)
@@ -1009,8 +1004,6 @@ uno::Sequence< OUString > SAL_CALL SvXMLImport::getSupportedServiceNames( )
return aSeq;
}
-///////////////////////////////////////////////////////////////////////
-
XMLTextImportHelper* SvXMLImport::CreateTextImport()
{
return new XMLTextImportHelper( mxModel, *this );
@@ -1031,8 +1024,6 @@ SchXMLImportHelper* SvXMLImport::CreateChartImport()
return new ::xmloff::OFormLayerXMLImport(*this);
}
-
-///////////////////////////////////////////////////////////////////////////////
//
// Get or create fill/line/lineend-style-helper
//
@@ -1649,7 +1640,6 @@ void SvXMLImport::_CreateNumberFormatsSupplier()
uno::Reference< util::XNumberFormatsSupplier> (mxModel, uno::UNO_QUERY);
}
-
void SvXMLImport::_CreateDataStylesImport()
{
SAL_WARN_IF( mpNumImport != NULL, "xmloff.core", "data styles import already exists!" );
@@ -1659,7 +1649,6 @@ void SvXMLImport::_CreateDataStylesImport()
mpNumImport = new SvXMLNumFmtHelper(xNum, GetComponentContext() );
}
-
sal_Unicode SvXMLImport::ConvStarBatsCharToStarSymbol( sal_Unicode c )
{
sal_Unicode cNew = c;
@@ -1696,8 +1685,6 @@ sal_Unicode SvXMLImport::ConvStarMathCharToStarSymbol( sal_Unicode c )
return cNew;
}
-
-
void SvXMLImport::SetError(
sal_Int32 nId,
const Sequence<OUString>& rMsgParams,
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index 51597208992f..998b773e5d4d 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -20,12 +20,8 @@
#include <xmloff/xmlmultiimagehelper.hxx>
#include <rtl/ustring.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
namespace
{
sal_uInt32 getQualityIndex(const OUString& rString)
@@ -72,8 +68,6 @@ namespace
}
}
-//////////////////////////////////////////////////////////////////////////////
-
MultiImageImportHelper::MultiImageImportHelper()
: maImplContextVector(),
mbSupportsMultipleContents(false)
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 1087017ca1ae..dd6ce09d445d 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -24,7 +24,6 @@
using namespace ::xmloff::token;
-
class SvXMLTokenMapEntry_Impl
{
sal_uInt16 nPrefixKey;
@@ -64,8 +63,6 @@ public:
class SvXMLTokenMap_Impl : public boost::ptr_set<SvXMLTokenMapEntry_Impl> {};
-// ---------------------------------------------------------------------
-
SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_uInt16 nKeyPrefix,
const OUString& rLName ) const
{
@@ -106,5 +103,4 @@ sal_uInt16 SvXMLTokenMap::Get( sal_uInt16 nKeyPrefix,
return XML_TOK_UNKNOWN;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index dafadbf14961..0490ebea22c3 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -27,7 +27,6 @@
#include "XMLShapePropertySetContext.hxx"
#include <xmloff/XMLGraphicsDefaultStyle.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -39,8 +38,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES;
using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
-// ---------------------------------------------------------------------
-
TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext );
XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
@@ -119,5 +116,4 @@ void XMLGraphicsDefaultStyle::SetDefaults()
FillPropertySet( xDefaults );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 26dd94a1063d..0fbbf792e551 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -31,7 +31,6 @@
using namespace ::xmloff::token;
-
struct SdXMLDataStyleNumber
{
enum XMLTokenEnum meNumberStyle;
@@ -86,7 +85,6 @@ struct SdXMLDataStyleNumber
#define DATA_STYLE_NUMBER_SECONDS 18 // <number:seconds/>
#define DATA_STYLE_NUMBER_SECONDS_02 19 // <number:seconds number:/>
-
struct SdXMLFixedDataStyle
{
const char* mpName;
@@ -312,8 +310,6 @@ const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
&aSdXML_TimeStyle_7
};
-
-///////////////////////////////////////////////////////////////////////
// export
static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumber& rElement )
@@ -478,8 +474,6 @@ OUString SdXMLNumberStylesExporter::getDateStyleName(const sal_Int32 nDateFormat
}
}
-
-///////////////////////////////////////////////////////////////////////
// import
class SdXMLNumberFormatMemberImportContext : public SvXMLImportContext
@@ -587,7 +581,6 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars )
TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext );
-
SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles)
: SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles),
mbAutomatic( sal_False ),
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 22aacdf9cfdf..226954d632f1 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "XMLShapePropertySetContext.hxx"
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlnumi.hxx>
@@ -26,12 +25,9 @@
#include "sdpropls.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLShapePropertySetContext, SvXMLPropertySetContext );
XMLShapePropertySetContext::XMLShapePropertySetContext(
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index a35a1daa01cc..736a5d1614b7 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <xmloff/XMLShapeStyleContext.hxx>
#include "XMLShapePropertySetContext.hxx"
@@ -34,7 +33,6 @@
#include "sdpropls.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -43,8 +41,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES;
using ::xmloff::token::XML_GRAPHIC_PROPERTIES;
using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLShapeStyleContext, XMLPropStyleContext );
XMLShapeStyleContext::XMLShapeStyleContext(
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 99beb23a349f..4ea26ce05d02 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -67,7 +66,6 @@
#include "animations.hxx"
#include "animationimport.hxx"
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star::beans;
@@ -90,15 +88,6 @@ using ::com::sun::star::lang::XInitialization;
namespace xmloff
{
-///////////////////////////////////////////////////////////////////////
-
-
-
-///////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////
-
class AnimationsImportHelperImpl
{
private:
@@ -622,8 +611,6 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue )
return makeAny( rValue );
}
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( AnimationNodeContext, SvXMLImportContext );
AnimationNodeContext::AnimationNodeContext(
@@ -1253,8 +1240,6 @@ SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefi
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-// --------------------------------------------------------------------
-
class AnimationsImport: public SvXMLImport, public XAnimationNodeSupplier
{
public:
@@ -1377,7 +1362,6 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
{
Reference< XTransitionFilter > xTransFilter( xChildNode, UNO_QUERY_THROW );
-
xPageProps->setPropertyValue("TransitionType", Any( xTransFilter->getTransition() ) );
xPageProps->setPropertyValue("TransitionSubtype", Any( xTransFilter->getSubtype() ) );
xPageProps->setPropertyValue("TransitionDirection", Any( xTransFilter->getDirection() ) );
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index f6964886d45e..3c73c033f8e9 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/presentation/AnimationEffect.hpp>
@@ -37,7 +36,6 @@
#include "anim.hxx"
#include "animimp.hxx"
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -317,8 +315,6 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti
}
}
-///////////////////////////////////////////////////////////////////////
-
class AnimImpImpl
{
public:
@@ -356,8 +352,6 @@ public:
{}
};
-///////////////////////////////////////////////////////////////////////
-
enum XMLActionKind
{
XMLE_SHOW,
@@ -449,7 +443,6 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext()
{
}
-
TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext );
XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl )
@@ -656,8 +649,6 @@ void XMLAnimationsEffectContext::EndElement()
}
}
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLAnimationsContext, SvXMLImportContext );
XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx
index 265918c6187d..66df45a976b0 100644
--- a/xmloff/source/draw/descriptionimp.cxx
+++ b/xmloff/source/draw/descriptionimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <xmloff/xmltoken.hxx>
@@ -27,7 +26,6 @@
#include "descriptionimp.hxx"
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -38,8 +36,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLDescriptionContext, SvXMLImportContext );
SdXMLDescriptionContext::SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx
index 5b77fa96b9c0..0284116d1514 100644
--- a/xmloff/source/draw/descriptionimp.hxx
+++ b/xmloff/source/draw/descriptionimp.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/drawing/XShape.hpp>
-//////////////////////////////////////////////////////////////////////////////
// office:events inside a shape
class SdXMLDescriptionContext : public SvXMLImportContext
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index ba288e63b02b..36e41561ec1f 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
@@ -38,7 +37,6 @@
#include "eventimp.hxx"
#include "anim.hxx"
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -53,8 +51,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::presentation;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////
-
SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] =
{
{ XML_NONE, ClickAction_NONE },
@@ -74,8 +70,6 @@ SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////
-
class SdXMLEventContext : public SvXMLImportContext
{
private:
@@ -105,8 +99,6 @@ public:
OUString msLanguage;
};
-///////////////////////////////////////////////////////////////////////
-
class XMLEventSoundContext : public SvXMLImportContext
{
SdXMLEventContext* mpParent;
@@ -155,8 +147,6 @@ XMLEventSoundContext::~XMLEventSoundContext()
{
}
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLEventContext, SvXMLImportContext );
SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape )
@@ -493,8 +483,6 @@ void SdXMLEventContext::EndElement()
} while(0);
}
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLEventsContext, SvXMLImportContext );
SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx
index 8704d9978fcf..59828d9ba4ea 100644
--- a/xmloff/source/draw/eventimp.hxx
+++ b/xmloff/source/draw/eventimp.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/drawing/XShape.hpp>
-//////////////////////////////////////////////////////////////////////////////
// office:events inside a shape
class SdXMLEventsContext : public SvXMLImportContext
diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx
index c6754e179c04..c314bb87bf51 100644
--- a/xmloff/source/draw/layerimp.hxx
+++ b/xmloff/source/draw/layerimp.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-//////////////////////////////////////////////////////////////////////////////
// presentations:animations
class SdXMLLayerSetContext : public SvXMLImportContext
diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx
index 96043fa6be7e..75241da9e489 100644
--- a/xmloff/source/draw/numithdl.cxx
+++ b/xmloff/source/draw/numithdl.cxx
@@ -21,7 +21,6 @@
using namespace ::com::sun::star;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLNumRulePropHdl
//
diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx
index 82c1dda41c12..b9b55b316bb8 100644
--- a/xmloff/source/draw/propimp0.cxx
+++ b/xmloff/source/draw/propimp0.cxx
@@ -32,17 +32,12 @@
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
// implementation of graphic property Stroke
-
-//////////////////////////////////////////////////////////////////////////////
// implementation of presentation page property Change
-//////////////////////////////////////////////////////////////////////////////
// implementation of an effect duration property handler
-
XMLDurationPropertyHdl::~XMLDurationPropertyHdl()
{
}
@@ -84,10 +79,8 @@ sal_Bool XMLDurationPropertyHdl::exportXML(
return sal_False;
}
-//////////////////////////////////////////////////////////////////////////////
// implementation of an opacity property handler
-
XMLOpacityPropertyHdl::XMLOpacityPropertyHdl( SvXMLImport* pImport )
: mpImport( pImport )
{
@@ -166,7 +159,6 @@ sal_Bool XMLOpacityPropertyHdl::exportXML(
return bRet;
}
-//////////////////////////////////////////////////////////////////////////////
// implementation of an text animation step amount
XMLTextAnimationStepPropertyHdl::~XMLTextAnimationStepPropertyHdl()
@@ -233,8 +225,6 @@ sal_Bool XMLTextAnimationStepPropertyHdl::exportXML(
return bRet;
}
-//////////////////////////////////////////////////////////////////////////////
-
#include "sdxmlexp_impl.hxx"
XMLDateTimeFormatHdl::XMLDateTimeFormatHdl( SvXMLExport* pExport )
diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx
index 0324a7e41a69..e20add963997 100644
--- a/xmloff/source/draw/propimp0.hxx
+++ b/xmloff/source/draw/propimp0.hxx
@@ -22,7 +22,6 @@
#include <xmloff/xmlprhdl.hxx>
-//////////////////////////////////////////////////////////////////////////////
// graphic property Stroke
class XMLDurationPropertyHdl : public XMLPropertyHandler
@@ -66,7 +65,6 @@ public:
virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
};
-
#endif // _PROPIMP0_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 9fa89b35f7d7..bb709c799b7f 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -68,7 +68,6 @@
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -81,7 +80,6 @@ using namespace ::xmloff::token;
#define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context)
#define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010}
-//////////////////////////////////////////////////////////////////////////////
// entry list for graphic properties
const XMLPropertyMapEntry aXMLSDProperties[] =
@@ -292,7 +290,6 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
MAP_END()
};
-//////////////////////////////////////////////////////////////////////////////
// entry list for presentation page properties
const XMLPropertyMapEntry aXMLSDPresPageProps[] =
@@ -365,7 +362,6 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] =
MAP_END()
};
-//////////////////////////////////////////////////////////////////////////////
// implementation of factory for own graphic properties
SvXMLEnumMapEntry aXML_LineStyle_EnumMap[] =
@@ -500,7 +496,6 @@ SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-//////////////////////////////////////////////////////////////////////////////
// 3D EnumMaps
SvXMLEnumMapEntry aXML_NormalsKind_EnumMap[] =
@@ -732,8 +727,6 @@ SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
-//////////////////////////////////////////////////////////////////////////////
-
class XMLCaptionEscapeRelative : public XMLPropertyHandler
{
public:
@@ -772,8 +765,6 @@ sal_Bool XMLCaptionEscapeRelative::exportXML( OUString& rStrExpValue, const Any&
return sal_True;
}
-//////////////////////////////////////////////////////////////////////////////
-
class XMLMoveSizeProtectHdl : public XMLPropertyHandler
{
public:
@@ -815,9 +806,6 @@ sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rV
return sal_True;
}
-
-//////////////////////////////////////////////////////////////////////////////
-
class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler
{
public:
@@ -864,9 +852,6 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
return bRet;
}
-
-//////////////////////////////////////////////////////////////////////////////
-
XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > xModel, SvXMLImport& rImport )
: mxModel( xModel ), mpExport(0), mpImport( &rImport )
{
@@ -964,7 +949,6 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
break;
}
- //////////////////////////////////////////////////////////////////
// 3D Properties
case XML_SD_TYPE_BACKFACE_CULLING:
@@ -1178,8 +1162,6 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
return pHdl;
}
-//////////////////////////////////////////////////////////////////////////////
-
XMLShapePropertySetMapper::XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef)
: XMLPropertySetMapper( aXMLSDProperties, rFactoryRef )
{
@@ -1189,8 +1171,6 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper()
{
}
-// ----------------------------------------
-
XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport )
: SvXMLExportPropertyMapper( rMapper )
, maNumRuleExp( rExport )
@@ -1575,8 +1555,6 @@ void XMLShapeExportPropertyMapper::handleElementItem(
}
}
-// ----------------------------------------
-
XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) :
SvXMLExportPropertyMapper( rMapper ),
mrExport( rExport ),
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 77bfe0053df7..3f55a330d60c 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -29,18 +29,15 @@
#include <xmloff/xmlprmap.hxx>
#include <xmloff/xmlexppr.hxx>
-//////////////////////////////////////////////////////////////////////////////
// entry list for graphic properties
extern const XMLPropertyMapEntry aXMLSDProperties[];
-//////////////////////////////////////////////////////////////////////////////
// entry list for presentation page properties
extern const XMLPropertyMapEntry aXMLSDPresPageProps[];
extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
-//////////////////////////////////////////////////////////////////////////////
// types of own properties
#define XML_SD_TYPE_STROKE (XML_SD_TYPES_START + 0)
@@ -89,14 +86,12 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define XML_SD_TYPE_TEX_KIND (XML_SD_TYPES_START + 45 )
#define XML_SD_TYPE_TEX_MODE (XML_SD_TYPES_START + 46 )
-//////////////////////////////////////////////////////////////////////////////
// #FontWork# types
#define XML_SD_TYPE_FONTWORK_STYLE (XML_SD_TYPES_START + 47 )
#define XML_SD_TYPE_FONTWORK_ADJUST (XML_SD_TYPES_START + 48 )
#define XML_SD_TYPE_FONTWORK_SHADOW (XML_SD_TYPES_START + 49 )
#define XML_SD_TYPE_FONTWORK_FORM (XML_SD_TYPES_START + 50 )
-//////////////////////////////////////////////////////////////////////////////
// Caption types
#define XML_SD_TYPE_CAPTION_ANGLE_TYPE (XML_SD_TYPES_START + 60 )
#define XML_SD_TYPE_CAPTION_IS_ESC_REL (XML_SD_TYPES_START + 61 )
@@ -105,13 +100,10 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define XML_SD_TYPE_CAPTION_ESC_DIR (XML_SD_TYPES_START + 64 )
#define XML_SD_TYPE_CAPTION_TYPE (XML_SD_TYPES_START + 65 )
-//////////////////////////////////////////////////////////////////////////////
// header & footer types
#define XML_SD_TYPE_DATETIMEUPDATE (XML_SD_TYPES_START + 70 )
#define XML_SD_TYPE_DATETIME_FORMAT (XML_SD_TYPES_START + 71 )
-//////////////////////////////////////////////////////////////////////////////
-
// new types for merged style:protect attribute
#define XML_SD_TYPE_MOVE_PROTECT (XML_SD_TYPES_START + 72 )
#define XML_SD_TYPE_SIZE_PROTECT (XML_SD_TYPES_START + 73 )
@@ -119,8 +111,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
// new type for style:mirror attribute
#define XML_TYPE_SD_MIRROR (XML_SD_TYPES_START + 74 )
-//////////////////////////////////////////////////////////////////////////////
-
// new smil transition types for pages
#define XML_SD_TYPE_TRANSITION_TYPE (XML_SD_TYPES_START + 75 )
#define XML_SD_TYPE_TRANSTIION_SUBTYPE (XML_SD_TYPES_START + 76 )
@@ -128,8 +118,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define XML_SD_TYPE_HEADER_FOOTER_VISIBILITY_TYPE (XML_SD_TYPES_START + 78 )
-//////////////////////////////////////////////////////////////////////////////
-
#define CTF_NUMBERINGRULES 1000
#define CTF_CONTROLWRITINGMODE 1001
#define CTF_WRITINGMODE 1002
@@ -157,7 +145,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define CTF_PAGE_TRANSITION_DIRECTION 1023
#define CTF_PAGE_TRANSITION_FADECOLOR 1024
-//////////////////////////////////////////////////////////////////////////////
// #FontWork#
#define CTF_FONTWORK_STYLE 1021
#define CTF_FONTWORK_ADJUST 1022
@@ -173,7 +160,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define CTF_FONTWORK_HIDEFORM 1032
#define CTF_FONTWORK_SHADOWTRANSPARENCE 1033
-//////////////////////////////////////////////////////////////////////////////
// OLE part 1
#define CTF_SD_OLE_VIS_AREA_IMPORT_LEFT 1040
#define CTF_SD_OLE_VIS_AREA_IMPORT_TOP 1041
@@ -184,13 +170,11 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define CTF_SD_MOVE_PROTECT 1045
#define CTF_SD_SIZE_PROTECT 1046
-//////////////////////////////////////////////////////////////////////////////
// caption
#define CTF_CAPTION_ISESCREL 1047
#define CTF_CAPTION_ESCREL 1048
#define CTF_CAPTION_ESCABS 1049
-//////////////////////////////////////////////////////////////////////////////
// header&footer
#define CTF_HEADER_VISIBLE 1050
#define CTF_FOOTER_VISIBLE 1051
@@ -202,7 +186,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define CTF_DATE_TIME_FORMAT 1057
#define CTF_DATE_TIME_UPDATE 1058
-//////////////////////////////////////////////////////////////////////////////
// OLE part 2
#define CTF_SD_OLE_ASPECT 1059
#define CTF_SD_OLE_VIS_AREA_EXPORT_LEFT 1060
@@ -210,18 +193,14 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[];
#define CTF_SD_OLE_VIS_AREA_EXPORT_WIDTH 1062
#define CTF_SD_OLE_VIS_AREA_EXPORT_HEIGHT 1063
-//////////////////////////////////////////////////////////////////////////////
// enum maps for attributes
extern SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[];
extern SvXMLEnumMapEntry aXML_CircleKind_EnumMap[];
-//////////////////////////////////////////////////////////////////////////////
-
/** contains the attribute to property mapping for a drawing layer table */
extern const XMLPropertyMapEntry aXMLTableShapeAttributes[];
-//////////////////////////////////////////////////////////////////////////////
// factory for own graphic properties
class SvXMLExport;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 34beb140cd4b..2174743fe8b4 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -76,7 +76,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -89,9 +88,6 @@ using namespace ::com::sun::star::geometry;
using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-
-//////////////////////////////////////////////////////////////////////////////
-
class ImpXMLEXPPageMasterInfo
{
sal_Int32 mnBorderBottom;
@@ -192,8 +188,6 @@ void ImpXMLEXPPageMasterInfo::SetName(const OUString& rStr)
msName = rStr;
}
-//////////////////////////////////////////////////////////////////////////////
-
#define IMP_AUTOLAYOUT_INFO_MAX (35L)
class ImpXMLAutoLayoutInfo
@@ -391,8 +385,6 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
maPresRect.SetSize(aLayoutSize);
}
-//////////////////////////////////////////////////////////////////////////////
-
// #110680#
SdXMLExport::SdXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
@@ -422,7 +414,6 @@ SdXMLExport::SdXMLExport(
msPageLayoutNames( "PageLayoutNames" )
{
-
}
// XExporter
@@ -638,7 +629,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
GetShapeExport()->enableHandleProgressBar();
}
-//////////////////////////////////////////////////////////////////////////////
// #82003# helper function for recursive object count
sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(Reference< drawing::XShapes > xShapes)
{
@@ -668,8 +658,6 @@ sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(Reference< drawing::XShapes > xS
return nRetval;
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLExport::~SdXMLExport()
{
// cleanup factory, decrease refcount. Should lead to destruction.
@@ -728,8 +716,6 @@ SdXMLExport::~SdXMLExport()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpPrepAutoLayoutInfos()
{
if(IsImpress())
@@ -829,8 +815,6 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O
return bRetval;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpWriteAutoLayoutInfos()
{
if( !mpAutoLayoutInfoList->empty() )
@@ -1217,8 +1201,6 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect)
{
OUString aStr;
@@ -1268,8 +1250,6 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan
SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, sal_True, sal_True);
}
-//////////////////////////////////////////////////////////////////////////////
-
ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< XDrawPage > xMasterPage )
{
bool bDoesExist = false;
@@ -1343,8 +1323,6 @@ void SdXMLExport::ImpPrepPageMasterInfos()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpWritePageMasterInfos()
{
// write created page-masters, create names for these
@@ -1411,8 +1389,6 @@ void SdXMLExport::ImpWritePageMasterInfos()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& rName)
{
if(!rName.isEmpty() && !mpPageMasterInfoList->empty())
@@ -1432,8 +1408,6 @@ ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString&
return 0L;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpPrepDrawPageInfos()
{
// create draw:style-name entries for page export
@@ -1458,8 +1432,6 @@ void SdXMLExport::ImpPrepDrawPageInfos()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUString& rText, const sal_Char* pPrefix )
{
// search rVector if there is already a string that equals rText
@@ -1570,8 +1542,6 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons
return aSettings;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpWriteHeaderFooterDecls()
{
OUStringBuffer sBuffer;
@@ -1648,8 +1618,6 @@ void SdXMLExport::ImplExportHeaderFooterDeclAttributes( const HeaderFooterPageSe
AddAttribute( XML_NAMESPACE_PRESENTATION, XML_USE_DATE_TIME_NAME, aSettings.maStrDateTimeDeclName );
}
-//////////////////////////////////////////////////////////////////////////////
-
OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage, bool bExportBackground /* = true */ )
{
// create name
@@ -1708,8 +1676,6 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage
return sStyleName;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::ImpPrepMasterPageInfos()
{
// create draw:style-name entries for master page export
@@ -1739,7 +1705,6 @@ void SdXMLExport::ImpPrepMasterPageInfos()
}
}
-//////////////////////////////////////////////////////////////////////////////
void SdXMLExport::ImpWritePresentationStyles()
{
if(IsImpress())
@@ -1770,8 +1735,6 @@ void SdXMLExport::ImpWritePresentationStyles()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::SetProgress(sal_Int32 nProg)
{
// set progress view
@@ -1779,7 +1742,6 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
GetStatusIndicator()->setValue(nProg);
}
-//////////////////////////////////////////////////////////////////////////////
// #82003#
void SdXMLExport::_ExportMeta()
@@ -1801,8 +1763,6 @@ void SdXMLExport::_ExportMeta()
SvXMLExport::_ExportMeta();
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::_ExportFontDecls()
{
GetFontAutoStylePool(); // make sure the pool is created
@@ -1891,7 +1851,6 @@ void SdXMLExport::_ExportContent()
if( IsImpress() )
ImplExportHeaderFooterDeclAttributes( maDrawPagesHeaderFooterSettings[nPageInd] );
-
OUString sNavigationOrder( getNavigationOrder( xDrawPage ) );
if( !sNavigationOrder.isEmpty() )
AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder );
@@ -1994,8 +1953,6 @@ void SdXMLExport::_ExportContent()
exportPresentationSettings();
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::exportPresentationSettings()
{
try
@@ -2180,8 +2137,6 @@ void SdXMLExport::exportPresentationSettings()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::_ExportStyles(sal_Bool bUsed)
{
GetPropertySetMapper()->SetAutoStyles( sal_False );
@@ -2220,8 +2175,6 @@ void SdXMLExport::_ExportStyles(sal_Bool bUsed)
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::_ExportAutoStyles()
{
Reference< beans::XPropertySet > xInfoSet( getExportInfo() );
@@ -2417,8 +2370,6 @@ void SdXMLExport::_ExportAutoStyles()
GetTextParagraphExport()->exportTextAutoStyles();
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::_ExportMasterStyles()
{
// export layer
@@ -2602,8 +2553,6 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat )
{
sal_Int32 nFormat = nNumberFormat;
@@ -2622,15 +2571,11 @@ void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeForm
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::exportDataStyles()
{
// there are no data styles to export in draw/impress yet
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::exportAutoDataStyles()
{
SdXMLFormatMap::iterator aIter( maUsedDateStyles.begin() );
@@ -2648,8 +2593,6 @@ void SdXMLExport::exportAutoDataStyles()
GetFormExport()->exportAutoControlNumberStyles();
}
-//////////////////////////////////////////////////////////////////////////////
-
OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) const
{
if( bTimeFormat )
@@ -2695,8 +2638,6 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag
return sNavOrder.makeStringAndClear();
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLExport::collectAnnotationAutoStyles( const Reference<XDrawPage>& xDrawPage )
{
Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY );
@@ -2791,8 +2732,6 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
}
}
-//////////////////////////////////////////////////////////////////////////////
-
#define SERVICE( classname, servicename, implementationname, draw, flags )\
uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
{\
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 506981d978f0..fd17b4d8b174 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -30,8 +30,6 @@
#include <vector>
-//////////////////////////////////////////////////////////////////////////////
-
class Rectangle;
class ImpXMLEXPPageMasterInfo;
@@ -43,8 +41,6 @@ class XMLPageExportPropertyMapper;
typedef ::std::vector< ImpXMLEXPPageMasterInfo* > ImpXMLEXPPageMasterList;
typedef ::std::vector< ImpXMLAutoLayoutInfo* > ImpXMLAutoLayoutInfoList;
-//////////////////////////////////////////////////////////////////////////////
-
enum XmlPlaceholder
{
XmlPlaceholderTitle,
@@ -65,8 +61,6 @@ enum XmlPlaceholder
DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap );
-//////////////////////////////////////////////////////////////////////////////
-
struct HeaderFooterPageSettingsImpl
{
OUString maStrHeaderDeclName;
@@ -81,9 +75,6 @@ struct DateTimeDeclImpl
sal_Int32 mnFormat;
};
-
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLExport : public SvXMLExport
{
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies;
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 2c5e302ac80e..c161ad160673 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <osl/thread.h>
#include <comphelper/processfactory.hxx>
@@ -48,24 +47,9 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLBodyContext_Impl : public SvXMLImportContext
{
const SdXMLImport& GetSdImport() const
@@ -103,8 +87,6 @@ SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext(
return GetSdImport().CreateBodyContext(rLocalName, xAttrList);
}
-//////////////////////////////////////////////////////////////////////////////
-
// NB: virtually inherit so we can multiply inherit properly
// in SdXMLFlatDocContext_Impl
class SdXMLDocContext_Impl : public virtual SvXMLImportContext
@@ -128,8 +110,6 @@ public:
const uno::Reference<xml::sax::XAttributeList>& xAttrList);
};
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLDocContext_Impl::SdXMLDocContext_Impl(
SdXMLImport& rImport,
sal_uInt16 nPrfx,
@@ -139,16 +119,12 @@ SdXMLDocContext_Impl::SdXMLDocContext_Impl(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLDocContext_Impl::~SdXMLDocContext_Impl()
{
}
TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext );
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -232,8 +208,6 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
// context for flat file xml format
class SdXMLFlatDocContext_Impl
: public SdXMLDocContext_Impl, public SvXMLMetaDocumentContext
@@ -279,8 +253,6 @@ SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
#define SERVICE(classname,servicename,implementationname,draw,flags)\
uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\
{\
@@ -312,8 +284,6 @@ SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter",
SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_False, IMPORT_SETTINGS )
SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_True, IMPORT_SETTINGS )
-//////////////////////////////////////////////////////////////////////////////
-
// #110680#
SdXMLImport::SdXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
@@ -445,8 +415,6 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLImport::~SdXMLImport() throw ()
{
// Styles or AutoStyles context?
@@ -476,8 +444,6 @@ SdXMLImport::~SdXMLImport() throw ()
delete mpPresentationPlaceholderAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
{
if(!mpDocElemTokenMap)
@@ -501,8 +467,6 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap()
return *mpDocElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
{
if(!mpBodyElemTokenMap)
@@ -524,8 +488,6 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap()
return *mpBodyElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
{
if(!mpStylesElemTokenMap)
@@ -544,8 +506,6 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap()
return *mpStylesElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
{
if(!mpMasterPageElemTokenMap)
@@ -563,8 +523,6 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap()
return *mpMasterPageElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap()
{
if(!mpMasterPageAttrTokenMap)
@@ -588,8 +546,6 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap()
return *mpMasterPageAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
{
if(!mpPageMasterAttrTokenMap)
@@ -606,8 +562,6 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
return *mpPageMasterAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
{
if(!mpPageMasterStyleAttrTokenMap)
@@ -630,8 +584,6 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
return *mpPageMasterStyleAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
{
if(!mpDrawPageAttrTokenMap)
@@ -658,8 +610,6 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
return *mpDrawPageAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
{
if(!mpDrawPageElemTokenMap)
@@ -678,8 +628,6 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
return *mpDrawPageElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
{
if(!mpPresentationPlaceholderAttrTokenMap)
@@ -700,8 +648,6 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap()
return *mpPresentationPlaceholderAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
@@ -731,8 +677,6 @@ SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix,
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>&)
{
@@ -757,8 +701,6 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>&)
{
@@ -767,8 +709,6 @@ SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
@@ -781,8 +721,6 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
return GetShapeImport()->GetStylesContext();
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
@@ -795,8 +733,6 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
return GetShapeImport()->GetAutoStylesContext();
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>&)
{
@@ -810,8 +746,6 @@ SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLoca
return mpMasterStylesContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
@@ -823,8 +757,6 @@ SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa
return pFSContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLImport::CreateScriptContext(
const OUString& rLocalName )
{
@@ -836,8 +768,6 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps)
{
uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY );
@@ -963,7 +893,6 @@ void SdXMLImport::SetStatistics(
}
}
-
// XServiceInfo
OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeException )
{
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 1a50eb9fc799..390cd5e54058 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -29,8 +29,6 @@
#include <vector>
#include <xmloff/xmlimp.hxx>
-//////////////////////////////////////////////////////////////////////////////
-
enum SdXMLDocElemTokenMap
{
XML_TOK_DOC_FONTDECLS,
@@ -144,8 +142,6 @@ enum SdXMLPresentationPlaceholderAttrTokenMap
XML_TOK_PRESENTATIONPLACEHOLDER_HEIGHT
};
-//////////////////////////////////////////////////////////////////////////////
-
struct SdXMLltXDrawPageId
{
bool operator()(sal_Int32 nId1, sal_Int32 nId2 ) const
@@ -156,14 +152,10 @@ struct SdXMLltXDrawPageId
typedef std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > DrawPageIdMap;
-//////////////////////////////////////////////////////////////////////////////
-
class SvXMLUnitConverter;
class SvXMLTokenMap;
class SdXMLMasterStylesContext;
-//////////////////////////////////////////////////////////////////////////////
-
struct DateTimeDeclContextImpl
{
OUString maStrText;
@@ -176,8 +168,6 @@ struct DateTimeDeclContextImpl
DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap );
DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap );
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLImport: public SvXMLImport
{
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index d9cf37534e7e..d56dea2cc547 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <memory>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
@@ -57,8 +56,6 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
SvXMLExportPropertyMapper *pExtMapper )
: mrExport( rExp ),
@@ -122,14 +119,10 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp,
GetShapeTableExport();
}
-///////////////////////////////////////////////////////////////////////
-
XMLShapeExport::~XMLShapeExport()
{
}
-///////////////////////////////////////////////////////////////////////
-
// sj: replacing CustomShapes with standard objects that are also supported in OpenOffice.org format
uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement( const uno::Reference< drawing::XShape >& xShape )
{
@@ -204,9 +197,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
if ( xCustomShapeReplacement.is() )
aShapeInfo.xCustomShapeReplacement = xCustomShapeReplacement;
- // -----------------------------
// first compute the shapes type
- // -----------------------------
ImpCalcShapeType(xShape, aShapeInfo.meShapeType);
// #i118485# enabled XmlShapeTypeDrawChartShape and XmlShapeTypeDrawOLE2Shape
@@ -234,9 +225,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
if ( aShapeInfo.xCustomShapeReplacement.is() )
xPropSet.clear();
- // ----------------
// prep text styles
- // ----------------
if( xPropSet.is() && bObjSupportsText )
{
uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY);
@@ -257,9 +246,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
}
}
- // ------------------------------
// compute the shape parent style
- // ------------------------------
if( xPropSet.is() )
{
uno::Reference< beans::XPropertySetInfo > xPropertySetInfo( xPropSet->getPropertySetInfo() );
@@ -369,7 +356,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
{
xPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet );
- // ----------------------------------------------------------------------
// yet more additionally, we need to care for the ParaAdjust property
if ( XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType )
{
@@ -401,7 +387,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
}
}
}
- // ----------------------------------------------------------------------
nCount = 0;
std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin();
@@ -426,9 +411,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
}
}
- // ----------------------------------------
// prepare animation information if needed
- // ----------------------------------------
if( mxAnimationsExporter.is() )
mxAnimationsExporter->prepare( xShape, mrExport );
@@ -471,10 +454,8 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
maShapeInfos.push_back( aShapeInfo );
maCurrentInfo = maShapeInfos.begin();
- // -----------------------------------------------------
// check for shape collections (group shape or 3d scene)
// and collect contained shapes style infos
- // -----------------------------------------------------
const uno::Reference< drawing::XShape >& xCollection = aShapeInfo.xCustomShapeReplacement.is()
? aShapeInfo.xCustomShapeReplacement : xShape;
{
@@ -486,8 +467,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
}
}
-///////////////////////////////////////////////////////////////////////
-
namespace
{
class NewTextListsHelper
@@ -523,7 +502,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
sal_Int32 nZIndex = 0;
uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY );
-
::std::auto_ptr< SvXMLElementExport > mpHyperlinkElement;
// export hyperlinks with <a><shape/></a>. Currently only in draw since draw
@@ -553,7 +531,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
SAL_WARN("xmloff", "XMLShapeExport::exportShape(): exception during hyperlink export");
}
-
if( xSet.is() )
xSet->getPropertyValue(msZIndex) >>= nZIndex;
@@ -569,11 +546,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex];
-
#ifdef DBG_UTIL
- // ---------------------------------------
// check if this is the correct ShapesInfo
- // ---------------------------------------
uno::Reference< container::XChild > xChild( xShape, uno::UNO_QUERY );
if( xChild.is() )
{
@@ -581,9 +555,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
DBG_ASSERT( xParent.is() && xParent.get() == (*maCurrentShapesIter).first.get(), "XMLShapeExport::exportShape(): Wrong call to XMLShapeExport::seekShapes()" );
}
- // -----------------------------
// first compute the shapes type
- // -----------------------------
{
XmlShapeType eShapeType(XmlShapeTypeNotYetSet);
ImpCalcShapeType(xShape, eShapeType);
@@ -592,9 +564,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
}
#endif
- // ----------------------------------------
// collect animation information if needed
- // ----------------------------------------
if( mxAnimationsExporter.is() )
mxAnimationsExporter->collect( xShape, mrExport );
@@ -623,9 +593,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
}
}
- // ------------------
// export style name
- // ------------------
if( !aShapeInfo.msStyleName.isEmpty() )
{
if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == aShapeInfo.mnFamily)
@@ -634,17 +602,13 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, mrExport.EncodeStyleName( aShapeInfo.msStyleName) );
}
- // ------------------
// export text style name
- // ------------------
if( !aShapeInfo.msTextStyleName.isEmpty() )
{
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME, aShapeInfo.msTextStyleName );
}
- // --------------------------
// export shapes id if needed
- // --------------------------
{
uno::Reference< uno::XInterface > xRef( xShape, uno::UNO_QUERY );
const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRef );
@@ -654,9 +618,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
}
}
- // --------------------------
// export layer information
- // --------------------------
if( IsLayerExportEnabled() )
{
// check for group or scene shape and not export layer if this is one
@@ -720,9 +682,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
onExport( xShape );
- // --------------------
// export shape element
- // --------------------
switch(aShapeInfo.meShapeType)
{
case XmlShapeTypeDrawRectangleShape:
@@ -904,8 +864,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
mrExport.ClearAttrList(); // clears the attributes
}
-///////////////////////////////////////////////////////////////////////
-
// This method collects all automatic styles for the shapes inside the given XShapes collection
void XMLShapeExport::collectShapesAutoStyles( const uno::Reference < drawing::XShapes >& xShapes )
{
@@ -927,8 +885,6 @@ void XMLShapeExport::collectShapesAutoStyles( const uno::Reference < drawing::XS
maCurrentShapesIter = aOldCurrentShapesIter;
}
-///////////////////////////////////////////////////////////////////////
-
// This method exports all XShape inside the given XShapes collection
void XMLShapeExport::exportShapes( const uno::Reference < drawing::XShapes >& xShapes, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */ )
{
@@ -950,8 +906,6 @@ void XMLShapeExport::exportShapes( const uno::Reference < drawing::XShapes >& xS
maCurrentShapesIter = aOldCurrentShapesIter;
}
-///////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShapes ) throw()
{
if( xShapes.is() )
@@ -977,8 +931,6 @@ void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShap
}
}
-///////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::exportAutoStyles()
{
// export all autostyle infos
@@ -1007,8 +959,6 @@ void XMLShapeExport::exportAutoStyles()
mxShapeTableExport->exportAutoStyles();
}
-///////////////////////////////////////////////////////////////////////
-
/// returns the export property mapper for external chaining
SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper(
SvXMLExport& rExport )
@@ -1022,8 +972,6 @@ SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper(
return pResult;
}
-///////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& xShape,
XmlShapeType& eShapeType)
{
@@ -1159,8 +1107,6 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
}
}
-///////////////////////////////////////////////////////////////////////
-
extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[];
extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[];
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx
index a55d70b57be2..f9071211b1e1 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -53,13 +53,9 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportNewTrans(const uno::Reference< beans::XPropertySet >& xPropSet,
sal_Int32 nFeatures, awt::Point* pRefPoint)
{
@@ -222,8 +218,6 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR
}
}
-//////////////////////////////////////////////////////////////////////////////
-
sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass )
{
sal_Bool bIsEmpty = sal_False;
@@ -257,8 +251,6 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference<
return bIsEmpty;
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape )
{
uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY );
@@ -270,7 +262,6 @@ void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xSh
}
}
-//////////////////////////////////////////////////////////////////////////////
#include <com/sun/star/presentation/ClickAction.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
@@ -303,8 +294,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
sal_Int32 nFound = 0;
- // extract properties from "OnClick" event --------------------------------
-
OUString aClickEventType;
presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
@@ -547,8 +536,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
}
}
-//////////////////////////////////////////////////////////////////////////////
-
/** #i68101# export shape Title and Description */
void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape >& xShape )
{
@@ -579,8 +566,6 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
@@ -611,8 +596,6 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportTextBoxShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -687,7 +670,6 @@ void XMLShapeExport::ImpExportTextBoxShape(
if(bIsPresShape)
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr );
-
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
XML_FRAME, bCreateNewline, sal_True );
@@ -716,8 +698,6 @@ void XMLShapeExport::ImpExportTextBoxShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportRectangleShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
@@ -750,8 +730,6 @@ void XMLShapeExport::ImpExportRectangleShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportLineShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -864,8 +842,6 @@ void XMLShapeExport::ImpExportLineShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportEllipseShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -933,8 +909,6 @@ void XMLShapeExport::ImpExportEllipseShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportPolygonShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -1081,8 +1055,6 @@ void XMLShapeExport::ImpExportPolygonShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportGraphicObjectShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -1212,8 +1184,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportChartShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint,
@@ -1222,8 +1192,6 @@ void XMLShapeExport::ImpExportChartShape(
ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint, pAttrList );
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportControlShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
@@ -1253,8 +1221,6 @@ void XMLShapeExport::ImpExportControlShape(
ImpExportDescription( xShape ); // #i68101#
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportConnectorShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
@@ -1489,8 +1455,6 @@ void XMLShapeExport::ImpExportConnectorShape(
ImpExportText( xShape );
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportMeasureShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
@@ -1588,8 +1552,6 @@ void XMLShapeExport::ImpExportMeasureShape(
mrExport.GetTextParagraphExport()->exportText( xText );
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportOLE2Shape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */,
@@ -1748,8 +1710,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportPageShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
@@ -1786,8 +1746,6 @@ void XMLShapeExport::ImpExportPageShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportCaptionShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */)
@@ -1838,8 +1796,6 @@ void XMLShapeExport::ImpExportCaptionShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportFrameShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
@@ -1874,8 +1830,6 @@ void XMLShapeExport::ImpExportFrameShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportAppletShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
@@ -1931,8 +1885,6 @@ void XMLShapeExport::ImpExportAppletShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExportPluginShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint)
@@ -1955,7 +1907,6 @@ void XMLShapeExport::ImpExportPluginShape(
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
-
// export mime-type
xPropSet->getPropertyValue("PluginMimeType") >>= aStr;
if(!aStr.isEmpty())
@@ -1980,8 +1931,6 @@ void XMLShapeExport::ImpExportPluginShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
static void lcl_CopyStream(
uno::Reference<io::XInputStream> const& xInStream,
uno::Reference<embed::XStorage> const& xTarget,
diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx
index 8d020ef6e4e7..a3b1cc437bcd 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -41,13 +41,9 @@
#include "xmloff/xmlnmspe.hxx"
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint)
{
uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY);
@@ -91,8 +87,6 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeExport::ImpExport3DShape(
const uno::Reference< drawing::XShape >& xShape,
XmlShapeType eShapeType, sal_Int32 /* nFeatures = SEF_DEFAULT */, awt::Point* /*pRefPoint = NULL */)
@@ -307,8 +301,6 @@ void XMLShapeExport::ImpExport3DShape(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
/** helper for chart that adds all attributes of a 3d scene element to the export */
void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet )
{
@@ -482,6 +474,4 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
}
}
-//////////////////////////////////////////////////////////////////////////////
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx
index 6d8b74371108..a87f73f5c597 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
@@ -74,8 +73,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-//////////////////////////////////////////////////////////////////////////////
-
void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter )
{
if ( !rStrBuffer.isEmpty() )
@@ -1223,7 +1220,6 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
}
}
-
uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW );
GetShapeTableExport()->exportTable( xRange );
}
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 3e7711c5c0ac..64f36f6847eb 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/debug.hxx>
#include <com/sun/star/text/PositionLayoutDir.hpp>
@@ -43,13 +42,10 @@
#include <map>
#include <vector>
-
using namespace ::std;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
struct ltint32
{
bool operator()(const sal_Int32 p, sal_Int32 q) const
@@ -111,8 +107,6 @@ struct XMLShapeImportHelperImpl
sal_Bool mbIsPresentationShapesSupported;
};
-//////////////////////////////////////////////////////////////////////////////
-
XMLShapeImportHelper::XMLShapeImportHelper(
SvXMLImport& rImporter,
const uno::Reference< frame::XModel>& rModel,
@@ -183,8 +177,6 @@ XMLShapeImportHelper::XMLShapeImportHelper(
mpImpl->mbIsPresentationShapesSupported = xInfo.is() && xInfo->supportsService( aSName );
}
-//////////////////////////////////////////////////////////////////////////////
-
XMLShapeImportHelper::~XMLShapeImportHelper()
{
DBG_ASSERT( mpImpl->maConnections.empty(), "XMLShapeImportHelper::restoreConnections() was not called!" );
@@ -239,10 +231,6 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
delete mpImpl;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
-
const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap()
{
if(!mpGroupShapeElemTokenMap)
@@ -306,9 +294,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap()
return *mpFrameShapeElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
{
if(!mp3DSceneShapeElemTokenMap)
@@ -329,9 +314,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap()
return *mp3DSceneShapeElemTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
{
if(!mp3DObjectAttrTokenMap)
@@ -349,9 +331,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap()
return *mp3DObjectAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
{
if(!mp3DPolygonBasedAttrTokenMap)
@@ -369,9 +348,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap()
return *mp3DPolygonBasedAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
{
if(!mp3DCubeObjectAttrTokenMap)
@@ -389,9 +365,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap()
return *mp3DCubeObjectAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
{
if(!mp3DSphereObjectAttrTokenMap)
@@ -409,8 +382,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap()
return *mp3DSphereObjectAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
{
if(!mp3DLightAttrTokenMap)
@@ -430,9 +401,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap()
return *mp3DLightAttrTokenMap;
}
-//////////////////////////////////////////////////////////////////////////////
-
-
SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
SvXMLImport& rImport,
sal_uInt16 p_nPrefix,
@@ -495,24 +463,18 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeImportHelper::SetStylesContext(SvXMLStylesContext* pNew)
{
mpStylesContext = pNew;
mpStylesContext->AddRef();
}
-//////////////////////////////////////////////////////////////////////////////
-
void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
{
mpAutoStylesContext = pNew;
mpAutoStylesContext->AddRef();
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
SvXMLImport& rImport,
sal_uInt16 p_nPrefix,
@@ -663,7 +625,6 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
pAttrList->AppendAttributeList( rFrameAttrList );
uno::Reference < xml::sax::XAttributeList > xAttrList = pAttrList;
-
switch(rTokenMap.Get(p_nPrefix, rLocalName))
{
case XML_TOK_FRAME_TEXT_BOX:
@@ -749,7 +710,6 @@ SvXMLImportContext *XMLShapeImportHelper::CreateFrameChildContext(
return pContext;
}
-
/** this function is called whenever the implementation classes like to add this new
shape to the given XShapes.
*/
@@ -904,7 +864,6 @@ void XMLShapeImportHelper::popGroupAndSort()
nCount -= rZList.size();
nCount -= rUnsortedList.size();
-
if( nCount > 0 )
{
// first update offsets of added shapes
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 06adb8a84951..f97aaacc41bb 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -33,15 +33,12 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/tools/unotools.hxx>
-
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
// Defines
#define BORDER_INTEGERS_ARE_EQUAL (4)
-//////////////////////////////////////////////////////////////////////////////
// Predeclarations
void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen);
@@ -58,9 +55,6 @@ void Imp_CalcVectorValues(::basegfx::B2DVector& aVec1, ::basegfx::B2DVector& aVe
bSameDirection = (nLen3 <= BORDER_INTEGERS_ARE_EQUAL);
}
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// parsing help functions for simple chars
void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
@@ -90,8 +84,6 @@ void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const
rPos++;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// parsing help functions for integer numbers
bool Imp_IsOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true)
@@ -152,8 +144,6 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue)
Imp_PutNumberChar(rStr, nValue);
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// parsing help functions for double numbers
void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32)
@@ -256,8 +246,6 @@ void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double f
rStr += OUString(sStringBuffer.makeStringAndClear());
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// base class of all 2D transform objects
struct ImpSdXMLExpTransObj2DBase
@@ -267,7 +255,6 @@ struct ImpSdXMLExpTransObj2DBase
: mnType(nType) {}
};
-//////////////////////////////////////////////////////////////////////////////
// possible object types for 2D
#define IMP_SDXMLEXP_TRANSOBJ2D_ROTATE 0x0000
@@ -277,7 +264,6 @@ struct ImpSdXMLExpTransObj2DBase
#define IMP_SDXMLEXP_TRANSOBJ2D_SKEWY 0x0004
#define IMP_SDXMLEXP_TRANSOBJ2D_MATRIX 0x0005
-//////////////////////////////////////////////////////////////////////////////
// classes of objects, different sizes
struct ImpSdXMLExpTransObj2DRotate : public ImpSdXMLExpTransObj2DBase
@@ -317,8 +303,6 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {}
};
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// delete all entries in list
void SdXMLImExTransform2D::EmptyList()
@@ -371,7 +355,6 @@ void SdXMLImExTransform2D::EmptyList()
maList.clear();
}
-//////////////////////////////////////////////////////////////////////////////
// add members
void SdXMLImExTransform2D::AddRotate(double fNew)
@@ -392,7 +375,6 @@ void SdXMLImExTransform2D::AddSkewX(double fNew)
maList.push_back(new ImpSdXMLExpTransObj2DSkewX(fNew));
}
-//////////////////////////////////////////////////////////////////////////////
// gen string for export
const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& rConv)
{
@@ -495,7 +477,6 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
return msString;
}
-//////////////////////////////////////////////////////////////////////////////
// sets new string, parses it and generates entries
void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv)
{
@@ -687,8 +668,6 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans)
}
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// base class of all 3D transform objects
struct ImpSdXMLExpTransObj3DBase
@@ -698,7 +677,6 @@ struct ImpSdXMLExpTransObj3DBase
: mnType(nType) {}
};
-//////////////////////////////////////////////////////////////////////////////
// possible object types for 3D
#define IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X 0x0000
@@ -708,7 +686,6 @@ struct ImpSdXMLExpTransObj3DBase
#define IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE 0x0004
#define IMP_SDXMLEXP_TRANSOBJ3D_MATRIX 0x0005
-//////////////////////////////////////////////////////////////////////////////
// classes of objects, different sizes
struct ImpSdXMLExpTransObj3DRotateX : public ImpSdXMLExpTransObj3DBase
@@ -748,8 +725,6 @@ struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {}
};
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
// delete all entries in list
void SdXMLImExTransform3D::EmptyList()
@@ -802,7 +777,6 @@ void SdXMLImExTransform3D::EmptyList()
maList.clear();
}
-//////////////////////////////////////////////////////////////////////////////
// add members
void SdXMLImExTransform3D::AddMatrix(const ::basegfx::B3DHomMatrix& rNew)
@@ -831,7 +805,6 @@ void SdXMLImExTransform3D::AddHomogenMatrix(const drawing::HomogenMatrix& xHomMa
AddMatrix(aExportMatrix);
}
-//////////////////////////////////////////////////////////////////////////////
// gen string for export
const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& rConv)
{
@@ -962,14 +935,12 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
return msString;
}
-//////////////////////////////////////////////////////////////////////////////
// for Import: constructor with string, parses it and generates entries
SdXMLImExTransform3D::SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnitConverter& rConv)
{
SetString(rNew, rConv);
}
-//////////////////////////////////////////////////////////////////////////////
// sets new string, parses it and generates entries
void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv)
{
@@ -1221,9 +1192,6 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans)
}
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLImExViewBox::SdXMLImExViewBox(sal_Int32 nX, sal_Int32 nY, sal_Int32 nW, sal_Int32 nH)
: mnX( nX ),
mnY( nY ),
@@ -1294,9 +1262,6 @@ const OUString& SdXMLImExViewBox::GetExportString()
return msString;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
const SdXMLImExViewBox& rViewBox,
const awt::Point& rObjectPos,
@@ -1457,9 +1422,6 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
}
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLImExSvgDElement::SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox,
const SvXMLExport& rExport)
: mrViewBox( rViewBox ),
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index 78f29da0603c..ae53e0a8a628 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -32,12 +32,8 @@
#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
#include <com/sun/star/drawing/DoubleSequence.hpp>
-
using namespace ::com::sun::star;
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext );
SdXML3DObjectContext::SdXML3DObjectContext(
@@ -77,14 +73,10 @@ SdXML3DObjectContext::SdXML3DObjectContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DObjectContext::~SdXML3DObjectContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
@@ -103,17 +95,12 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DObjectContext::EndElement()
{
// call parent
SdXMLShapeContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext);
SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
@@ -168,14 +155,10 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DCubeObjectShapeContext::~SdXML3DCubeObjectShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create shape
@@ -214,17 +197,12 @@ void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax:
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DCubeObjectShapeContext::EndElement()
{
// call parent
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext);
SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
@@ -279,14 +257,10 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DSphereObjectShapeContext::~SdXML3DSphereObjectShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create shape
@@ -322,17 +296,12 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DSphereObjectShapeContext::EndElement()
{
// call parent
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext );
SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
@@ -369,14 +338,10 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DPolygonBasedShapeContext::~SdXML3DPolygonBasedShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
@@ -441,17 +406,12 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DPolygonBasedShapeContext::EndElement()
{
// call parent
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
@@ -465,14 +425,10 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DLatheObjectShapeContext::~SdXML3DLatheObjectShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DLatheObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create shape
@@ -485,17 +441,12 @@ void SdXML3DLatheObjectShapeContext::StartElement(const uno::Reference< xml::sax
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DLatheObjectShapeContext::EndElement()
{
// call parent
SdXML3DPolygonBasedShapeContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext);
SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
@@ -509,14 +460,10 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DExtrudeObjectShapeContext::~SdXML3DExtrudeObjectShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DExtrudeObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
AddShape( "com.sun.star.drawing.Shape3DExtrudeObject" );
@@ -528,8 +475,6 @@ void SdXML3DExtrudeObjectShapeContext::StartElement(const uno::Reference< xml::s
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DExtrudeObjectShapeContext::EndElement()
{
// call parent
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index 42dcde876762..bfdb75788c56 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/drawing/Position3D.hpp>
#include "ximpshap.hxx"
-//////////////////////////////////////////////////////////////////////////////
// common shape context
class SdXML3DObjectContext : public SdXMLShapeContext
@@ -56,7 +55,6 @@ public:
virtual void EndElement();
};
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dcube context
class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext
@@ -80,7 +78,6 @@ public:
virtual void EndElement();
};
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dsphere context
class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext
@@ -104,7 +101,6 @@ public:
virtual void EndElement();
};
-//////////////////////////////////////////////////////////////////////////////
// polygonbased context
class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext
@@ -126,7 +122,6 @@ public:
virtual void EndElement();
};
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dlathe context
class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext
@@ -145,7 +140,6 @@ public:
virtual void EndElement();
};
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dextrude context
class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 563b21640cd9..4555e7bcd74e 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <sax/tools/converter.hxx>
#include "ximp3dscene.hxx"
@@ -30,11 +29,9 @@
#include "eventimp.hxx"
#include "descriptionimp.hxx"
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dlight context
SdXML3DLightContext::SdXML3DLightContext(
@@ -88,8 +85,6 @@ SdXML3DLightContext::~SdXML3DLightContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext );
SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
@@ -103,14 +98,10 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DSceneShapeContext::~SdXML3DSceneShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create new 3DScene shape and add it to rShapes, use it
@@ -149,8 +140,6 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXML3DSceneShapeContext::EndElement()
{
if(mxShape.is())
@@ -169,8 +158,6 @@ void SdXML3DSceneShapeContext::EndElement()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -211,8 +198,6 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPr
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter )
: mrImport( rImporter ),
mbSetTransform( sal_False ),
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 8eea3ac00d27..5d8dc655b7f7 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -27,7 +27,6 @@
#include <tools/rtti.hxx>
#include <ximpshap.hxx>
-//////////////////////////////////////////////////////////////////////////////
// dr3d:3dscene context
class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAttributesHelper
@@ -68,7 +67,6 @@ public:
{ return mxShapes; }
};
-
#endif // _XIMPGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 434d0d5d0bfc..825020050723 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -37,11 +37,8 @@
#include "PropertySetMerger.hxx"
#include "animationimport.hxx"
-
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -209,14 +206,10 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
DeleteAllShapes();
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLDrawPageContext::~SdXMLDrawPageContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
@@ -286,23 +279,16 @@ void SdXMLDrawPageContext::EndElement()
}
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLocalName )
: SvXMLImportContext( rImport, nPrfx, rLocalName )
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLBodyContext::~SdXMLBodyContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLBodyContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index 2e6b3b8d6337..f45acb9c4809 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -25,7 +25,6 @@
#include <xmloff/nmspmap.hxx>
#include "ximppage.hxx"
-//////////////////////////////////////////////////////////////////////////////
// draw:page context
class SdXMLDrawPageContext : public SdXMLGenericPageContext
@@ -50,7 +49,6 @@ public:
};
-//////////////////////////////////////////////////////////////////////////////
// office:body context
class SdXMLBodyContext : public SvXMLImportContext
@@ -67,7 +65,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
};
-
#endif // _XIMPBODY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx
index 8747bdadb58c..895a35d7abb5 100644
--- a/xmloff/source/draw/ximpgrp.cxx
+++ b/xmloff/source/draw/ximpgrp.cxx
@@ -24,12 +24,9 @@
#include "eventimp.hxx"
#include "descriptionimp.hxx"
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext );
SdXMLGroupShapeContext::SdXMLGroupShapeContext(
@@ -42,14 +39,10 @@ SdXMLGroupShapeContext::SdXMLGroupShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLGroupShapeContext::~SdXMLGroupShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -85,8 +78,6 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPref
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&)
{
// create new group shape and add it to rShapes, use it
@@ -105,8 +96,6 @@ void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLGroupShapeContext::EndElement()
{
if( mxChildren.is() )
@@ -115,5 +104,4 @@ void SdXMLGroupShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index b24414e91cb6..431ad4ed80e2 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -27,7 +27,6 @@
#include <tools/rtti.hxx>
#include "ximpshap.hxx"
-//////////////////////////////////////////////////////////////////////////////
// draw:g context (RECURSIVE)
class SdXMLGroupShapeContext : public SdXMLShapeContext
@@ -60,7 +59,6 @@ public:
{ return mxShapes; }
};
-
#endif // _XIMPGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 92f99c004c28..fdea3d9c3731 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -21,12 +21,9 @@
#include "ximplink.hxx"
#include <xmloff/xmltoken.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext );
SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes)
@@ -48,14 +45,10 @@ SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 n
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLShapeLinkContext::~SdXMLShapeLinkContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -73,19 +66,14 @@ SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefi
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeLinkContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttr )
{
SvXMLImportContext::StartElement( xAttr );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeLinkContext::EndElement()
{
SvXMLImportContext::EndElement();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index d2d33779787e..e02b0257b11a 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -27,7 +27,6 @@
#include <tools/rtti.hxx>
#include "ximpshap.hxx"
-//////////////////////////////////////////////////////////////////////////////
// draw:a context
// this should have been a SvXMLImportContext but CreateGroupChildContext() returns
@@ -54,7 +53,6 @@ public:
virtual void EndElement();
};
-
#endif // _XIMPLINK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index 52f90ad8f02e..be6e0271cd60 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -20,11 +20,8 @@
#include "ximpnote.hxx"
#include <com/sun/star/presentation/XPresentationPage.hpp>
-
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList,
@@ -91,14 +88,10 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLNotesContext::~SdXMLNotesContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -109,12 +102,6 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix,
// some special objects inside presentation:notes context
// ...
-
-
-
-
-
-
// call parent when no own context was created
if(!pContext)
pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
@@ -122,8 +109,6 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix,
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLNotesContext::EndElement()
{
SdXMLGenericPageContext::EndElement();
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index 89ec7e3163b5..9927b4e98ad6 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -25,7 +25,6 @@
#include <xmloff/nmspmap.hxx>
#include "ximppage.hxx"
-//////////////////////////////////////////////////////////////////////////////
// presentation:notes context
class SdXMLNotesContext : public SdXMLGenericPageContext
@@ -46,7 +45,6 @@ public:
virtual void EndElement();
};
-
#endif // _XIMPNOTES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index f56af25022c0..41d4b15fcee8 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -38,7 +38,6 @@
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
#include <xmloff/xmluconv.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
using namespace ::com::sun::star::uno;
@@ -52,9 +51,6 @@ using namespace ::com::sun::star::office;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::geometry;
-
-//////////////////////////////////////////////////////////////////////////////
-
class DrawAnnotationContext : public SvXMLImportContext
{
@@ -200,8 +196,6 @@ void DrawAnnotationContext::EndElement()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext );
SdXMLGenericPageContext::SdXMLGenericPageContext(
@@ -228,14 +222,10 @@ SdXMLGenericPageContext::SdXMLGenericPageContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLGenericPageContext::~SdXMLGenericPageContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& )
{
GetImport().GetShapeImport()->pushGroupForSorting( mxShapes );
@@ -244,8 +234,6 @@ void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::x
GetImport().GetFormImport()->startPage( Reference< drawing::XDrawPage >::query( mxShapes ) );
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< xml::sax::XAttributeList>& xAttrList )
@@ -280,8 +268,6 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPre
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLGenericPageContext::EndElement()
{
GetImport().GetShapeImport()->popGroupAndSort();
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index cb5b01a63035..dc4338f1c819 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -28,7 +28,6 @@
#include <tools/rtti.hxx>
#include "ximpshap.hxx"
-//////////////////////////////////////////////////////////////////////////////
// draw:g context (RECURSIVE)
class SdXMLGenericPageContext : public SvXMLImportContext
@@ -84,7 +83,6 @@ public:
{ return mxShapes; }
};
-
#endif // _XIMPGROUP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 4909075f490c..b1a00c3a716f 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -79,7 +79,6 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing;
@@ -115,8 +114,6 @@ SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
static bool ImpIsEmptyURL( const OUString& rURL )
{
if( rURL.isEmpty() )
@@ -130,8 +127,6 @@ static bool ImpIsEmptyURL( const OUString& rURL )
return false;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SvXMLShapeContext, SvXMLImportContext );
TYPEINIT1( SdXMLShapeContext, SvXMLShapeContext );
@@ -160,14 +155,10 @@ SdXMLShapeContext::SdXMLShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLShapeContext::~SdXMLShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -333,7 +324,6 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
}
}
}
-//////////////////////////////////////////////////////////////////////////////
void SdXMLShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&)
{
@@ -415,8 +405,6 @@ void SdXMLShapeContext::EndElement()
mxLockable->removeActionLock();
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
{
if(xShape.is())
@@ -483,8 +471,6 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeContext::AddShape(const char* pServiceName )
{
uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetImport().GetModel(), uno::UNO_QUERY);
@@ -521,8 +507,6 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeContext::SetTransformation()
{
if(mxShape.is())
@@ -588,8 +572,6 @@ void SdXMLShapeContext::SetTransformation()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
{
try
@@ -920,9 +902,6 @@ sal_Bool SdXMLShapeContext::isPresentationShape() const
return sal_False;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext );
SdXMLRectShapeContext::SdXMLRectShapeContext(
@@ -937,14 +916,10 @@ SdXMLRectShapeContext::SdXMLRectShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLRectShapeContext::~SdXMLRectShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -961,8 +936,6 @@ void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create rectangle shape
@@ -995,9 +968,6 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////3////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext );
SdXMLLineShapeContext::SdXMLLineShapeContext(
@@ -1015,14 +985,10 @@ SdXMLLineShapeContext::SdXMLLineShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLLineShapeContext::~SdXMLLineShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1057,8 +1023,6 @@ void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// #85920# use SetTransformation() to handle import of simple lines.
@@ -1121,9 +1085,6 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext );
SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
@@ -1144,14 +1105,10 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1220,8 +1177,6 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create rectangle shape
@@ -1265,9 +1220,6 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext );
SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
@@ -1281,8 +1233,6 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1306,14 +1256,10 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPolygonShapeContext::~SdXMLPolygonShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// Add, set Style and properties from base shape
@@ -1358,9 +1304,6 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext );
SdXMLPathShapeContext::SdXMLPathShapeContext(
@@ -1374,14 +1317,10 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPathShapeContext::~SdXMLPathShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1402,8 +1341,6 @@ void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create polygon shape
@@ -1491,9 +1428,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext );
SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
@@ -1508,14 +1442,10 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1532,8 +1462,6 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&)
{
// create textbox shape
@@ -1666,9 +1594,6 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext );
SdXMLControlShapeContext::SdXMLControlShapeContext(
@@ -1682,14 +1607,10 @@ SdXMLControlShapeContext::SdXMLControlShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLControlShapeContext::~SdXMLControlShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1738,9 +1659,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext );
SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
@@ -1762,14 +1680,10 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -1889,8 +1803,6 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// #107928#
@@ -2007,9 +1919,6 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext );
SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
@@ -2025,8 +1934,6 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext()
{
}
@@ -2068,8 +1975,6 @@ void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLMeasureShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create Measure shape
@@ -2126,9 +2031,6 @@ void SdXMLMeasureShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext );
SdXMLPageShapeContext::SdXMLPageShapeContext(
@@ -2143,14 +2045,10 @@ SdXMLPageShapeContext::SdXMLPageShapeContext(
mbClearDefaultAttributes = false;
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPageShapeContext::~SdXMLPageShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -2166,8 +2064,6 @@ void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create Page shape
@@ -2223,9 +2119,6 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext );
SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
@@ -2241,14 +2134,10 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLCaptionShapeContext::~SdXMLCaptionShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
// create Caption shape
@@ -2331,9 +2220,6 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext );
SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
@@ -2348,8 +2234,6 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -2365,8 +2249,6 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& )
{
// create graphic object shape
@@ -2472,9 +2354,6 @@ void SdXMLGraphicObjectShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
@@ -2502,16 +2381,11 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext()
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext );
SdXMLChartShapeContext::SdXMLChartShapeContext(
@@ -2526,16 +2400,12 @@ SdXMLChartShapeContext::SdXMLChartShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLChartShapeContext::~SdXMLChartShapeContext()
{
if( mpChartContext )
delete mpChartContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
const sal_Bool bIsPresentation = isPresentationShape();
@@ -2586,7 +2456,6 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
}
}
-
// set pos, size, shear and rotate
SetTransformation();
@@ -2620,8 +2489,6 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre
return NULL;
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext );
SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -2837,8 +2704,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext );
SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -3002,8 +2867,6 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n
return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext );
SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -3278,8 +3141,6 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n
return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList );
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext );
SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -3375,8 +3236,6 @@ void SdXMLFloatingFrameShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext );
SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -3671,14 +3530,10 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext(
{
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLCustomShapeContext::~SdXMLCustomShapeContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
// this is called from the parent group for each unparsed attribute in the attribute list
void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue )
{
@@ -3698,8 +3553,6 @@ void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStri
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
// create rectangle shape
@@ -3828,8 +3681,6 @@ void SdXMLCustomShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
@@ -3851,10 +3702,6 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
return pContext;
}
-///////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext );
SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes )
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index ab0051573167..34786ec072a0 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -36,7 +36,6 @@
#include <xmloff/xmlmultiimagehelper.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-//////////////////////////////////////////////////////////////////////////////
// common shape context
class SdXMLShapeContext : public SvXMLShapeContext
@@ -118,7 +117,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:rect context
class SdXMLRectShapeContext : public SdXMLShapeContext
@@ -140,7 +138,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:line context
class SdXMLLineShapeContext : public SdXMLShapeContext
@@ -165,7 +162,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:ellipse and draw:circle context
class SdXMLEllipseShapeContext : public SdXMLShapeContext
@@ -193,7 +189,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:polyline and draw:polygon context
class SdXMLPolygonShapeContext : public SdXMLShapeContext
@@ -216,7 +211,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:path context
class SdXMLPathShapeContext : public SdXMLShapeContext
@@ -239,7 +233,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:text-box context
class SdXMLTextBoxShapeContext : public SdXMLShapeContext
@@ -261,7 +254,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:control context
class SdXMLControlShapeContext : public SdXMLShapeContext
@@ -284,7 +276,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:connector context
class SdXMLConnectorShapeContext : public SdXMLShapeContext
@@ -321,7 +312,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:measure context
class SdXMLMeasureShapeContext : public SdXMLShapeContext
@@ -346,7 +336,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:page context
class SdXMLPageShapeContext : public SdXMLShapeContext
@@ -368,7 +357,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:caption context
class SdXMLCaptionShapeContext : public SdXMLShapeContext
@@ -392,7 +380,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// office:image context
class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext
@@ -420,7 +407,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// chart:chart context
class SdXMLChartShapeContext : public SdXMLShapeContext
@@ -444,7 +430,6 @@ public:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:object and draw:object_ole context
class SdXMLObjectShapeContext : public SdXMLShapeContext
@@ -477,7 +462,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:applet
class SdXMLAppletShapeContext : public SdXMLShapeContext
@@ -510,7 +494,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:plugin
class SdXMLPluginShapeContext : public SdXMLShapeContext
@@ -542,7 +525,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:floating-frame
class SdXMLFloatingFrameShapeContext : public SdXMLShapeContext
@@ -568,7 +550,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:-frame
class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper
@@ -632,7 +613,6 @@ public:
virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue );
};
-//////////////////////////////////////////////////////////////////////////////
// draw:table
class SdXMLTableShapeContext : public SdXMLShapeContext
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index 17b0edf23755..d99e1e1f8dc6 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -34,7 +33,6 @@
#include <xmloff/xmluconv.hxx>
#include "ximpshow.hxx"
-
using namespace ::std;
using namespace ::cppu;
using namespace ::com::sun::star;
@@ -49,8 +47,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::presentation;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////
-
class ShowsImpImpl
{
public:
@@ -66,8 +62,6 @@ public:
{}
};
-///////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLShowsContext, SvXMLImportContext );
SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
@@ -90,7 +84,6 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c
if( xPresentationSupplier.is() )
mpImpl->mxPresProps = Reference< XPropertySet >::query( xPresentationSupplier->getPresentation() );
-
if( mpImpl->mxPresProps.is() )
{
sal_Bool bAll = sal_True;
diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx
index a6190f0c6de8..50fcb9fd197e 100644
--- a/xmloff/source/draw/ximpshow.hxx
+++ b/xmloff/source/draw/ximpshow.hxx
@@ -25,7 +25,6 @@
class ShowsImpImpl;
-//////////////////////////////////////////////////////////////////////////////
// presentations:animations
class SdXMLShowsContext : public SvXMLImportContext
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index a9883cdfaf81..e092e37807be 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -45,14 +45,11 @@
#include "XMLNumberStylesImport.hxx"
#include "xmloff/xmlerror.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext
{
public:
@@ -131,8 +128,6 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
class SdXMLDrawingPageStyleContext : public XMLPropStyleContext
{
public:
@@ -303,8 +298,6 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext );
SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
@@ -383,15 +376,10 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext );
SdXMLPageMasterContext::SdXMLPageMasterContext(
@@ -425,8 +413,6 @@ SdXMLPageMasterContext::SdXMLPageMasterContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPageMasterContext::~SdXMLPageMasterContext()
{
// release remembered contexts, they are no longer needed
@@ -437,8 +423,6 @@ SdXMLPageMasterContext::~SdXMLPageMasterContext()
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -466,9 +450,6 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext );
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
@@ -740,9 +721,6 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
SdXMLImport& rImport,
sal_uInt16 nPrfx, const
@@ -798,15 +776,10 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
}
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext );
SdXMLMasterPageContext::SdXMLMasterPageContext(
@@ -901,14 +874,10 @@ SdXMLMasterPageContext::SdXMLMasterPageContext(
DeleteAllShapes();
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLMasterPageContext::~SdXMLMasterPageContext()
{
}
-//////////////////////////////////////////////////////////////////////////////
-
void SdXMLMasterPageContext::EndElement()
{
// set styles on master-page
@@ -923,8 +892,6 @@ void SdXMLMasterPageContext::EndElement()
GetImport().GetShapeImport()->endPage(GetLocalShapesContext());
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -985,9 +952,6 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext );
SdXMLStylesContext::SdXMLStylesContext(
@@ -1004,16 +968,12 @@ SdXMLStylesContext::SdXMLStylesContext(
mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter, xContext );
}
-//////////////////////////////////////////////////////////////////////////////
-
SdXMLStylesContext::~SdXMLStylesContext()
{
delete mpNumFmtHelper;
delete mpNumFormatter;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -1083,8 +1043,6 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
sal_uInt16 nFamily,
sal_uInt16 nPrefix,
@@ -1112,8 +1070,6 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext(
sal_uInt16 nFamily,
sal_uInt16 nPrefix,
@@ -1136,16 +1092,12 @@ SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext(
return pContext;
}
-//////////////////////////////////////////////////////////////////////////////
-
sal_uInt16 SdXMLStylesContext::GetFamily( const OUString& rFamily ) const
{
// call base class
return SvXMLStylesContext::GetFamily(rFamily);
}
-//////////////////////////////////////////////////////////////////////////////
-
UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyMapper(
sal_uInt16 nFamily) const
{
@@ -1187,7 +1139,6 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
return xMapper;
}
-//////////////////////////////////////////////////////////////////////////////
// Process all style and object info
//
void SdXMLStylesContext::EndElement()
@@ -1250,7 +1201,6 @@ void SdXMLStylesContext::EndElement()
}
}
-//////////////////////////////////////////////////////////////////////////////
// set master-page styles (all with family="presentation" and a special
// prefix) on given master-page.
//
@@ -1278,7 +1228,6 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co
}
}
-//////////////////////////////////////////////////////////////////////////////
// Process styles list:
// set graphic styles (all with family="graphics"). Remember xStyle at list element.
//
@@ -1312,7 +1261,6 @@ void SdXMLStylesContext::ImpSetCellStyles() const
}
}
-//////////////////////////////////////////////////////////////////////////////
// help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles()
//
void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const
@@ -1467,7 +1415,6 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
}
}
-////////////////////////////////////////////////////////////////////////////////
// helper function to create the uno component that hold the mappings from
// xml auto layout name to internal autolayout id
@@ -1488,8 +1435,6 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
return uno::Reference< container::XNameAccess >::query( xLayouts );
}
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
//
TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext );
@@ -1581,8 +1526,6 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
return pContext;
}
-///////////////////////////////////////////////////////////////////////
-
SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 3b572bfc5223..e53ec1cec418 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -30,7 +30,6 @@
class SvNumberFormatter;
class SvXMLNumFmtHelper;
-//////////////////////////////////////////////////////////////////////////////
// special style:style context inside style:page-master context
class SdXMLPageMasterStyleContext: public SvXMLStyleContext
@@ -65,7 +64,6 @@ public:
com::sun::star::view::PaperOrientation GetOrientation() const { return meOrientation; }
};
-//////////////////////////////////////////////////////////////////////////////
// style:page-master context
class SdXMLPageMasterContext: public SvXMLStyleContext
@@ -94,7 +92,6 @@ public:
const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; }
};
-//////////////////////////////////////////////////////////////////////////////
// style:masterpage context
class SdXMLMasterPageContext: public SdXMLGenericPageContext
@@ -128,7 +125,6 @@ public:
};
typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList;
-//////////////////////////////////////////////////////////////////////////////
// presentation:placeholder context
class SdXMLPresentationPlaceholderContext: public SvXMLImportContext
@@ -158,7 +154,6 @@ public:
};
typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList;
-//////////////////////////////////////////////////////////////////////////////
// style:presentation-page-layout context
class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext
@@ -188,7 +183,6 @@ public:
sal_uInt16 GetTypeId() const { return mnTypeId; }
};
-//////////////////////////////////////////////////////////////////////////////
// office:styles context
class SdXMLStylesContext : public SvXMLStylesContext
@@ -243,7 +237,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getPageLayouts() const;
};
-//////////////////////////////////////////////////////////////////////////////
// office:master-styles context
//
class SdXMLMasterStylesContext : public SvXMLImportContext
@@ -270,7 +263,6 @@ public:
const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; }
};
-//////////////////////////////////////////////////////////////////////////////
// <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl>
class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext
@@ -291,7 +283,6 @@ private:
sal_Bool mbFixed;
};
-
#endif // _XIMPSTYLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 37a965967046..690345bedae0 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -19,18 +19,13 @@
#include "attriblistmerge.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
- //=====================================================================
//= OAttribListMerger
- //=====================================================================
- //---------------------------------------------------------------------
void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList)
{
OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!");
@@ -38,7 +33,6 @@ namespace xmloff
m_aLists.push_back(_rxList);
}
- //---------------------------------------------------------------------
sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
{
sal_Int16 nLeftOver = _nGlobalIndex;
@@ -59,7 +53,6 @@ namespace xmloff
return sal_True;
}
- //---------------------------------------------------------------------
sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
{
for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
@@ -78,7 +71,6 @@ namespace xmloff
return sal_False;
}
- //---------------------------------------------------------------------
sal_Int16 SAL_CALL OAttribListMerger::getLength( ) throw(RuntimeException)
{
sal_Int16 nCount = 0;
@@ -90,7 +82,6 @@ namespace xmloff
return nCount;
}
- //---------------------------------------------------------------------
OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException)
{
Reference< xml::sax::XAttributeList > xSubList;
@@ -102,7 +93,6 @@ namespace xmloff
return xSubList->getNameByIndex(nLocalIndex);
}
- //---------------------------------------------------------------------
OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException)
{
Reference< xml::sax::XAttributeList > xSubList;
@@ -114,7 +104,6 @@ namespace xmloff
return xSubList->getTypeByIndex(nLocalIndex);
}
- //---------------------------------------------------------------------
OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException)
{
Reference< xml::sax::XAttributeList > xSubList;
@@ -128,7 +117,6 @@ namespace xmloff
return xSubList->getTypeByIndex(nLocalIndex);
}
- //---------------------------------------------------------------------
OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException)
{
Reference< xml::sax::XAttributeList > xSubList;
@@ -140,7 +128,6 @@ namespace xmloff
return xSubList->getValueByIndex(nLocalIndex);
}
- //---------------------------------------------------------------------
OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException)
{
Reference< xml::sax::XAttributeList > xSubList;
@@ -154,8 +141,6 @@ namespace xmloff
return xSubList->getValueByIndex(nLocalIndex);
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx
index 8cdd67642e24..344bbc6b22ec 100644
--- a/xmloff/source/forms/attriblistmerge.hxx
+++ b/xmloff/source/forms/attriblistmerge.hxx
@@ -25,14 +25,10 @@
#include <osl/mutex.hxx>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OAttribListMerger
- //=====================================================================
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::xml::sax::XAttributeList
> OAttribListMerger_Base;
/** implements the XAttributeList list by merging different source attribute lists
@@ -68,10 +64,7 @@ namespace xmloff
sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex);
};
-
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index 311846b11131..9cc6d0498fca 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -29,14 +29,10 @@
class SvXMLExport;
class SvXMLExportPropertyMapper;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= IFormsExportContext
- //=====================================================================
class IFormsExportContext
{
public:
@@ -55,9 +51,7 @@ namespace xmloff
~IFormsExportContext() {}
};
- //=====================================================================
//= IEventAttacherManager
- //=====================================================================
class IEventAttacherManager
{
public:
@@ -70,9 +64,7 @@ namespace xmloff
~IEventAttacherManager() {}
};
- //=====================================================================
//= IEventAttacher
- //=====================================================================
class IEventAttacher
{
public:
@@ -84,9 +76,7 @@ namespace xmloff
~IEventAttacher() {}
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_CALLBACKS_HXX_
diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx
index eaeb6fd1baac..72a92d25c66a 100644
--- a/xmloff/source/forms/controlelement.cxx
+++ b/xmloff/source/forms/controlelement.cxx
@@ -19,15 +19,10 @@
#include "controlelement.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OControlElement
- //=====================================================================
- //---------------------------------------------------------------------
const sal_Char* OControlElement::getElementName(ElementType _eType)
{
switch (_eType)
@@ -56,8 +51,6 @@ namespace xmloff
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx
index e9b73d316ce7..acc11534fe9f 100644
--- a/xmloff/source/forms/controlelement.hxx
+++ b/xmloff/source/forms/controlelement.hxx
@@ -22,14 +22,10 @@
#include <sal/types.h>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OControlElement
- //=====================================================================
/** helper for translating between control types and XML tags
*/
class OControlElement
@@ -79,9 +75,7 @@ namespace xmloff
static const sal_Char* getElementName(ElementType _eType);
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_CONTROLELEMENT_HXX_
diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx
index d89f2eb23bc6..cb190ef9a6f1 100644
--- a/xmloff/source/forms/controlpropertyhdl.cxx
+++ b/xmloff/source/forms/controlpropertyhdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmloff/controlpropertyhdl.hxx>
#include <com/sun/star/util/MeasureUnit.hpp>
@@ -37,10 +36,8 @@
#include "callbacks.hxx"
#include <xmloff/XMLConstantsPropertyHandler.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -48,10 +45,7 @@ namespace xmloff
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
- //=====================================================================
//= OControlPropertyHandlerFactory
- //=====================================================================
- //---------------------------------------------------------------------
OControlPropertyHandlerFactory::OControlPropertyHandlerFactory()
:m_pTextAlignHandler(NULL)
,m_pControlBorderStyleHandler(NULL)
@@ -63,7 +57,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
OControlPropertyHandlerFactory::~OControlPropertyHandlerFactory()
{
delete m_pTextAlignHandler;
@@ -75,7 +68,6 @@ namespace xmloff
delete m_pFontReliefHandler;
}
- //---------------------------------------------------------------------
const XMLPropertyHandler* OControlPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
{
const XMLPropertyHandler* pHandler = NULL;
@@ -135,14 +127,11 @@ namespace xmloff
return pHandler;
}
- //=====================================================================
//= OControlTextEmphasisHandler
- //=====================================================================
OControlTextEmphasisHandler::OControlTextEmphasisHandler()
{
}
- //---------------------------------------------------------------------
sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const
{
OUStringBuffer aReturn;
@@ -169,7 +158,6 @@ namespace xmloff
return bSuccess;
}
- //---------------------------------------------------------------------
sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const
{
sal_Bool bSuccess = sal_True;
@@ -218,16 +206,12 @@ namespace xmloff
return bSuccess;
}
- //=====================================================================
//= OControlBorderHandlerBase
- //=====================================================================
- //---------------------------------------------------------------------
OControlBorderHandler::OControlBorderHandler( const OControlBorderHandler::BorderFacet _eFacet )
:m_eFacet( _eFacet )
{
}
- //---------------------------------------------------------------------
sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const
{
OUString sToken;
@@ -265,7 +249,6 @@ namespace xmloff
return sal_False;
}
- //---------------------------------------------------------------------
sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const
{
sal_Bool bSuccess = sal_False;
@@ -302,15 +285,11 @@ namespace xmloff
return sal_True;
}
- //=====================================================================
//= OFontWidthHandler
- //=====================================================================
- //---------------------------------------------------------------------
OFontWidthHandler::OFontWidthHandler()
{
}
- //---------------------------------------------------------------------
sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const
{
sal_Int32 nWidth = 0;
@@ -322,7 +301,6 @@ namespace xmloff
return bSuccess;
}
- //---------------------------------------------------------------------
sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const
{
sal_Int16 nWidth = 0;
@@ -337,15 +315,11 @@ namespace xmloff
return !_rStrExpValue.isEmpty();
}
- //=====================================================================
//= ORotationAngleHandler
- //=====================================================================
- //---------------------------------------------------------------------
ORotationAngleHandler::ORotationAngleHandler()
{
}
- //---------------------------------------------------------------------
sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const
{
double fValue;
@@ -360,7 +334,6 @@ namespace xmloff
return bSucces;
}
- //---------------------------------------------------------------------
sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const
{
float fAngle = 0;
@@ -376,17 +349,12 @@ namespace xmloff
return bSuccess;
}
- //=====================================================================
//= ImageScaleModeHandler
- //=====================================================================
- //---------------------------------------------------------------------
ImageScaleModeHandler::ImageScaleModeHandler()
:XMLConstantsPropertyHandler( OEnumMapper::getEnumMap( OEnumMapper::epImageScaleMode ), XML_STRETCH )
{
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx
index 2f0dc041bbb2..ffb729815717 100644
--- a/xmloff/source/forms/controlpropertymap.cxx
+++ b/xmloff/source/forms/controlpropertymap.cxx
@@ -30,10 +30,8 @@
using namespace ::xmloff::token;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
#define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
#define MAP_CONST( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
@@ -87,8 +85,6 @@ namespace xmloff
return getControlStylePropertyMap_Access();
}
- //=====================================================================
- //---------------------------------------------------------------------
struct XMLPropertyMapEntryLess
{
sal_Bool operator()(const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight)
@@ -97,7 +93,6 @@ namespace xmloff
}
};
- //---------------------------------------------------------------------
void implSortMap(XMLPropertyMapEntry* _pMap)
{
XMLPropertyMapEntry* pEnd;
@@ -107,7 +102,6 @@ namespace xmloff
::std::sort(_pMap, pEnd, XMLPropertyMapEntryLess());
}
- //---------------------------------------------------------------------
void initializePropertyMaps()
{
static sal_Bool bSorted = sal_False;
@@ -118,16 +112,12 @@ namespace xmloff
}
}
- //=====================================================================
//= OFormComponentStyleExportMapper
- //=====================================================================
- //---------------------------------------------------------------------
OFormComponentStyleExportMapper::OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper )
:SvXMLExportPropertyMapper( _rMapper )
{
}
- //---------------------------------------------------------------------
void OFormComponentStyleExportMapper::handleSpecialItem( SvXMLAttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter,
const SvXMLNamespaceMap& _rNamespaceMap, const ::std::vector< XMLPropertyState >* _pProperties,
sal_uInt32 _nIdx ) const
@@ -137,9 +127,6 @@ namespace xmloff
SvXMLExportPropertyMapper::handleSpecialItem( _rAttrList, _rProperty, _rUnitConverter, _rNamespaceMap, _pProperties, _nIdx );
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx
index 9a4894fe12f2..7a58d771db5f 100644
--- a/xmloff/source/forms/controlpropertymap.hxx
+++ b/xmloff/source/forms/controlpropertymap.hxx
@@ -24,18 +24,14 @@
#include <xmloff/xmlexppr.hxx>
struct XMLPropertyMapEntry;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
const XMLPropertyMapEntry* getControlStylePropertyMap( );
void initializePropertyMaps();
- //=====================================================================
//= OFormComponentStyleExportMapper
- //=====================================================================
class OFormComponentStyleExportMapper : public SvXMLExportPropertyMapper
{
public:
@@ -51,11 +47,8 @@ namespace xmloff
) const;
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index dbcb9c0e8e22..749e64dcf846 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "elementexport.hxx"
#include "strings.hxx"
#include "xmloff/xmlnmspe.hxx"
@@ -63,10 +62,8 @@
#include <stdio.h>
#include <algorithm>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
#if OSL_DEBUG_LEVEL > 0
#define RESET_BIT( bitfield, bit ) \
@@ -90,9 +87,7 @@ namespace xmloff
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::form::binding;
- //=====================================================================
//= OElementExport
- //=====================================================================
OElementExport::OElementExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxProps,
const Sequence< ScriptEventDescriptor >& _rEvents)
:OPropertyExport(_rContext, _rxProps)
@@ -101,13 +96,11 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
OElementExport::~OElementExport()
{
implEndElement();
}
- //---------------------------------------------------------------------
void OElementExport::doExport()
{
// collect some general information about the element
@@ -128,19 +121,16 @@ namespace xmloff
implEndElement();
}
- //---------------------------------------------------------------------
void OElementExport::examine()
{
// nothing to do here
}
- //---------------------------------------------------------------------
void OElementExport::exportAttributes()
{
// nothing to do here
}
- //---------------------------------------------------------------------
void OElementExport::exportSubTags()
{
// the properties which where not exported 'til now
@@ -150,20 +140,17 @@ namespace xmloff
exportEvents();
}
- //---------------------------------------------------------------------
void OElementExport::implStartElement(const sal_Char* _pName)
{
m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, sal_True, sal_True);
}
- //---------------------------------------------------------------------
void OElementExport::implEndElement()
{
delete m_pXMLElement;
m_pXMLElement = NULL;
}
- //---------------------------------------------------------------------
void OElementExport::exportServiceNameAttribute()
{
Reference< XPersistObject > xPersistence(m_xProps, UNO_QUERY);
@@ -231,7 +218,6 @@ namespace xmloff
sToWriteServiceName);
}
- //---------------------------------------------------------------------
void OElementExport::exportEvents()
{
if (!m_aEvents.getLength())
@@ -242,10 +228,7 @@ namespace xmloff
m_rContext.getGlobalContext().GetEventExport().Export(xWrapper);
}
- //=====================================================================
//= OControlExport
- //=====================================================================
- //---------------------------------------------------------------------
OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl,
const OUString& _rControlId, const OUString& _rReferringControls,
const Sequence< ScriptEventDescriptor >& _rEvents)
@@ -264,13 +247,11 @@ namespace xmloff
OSL_ENSURE(m_xProps.is(), "OControlExport::OControlExport: invalid arguments!");
}
- //---------------------------------------------------------------------
OControlExport::~OControlExport()
{
implEndElement();
}
- //---------------------------------------------------------------------
void OControlExport::exportOuterAttributes()
{
// the control id
@@ -298,7 +279,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportInnerAttributes()
{
// the control id
@@ -332,13 +312,11 @@ namespace xmloff
flagStyleProperties();
}
- //---------------------------------------------------------------------
void OControlExport::exportAttributes()
{
exportOuterAttributes();
}
- //---------------------------------------------------------------------
void OControlExport::exportSubTags() throw (Exception)
{
// for the upcoming exportRemainingProperties:
@@ -468,7 +446,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportGenericHandlerAttributes()
{
const Sequence< Property > aProperties = m_xPropertyInfo->getProperties();
@@ -549,7 +526,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportCommonControlAttributes()
{
size_t i=0;
@@ -562,7 +538,6 @@ namespace xmloff
// the extra indents for the respective blocks are to ensure that there is no copy'n'paste error, using
// map identifiers from the wrong block
- // --------------------------------------------------------------------
// some string properties
{
// the attribute ids of all properties which are expected to be of type string
@@ -594,7 +569,6 @@ namespace xmloff
}
}
- // --------------------------------------------------------------------
// some boolean properties
{
static const sal_Int32 nBooleanPropertyAttributeIds[] =
@@ -634,8 +608,6 @@ namespace xmloff
}
}
-
- // --------------------------------------------------------------------
// some integer properties
{
// now the common handling
@@ -676,10 +648,8 @@ namespace xmloff
#endif
}
-
}
- // --------------------------------------------------------------------
// some enum properties
{
if (m_nIncludeCommon & CCA_BUTTON_TYPE)
@@ -726,7 +696,6 @@ namespace xmloff
}
}
- // --------------------------------------------------------------------
// some properties which require a special handling
// the target frame
@@ -855,7 +824,6 @@ namespace xmloff
// be 0 now ...
}
- //---------------------------------------------------------------------
void OControlExport::exportDatabaseAttributes()
{
#if OSL_DEBUG_LEVEL > 0
@@ -934,14 +902,12 @@ namespace xmloff
#endif
}
- //---------------------------------------------------------------------
void OControlExport::exportBindingAtributes()
{
#if OSL_DEBUG_LEVEL > 0
sal_Int32 nIncludeBinding = m_nIncludeBindings;
#endif
- // ....................................................
if ( m_nIncludeBindings & BA_LINKED_CELL )
{
exportCellBindingAttributes( ( m_nIncludeBindings & BA_LIST_LINKING_TYPE ) != 0 );
@@ -951,7 +917,6 @@ namespace xmloff
#endif
}
- // ....................................................
if ( m_nIncludeBindings & BA_LIST_CELL_RANGE )
{
exportCellListSourceRange();
@@ -1103,7 +1068,6 @@ namespace xmloff
}
- // -------------------
// the enum properties
{
if (SCA_STATE & m_nIncludeSpecial)
@@ -1135,7 +1099,6 @@ namespace xmloff
}
}
- // --------------------------------------------------------------------
// some properties which require a special handling
// the repeat delay
{
@@ -1168,7 +1131,6 @@ namespace xmloff
}
}
- // ----------------------------------
// the EchoChar property needs special handling, cause it's a Int16, but must be stored as one-character-string
{
if (SCA_ECHO_CHAR & m_nIncludeSpecial)
@@ -1192,7 +1154,6 @@ namespace xmloff
}
}
- // ----------------------------------
// the string properties
{
static const sal_Int32 nStringPropertyAttributeIds[] =
@@ -1225,7 +1186,6 @@ namespace xmloff
}
}
- // ----------------------------------
if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
{
// need to export the min value and the max value as attributes
@@ -1263,7 +1223,6 @@ namespace xmloff
#endif
}
- // ----------------------------------
if ( SCA_IMAGE_POSITION & m_nIncludeSpecial )
{
exportImagePositionAttributes();
@@ -1276,7 +1235,6 @@ namespace xmloff
// be 0 now ...
}
- //---------------------------------------------------------------------
OUString OControlExport::getScalarListSourceValue() const
{
OUString sListSource;
@@ -1291,7 +1249,6 @@ namespace xmloff
return sListSource;
}
- //---------------------------------------------------------------------
void OControlExport::exportListSourceAsAttribute()
{
// DA_LIST_SOURCE needs some special handling
@@ -1309,7 +1266,6 @@ namespace xmloff
exportedProperty( PROPERTY_LISTSOURCE );
}
- //---------------------------------------------------------------------
void OControlExport::getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut)
{
Sequence< sal_Int16 > aValueSequence;
@@ -1321,7 +1277,6 @@ namespace xmloff
_rOut.insert(*pValues);
}
- //---------------------------------------------------------------------
void OControlExport::exportListSourceAsElements()
{
// the string lists
@@ -1445,7 +1400,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::implStartElement(const sal_Char* _pName)
{
// before we let the base class start it's outer element, we add a wrapper element
@@ -1465,7 +1419,6 @@ namespace xmloff
OElementExport::implStartElement(_pName);
}
- //---------------------------------------------------------------------
void OControlExport::implEndElement()
{
// end the inner element
@@ -1476,19 +1429,16 @@ namespace xmloff
m_pOuterElement = NULL;
}
- //---------------------------------------------------------------------
const sal_Char* OControlExport::getOuterXMLElementName() const
{
return 0;
}
- //---------------------------------------------------------------------
const sal_Char* OControlExport::getXMLElementName() const
{
return getElementName(m_eType);
}
- //---------------------------------------------------------------------
void OControlExport::examine()
{
OSL_ENSURE( ( m_nIncludeCommon == 0 ) && ( m_nIncludeSpecial == 0 ) && ( m_nIncludeDatabase == 0 )
@@ -1821,7 +1771,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportCellBindingAttributes( bool _bIncludeListLinkageType )
{
try
@@ -1831,14 +1780,12 @@ namespace xmloff
OSL_ENSURE( xBinding.is(), "OControlExport::exportCellBindingAttributes: invalid bindable or invalid binding!" );
if ( xBinding.is() )
{
- // ....................................................
AddAttribute(
OAttributeMetaData::getBindingAttributeNamespace( BA_LINKED_CELL ),
OAttributeMetaData::getBindingAttributeName( BA_LINKED_CELL ),
aHelper.getStringAddressFromCellBinding( xBinding )
);
- // ....................................................
if ( _bIncludeListLinkageType )
{
sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0;
@@ -1866,25 +1813,21 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportXFormsBindAttributes()
{
OUString sBindName = getXFormsBindName( m_xProps );
AddAttribute( XML_NAMESPACE_XFORMS, XML_BIND, sBindName );
}
- //---------------------------------------------------------------------
void OControlExport::exportXFormsListAttributes()
{
OUString sBindName = getXFormsListBindName( m_xProps );
AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_LIST_SOURCE, sBindName );
}
- //---------------------------------------------------------------------
void OControlExport::exportXFormsSubmissionAttributes()
{
OUString sSubmission = getXFormsSubmissionName( m_xProps );
AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_SUBMISSION, sSubmission );
}
- //---------------------------------------------------------------------
void OControlExport::exportCellListSourceRange( )
{
try
@@ -1912,7 +1855,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlExport::exportImagePositionAttributes()
{
try
@@ -1960,7 +1902,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
bool OControlExport::controlHasActiveDataBinding() const
{
try
@@ -1989,7 +1930,6 @@ namespace xmloff
return false;
}
- //---------------------------------------------------------------------
bool OControlExport::controlHasUserSuppliedListEntries() const
{
try
@@ -2023,23 +1963,18 @@ namespace xmloff
return true;
}
- //=====================================================================
//= OColumnExport
- //=====================================================================
- //---------------------------------------------------------------------
OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId,
const Sequence< ScriptEventDescriptor >& _rEvents)
:OControlExport(_rContext, _rxControl, _rControlId, OUString(), _rEvents)
{
}
- //---------------------------------------------------------------------
OColumnExport::~OColumnExport()
{
implEndElement();
}
- //---------------------------------------------------------------------
void OColumnExport::exportServiceNameAttribute()
{
// the attribute "service name" (which has a slightly different meaning for columns
@@ -2064,13 +1999,11 @@ namespace xmloff
}
- //---------------------------------------------------------------------
const sal_Char* OColumnExport::getOuterXMLElementName() const
{
return "column";
}
- //---------------------------------------------------------------------
void OColumnExport::exportAttributes()
{
OControlExport::exportAttributes();
@@ -2093,7 +2026,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OColumnExport::examine()
{
OControlExport::examine();
@@ -2107,10 +2039,7 @@ namespace xmloff
m_nIncludeCommon &= ~CCA_DROPDOWN;
}
- //=====================================================================
//= OFormExport
- //=====================================================================
- //---------------------------------------------------------------------
OFormExport::OFormExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxForm,
const Sequence< ScriptEventDescriptor >& _rEvents)
:OElementExport(_rContext, _rxForm, _rEvents)
@@ -2119,13 +2048,11 @@ namespace xmloff
OSL_ENSURE(m_xProps.is(), "OFormExport::OFormExport: invalid arguments!");
}
- //---------------------------------------------------------------------
const sal_Char* OFormExport::getXMLElementName() const
{
return "form";
}
- //---------------------------------------------------------------------
void OFormExport::exportSubTags()
{
if ( m_bCreateConnectionResourceElement && m_xProps.is() )
@@ -2156,12 +2083,10 @@ namespace xmloff
m_rContext.exportCollectionElements(xCollection);
}
- //---------------------------------------------------------------------
void OFormExport::exportAttributes()
{
sal_Int32 i=0;
- // ---------------------
// the string properties
{
static const FormAttributes eStringPropertyIds[] =
@@ -2301,8 +2226,6 @@ namespace xmloff
OAttributeMetaData::getFormAttributeName(faDetailFiels),
PROPERTY_DETAILFIELDS);
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index d4b3e0a90476..38c3beccbb7f 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -29,14 +29,10 @@
#include "valueproperties.hxx"
class SvXMLElementExport;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OElementExport
- //=====================================================================
class OElementExport : public OPropertyExport
{
protected:
@@ -78,9 +74,7 @@ namespace xmloff
virtual void implEndElement();
};
- //=====================================================================
//= OControlExport
- //=====================================================================
/** Helper class for handling xml elements representing a form control
*/
class OControlExport
@@ -259,9 +253,7 @@ namespace xmloff
bool controlHasUserSuppliedListEntries() const;
};
- //=====================================================================
//= OColumnExport
- //=====================================================================
/** Helper class for exporting a grid column
*/
class OColumnExport : public OControlExport
@@ -287,9 +279,7 @@ namespace xmloff
virtual void examine();
};
- //=====================================================================
//= OFormExport
- //=====================================================================
/** Helper class for handling xml elements representing a form
<p>In opposite to the class <type>OControlExport</type>, OFormExport is unable to export a <em>complete</em>
@@ -313,9 +303,7 @@ namespace xmloff
virtual void exportSubTags();
virtual void exportAttributes();
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_ELEMENTEXPORT_HXX_
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 492abdcc4893..2981f74d6cda 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "elementimport.hxx"
#include "xmloff/xmlimp.hxx"
#include "xmloff/nmspmap.hxx"
@@ -52,10 +51,8 @@
#include <algorithm>
#include <functional>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::xmloff::token;
using namespace ::com::sun::star;
@@ -77,7 +74,6 @@ namespace xmloff
#define PROPID_MIN_VALUE 3
#define PROPID_MAX_VALUE 4
- //=====================================================================
struct PropertyValueLess
{
sal_Bool operator()(const PropertyValue& _rLeft, const PropertyValue& _rRight)
@@ -86,7 +82,6 @@ namespace xmloff
}
};
- //=====================================================================
struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool>
{
bool operator() (const PropertyValue& lhs, const OUString& rhs) const
@@ -99,7 +94,6 @@ namespace xmloff
}
};
- //=====================================================================
template <class ELEMENT>
void pushBackSequenceElement(Sequence< ELEMENT >& _rContainer, const ELEMENT& _rElement)
{
@@ -108,13 +102,9 @@ namespace xmloff
_rContainer[nLen] = _rElement;
}
- //=====================================================================
//= OElementNameMap
- //=====================================================================
- //---------------------------------------------------------------------
OElementNameMap::MapString2Element OElementNameMap::s_sElementTranslations;
- //---------------------------------------------------------------------
const OControlElement::ElementType& operator ++(OControlElement::ElementType& _e)
{
OControlElement::ElementType e = _e;
@@ -123,7 +113,6 @@ namespace xmloff
return _e;
}
- //---------------------------------------------------------------------
OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName)
{
if ( s_sElementTranslations.empty() )
@@ -138,10 +127,7 @@ namespace xmloff
return UNKNOWN;
}
- //=====================================================================
//= OElementImport
- //=====================================================================
- //---------------------------------------------------------------------
OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer)
:OPropertyImport(_rImport, _nPrefix, _rName)
@@ -154,18 +140,15 @@ namespace xmloff
OSL_ENSURE(m_xParentContainer.is(), "OElementImport::OElementImport: invalid parent container!");
}
- //---------------------------------------------------------------------
OElementImport::~OElementImport()
{
}
- //---------------------------------------------------------------------
OUString OElementImport::determineDefaultServiceName() const
{
return OUString();
}
- //---------------------------------------------------------------------
void OElementImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" );
@@ -197,7 +180,6 @@ namespace xmloff
OPropertyImport::StartElement( _rxAttrList );
}
- //---------------------------------------------------------------------
SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >& _rxAttrList)
{
@@ -207,7 +189,6 @@ namespace xmloff
return OPropertyImport::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
}
- //---------------------------------------------------------------------
void OElementImport::EndElement()
{
OSL_ENSURE(m_xElement.is(), "OElementImport::EndElement: invalid element created!");
@@ -246,7 +227,6 @@ namespace xmloff
LEAVE_LOG_CONTEXT( );
}
- //---------------------------------------------------------------------
void OElementImport::implApplySpecificProperties()
{
if ( m_aValues.empty() )
@@ -337,7 +317,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OElementImport::implApplyGenericProperties()
{
if ( m_aGenericValues.empty() )
@@ -479,7 +458,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
OUString OElementImport::implGetDefaultName() const
{
// no optimization here. If this method gets called, the XML stream did not contain a name for the
@@ -515,7 +493,6 @@ namespace xmloff
return sUnnamedName;
}
- //---------------------------------------------------------------------
PropertyGroups::const_iterator OElementImport::impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const
{
ENSURE_OR_RETURN( m_xInfo.is(), "OElementImport::impl_matchPropertyGroup: no property set info!", i_propertyGroups.end() );
@@ -548,7 +525,6 @@ namespace xmloff
return i_propertyGroups.end();
}
- //---------------------------------------------------------------------
bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue )
{
// the generic approach (which I hope all props will be migrated to, on the medium term): property handlers
@@ -605,7 +581,6 @@ namespace xmloff
return false;
}
- //---------------------------------------------------------------------
bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
if ( token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION ) )
@@ -638,7 +613,6 @@ namespace xmloff
return OPropertyImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
}
- //---------------------------------------------------------------------
Reference< XPropertySet > OElementImport::createElement()
{
Reference< XPropertySet > xReturn;
@@ -656,14 +630,12 @@ namespace xmloff
return xReturn;
}
- //---------------------------------------------------------------------
void OElementImport::registerEvents(const Sequence< ScriptEventDescriptor >& _rEvents)
{
OSL_ENSURE(m_xElement.is(), "OElementImport::registerEvents: no element to register events for!");
m_rEventManager.registerEvents(m_xElement, _rEvents);
}
- //---------------------------------------------------------------------
void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault)
{
OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" );
@@ -676,10 +648,7 @@ namespace xmloff
}
}
- //=====================================================================
//= OControlImport
- //=====================================================================
- //---------------------------------------------------------------------
OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer)
:OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer)
@@ -688,7 +657,6 @@ namespace xmloff
disableImplicitGenericAttributeHandling();
}
- //---------------------------------------------------------------------
OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType)
:OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer)
@@ -697,7 +665,6 @@ namespace xmloff
disableImplicitGenericAttributeHandling();
}
- //---------------------------------------------------------------------
OUString OControlImport::determineDefaultServiceName() const
{
const sal_Char* pServiceName = NULL;
@@ -728,14 +695,12 @@ namespace xmloff
return OUString();
}
- //---------------------------------------------------------------------
void OControlImport::addOuterAttributes(const Reference< XAttributeList >& _rxOuterAttribs)
{
OSL_ENSURE(!m_xOuterAttributes.is(), "OControlImport::addOuterAttributes: already have these attributes!");
m_xOuterAttributes = _rxOuterAttribs;
}
- //---------------------------------------------------------------------
bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL);
@@ -835,7 +800,6 @@ namespace xmloff
return OElementImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
}
- //---------------------------------------------------------------------
void OControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttributes;
@@ -964,7 +928,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OControlImport::implTranslateValueProperty(const Reference< XPropertySetInfo >& _rxPropInfo,
PropertyValue& _rPropValue)
{
@@ -1001,7 +964,6 @@ namespace xmloff
_rPropValue.Value = PropertyConversion::convertString(GetImport(), aProp.Type, sValue);
}
- //---------------------------------------------------------------------
void OControlImport::EndElement()
{
OSL_ENSURE(m_xElement.is(), "OControlImport::EndElement: invalid control!");
@@ -1110,7 +1072,6 @@ namespace xmloff
doRegisterXFormsSubmission( m_sSubmissionID );
}
- //---------------------------------------------------------------------
void OControlImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress )
{
OSL_PRECOND( m_xElement.is(), "OControlImport::doRegisterCellValueBinding: invalid element!" );
@@ -1120,7 +1081,6 @@ namespace xmloff
m_rContext.registerCellValueBinding( m_xElement, _rBoundCellAddress );
}
- //---------------------------------------------------------------------
void OControlImport::doRegisterXFormsValueBinding( const OUString& _rBindingID )
{
OSL_PRECOND( m_xElement.is(), "need element" );
@@ -1129,7 +1089,6 @@ namespace xmloff
m_rContext.registerXFormsValueBinding( m_xElement, _rBindingID );
}
- //---------------------------------------------------------------------
void OControlImport::doRegisterXFormsListBinding( const OUString& _rBindingID )
{
OSL_PRECOND( m_xElement.is(), "need element" );
@@ -1138,7 +1097,6 @@ namespace xmloff
m_rContext.registerXFormsListBinding( m_xElement, _rBindingID );
}
- //---------------------------------------------------------------------
void OControlImport::doRegisterXFormsSubmission( const OUString& _rSubmissionID )
{
OSL_PRECOND( m_xElement.is(), "need element" );
@@ -1147,8 +1105,6 @@ namespace xmloff
m_rContext.registerXFormsSubmission( m_xElement, _rSubmissionID );
}
- //---------------------------------------------------------------------
-
Reference< XPropertySet > OControlImport::createElement()
{
const Reference<XPropertySet> xPropSet = OElementImport::createElement();
@@ -1164,10 +1120,7 @@ namespace xmloff
return xPropSet;
}
- //=====================================================================
//= OImagePositionImport
- //=====================================================================
- //---------------------------------------------------------------------
OImagePositionImport::OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager,
sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType )
@@ -1178,7 +1131,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName,
const OUString& _rValue )
{
@@ -1204,7 +1156,6 @@ namespace xmloff
return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
}
- //---------------------------------------------------------------------
void OImagePositionImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OControlImport::StartElement( _rxAttrList );
@@ -1226,10 +1177,7 @@ namespace xmloff
}
}
- //=====================================================================
//= OReferredControlImport
- //=====================================================================
- //---------------------------------------------------------------------
OReferredControlImport::OReferredControlImport(
OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
@@ -1238,7 +1186,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
void OReferredControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OControlImport::StartElement(_rxAttrList);
@@ -1248,7 +1195,6 @@ namespace xmloff
m_rFormImport.registerControlReferences(m_xElement, m_sReferringControls);
}
- //---------------------------------------------------------------------
bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName,
const OUString& _rValue)
{
@@ -1261,17 +1207,13 @@ namespace xmloff
return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
}
- //=====================================================================
//= OPasswordImport
- //=====================================================================
- //---------------------------------------------------------------------
OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType)
:OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType)
{
}
- //---------------------------------------------------------------------
bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR));
@@ -1292,17 +1234,13 @@ namespace xmloff
return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
}
- //=====================================================================
//= ORadioImport
- //=====================================================================
- //---------------------------------------------------------------------
ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType)
:OImagePositionImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType )
{
}
- //---------------------------------------------------------------------
bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
// need special handling for the State & CurrentState properties:
@@ -1331,9 +1269,7 @@ namespace xmloff
return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
}
- //=====================================================================
//= OURLReferenceImport
- //=====================================================================
OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
@@ -1341,7 +1277,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION );
@@ -1375,10 +1310,7 @@ namespace xmloff
return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
}
- //=====================================================================
//= OButtonImport
- //=====================================================================
- //---------------------------------------------------------------------
OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
@@ -1387,7 +1319,6 @@ namespace xmloff
enableTrackAttributes();
}
- //---------------------------------------------------------------------
void OButtonImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OURLReferenceImport::StartElement(_rxAttrList);
@@ -1396,10 +1327,7 @@ namespace xmloff
simulateDefaultedAttribute(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_FRAME), PROPERTY_TARGETFRAME, "_blank");
}
- //=====================================================================
//= OValueRangeImport
- //=====================================================================
- //---------------------------------------------------------------------
OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType )
:OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType )
@@ -1408,7 +1336,6 @@ namespace xmloff
}
- //---------------------------------------------------------------------
bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue )
{
if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) )
@@ -1419,7 +1346,6 @@ namespace xmloff
return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );
}
- //---------------------------------------------------------------------
void OValueRangeImport::StartElement( const Reference< XAttributeList >& _rxAttrList )
{
OControlImport::StartElement( _rxAttrList );
@@ -1433,10 +1359,7 @@ namespace xmloff
}
}
- //=====================================================================
//= OTextLikeImport
- //=====================================================================
- //---------------------------------------------------------------------
OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
@@ -1446,7 +1369,6 @@ namespace xmloff
enableTrackAttributes();
}
- //---------------------------------------------------------------------
SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >& _rxAttrList )
{
@@ -1487,7 +1409,6 @@ namespace xmloff
return OControlImport::CreateChildContext( _nPrefix, _rLocalName, _rxAttrList );
}
- //---------------------------------------------------------------------
void OTextLikeImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OControlImport::StartElement(_rxAttrList);
@@ -1500,7 +1421,6 @@ namespace xmloff
simulateDefaultedAttribute(OAttributeMetaData::getDatabaseAttributeName(DA_CONVERT_EMPTY), PROPERTY_EMPTY_IS_NULL, "false");
}
- //---------------------------------------------------------------------
struct EqualHandle : public ::std::unary_function< PropertyValue, bool >
{
const sal_Int32 m_nHandle;
@@ -1512,7 +1432,6 @@ namespace xmloff
}
};
- //---------------------------------------------------------------------
void OTextLikeImport::removeRedundantCurrentValue()
{
if ( m_bEncounteredTextPara )
@@ -1555,7 +1474,6 @@ namespace xmloff
// since this is the default of this property, anyway.
}
- //---------------------------------------------------------------------
struct EqualName : public ::std::unary_function< PropertyValue, bool >
{
const OUString m_sName;
@@ -1567,7 +1485,6 @@ namespace xmloff
}
};
- //---------------------------------------------------------------------
void OTextLikeImport::adjustDefaultControlProperty()
{
// In OpenOffice.org 2.0, we changed the implementation of the css.form.component.TextField (the model of a text field control),
@@ -1596,7 +1513,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OTextLikeImport::EndElement()
{
removeRedundantCurrentValue();
@@ -1624,10 +1540,7 @@ namespace xmloff
}
- //=====================================================================
//= OListAndComboImport
- //=====================================================================
- //---------------------------------------------------------------------
OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
@@ -1641,7 +1554,6 @@ namespace xmloff
enableTrackAttributes();
}
- //---------------------------------------------------------------------
SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >& _rxAttrList)
{
@@ -1659,7 +1571,6 @@ namespace xmloff
return OControlImport::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
}
- //---------------------------------------------------------------------
void OListAndComboImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
m_bLinkWithIndexes = sal_False;
@@ -1678,7 +1589,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OListAndComboImport::EndElement()
{
// append the list source property the properties sequence of our importer
@@ -1722,7 +1632,6 @@ namespace xmloff
m_rContext.registerCellRangeListSource( m_xElement, m_sCellListSource );
}
- //---------------------------------------------------------------------
void OListAndComboImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress )
{
OUString sBoundCellAddress( _rBoundCellAddress );
@@ -1738,7 +1647,6 @@ namespace xmloff
OControlImport::doRegisterCellValueBinding( sBoundCellAddress );
}
- //---------------------------------------------------------------------
bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE);
@@ -1790,7 +1698,6 @@ namespace xmloff
return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
}
- //---------------------------------------------------------------------
void OListAndComboImport::implPushBackLabel(const OUString& _rLabel)
{
OSL_ENSURE(!m_nEmptyListItems, "OListAndComboImport::implPushBackValue: label list is already done!");
@@ -1798,7 +1705,6 @@ namespace xmloff
pushBackSequenceElement(m_aListSource, _rLabel);
}
- //---------------------------------------------------------------------
void OListAndComboImport::implPushBackValue(const OUString& _rValue)
{
OSL_ENSURE(!m_nEmptyValueItems, "OListAndComboImport::implPushBackValue: value list is already done!");
@@ -1814,19 +1720,16 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OListAndComboImport::implEmptyLabelFound()
{
++m_nEmptyListItems;
}
- //---------------------------------------------------------------------
void OListAndComboImport::implEmptyValueFound()
{
++m_nEmptyValueItems;
}
- //---------------------------------------------------------------------
void OListAndComboImport::implSelectCurrentItem()
{
OSL_ENSURE((m_aListSource.getLength() + m_nEmptyListItems) == (m_aValueList.getLength() + m_nEmptyValueItems),
@@ -1836,7 +1739,6 @@ namespace xmloff
pushBackSequenceElement(m_aSelectedSeq, nItemNumber);
}
- //---------------------------------------------------------------------
void OListAndComboImport::implDefaultSelectCurrentItem()
{
OSL_ENSURE((m_aListSource.getLength() + m_nEmptyListItems) == (m_aValueList.getLength() + m_nEmptyValueItems),
@@ -1846,10 +1748,7 @@ namespace xmloff
pushBackSequenceElement(m_aDefaultSelectedSeq, nItemNumber);
}
- //=====================================================================
//= OListOptionImport
- //=====================================================================
- //---------------------------------------------------------------------
OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
const OListAndComboImportRef& _rListBox)
:SvXMLImportContext(_rImport, _nPrefix, _rName)
@@ -1857,7 +1756,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
void OListOptionImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
// the label and the value
@@ -1867,7 +1765,6 @@ namespace xmloff
const OUString sValueAttribute = rMap.GetQNameByKey(
GetPrefix(), OUString("value"));
- // -------------------
// the label attribute
OUString sValue = _rxAttrList->getValueByName(sLabelAttribute);
sal_Bool bNonexistentAttribute = sal_False;
@@ -1881,7 +1778,6 @@ namespace xmloff
else
m_xListBoxImport->implPushBackLabel( sValue );
- // -------------------
// the value attribute
sValue = _rxAttrList->getValueByName(sValueAttribute);
bNonexistentAttribute = sal_False;
@@ -1918,10 +1814,7 @@ namespace xmloff
SvXMLImportContext::StartElement(_rxAttrList);
}
- //=====================================================================
//= OComboItemImport
- //=====================================================================
- //---------------------------------------------------------------------
OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
const OListAndComboImportRef& _rListBox)
:SvXMLImportContext(_rImport, _nPrefix, _rName)
@@ -1929,7 +1822,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
void OComboItemImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
const OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey(
@@ -1939,11 +1831,7 @@ namespace xmloff
SvXMLImportContext::StartElement(_rxAttrList);
}
-
- //=====================================================================
//= OColumnWrapperImport
- //=====================================================================
- //---------------------------------------------------------------------
OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer)
:SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName)
@@ -1952,7 +1840,6 @@ namespace xmloff
,m_rEventManager(_rEventManager)
{
}
- //---------------------------------------------------------------------
SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >&)
{
@@ -1964,7 +1851,6 @@ namespace xmloff
}
return pReturn;
}
- //---------------------------------------------------------------------
void OColumnWrapperImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OSL_ENSURE(!m_xOwnAttributes.is(), "OColumnWrapperImport::StartElement: aready have the cloned list!");
@@ -1977,7 +1863,6 @@ namespace xmloff
OSL_ENSURE(m_xOwnAttributes.is(), "OColumnWrapperImport::StartElement: no cloned list!");
}
- //---------------------------------------------------------------------
OControlImport* OColumnWrapperImport::implCreateChildContext(
sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType)
@@ -2011,10 +1896,7 @@ namespace xmloff
}
}
- //=====================================================================
//= OGridImport
- //=====================================================================
- //---------------------------------------------------------------------
OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer,
OControlElement::ElementType _eType)
@@ -2023,16 +1905,12 @@ namespace xmloff
setElementType(_eType);
}
- //---------------------------------------------------------------------
SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName)
{
return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer);
}
- //=====================================================================
//= OFormImport
- //=====================================================================
- //---------------------------------------------------------------------
OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const Reference< XNameContainer >& _rxParentContainer)
:OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "control")
@@ -2040,7 +1918,6 @@ namespace xmloff
enableTrackAttributes();
}
- //---------------------------------------------------------------------
SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >& _rxAttrList)
{
@@ -2059,7 +1936,6 @@ namespace xmloff
OElementNameMap::getElementType(_rLocalName) );
}
- //---------------------------------------------------------------------
void OFormImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
m_rFormImport.enterEventContext();
@@ -2069,21 +1945,18 @@ namespace xmloff
simulateDefaultedAttribute(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_FRAME), PROPERTY_TARGETFRAME, "_blank");
}
- //---------------------------------------------------------------------
void OFormImport::EndElement()
{
OFormImport_Base::EndElement();
m_rFormImport.leaveEventContext();
}
- //---------------------------------------------------------------------
SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName)
{
OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" );
return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName );
}
- //---------------------------------------------------------------------
bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue)
{
// handle the master/details field attributes (they're way too special to let the OPropertyImport handle them)
@@ -2105,7 +1978,6 @@ namespace xmloff
return OFormImport_Base::handleAttribute(_nNamespaceKey, _rLocalName, _rValue);
}
- //---------------------------------------------------------------------
void OFormImport::implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue)
{
PropertyValue aProp;
@@ -2128,7 +2000,6 @@ namespace xmloff
aElements.reserve(nEstimate + 1);
// that's the worst case. If the string contains the separator character _quoted_, we reserved to much ...
-
sal_Int32 nElementStart = 0;
sal_Int32 nNextSep = 0;
sal_Int32 nElementLength;
@@ -2170,9 +2041,7 @@ namespace xmloff
// add the property to the base class' array
implPushBackPropertyValue(aProp);
}
- //=====================================================================
//= OXMLDataSourceImport
- //=====================================================================
OXMLDataSourceImport::OXMLDataSourceImport(
SvXMLImport& _rImport
,sal_uInt16 nPrfx
@@ -2206,7 +2075,6 @@ namespace xmloff
}
}
}
- //---------------------------------------------------------------------
OControlImport* OFormImport::implCreateChildContext(
sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType )
@@ -2251,8 +2119,6 @@ namespace xmloff
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index b9792808b905..e3df69e253c0 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -36,16 +36,12 @@
#include <comphelper/stl_types.hxx>
class XMLTextStyleContext;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
class OFormLayerXMLImport_Impl;
- //=====================================================================
//= OElementNameMap
- //=====================================================================
const OControlElement::ElementType& operator ++(OControlElement::ElementType& _e);
/** helper class which allows fast translation of xml tag names into element types.
@@ -63,9 +59,7 @@ namespace xmloff
static ElementType getElementType(const OUString& _rName);
};
- //=====================================================================
//= OElementImport
- //=====================================================================
/** implements common behaviour for importing forms, controls and columns
*/
class OElementImport
@@ -176,9 +170,7 @@ namespace xmloff
virtual OUString determineDefaultServiceName() const;
};
- //=====================================================================
//= OControlImport
- //=====================================================================
/** helper class for importing the description of a single control
*/
class OControlImport
@@ -283,9 +275,7 @@ namespace xmloff
// we should have dedicated attribute handlers
// The rest of xmloff implements it this way - why don't we do, too?
- //=====================================================================
//= OImagePositionImport
- //=====================================================================
class OImagePositionImport : public OControlImport
{
sal_Int16 m_nImagePosition;
@@ -311,9 +301,7 @@ namespace xmloff
);
};
- //=====================================================================
//= OReferredControlImport
- //=====================================================================
class OReferredControlImport : public OControlImport
{
protected:
@@ -336,9 +324,7 @@ namespace xmloff
const OUString& _rValue);
};
- //=====================================================================
//= OPasswordImport
- //=====================================================================
class OPasswordImport : public OControlImport
{
public:
@@ -354,9 +340,7 @@ namespace xmloff
const OUString& _rValue);
};
- //=====================================================================
//= ORadioImport
- //=====================================================================
class ORadioImport : public OImagePositionImport
{
public:
@@ -373,9 +357,7 @@ namespace xmloff
const OUString& _rValue);
};
- //=====================================================================
//= OURLReferenceImport
- //=====================================================================
/** a specialized version of the <type>OControlImport</type> class, which is able
to handle attributes which denote URLs (and stored relative)
*/
@@ -395,9 +377,7 @@ namespace xmloff
const OUString& _rValue);
};
- //=====================================================================
//= OButtonImport
- //=====================================================================
/** A specialized version of the <type>OControlImport</type> class, which handles
the target frame for image and command buttons
*/
@@ -416,9 +396,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
};
- //=====================================================================
//= OValueRangeImport
- //=====================================================================
/** A specialized version of the <type>OControlImport</type> class, which imports
the value-range elements
*/
@@ -445,9 +423,7 @@ namespace xmloff
const OUString& _rValue );
};
- //=====================================================================
//= OTextLikeImport
- //=====================================================================
/** A specialized version of the <type>OControlImport</type> class, which handles
text like controls which have the convert-empty-to-null attribute</p>
*/
@@ -478,9 +454,7 @@ namespace xmloff
void removeRedundantCurrentValue();
};
- //=====================================================================
//= OListAndComboImport
- //=====================================================================
/** A specialized version of the <type>OControlImport</type> class, which handles
attributes / sub elements which are special to list and combo boxes
*/
@@ -545,9 +519,7 @@ namespace xmloff
};
SV_DECL_IMPL_REF(OListAndComboImport);
- //=====================================================================
//= OListOptionImport
- //=====================================================================
/** helper class for importing a single &lt;form:option&gt; element.
*/
class OListOptionImport
@@ -563,9 +535,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
};
- //=====================================================================
//= OComboItemImport
- //=====================================================================
/** helper class for importing a single &lt;form:item&gt; element.
*/
class OComboItemImport
@@ -583,9 +553,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
};
- //=====================================================================
//= OContainerImport
- //=====================================================================
// BASE must be a derivee of OElementImport
template <class BASE>
class OContainerImport
@@ -622,9 +590,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0;
};
- //=====================================================================
//= OColumnImport
- //=====================================================================
/** helper class importing a single grid column (without the &lt;form:column&gt; element wrapping
the column).
@@ -648,9 +614,7 @@ namespace xmloff
createElement();
};
- //=====================================================================
//= OColumnWrapperImport
- //=====================================================================
class OColumnWrapperImport : public SvXMLImportContext
{
protected:
@@ -677,9 +641,7 @@ namespace xmloff
OControlElement::ElementType _eType);
};
- //=====================================================================
//= OGridImport
- //=====================================================================
typedef OContainerImport< OControlImport > OGridImport_Base;
/** helper class importing a single &lt;form:grid&gt; element
*/
@@ -697,9 +659,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const OUString& _rLocalName);
};
- //=====================================================================
//= OFormImport
- //=====================================================================
typedef OContainerImport< OElementImport > OFormImport_Base;
/** helper class importing a single &lt;form:form&gt; element
*/
@@ -733,13 +693,10 @@ namespace xmloff
sal_uInt16 _nPrefix, const OUString& _rLocalName,
OControlElement::ElementType _eType );
-
void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue);
};
- //=====================================================================
//= OXMLDataSourceImport
- //=====================================================================
class OXMLDataSourceImport : public SvXMLImportContext
{
public:
@@ -754,9 +711,7 @@ namespace xmloff
#include "elementimport_impl.hxx"
#undef _INCLUDING_FROM_ELEMENTIMPORT_HXX_
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_ELEMENTIMPORT_HXX_
diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx
index e9c245c9e5d5..2ca20f76ddec 100644
--- a/xmloff/source/forms/elementimport_impl.hxx
+++ b/xmloff/source/forms/elementimport_impl.hxx
@@ -26,10 +26,7 @@
// no namespace. Same as above: this file is included from elementimport.hxx only,
// and this is done inside the namespace
-//=========================================================================
//= OContainerImport
-//=========================================================================
-//-------------------------------------------------------------------------
template <class BASE>
inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext(
sal_uInt16 _nPrefix, const OUString& _rLocalName,
@@ -50,7 +47,6 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext(
return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList);
}
-//-------------------------------------------------------------------------
template <class BASE>
inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
OContainerImport< BASE >::createElement()
@@ -71,7 +67,6 @@ inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
return xReturn;
}
-//-------------------------------------------------------------------------
template <class BASE>
inline void OContainerImport< BASE >::EndElement()
{
@@ -83,10 +78,7 @@ inline void OContainerImport< BASE >::EndElement()
ODefaultEventAttacherManager::setEvents(xIndexContainer);
}
-//=========================================================================
//= OColumnImport
-//=========================================================================
-//-------------------------------------------------------------------------
template <class BASE>
OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer,
@@ -97,7 +89,6 @@ OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventA
OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!");
}
-//-------------------------------------------------------------------------
// OElementImport overridables
template <class BASE>
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OColumnImport< BASE >::createElement()
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index c35d201a3321..6ec70d6009bf 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -22,10 +22,8 @@
#include "strings.hxx"
#include <tools/debug.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
@@ -33,10 +31,7 @@ namespace xmloff
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
- //=====================================================================
//= OEventDescriptorMapper
- //=====================================================================
- //---------------------------------------------------------------------
OEventDescriptorMapper::OEventDescriptorMapper(const Sequence< ScriptEventDescriptor >& _rEvents)
{
sal_Int32 nEvents = _rEvents.getLength();
@@ -92,14 +87,12 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
{
throw IllegalArgumentException(
OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1);
}
- //---------------------------------------------------------------------
Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
{
ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
@@ -111,7 +104,6 @@ namespace xmloff
return makeAny(aPos->second);
}
- //---------------------------------------------------------------------
Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException)
{
Sequence< OUString > aReturn(m_aMappedEvents.size());
@@ -125,27 +117,22 @@ namespace xmloff
return aReturn;
}
- //---------------------------------------------------------------------
sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException)
{
ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
return m_aMappedEvents.end() != aPos;
}
- //---------------------------------------------------------------------
Type SAL_CALL OEventDescriptorMapper::getElementType( ) throw(RuntimeException)
{
return ::getCppuType(static_cast< PropertyValue* >(NULL));
}
- //---------------------------------------------------------------------
sal_Bool SAL_CALL OEventDescriptorMapper::hasElements( ) throw(RuntimeException)
{
return !m_aMappedEvents.empty();
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx
index b919236275fa..91548c49a119 100644
--- a/xmloff/source/forms/eventexport.hxx
+++ b/xmloff/source/forms/eventexport.hxx
@@ -27,14 +27,10 @@
#include <cppuhelper/implbase1.hxx>
#include <comphelper/stl_types.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OEventDescriptorMapper
- //=====================================================================
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace
> OEventDescriptorMapper_Base;
/** helper class wrapping different script event representations
@@ -69,10 +65,7 @@ namespace xmloff
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException);
};
-
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_EVENTEXPORT_HXX_
diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx
index d61fe5f4f9b7..8a6a99e8d365 100644
--- a/xmloff/source/forms/eventimport.cxx
+++ b/xmloff/source/forms/eventimport.cxx
@@ -23,27 +23,21 @@
#include <comphelper/extract.hxx>
#include "strings.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::script;
using namespace ::com::sun::star::container;
- //=====================================================================
//= OFormEventsImportContext
- //=====================================================================
- //---------------------------------------------------------------------
OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher)
:XMLEventsImportContext(_rImport, _nPrefix, _rLocalName)
,m_rEventAttacher(_rEventAttacher)
{
}
- //---------------------------------------------------------------------
void OFormEventsImportContext::EndElement()
{
Sequence< ScriptEventDescriptor > aTranslated(aCollectEvents.size());
@@ -102,15 +96,12 @@ namespace xmloff
XMLEventsImportContext::EndElement();
}
- //=====================================================================
//= ODefaultEventAttacherManager
- //=====================================================================
ODefaultEventAttacherManager::~ODefaultEventAttacherManager()
{
}
- //-------------------------------------------------------------------------
void ODefaultEventAttacherManager::registerEvents(const Reference< XPropertySet >& _rxElement,
const Sequence< ScriptEventDescriptor >& _rEvents)
{
@@ -120,7 +111,6 @@ namespace xmloff
m_aEvents[_rxElement] = _rEvents;
}
- //-------------------------------------------------------------------------
void ODefaultEventAttacherManager::setEvents(const Reference< XIndexAccess >& _rxContainer)
{
Reference< XEventAttacherManager > xEventManager(_rxContainer, UNO_QUERY);
@@ -146,9 +136,6 @@ namespace xmloff
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx
index af7df463bade..1993828255f5 100644
--- a/xmloff/source/forms/eventimport.hxx
+++ b/xmloff/source/forms/eventimport.hxx
@@ -26,14 +26,10 @@
#include <com/sun/star/container/XIndexAccess.hpp>
class SvXMLImport;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OFormEventsImportContext
- //=====================================================================
class OFormEventsImportContext : public XMLEventsImportContext
{
protected:
@@ -47,9 +43,7 @@ namespace xmloff
virtual void EndElement();
};
- //=====================================================================
//= ODefaultEventAttacherManager
- //=====================================================================
class ODefaultEventAttacherManager : public IEventAttacherManager
{
protected:
@@ -79,9 +73,7 @@ namespace xmloff
virtual ~ODefaultEventAttacherManager();
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_EVENTIMPORT_HXX_
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 31989bac7b7d..b1ebf0040d28 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "formattributes.hxx"
#include <sax/tools/converter.hxx>
@@ -25,20 +24,14 @@
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmluconv.hxx>
#include <rtl/ustrbuf.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
-
- //=====================================================================
//= OAttributeMetaData
- //=====================================================================
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getCommonControlAttributeName(sal_Int32 _nId)
{
switch (_nId)
@@ -74,7 +67,6 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getCommonControlAttributeNamespace(sal_Int32 _nId)
{
if (CCA_TARGET_LOCATION == _nId)
@@ -86,7 +78,6 @@ namespace xmloff
return XML_NAMESPACE_FORM;
}
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getFormAttributeName(FormAttributes _eAttrib)
{
switch (_eAttrib)
@@ -119,7 +110,6 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getFormAttributeNamespace(FormAttributes _eAttrib)
{
if (faAction == _eAttrib)
@@ -131,7 +121,6 @@ namespace xmloff
return XML_NAMESPACE_FORM;
}
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getDatabaseAttributeName(sal_Int32 _nId)
{
switch (_nId)
@@ -148,14 +137,12 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getDatabaseAttributeNamespace(sal_Int32 /*_nId*/)
{
// nothing special here
return XML_NAMESPACE_FORM;
}
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getBindingAttributeName(sal_Int32 _nId)
{
switch (_nId)
@@ -169,14 +156,12 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getBindingAttributeNamespace(sal_Int32)
{
// nothing special here
return XML_NAMESPACE_FORM;
}
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getSpecialAttributeName(sal_Int32 _nId)
{
switch (_nId)
@@ -205,7 +190,6 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
{
switch( _nId )
@@ -215,7 +199,6 @@ namespace xmloff
return XML_NAMESPACE_FORM;
}
- //---------------------------------------------------------------------
const sal_Char* OAttributeMetaData::getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib)
{
switch (_eAttrib)
@@ -228,27 +211,21 @@ namespace xmloff
return "";
}
- //---------------------------------------------------------------------
sal_uInt16 OAttributeMetaData::getOfficeFormsAttributeNamespace(OfficeFormsAttributes /* _eAttrib */)
{
// nothing special here
return XML_NAMESPACE_FORM;
}
- //=====================================================================
//= OAttribute2Property
- //=====================================================================
- //---------------------------------------------------------------------
OAttribute2Property::OAttribute2Property()
{
}
- //---------------------------------------------------------------------
OAttribute2Property::~OAttribute2Property()
{
}
- //---------------------------------------------------------------------
const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation(
const OUString& _rAttribName)
{
@@ -258,7 +235,6 @@ namespace xmloff
return NULL;
}
- //---------------------------------------------------------------------
void OAttribute2Property::addStringProperty(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const sal_Char* _pAttributeDefault)
@@ -267,7 +243,6 @@ namespace xmloff
_pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString());
}
- //---------------------------------------------------------------------
void OAttribute2Property::addBooleanProperty(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics)
@@ -278,7 +253,6 @@ namespace xmloff
aAssignment.bInverseSemantics = _bInverseSemantics;
}
- //---------------------------------------------------------------------
void OAttribute2Property::addInt16Property(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const sal_Int16 _nAttributeDefault)
@@ -288,7 +262,6 @@ namespace xmloff
implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >(NULL) ), aDefault.makeStringAndClear());
}
- //---------------------------------------------------------------------
void OAttribute2Property::addInt32Property(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const sal_Int32 _nAttributeDefault)
@@ -298,7 +271,6 @@ namespace xmloff
implAdd( _pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >(NULL) ), aDefault.makeStringAndClear() );
}
- //---------------------------------------------------------------------
void OAttribute2Property::addEnumProperty(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap,
@@ -313,7 +285,6 @@ namespace xmloff
aAssignment.pEnumMap = _pValueMap;
}
- //---------------------------------------------------------------------
OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd(
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/)
@@ -332,8 +303,6 @@ namespace xmloff
return m_aKnownProperties[sAttributeName] = aAssignment;
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index f535d0172ba0..9b933c42205f 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -27,10 +27,8 @@
struct SvXMLEnumMapEntry;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
// flags for common control attributes
#define CCA_NAME 0x00000001
@@ -137,9 +135,7 @@ namespace xmloff
ofaApplyDesignMode
};
- //=====================================================================
//= OAttributeMetaData
- //=====================================================================
/** allows the translation of attribute ids into strings.
<p>This class does not allow to connect xml attributes to property names or
@@ -221,9 +217,7 @@ namespace xmloff
static sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes _eAttrib);
};
- //=====================================================================
//= OAttribute2Property
- //=====================================================================
/** some kind of opposite to the OAttributeMetaData class. Able to translate
attributes into property names/types
@@ -347,9 +341,7 @@ namespace xmloff
const sal_Char* _pAttributeName, const OUString& _rPropertyName,
const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString);
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMATTRIBUTES_HXX_
diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx
index 6ff657ec30da..176aaaabddf2 100644
--- a/xmloff/source/forms/formcellbinding.cxx
+++ b/xmloff/source/forms/formcellbinding.cxx
@@ -37,10 +37,8 @@
#include <functional>
#include <algorithm>
-//............................................................................
namespace xmloff
{
-//............................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -61,7 +59,6 @@ namespace
using ::com::sun::star::frame::XModel;
using ::com::sun::star::uno::UNO_QUERY;
- //....................................................................
template< class TYPE >
Reference< TYPE > getTypedModelNode( const Reference< XInterface >& _rxModelNode )
{
@@ -78,13 +75,11 @@ namespace
}
}
- //....................................................................
Reference< XModel > getDocument( const Reference< XInterface >& _rxModelNode )
{
return getTypedModelNode< XModel >( _rxModelNode );
}
- //....................................................................
struct StringCompare : public ::std::unary_function< OUString, bool >
{
private:
@@ -100,10 +95,7 @@ namespace
};
}
-//========================================================================
//= FormCellBindingHelper
-//========================================================================
-//------------------------------------------------------------------------
FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _rxControlModel, const Reference< XModel >& _rxDocument )
:m_xControlModel( _rxControlModel )
,m_xDocument( _rxDocument, UNO_QUERY )
@@ -115,14 +107,12 @@ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _
OSL_ENSURE( m_xDocument.is(), "FormCellBindingHelper::FormCellBindingHelper: Did not find the spreadsheet document!" );
}
-//------------------------------------------------------------------------
sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPropertySet >& _rxControlModel )
{
Reference< XSpreadsheetDocument > xDocument( getDocument( _rxControlModel ), UNO_QUERY );
return xDocument.is();
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const
{
Any aAddress;
@@ -136,7 +126,6 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr
&& ( aAddress >>= _rAddress );
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription,
CellRangeAddress& /* [out] */ _rAddress ) const
{
@@ -151,7 +140,6 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr
&& ( aAddress >>= _rAddress );
}
-//------------------------------------------------------------------------
Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding ) const
{
Reference< XValueBinding > xBinding;
@@ -173,7 +161,6 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd
return xBinding;
}
-//------------------------------------------------------------------------
Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const
{
Reference< XListEntrySource > xSource;
@@ -192,7 +179,6 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr
return xSource;
}
-//------------------------------------------------------------------------
OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const
{
OSL_PRECOND( !_rxBinding.is() || isCellBinding( _rxBinding ), "FormCellBindingHelper::getStringAddressFromCellBinding: this is no cell binding!" );
@@ -222,7 +208,6 @@ OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference
return sAddress;
}
-//------------------------------------------------------------------------
OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const
{
OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "FormCellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" );
@@ -251,7 +236,6 @@ OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Refere
return sAddress;
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const OUString& _rService ) SAL_THROW(())
{
bool bYesItIs = false;
@@ -287,13 +271,11 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference<
return bYesItIs;
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(())
{
return isSpreadsheetDocumentWhichSupplies( m_xDocument, _rService );
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isListCellRangeAllowed( const Reference< XModel >& _rxDocument )
{
return isSpreadsheetDocumentWhichSupplies(
@@ -302,7 +284,6 @@ bool FormCellBindingHelper::isListCellRangeAllowed( const Reference< XModel >& _
);
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isListCellRangeAllowed( ) const
{
bool bAllow( false );
@@ -316,7 +297,6 @@ bool FormCellBindingHelper::isListCellRangeAllowed( ) const
return bAllow;
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isCellBindingAllowed( ) const
{
bool bAllow( false );
@@ -332,7 +312,6 @@ bool FormCellBindingHelper::isCellBindingAllowed( ) const
return bAllow;
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rxDocument )
{
return isSpreadsheetDocumentWhichSupplies(
@@ -341,25 +320,21 @@ bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rx
);
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const
{
return doesComponentSupport( _rxBinding.get(), SERVICE_CELLVALUEBINDING );
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const
{
return doesComponentSupport( _rxBinding.get(), SERVICE_LISTINDEXCELLBINDING );
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const
{
return doesComponentSupport( _rxSource.get(), SERVICE_CELLRANGELISTSOURCE );
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const
{
Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY );
@@ -367,7 +342,6 @@ bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >&
return bDoes;
}
-//------------------------------------------------------------------------
Reference< XValueBinding > FormCellBindingHelper::getCurrentBinding( ) const
{
Reference< XValueBinding > xBinding;
@@ -377,7 +351,6 @@ Reference< XValueBinding > FormCellBindingHelper::getCurrentBinding( ) const
return xBinding;
}
-//------------------------------------------------------------------------
Reference< XListEntrySource > FormCellBindingHelper::getCurrentListSource( ) const
{
Reference< XListEntrySource > xSource;
@@ -387,7 +360,6 @@ Reference< XListEntrySource > FormCellBindingHelper::getCurrentListSource( ) con
return xSource;
}
-//------------------------------------------------------------------------
void FormCellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBinding )
{
Reference< XBindableValue > xBindable( m_xControlModel, UNO_QUERY );
@@ -396,7 +368,6 @@ void FormCellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBin
xBindable->setValueBinding( _rxBinding );
}
-//------------------------------------------------------------------------
void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& _rxSource )
{
Reference< XListEntrySink > xSink( m_xControlModel, UNO_QUERY );
@@ -405,7 +376,6 @@ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >&
xSink->setListEntrySource( _rxSource );
}
-//------------------------------------------------------------------------
Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName,
const Any& _rArgumentValue ) const
{
@@ -441,7 +411,6 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance(
return xReturn;
}
-//------------------------------------------------------------------------
bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue,
const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(())
{
@@ -473,8 +442,6 @@ bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rI
return bSuccess;
}
-//............................................................................
} // namespace xmloff
-//............................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index e1be12ec7da3..71d1bba796dd 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -29,14 +29,10 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XModel.hpp>
-//............................................................................
namespace xmloff
{
-//............................................................................
- //========================================================================
//= FormCellBindingHelper
- //========================================================================
/** encapsulates functionality related to binding a form control to a spreadsheet cell
*/
class FormCellBindingHelper
@@ -264,9 +260,7 @@ namespace xmloff
) const SAL_THROW(());
};
-//............................................................................
} // namespace xmloff
-//............................................................................
#endif // XMLOFF_FORMS_FORMCELLBINDING
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 58c9b2842025..a6b7564b4752 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -36,10 +36,8 @@
#include <tools/wintypes.hxx> // for check states
#include <xmloff/xmltoken.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::sdb;
@@ -66,7 +64,6 @@ namespace xmloff
NULL
};
- //---------------------------------------------------------------------
const SvXMLEnumMapEntry* OEnumMapper::getEnumMap(EnumProperties _eProperty)
{
OSL_ENSURE(_eProperty < KNOWN_ENUM_PROPERTIES, "OEnumMapper::getEnumMap: invalid index (this will crash)!");
@@ -333,8 +330,6 @@ namespace xmloff
return rReturn;
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx
index 0b391e2f9d0c..58786fa486ee 100644
--- a/xmloff/source/forms/formenums.hxx
+++ b/xmloff/source/forms/formenums.hxx
@@ -22,14 +22,10 @@
#include <xmloff/xmlement.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OEnumMapper
- //=====================================================================
class OEnumMapper
{
public:
@@ -64,9 +60,7 @@ namespace xmloff
static const SvXMLEnumMapEntry* getEnumMap(EnumProperties _eProperty);
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMENUMS_HXX_
diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx
index eae958e3197b..928a06f0984d 100644
--- a/xmloff/source/forms/formevents.cxx
+++ b/xmloff/source/forms/formevents.cxx
@@ -21,14 +21,10 @@
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmlevent.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= event translation table
- //=====================================================================
static const XMLEventNameTranslation aEventTranslations[] =
{
{ "XApproveActionListener::approveAction", XML_NAMESPACE_FORM, "approveaction" }, // "on-approveaction"
@@ -69,8 +65,6 @@ namespace xmloff
const XMLEventNameTranslation* g_pFormsEventTranslation = aEventTranslations;
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx
index 9bb95a106b13..df222d38660a 100644
--- a/xmloff/source/forms/formevents.hxx
+++ b/xmloff/source/forms/formevents.hxx
@@ -21,19 +21,13 @@
#define _XMLOFF_FORMS_FORMEVENTS_HXX_
struct XMLEventNameTranslation;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= event translation table
- //=====================================================================
extern const XMLEventNameTranslation* g_pFormsEventTranslation;
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_FORMEVENTS_HXX_
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index b200503caad7..c8c2ecf87308 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <xmloff/formlayerexport.hxx>
#include "strings.hxx"
@@ -32,11 +31,8 @@
#include <comphelper/stl_types.hxx>
#include "officeforms.hxx"
-
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -46,43 +42,35 @@ namespace xmloff
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::frame;
- //=====================================================================
//= OFormLayerXMLExport
- //=====================================================================
- //---------------------------------------------------------------------
OFormLayerXMLExport::OFormLayerXMLExport(SvXMLExport& _rContext)
:m_rContext(_rContext)
,m_pImpl(new OFormLayerXMLExport_Impl(_rContext))
{
}
- //---------------------------------------------------------------------
OFormLayerXMLExport::~OFormLayerXMLExport()
{
delete m_pImpl;
m_pImpl = NULL;
}
- //---------------------------------------------------------------------
sal_Bool OFormLayerXMLExport::seekPage(const Reference< XDrawPage >& _rxDrawPage)
{
return m_pImpl->seekPage(_rxDrawPage);
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl)
{
return m_pImpl->getControlId(_rxControl);
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl )
{
return m_pImpl->getControlNumberStyle(_rxControl);
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::examineForms(const Reference< XDrawPage >& _rxDrawPage)
{
try
@@ -95,66 +83,53 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::exportForms(const Reference< XDrawPage >& _rxDrawPage)
{
m_pImpl->exportForms(_rxDrawPage);
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::exportXForms() const
{
m_pImpl->exportXForms();
}
- //---------------------------------------------------------------------
bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
{
return m_pImpl->pageContainsForms( _rxDrawPage );
}
- //---------------------------------------------------------------------
bool OFormLayerXMLExport::documentContainsXForms() const
{
return m_pImpl->documentContainsXForms();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::exportAutoControlNumberStyles()
{
m_pImpl->exportAutoControlNumberStyles();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::exportAutoStyles()
{
m_pImpl->exportAutoStyles();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport::excludeFromExport( const Reference< XControlModel > _rxControl )
{
m_pImpl->excludeFromExport( _rxControl );
}
- //=========================================================================
//= OOfficeFormsExport
- //=========================================================================
- //-------------------------------------------------------------------------
OOfficeFormsExport::OOfficeFormsExport( SvXMLExport& _rExp )
:m_pImpl(NULL)
{
m_pImpl = new OFormsRootExport(_rExp);
}
- //-------------------------------------------------------------------------
OOfficeFormsExport::~OOfficeFormsExport()
{
delete m_pImpl;
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 80245da6195b..c5e40ed606d7 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -20,10 +20,8 @@
#include <xmloff/formlayerimport.hxx>
#include "layerimport.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -32,48 +30,39 @@ namespace xmloff
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star;
- //=====================================================================
//= OFormLayerXMLExport
- //=====================================================================
- //---------------------------------------------------------------------
OFormLayerXMLImport::OFormLayerXMLImport(SvXMLImport& _rImporter)
:m_pImpl(NULL)
{
m_pImpl = new OFormLayerXMLImport_Impl(_rImporter);
}
- //---------------------------------------------------------------------
OFormLayerXMLImport::~OFormLayerXMLImport()
{
delete m_pImpl;
}
- //---------------------------------------------------------------------
void OFormLayerXMLImport::setAutoStyleContext(SvXMLStylesContext* _pNewContext)
{
m_pImpl->setAutoStyleContext(_pNewContext);
}
- //---------------------------------------------------------------------
void OFormLayerXMLImport::startPage(const Reference< XDrawPage >& _rxDrawPage)
{
m_pImpl->startPage(_rxDrawPage);
}
- //---------------------------------------------------------------------
void OFormLayerXMLImport::endPage()
{
m_pImpl->endPage();
}
- //---------------------------------------------------------------------
Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const OUString& _rId)
{
return m_pImpl->lookupControlId(_rId);
}
- //---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext(
SvXMLImport& _rImport,
sal_uInt16 _nPrefix,
@@ -82,27 +71,22 @@ namespace xmloff
return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName);
}
- //---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< xml::sax::XAttributeList >& _rxAttribs)
{
return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs);
}
- //---------------------------------------------------------------------
void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName)
{
m_pImpl->applyControlNumberStyle(_rxControlModel, _rControlNumerStyleName);
}
- //---------------------------------------------------------------------
void OFormLayerXMLImport::documentDone( )
{
m_pImpl->documentDone( );
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index c8c553629b4f..848d653ff1d8 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -27,10 +27,8 @@
#include <algorithm>
-//........................................................................
namespace xmloff
{
-//........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -41,19 +39,16 @@ namespace xmloff
namespace
{
- //----------------------------------------------------------------
OUString getParaAlignProperty()
{
return OUString( "ParaAdjust" );
}
- //----------------------------------------------------------------
OUString getAlignProperty()
{
return OUString( "Align" );
}
- //----------------------------------------------------------------
sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName )
{
const OUString* pStart = _rNames.getConstArray();
@@ -64,7 +59,6 @@ namespace xmloff
return -1;
}
- //----------------------------------------------------------------
struct AlignmentTranslationEntry
{
ParagraphAdjust nParagraphValue;
@@ -84,7 +78,6 @@ namespace xmloff
{ ParagraphAdjust_MAKE_FIXED_SIZE, -1 }
};
- //----------------------------------------------------------------
void valueAlignToParaAdjust(Any& rValue)
{
sal_Int16 nValue = 0;
@@ -102,7 +95,6 @@ namespace xmloff
OSL_FAIL( "valueAlignToParaAdjust: unreachable!" );
}
- //----------------------------------------------------------------
void valueParaAdjustToAlign(Any& rValue)
{
sal_Int32 nValue = 0;
@@ -120,9 +112,7 @@ namespace xmloff
OSL_FAIL( "valueParaAdjustToAlign: unreachable!" );
}
- //====================================================================
//= OMergedPropertySetInfo
- //====================================================================
typedef ::cppu::WeakAggImplHelper1 < XPropertySetInfo
> OMergedPropertySetInfo_Base;
class OMergedPropertySetInfo : public OMergedPropertySetInfo_Base
@@ -142,19 +132,16 @@ namespace xmloff
virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException);
};
- //----------------------------------------------------------------
OMergedPropertySetInfo::OMergedPropertySetInfo( const Reference< XPropertySetInfo >& _rxMasterInfo )
:m_xMasterInfo( _rxMasterInfo )
{
OSL_ENSURE( m_xMasterInfo.is(), "OMergedPropertySetInfo::OMergedPropertySetInfo: hmm?" );
}
- //----------------------------------------------------------------
OMergedPropertySetInfo::~OMergedPropertySetInfo()
{
}
- //----------------------------------------------------------------
Sequence< Property > SAL_CALL OMergedPropertySetInfo::getProperties( ) throw (RuntimeException)
{
// add a "ParaAdjust" property to the master properties
@@ -169,7 +156,6 @@ namespace xmloff
return aProperties;
}
- //----------------------------------------------------------------
Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException)
{
if ( aName == getParaAlignProperty() )
@@ -182,7 +168,6 @@ namespace xmloff
return m_xMasterInfo->getPropertyByName( aName );
}
- //----------------------------------------------------------------
::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException)
{
if ( Name == getParaAlignProperty() )
@@ -195,23 +180,17 @@ namespace xmloff
}
}
-
- //====================================================================
//= OGridColumnPropertyTranslator
- //====================================================================
- //--------------------------------------------------------------------
OGridColumnPropertyTranslator::OGridColumnPropertyTranslator( const Reference< XMultiPropertySet >& _rxGridColumn )
:m_xGridColumn( _rxGridColumn )
{
OSL_ENSURE( m_xGridColumn.is(), "OGridColumnPropertyTranslator: invalid grid column!" );
}
- //--------------------------------------------------------------------
OGridColumnPropertyTranslator::~OGridColumnPropertyTranslator()
{
}
- //--------------------------------------------------------------------
Reference< XPropertySetInfo > SAL_CALL OGridColumnPropertyTranslator::getPropertySetInfo( ) throw (RuntimeException)
{
Reference< XPropertySetInfo > xColumnPropInfo;
@@ -220,7 +199,6 @@ namespace xmloff
return new OMergedPropertySetInfo( xColumnPropInfo );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
// we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our
@@ -234,7 +212,6 @@ namespace xmloff
setPropertyValues( aNames, aValues );
}
- //--------------------------------------------------------------------
Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
Sequence< OUString > aNames( &PropertyName, 1 );
@@ -245,31 +222,26 @@ namespace xmloff
return Any();
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
{
if ( !m_xGridColumn.is() )
@@ -291,7 +263,6 @@ namespace xmloff
m_xGridColumn->setPropertyValues( aTranslatedNames, aTranslatedValues );
}
- //--------------------------------------------------------------------
Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException)
{
Sequence< Any > aValues( aPropertyNames.getLength() );
@@ -310,26 +281,21 @@ namespace xmloff
return aValues;
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::removePropertiesChangeListener: not implemented - this should not be needed!" );
}
- //--------------------------------------------------------------------
void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
{
OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" );
}
-//........................................................................
} // namespace xmloff
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx
index 6c9313bdc7e7..422630e8e569 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.hxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.hxx
@@ -24,14 +24,10 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <cppuhelper/implbase2.hxx>
-//........................................................................
namespace xmloff
{
-//........................................................................
- //====================================================================
//= OGridColumnPropertyTranslator
- //====================================================================
typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet
, ::com::sun::star::beans::XMultiPropertySet
> OGridColumnPropertyTranslator_Base;
@@ -66,9 +62,7 @@ namespace xmloff
virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
};
-//........................................................................
} // namespace xmloff
-//........................................................................
#endif // XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
index ca43f8f5f77e..7b944f7c986d 100644
--- a/xmloff/source/forms/handler/form_handler_factory.cxx
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -17,15 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "forms/form_handler_factory.hxx"
#include "vcl_date_handler.hxx"
#include "vcl_time_handler.hxx"
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
namespace
{
@@ -33,10 +30,7 @@ namespace xmloff
static PPropertyHandler s_pVCLTimeHandler = NULL;
}
- //==================================================================================================================
//= FormHandlerFactory
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
PPropertyHandler FormHandlerFactory::getFormPropertyHandler( const PropertyId i_propertyId )
{
PPropertyHandler pHandler( NULL );
@@ -77,8 +71,6 @@ namespace xmloff
return pHandler;
}
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx
index 92aeeaca38b1..e92b16b4b530 100644
--- a/xmloff/source/forms/handler/property_handler_base.cxx
+++ b/xmloff/source/forms/handler/property_handler_base.cxx
@@ -17,27 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "property_handler_base.hxx"
namespace xmloff
{
- //==================================================================================================================
//= PropertyHandlerBase
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
PropertyHandlerBase::~PropertyHandlerBase()
{
}
- //------------------------------------------------------------------------------------------------------------------
oslInterlockedCount SAL_CALL PropertyHandlerBase::acquire()
{
return osl_atomic_increment( &m_refCount );
}
- //------------------------------------------------------------------------------------------------------------------
oslInterlockedCount SAL_CALL PropertyHandlerBase::release()
{
oslInterlockedCount decremented = osl_atomic_decrement( &m_refCount );
diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx
index 2d8c4d617429..72789f90b866 100644
--- a/xmloff/source/forms/handler/property_handler_base.hxx
+++ b/xmloff/source/forms/handler/property_handler_base.hxx
@@ -24,14 +24,10 @@
#include <osl/interlck.h>
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= PropertyHandlerBase
- //==================================================================================================================
class PropertyHandlerBase : public IPropertyHandler
{
protected:
@@ -50,9 +46,7 @@ namespace xmloff
oslInterlockedCount m_refCount;
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_HANDLER_BASE_HXX
diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx
index b3ff4f744e8d..a29f01815a36 100644
--- a/xmloff/source/forms/handler/vcl_date_handler.cxx
+++ b/xmloff/source/forms/handler/vcl_date_handler.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl_date_handler.hxx"
#include <rtl/ustrbuf.hxx>
@@ -30,32 +29,25 @@
#include <tools/diagnose_ex.h>
#include <tools/date.hxx>
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::util::DateTime;
using ::com::sun::star::util::Date;
- //==================================================================================================================
//= VCLDateHandler
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
VCLDateHandler::VCLDateHandler()
{
}
- //------------------------------------------------------------------------------------------------------------------
OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const
{
OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" );
return OUString();
}
- //------------------------------------------------------------------------------------------------------------------
OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const
{
Date aDate;
@@ -71,7 +63,6 @@ namespace xmloff
return aBuffer.makeStringAndClear();
}
- //------------------------------------------------------------------------------------------------------------------
bool VCLDateHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const
{
DateTime aDateTime;
@@ -107,8 +98,6 @@ namespace xmloff
return true;
}
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx
index 720270ba04b0..5c0e3d123f57 100644
--- a/xmloff/source/forms/handler/vcl_date_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_date_handler.hxx
@@ -22,14 +22,10 @@
#include "property_handler_base.hxx"
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= VCLDateHandler
- //==================================================================================================================
class VCLDateHandler : public PropertyHandlerBase
{
public:
@@ -41,9 +37,7 @@ namespace xmloff
virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const;
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_VCL_DATE_HANDLER_HXX
diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx
index bbf9698d7c49..bdbd211b2575 100644
--- a/xmloff/source/forms/handler/vcl_time_handler.cxx
+++ b/xmloff/source/forms/handler/vcl_time_handler.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "vcl_time_handler.hxx"
#include <rtl/ustrbuf.hxx>
@@ -30,32 +29,25 @@
#include <tools/diagnose_ex.h>
#include <tools/time.hxx>
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::util::Duration;
using ::com::sun::star::util::Time;
- //==================================================================================================================
//= VCLTimeHandler
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
VCLTimeHandler::VCLTimeHandler()
{
}
- //------------------------------------------------------------------------------------------------------------------
OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const
{
OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" );
return OUString();
}
- //------------------------------------------------------------------------------------------------------------------
OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const
{
Time aTime;
@@ -72,7 +64,6 @@ namespace xmloff
return aBuffer.makeStringAndClear();
}
- //------------------------------------------------------------------------------------------------------------------
bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const
{
Duration aDuration;
@@ -110,8 +101,6 @@ namespace xmloff
return true;
}
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx
index 5785a78cbb08..895650f96b57 100644
--- a/xmloff/source/forms/handler/vcl_time_handler.hxx
+++ b/xmloff/source/forms/handler/vcl_time_handler.hxx
@@ -22,14 +22,10 @@
#include "property_handler_base.hxx"
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= VCLTimeHandler
- //==================================================================================================================
class VCLTimeHandler : public PropertyHandlerBase
{
public:
@@ -41,9 +37,7 @@ namespace xmloff
virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const;
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_VCL_TIME_HANDLER_HXX
diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx
index 8c090f6c9c2d..b4859d88bf02 100644
--- a/xmloff/source/forms/ifacecompare.hxx
+++ b/xmloff/source/forms/ifacecompare.hxx
@@ -24,14 +24,10 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OInterfaceCompare
- //=====================================================================
/** is stl-compliant structure for comparing Reference&lt; &lt;iface&gt; &gt; instances
*/
template < class IAFCE >
@@ -54,9 +50,7 @@ namespace xmloff
typedef OInterfaceCompare< ::com::sun::star::beans::XPropertySet > OPropertySetCompare;
typedef OInterfaceCompare< ::com::sun::star::drawing::XDrawPage > ODrawPageCompare;
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_IFACECOMPARE_HXX_
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index c880662d9d3a..5bf3b982a364 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include "layerexport.hxx"
#include "strings.hxx"
@@ -52,10 +51,8 @@
#include <numeric>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -70,17 +67,13 @@ namespace xmloff
typedef ::com::sun::star::xforms::XFormsSupplier XXFormsSupplier;
- //=====================================================================
//= OFormLayerXMLExport_Impl
- //=====================================================================
- //---------------------------------------------------------------------
const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix()
{
static const OUString s_sControlNumberStyleNamePrefix("C");
return s_sControlNumberStyleNamePrefix;
}
- //---------------------------------------------------------------------
OFormLayerXMLExport_Impl::OFormLayerXMLExport_Impl(SvXMLExport& _rContext)
:m_rContext(_rContext)
,m_pControlNumberStyles(NULL)
@@ -109,7 +102,6 @@ namespace xmloff
{
}
- //---------------------------------------------------------------------
sal_Bool OFormLayerXMLExport_Impl::impl_isFormPageContainingForms(const Reference< XDrawPage >& _rxDrawPage, Reference< XIndexAccess >& _rxForms)
{
Reference< XFormsSupplier2 > xFormsSupp(_rxDrawPage, UNO_QUERY);
@@ -136,7 +128,6 @@ namespace xmloff
return sal_True;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportGridColumn(const Reference< XPropertySet >& _rxColumn,
const Sequence< ScriptEventDescriptor >& _rEvents)
{
@@ -145,7 +136,6 @@ namespace xmloff
aExportImpl.doExport();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportControl(const Reference< XPropertySet >& _rxControl,
const Sequence< ScriptEventDescriptor >& _rEvents)
{
@@ -163,7 +153,6 @@ namespace xmloff
aExportImpl.doExport();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportForm(const Reference< XPropertySet >& _rxProps,
const Sequence< ScriptEventDescriptor >& _rEvents)
{
@@ -172,19 +161,16 @@ namespace xmloff
aAttributeHandler.doExport();
}
- //---------------------------------------------------------------------
::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper()
{
return m_xStyleExportMapper;
}
- //---------------------------------------------------------------------
SvXMLExport& OFormLayerXMLExport_Impl::getGlobalContext()
{
return m_rContext;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportCollectionElements(const Reference< XIndexAccess >& _rxCollection)
{
// step through all the elements of the collection
@@ -240,7 +226,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject )
{
OUString aObjectStyle;
@@ -251,7 +236,6 @@ namespace xmloff
return aObjectStyle;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::clear()
{
m_aControlIds.clear();
@@ -265,14 +249,12 @@ namespace xmloff
m_aIgnoreList.clear();
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportAutoControlNumberStyles()
{
if ( m_pControlNumberStyles )
m_pControlNumberStyles->Export( sal_True );
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportAutoStyles()
{
m_rContext.GetAutoStylePool()->exportXML(
@@ -283,7 +265,6 @@ namespace xmloff
);
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportForms(const Reference< XDrawPage >& _rxDrawPage)
{
// get the forms collection of the page
@@ -301,14 +282,12 @@ namespace xmloff
exportCollectionElements(xCollectionIndex);
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::exportXForms() const
{
// export XForms models
::exportXForms( m_rContext );
}
- //---------------------------------------------------------------------
bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const
{
Reference< XFormsSupplier2 > xFormsSupp( _rxDrawPage, UNO_QUERY );
@@ -316,7 +295,6 @@ namespace xmloff
return xFormsSupp.is() && xFormsSupp->hasForms();
}
- //---------------------------------------------------------------------
bool OFormLayerXMLExport_Impl::documentContainsXForms() const
{
Reference< XXFormsSupplier > xXFormSupp( m_rContext.GetModel(), UNO_QUERY );
@@ -326,7 +304,6 @@ namespace xmloff
return xForms.is() && xForms->hasElements();
}
- //---------------------------------------------------------------------
sal_Bool OFormLayerXMLExport_Impl::implMoveIterators(const Reference< XDrawPage >& _rxDrawPage, sal_Bool _bClear)
{
if (!_rxDrawPage.is())
@@ -364,7 +341,6 @@ namespace xmloff
return bKnownPage;
}
- //---------------------------------------------------------------------
sal_Bool OFormLayerXMLExport_Impl::seekPage(const Reference< XDrawPage >& _rxDrawPage)
{
sal_Bool bKnownPage = implMoveIterators( _rxDrawPage, sal_False );
@@ -388,7 +364,6 @@ namespace xmloff
return sal_False;
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl)
{
if (m_aCurrentPageIds == m_aControlIds.end())
@@ -399,7 +374,6 @@ namespace xmloff
return m_aCurrentPageIds->second[_rxControl];
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject )
{
OUString sNumberStyle;
@@ -411,7 +385,6 @@ namespace xmloff
return sNumberStyle;
}
- //---------------------------------------------------------------------
OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl )
{
OUString sNumberStyle;
@@ -428,7 +401,6 @@ namespace xmloff
return sNumberStyle;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::examineForms(const Reference< XDrawPage >& _rxDrawPage)
{
// get the forms collection of the page
@@ -492,7 +464,6 @@ namespace xmloff
while (xLoop.is());
}
- //---------------------------------------------------------------------
namespace
{
struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t >
@@ -532,7 +503,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
sal_Bool OFormLayerXMLExport_Impl::checkExamineControl(const Reference< XPropertySet >& _rxObject)
{
Reference< XPropertySetInfo > xCurrentInfo = _rxObject->getPropertySetInfo();
@@ -541,7 +511,6 @@ namespace xmloff
sal_Bool bIsControl = xCurrentInfo->hasPropertyByName( PROPERTY_CLASSID );
if (bIsControl)
{
- // ----------------------------------
// generate a new control id
// find a free id
@@ -549,7 +518,6 @@ namespace xmloff
// add it to the map
m_aCurrentPageIds->second[_rxObject] = sCurrentId;
- // ----------------------------------
// check if this control has a "LabelControl" property referring another control
if ( xCurrentInfo->hasPropertyByName( PROPERTY_CONTROLLABEL ) )
{
@@ -565,14 +533,12 @@ namespace xmloff
}
}
- // ----------------------------------
// check if the control needs a number format style
if ( xCurrentInfo->hasPropertyByName( PROPERTY_FORMATKEY ) )
{
examineControlNumberFormat(_rxObject);
}
- // ----------------------------------
// check if it's a control providing text
Reference< XText > xControlText( _rxObject, UNO_QUERY );
if ( xControlText.is() )
@@ -580,7 +546,6 @@ namespace xmloff
m_rContext.GetTextParagraphExport()->collectTextAutoStyles( xControlText );
}
- // ----------------------------------
// check if it is a grid control - in this case, we need special handling for the columns
sal_Int16 nControlType = FormComponentType::CONTROL;
_rxObject->getPropertyValue( PROPERTY_CLASSID ) >>= nControlType;
@@ -593,7 +558,6 @@ namespace xmloff
return bIsControl;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds( const Reference< XPropertySet >& _rxControl )
{
// loop through all columns of the grid
@@ -614,7 +578,6 @@ namespace xmloff
if ( !xColumnProperties.is() )
continue;
- // ----------------------------------
// generate a new control id
// find a free id
@@ -622,7 +585,6 @@ namespace xmloff
// add it to the map
m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId;
- // ----------------------------------
// determine a number style, if needed
xColumnPropertiesMeta = xColumnProperties->getPropertySetInfo();
// get the styles of the column
@@ -651,7 +613,6 @@ namespace xmloff
}
#endif
- // ----------------------------------
// determine the column style
if ( !aPropertyStates.empty() )
@@ -671,7 +632,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
sal_Int32 OFormLayerXMLExport_Impl::implExamineControlNumberFormat( const Reference< XPropertySet >& _rxObject )
{
// get the format key relative to our own formats supplier
@@ -684,7 +644,6 @@ namespace xmloff
return nOwnFormatKey;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::examineControlNumberFormat( const Reference< XPropertySet >& _rxControl )
{
sal_Int32 nOwnFormatKey = implExamineControlNumberFormat( _rxControl );
@@ -699,7 +658,6 @@ namespace xmloff
m_aControlNumberFormats[_rxControl] = nOwnFormatKey;
}
- //---------------------------------------------------------------------
sal_Int32 OFormLayerXMLExport_Impl::ensureTranslateFormat(const Reference< XPropertySet >& _rxFormattedControl)
{
ensureControlNumberStyleExport();
@@ -747,7 +705,6 @@ namespace xmloff
return nOwnFormatKey;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::ensureControlNumberStyleExport()
{
if (!m_pControlNumberStyles)
@@ -780,14 +737,12 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
SvXMLNumFmtExport* OFormLayerXMLExport_Impl::getControlNumberStyleExport()
{
ensureControlNumberStyleExport();
return m_pControlNumberStyles;
}
- //---------------------------------------------------------------------
void OFormLayerXMLExport_Impl::excludeFromExport( const Reference< XControlModel > _rxControl )
{
Reference< XPropertySet > xProps( _rxControl, UNO_QUERY );
@@ -799,9 +754,6 @@ namespace xmloff
OSL_ENSURE( aPos.second, "OFormLayerXMLExport_Impl::excludeFromExport: element already exists in the ignore list!" );
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index bd25986b478e..a0e0a033e5b0 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -33,10 +33,8 @@ class SvXMLNumFmtExport;
class XMLPropertyHandlerFactory;
class SvXMLExportPropertyMapper;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
, OPropertySetCompare
@@ -54,9 +52,7 @@ namespace xmloff
, ODrawPageCompare
> MapPropertySet2Map;
- //=====================================================================
//= OFormLayerXMLExport_Impl
- //=====================================================================
/** the implementation class for OFormLayerXMLExport
*/
class OFormLayerXMLExport_Impl
@@ -300,9 +296,7 @@ namespace xmloff
void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > _rxControl );
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_LAYEREXPORT_HXX_
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 0003e27e2920..5387c2c73dd1 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -55,10 +55,8 @@
SV_IMPL_REF( SvXMLStylesContext );
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -71,10 +69,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::sdb;
-//=====================================================================
//= OFormLayerXMLImport_Impl
-//=====================================================================
-//---------------------------------------------------------------------
OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
:m_rImporter(_rImporter)
,m_pAutoStyles(NULL)
@@ -232,7 +227,6 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter)
m_aCurrentPageIds = m_aControlIds.end();
}
-//---------------------------------------------------------------------
OFormLayerXMLImport_Impl::~OFormLayerXMLImport_Impl()
{
// outlined to allow forward declaration of OAttribute2Property in the header
@@ -241,7 +235,6 @@ OFormLayerXMLImport_Impl::~OFormLayerXMLImport_Impl()
m_pAutoStyles->ReleaseRef();
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewContext)
{
OSL_ENSURE(!m_pAutoStyles, "OFormLayerXMLImport_Impl::setAutoStyleContext: not to be called twice!");
@@ -250,7 +243,6 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont
m_pAutoStyles->AddRef();
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName)
{
OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()),
@@ -302,7 +294,6 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert
}
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellAddress )
{
OSL_ENSURE( _rxControlModel.is() && !_rCellAddress.isEmpty(),
@@ -310,7 +301,6 @@ void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPrope
m_aCellValueBindings.push_back( ModelStringPair( _rxControlModel, _rCellAddress ) );
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerXFormsValueBinding(
const Reference< XPropertySet >& _rxControlModel,
const OUString& _rBindingID )
@@ -322,7 +312,6 @@ void OFormLayerXMLImport_Impl::registerXFormsValueBinding(
ModelStringPair( _rxControlModel, _rBindingID ) );
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerXFormsListBinding(
const Reference< XPropertySet >& _rxControlModel,
const OUString& _rBindingID )
@@ -334,7 +323,6 @@ void OFormLayerXMLImport_Impl::registerXFormsListBinding(
ModelStringPair( _rxControlModel, _rBindingID ) );
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerXFormsSubmission(
const Reference< XPropertySet >& _rxControlModel,
const OUString& _rSubmissionID )
@@ -346,14 +334,12 @@ void OFormLayerXMLImport_Impl::registerXFormsSubmission(
ModelStringPair( _rxControlModel, _rSubmissionID ) );
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress )
{
OSL_ENSURE( _rxControlModel.is() && !_rCellRangeAddress.isEmpty(),
"OFormLayerXMLImport_Impl::registerCellRangeListSource: invalid arguments!" );
m_aCellRangeListSources.push_back( ModelStringPair( _rxControlModel, _rCellRangeAddress ) );
}
-//---------------------------------------------------------------------
const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUString& _rStyleName) const
{
OSL_ENSURE( m_pAutoStyles, "OFormLayerXMLImport_Impl::getStyleElement: have no auto style context!" );
@@ -366,7 +352,6 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUStrin
return pControlStyle;
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::enterEventContext()
{
// install our own translation table. We need to disable the other tables because of name conflicts.
@@ -374,14 +359,12 @@ void OFormLayerXMLImport_Impl::enterEventContext()
m_rImporter.GetEventImport().AddTranslationTable(g_pFormsEventTranslation);
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::leaveEventContext()
{
// install the original event tables.
m_rImporter.GetEventImport().PopTranslationTable();
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const OUString& _rId)
{
OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::registerControlId: no current page!");
@@ -391,7 +374,6 @@ void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >
m_aCurrentPageIds->second[_rId] = _rxControl;
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const OUString& _rReferringControls)
{
OSL_ENSURE(!_rReferringControls.isEmpty(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (empty) control id list!");
@@ -399,7 +381,6 @@ void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPrope
m_aControlReferences.push_back( ModelStringPair( _rxControl, _rReferringControls ) );
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPage)
{
m_xCurrentPageFormsSupp.clear();
@@ -418,7 +399,6 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa
m_aCurrentPageIds = aPagePosition.first;
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::endPage()
{
OSL_ENSURE( m_xCurrentPageFormsSupp.is(), "OFormLayerXMLImport_Impl::endPage: sure you called startPage before?" );
@@ -477,7 +457,6 @@ void OFormLayerXMLImport_Impl::endPage()
m_aCurrentPageIds = m_aControlIds.end();
}
-//---------------------------------------------------------------------
Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUString& _rControlId)
{
OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::lookupControlId: no current page!");
@@ -493,7 +472,6 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUStri
return xReturn;
}
-//---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext(
SvXMLImport& _rImport,
sal_uInt16 _nPrefix,
@@ -502,7 +480,6 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext(
return new OFormsRootImport( _rImport, _nPrefix, _rLocalName );
}
-//---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< xml::sax::XAttributeList >&)
{
@@ -529,7 +506,6 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nP
return pContext;
}
-//---------------------------------------------------------------------
void OFormLayerXMLImport_Impl::documentDone( )
{
SvXMLImport& rImport = getGlobalContext();
@@ -621,8 +597,6 @@ void OFormLayerXMLImport_Impl::documentDone( )
rImport.GetModel() ) );
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index cb1b68d46435..9431525ca480 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -36,16 +36,12 @@ SV_DECL_REF( SvXMLStylesContext )
// unfortunately, we can't put this into our namespace, as the macro expands to (amongst others) a forward
// declaration of the class name, which then would be in the namespace, too
-//.........................................................................
namespace xmloff
{
-//.........................................................................
class OAttribute2Property;
- //=====================================================================
//= OFormLayerXMLImport_Impl
- //=====================================================================
class OFormLayerXMLImport_Impl
: public ODefaultEventAttacherManager
{
@@ -175,9 +171,7 @@ namespace xmloff
void documentDone( );
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_LAYERIMPORT_HXX_
diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx
index 6661d671e234..9f887ab135ff 100644
--- a/xmloff/source/forms/logging.cxx
+++ b/xmloff/source/forms/logging.cxx
@@ -19,22 +19,16 @@
#include "logging.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
#ifdef TIMELOG
- //=====================================================================
//= OStackedLogging
- //=====================================================================
- //---------------------------------------------------------------------
void OStackedLogging::enterContext( const sal_Char* _pContextName )
{
m_aLogger.push( new ::rtl::Logfile( _pContextName ) );
}
- //---------------------------------------------------------------------
void OStackedLogging::leaveTopContext( )
{
delete m_aLogger.top();
@@ -42,9 +36,6 @@ namespace xmloff
}
#endif
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx
index 9cb710949d03..bb292da83d20 100644
--- a/xmloff/source/forms/logging.hxx
+++ b/xmloff/source/forms/logging.hxx
@@ -25,16 +25,12 @@
namespace rtl { class Logfile; }
-//.........................................................................
namespace xmloff
{
-//.........................................................................
#ifdef TIMELOG
- //=====================================================================
//= OStackedLogging
- //=====================================================================
class OStackedLogging
{
private:
@@ -59,9 +55,7 @@ namespace xmloff
#endif
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // XMLOFF_FORMS_LOGGING_HXX
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index e596aa43cccc..621a879502e1 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "officeforms.hxx"
#include <sax/tools/converter.hxx>
@@ -30,10 +29,8 @@
#include <comphelper/extract.hxx>
#include "strings.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -42,29 +39,23 @@ namespace xmloff
using ::xmloff::token::XML_FORMS;
using ::com::sun::star::xml::sax::XAttributeList;
- //=========================================================================
//= OFormsRootImport
- //=========================================================================
TYPEINIT1(OFormsRootImport, SvXMLImportContext);
- //-------------------------------------------------------------------------
OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName )
:SvXMLImportContext(rImport, nPrfx, rLocalName)
{
}
- //-------------------------------------------------------------------------
OFormsRootImport::~OFormsRootImport()
{
}
- //-------------------------------------------------------------------------
SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList>& xAttrList )
{
return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList );
}
- //-------------------------------------------------------------------------
void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute,
const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo,
const OUString& _rPropName, sal_Bool _bDefault)
@@ -86,7 +77,6 @@ namespace xmloff
}
}
- //-------------------------------------------------------------------------
void OFormsRootImport::StartElement( const Reference< XAttributeList >& _rxAttrList )
{
ENTER_LOG_CONTEXT( "xmloff::OFormsRootImport - importing the complete tree" );
@@ -112,17 +102,13 @@ namespace xmloff
}
}
- //-------------------------------------------------------------------------
void OFormsRootImport::EndElement()
{
SvXMLImportContext::EndElement();
LEAVE_LOG_CONTEXT( );
}
- //=====================================================================
//= OFormsRootExport
- //=====================================================================
- //---------------------------------------------------------------------
OFormsRootExport::OFormsRootExport( SvXMLExport& _rExp )
:m_pImplElement(NULL)
{
@@ -131,13 +117,11 @@ namespace xmloff
m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, sal_True, sal_True);
}
- //---------------------------------------------------------------------
OFormsRootExport::~OFormsRootExport( )
{
delete m_pImplElement;
}
- //-------------------------------------------------------------------------
void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute,
const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo,
const OUString& _rPropName, sal_Bool _bDefault)
@@ -158,7 +142,6 @@ namespace xmloff
aValue.makeStringAndClear());
}
- //-------------------------------------------------------------------------
void OFormsRootExport::addModelAttributes(SvXMLExport& _rExp) SAL_THROW(())
{
try
@@ -181,9 +164,6 @@ namespace xmloff
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 7225ce9280b8..9e4f3d304a8b 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -27,14 +27,10 @@
class SvXMLElementExport;
class SvXMLExport;
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OFormsRootImport
- //=====================================================================
class OFormsRootImport
:public SvXMLImportContext
,public OStackedLogging
@@ -62,9 +58,7 @@ namespace xmloff
);
};
- //=====================================================================
//= OFormsRootExport
- //=====================================================================
class OFormsRootExport
{
private:
@@ -87,11 +81,8 @@ namespace xmloff
);
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_OFFICEFORMS_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx
index 170b23d52269..ee1c25b2ca01 100644
--- a/xmloff/source/forms/property_description.hxx
+++ b/xmloff/source/forms/property_description.hxx
@@ -28,14 +28,10 @@
#include <vector>
#include <list>
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= PropertyDescription
- //==================================================================================================================
struct AttributeDescription
{
sal_uInt16 namespacePrefix; // usually XML_NAMESPACE_FORM
@@ -57,16 +53,13 @@ namespace xmloff
}
};
- //..................................................................................................................
inline bool operator==( const AttributeDescription& i_lhs, const AttributeDescription& i_rhs )
{
return ( i_lhs.namespacePrefix == i_rhs.namespacePrefix )
&& ( i_lhs.attributeToken == i_rhs.attributeToken );
}
- //==================================================================================================================
//= PropertyDescription
- //==================================================================================================================
struct PropertyDescription
{
/// is the name of the property
@@ -116,19 +109,13 @@ namespace xmloff
}
};
- //==================================================================================================================
//= PropertyDescriptionList
- //==================================================================================================================
typedef ::std::vector< const PropertyDescription* > PropertyDescriptionList;
- //==================================================================================================================
//= PropertyGroups
- //==================================================================================================================
typedef ::std::list< PropertyDescriptionList > PropertyGroups;
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_DESCRIPTION_HXX
diff --git a/xmloff/source/forms/property_group.hxx b/xmloff/source/forms/property_group.hxx
index 70563d52fe23..16e27063254f 100644
--- a/xmloff/source/forms/property_group.hxx
+++ b/xmloff/source/forms/property_group.hxx
@@ -20,22 +20,16 @@
#ifndef XMLOFF_PROPERTY_GROUP_HXX
#define XMLOFF_PROPERTY_GROUP_HXX
-//......................................................................................................................
namespace xmloff
{
-//......................................................................................................................
- //==================================================================================================================
//= PropertyGroup
- //==================================================================================================================
enum PropertyGroup
{
NO_GROUP
};
-//......................................................................................................................
} // namespace xmloff
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_GROUP_HXX
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index c9583fff4976..f739dfa1abae 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "property_description.hxx"
#include "forms/form_handler_factory.hxx"
#include "strings.hxx"
@@ -28,20 +27,15 @@
#include <boost/unordered_map.hpp>
-//......................................................................................................................
namespace xmloff { namespace metadata
{
-//......................................................................................................................
using namespace ::xmloff::token;
#define FORM_SINGLE_PROPERTY( id, att ) \
PropertyDescription( PROPERTY_##id, XML_NAMESPACE_FORM, att, &FormHandlerFactory::getFormPropertyHandler, PID_##id, NO_GROUP )
- //==================================================================================================================
//= property meta data
- //==================================================================================================================
- //------------------------------------------------------------------------------------------------------------------
namespace
{
const PropertyDescription* lcl_getPropertyMetaData()
@@ -63,7 +57,6 @@ namespace xmloff { namespace metadata
}
}
- //------------------------------------------------------------------------------------------------------------------
namespace
{
// TODO: instead of having all of the below static, it should be some per-instance data. This way, the
@@ -73,10 +66,8 @@ namespace xmloff { namespace metadata
// one big instance, since in this case, every instance can quickly decide whether it is responsible
// for some attribute or property, and otherwise delegate to the next instance.
- //..............................................................................................................
typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName;
- //..............................................................................................................
const DescriptionsByName& lcl_getPropertyDescriptions()
{
DBG_TESTSOLARMUTEX();
@@ -93,10 +84,8 @@ namespace xmloff { namespace metadata
return s_propertyDescriptionsByName;
}
- //..............................................................................................................
typedef ::std::map< PropertyGroup, PropertyDescriptionList > IndexedPropertyGroups;
- //..............................................................................................................
const IndexedPropertyGroups& lcl_getIndexedPropertyGroups()
{
DBG_TESTSOLARMUTEX();
@@ -114,10 +103,8 @@ namespace xmloff { namespace metadata
return s_indexedPropertyGroups;
}
- //..............................................................................................................
typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup;
- //..............................................................................................................
const ReverseTokenLookup& getReverseTokenLookup()
{
DBG_TESTSOLARMUTEX();
@@ -134,7 +121,6 @@ namespace xmloff { namespace metadata
return s_reverseTokenLookup;
}
- //..............................................................................................................
struct AttributeHash : public ::std::unary_function< AttributeDescription, size_t >
{
size_t operator()( const AttributeDescription& i_attribute ) const
@@ -143,10 +129,8 @@ namespace xmloff { namespace metadata
}
};
- //..............................................................................................................
typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups;
- //..............................................................................................................
const AttributeGroups& lcl_getAttributeGroups()
{
DBG_TESTSOLARMUTEX();
@@ -164,10 +148,8 @@ namespace xmloff { namespace metadata
return s_attributeGroups;
}
- //..............................................................................................................
typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup;
- //..............................................................................................................
const AttributesWithoutGroup& lcl_getAttributesWithoutGroups()
{
DBG_TESTSOLARMUTEX();
@@ -191,7 +173,6 @@ namespace xmloff { namespace metadata
}
}
- //------------------------------------------------------------------------------------------------------------------
const PropertyDescription* getPropertyDescription( const OUString& i_propertyName )
{
const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() );
@@ -201,7 +182,6 @@ namespace xmloff { namespace metadata
return NULL;
}
- //------------------------------------------------------------------------------------------------------------------
void getPropertyGroup( const PropertyGroup i_propertyGroup, PropertyDescriptionList& o_propertyDescriptions )
{
OSL_ENSURE( i_propertyGroup != NO_GROUP, "xmloff::metadata::getPropertyGroup: illegal group!" );
@@ -212,7 +192,6 @@ namespace xmloff { namespace metadata
o_propertyDescriptions = pos->second;
}
- //------------------------------------------------------------------------------------------------------------------
void getPropertyGroupList( const AttributeDescription& i_attribute, PropertyGroups& o_propertyGroups )
{
const AttributeGroups& rAttributeGroups = lcl_getAttributeGroups();
@@ -247,7 +226,6 @@ namespace xmloff { namespace metadata
}
}
- //------------------------------------------------------------------------------------------------------------------
AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName )
{
AttributeDescription attribute;
@@ -261,8 +239,6 @@ namespace xmloff { namespace metadata
return attribute;
}
-//......................................................................................................................
} } // namespace xmloff::metadata
-//......................................................................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx
index 7db6912190da..2216f50a6fb5 100644
--- a/xmloff/source/forms/property_meta_data.hxx
+++ b/xmloff/source/forms/property_meta_data.hxx
@@ -22,10 +22,8 @@
#include "property_description.hxx"
-//......................................................................................................................
namespace xmloff { namespace metadata
{
-//......................................................................................................................
const PropertyDescription* getPropertyDescription( const OUString& i_propertyName );
@@ -51,9 +49,7 @@ namespace xmloff { namespace metadata
AttributeDescription
getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName );
-//......................................................................................................................
} } // namespace xmloff::metadata
-//......................................................................................................................
#endif // XMLOFF_PROPERTY_META_DATA_HXX
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 7e7597b723e2..fa960c9d1646 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include "propertyexport.hxx"
#include <xmloff/xmlexp.hxx>
@@ -40,10 +39,8 @@
#include <tools/date.hxx>
#include <tools/datetime.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -54,10 +51,7 @@ namespace xmloff
using namespace ::comphelper;
- //=====================================================================
//= OPropertyExport
- //=====================================================================
- //---------------------------------------------------------------------
OPropertyExport::OPropertyExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxProps)
:m_rContext(_rContext)
,m_xProps(_rxProps)
@@ -77,7 +71,6 @@ namespace xmloff
examinePersistence();
}
- //---------------------------------------------------------------------
bool OPropertyExport::shouldExportProperty( const OUString& i_propertyName ) const
{
// if the property state is DEFAULT, it does not need to be written - at least
@@ -180,7 +173,6 @@ namespace xmloff
AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue );
}
-
// start the property tag
SvXMLElementExport aValueTag1(m_rContext.getGlobalContext(),
XML_NAMESPACE_FORM,
@@ -235,7 +227,6 @@ namespace xmloff
delete pPropertiesTag;
}
- //---------------------------------------------------------------------
void OPropertyExport::examinePersistence()
{
m_aRemainingProps.clear();
@@ -255,7 +246,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName,
const OUString& _rPropertyName )
{
@@ -278,7 +268,6 @@ namespace xmloff
exportedProperty( _rPropertyName );
}
- //---------------------------------------------------------------------
void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName,
const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags)
{
@@ -317,7 +306,6 @@ namespace xmloff
exportedProperty( _rPropertyName );
}
- //---------------------------------------------------------------------
void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName,
const OUString& _rPropertyName, const sal_Int16 _nDefault, bool force)
{
@@ -341,7 +329,6 @@ namespace xmloff
exportedProperty( _rPropertyName );
}
- //---------------------------------------------------------------------
void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName,
const OUString& _rPropertyName, const sal_Int32 _nDefault )
{
@@ -365,7 +352,6 @@ namespace xmloff
exportedProperty( _rPropertyName );
}
- //---------------------------------------------------------------------
void OPropertyExport::exportEnumPropertyAttribute(
const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName,
const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap,
@@ -400,7 +386,6 @@ namespace xmloff
exportedProperty(rPropertyName);
}
- //---------------------------------------------------------------------
void OPropertyExport::exportTargetFrameAttribute()
{
DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString );
@@ -416,7 +401,6 @@ namespace xmloff
exportedProperty(PROPERTY_TARGETFRAME);
}
- //---------------------------------------------------------------------
void OPropertyExport::exportRelativeTargetLocation(const OUString& _sPropertyName,sal_Int32 _nProperty,bool _bAddType)
{
DBG_CHECK_PROPERTY( _sPropertyName, OUString );
@@ -436,7 +420,6 @@ namespace xmloff
exportedProperty(_sPropertyName);
}
- //---------------------------------------------------------------------
void OPropertyExport::flagStyleProperties()
{
// flag all the properties which are part of the style as "handled"
@@ -461,7 +444,6 @@ namespace xmloff
exportedProperty( "WritingMode" );
}
- //---------------------------------------------------------------------
void OPropertyExport::exportGenericPropertyAttribute(
const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, const sal_Char* _pPropertyName)
{
@@ -490,7 +472,6 @@ namespace xmloff
AddAttribute(_nAttributeNamespaceKey, _pAttributeName, sValue);
}
- //---------------------------------------------------------------------
void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName,
const OUString& _rPropertyName,
const sal_Unicode _aQuoteCharacter, const sal_Unicode _aListSeparator)
@@ -538,7 +519,6 @@ namespace xmloff
exportedProperty( _rPropertyName );
}
- //---------------------------------------------------------------------
OUString OPropertyExport::implConvertAny(const Any& _rValue)
{
OUStringBuffer aBuffer;
@@ -624,8 +604,6 @@ namespace xmloff
return aBuffer.makeStringAndClear();
}
-
- //---------------------------------------------------------------------
token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType)
{
// handle the type description
@@ -649,7 +627,6 @@ namespace xmloff
}
#ifdef DBG_UTIL
- //---------------------------------------------------------------------
void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue)
{
OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(),
@@ -658,7 +635,6 @@ namespace xmloff
m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue);
}
- //---------------------------------------------------------------------
void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue )
{
OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName( _rName ).isEmpty(),
@@ -667,7 +643,6 @@ namespace xmloff
m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue );
}
- //---------------------------------------------------------------------
void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue)
{
OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(),
@@ -676,7 +651,6 @@ namespace xmloff
m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue);
}
- //---------------------------------------------------------------------
void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue)
{
OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(),
@@ -685,7 +659,6 @@ namespace xmloff
m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue);
}
- //---------------------------------------------------------------------
void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue )
{
OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(),
@@ -694,7 +667,6 @@ namespace xmloff
m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _eValue);
}
- //---------------------------------------------------------------------
void OPropertyExport::dbg_implCheckProperty(const OUString& _rPropertyName, const Type* _pType)
{
try
@@ -722,9 +694,6 @@ namespace xmloff
}
#endif // DBG_UTIL - dbg_implCheckProperty
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index ffc7f7cc5b80..69f06c3a6c81 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -29,10 +29,8 @@
#include "callbacks.hxx"
#include "strings.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
#define BOOLATTR_DEFAULT_FALSE 0x00
#define BOOLATTR_DEFAULT_TRUE 0x01
@@ -47,9 +45,7 @@ namespace xmloff
// is <TRUE/>, the current property value is inverted <em>before</em> comparing it to the default.</p>
class IFormsExportContext;
- //=====================================================================
//= OPropertyExport
- //=====================================================================
/** provides export related tools for attribute handling
<p>(The name is somewhat misleading. It's not only a PropertyExport, but in real a ElementExport.
@@ -390,9 +386,7 @@ namespace xmloff
#endif
};
- //=====================================================================
//= helper
- //=====================================================================
#ifdef DBG_UTIL
#define DBG_CHECK_PROPERTY(name, type) \
dbg_implCheckProperty(name, &::getCppuType(static_cast< type* >(NULL)))
@@ -408,11 +402,8 @@ namespace xmloff
#define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name )
#endif
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_PROPERTYEXPORT_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 0ba21d22ba99..d305a86dc77b 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "propertyimport.hxx"
#include <sax/tools/converter.hxx>
@@ -41,10 +40,8 @@
#include <osl/thread.h>
#endif
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -58,12 +55,9 @@ namespace xmloff
#define TYPE_TIME 2
#define TYPE_DATETIME 3
-//=====================================================================
//= PropertyConversion
-//=====================================================================
namespace
{
- //---------------------------------------------------------------------
::com::sun::star::util::Time lcl_getTime(double _nValue)
{
::com::sun::star::util::Time aTime;
@@ -80,7 +74,6 @@ namespace
return aTime;
}
- //---------------------------------------------------------------------
static ::com::sun::star::util::Date lcl_getDate( double _nValue )
{
Date aToolsDate((sal_uInt32)_nValue);
@@ -90,7 +83,6 @@ namespace
}
}
-//---------------------------------------------------------------------
Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType,
const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean )
{
@@ -241,7 +233,6 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun
return aReturn;
}
-//---------------------------------------------------------------------
Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
{
Type aUnoType( ::getVoidCppuType() );
@@ -263,10 +254,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
return aUnoType;
}
-//=====================================================================
//= OPropertyImport
-//=====================================================================
-//---------------------------------------------------------------------
OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName)
:SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName)
,m_rContext(_rImport)
@@ -274,7 +262,6 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16
{
}
-//---------------------------------------------------------------------
SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >& _rxAttrList)
{
@@ -292,7 +279,6 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con
}
}
-//---------------------------------------------------------------------
void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OSL_ENSURE(_rxAttrList.is(), "OPropertyImport::StartElement: invalid attribute list!");
@@ -319,14 +305,12 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis
// default
}
-//---------------------------------------------------------------------
sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const
{
OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!");
return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName);
}
-//---------------------------------------------------------------------
void OPropertyImport::Characters(const OUString&
#if OSL_DEBUG_LEVEL > 0
_rChars
@@ -337,7 +321,6 @@ _rChars
OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyImport::Characters: non-whitespace characters!");
}
-//---------------------------------------------------------------------
bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUString& _rLocalName, const OUString& _rValue)
{
const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName);
@@ -367,10 +350,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUStr
return true;
}
-//=====================================================================
//= OPropertyElementsContext
-//=====================================================================
-//---------------------------------------------------------------------
OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
const OPropertyImportRef& _rPropertyImporter)
:SvXMLImportContext(_rImport, _nPrefix, _rName)
@@ -378,7 +358,6 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI
{
}
-//---------------------------------------------------------------------
SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >&)
{
@@ -400,14 +379,12 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr
}
#if OSL_DEBUG_LEVEL > 0
- //---------------------------------------------------------------------
void OPropertyElementsContext::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
OSL_ENSURE(0 == _rxAttrList->getLength(), "OPropertyElementsContext::StartElement: the form:properties element should not have attributes!");
SvXMLImportContext::StartElement(_rxAttrList);
}
- //---------------------------------------------------------------------
void OPropertyElementsContext::Characters(const OUString& _rChars)
{
OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!");
@@ -416,10 +393,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr
#endif
-//=====================================================================
//= OSinglePropertyContext
-//=====================================================================
-//---------------------------------------------------------------------
OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
const OPropertyImportRef& _rPropertyImporter)
:SvXMLImportContext(_rImport, _nPrefix, _rName)
@@ -427,7 +401,6 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16
{
}
-//---------------------------------------------------------------------
SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName,
const Reference< XAttributeList >&)
{
@@ -437,7 +410,6 @@ SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPref
return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName);
}
-//---------------------------------------------------------------------
void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rxAttrList)
{
::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently
@@ -495,10 +467,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx
m_xPropertyImporter->implPushBackGenericPropertyValue(aPropValue);
}
-//=====================================================================
//= OListPropertyContext
-//=====================================================================
-//---------------------------------------------------------------------
OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
const OPropertyImportRef& _rPropertyImporter )
:SvXMLImportContext( _rImport, _nPrefix, _rName )
@@ -506,7 +475,6 @@ OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _n
{
}
-//---------------------------------------------------------------------
void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxAttrList )
{
sal_Int32 nAttributeCount = _rxAttrList->getLength();
@@ -538,7 +506,6 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA
}
}
-//---------------------------------------------------------------------
void OListPropertyContext::EndElement()
{
OSL_ENSURE( !m_sPropertyName.isEmpty() && !m_sPropertyType.isEmpty(),
@@ -565,7 +532,6 @@ void OListPropertyContext::EndElement()
m_xPropertyImporter->implPushBackGenericPropertyValue( aSequenceValue );
}
-//---------------------------------------------------------------------
SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ )
{
if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) )
@@ -582,17 +548,13 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi
}
}
-//=====================================================================
//= OListValueContext
-//=====================================================================
-//---------------------------------------------------------------------
OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, OUString& _rListValueHolder )
:SvXMLImportContext( _rImport, _nPrefix, _rName )
,m_rListValueHolder( _rListValueHolder )
{
}
-//---------------------------------------------------------------------
void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttrList )
{
const sal_Int32 nAttributeCount = _rxAttrList->getLength();
@@ -621,8 +583,6 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index e813d383e348..7703979c1881 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -32,14 +32,10 @@ namespace com { namespace sun { namespace star { namespace util {
struct Date;
} } } }
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= PropertyConversion
- //=====================================================================
class PropertyConversion
{
public:
@@ -55,9 +51,7 @@ namespace xmloff
};
class OFormLayerXMLImport_Impl;
- //=====================================================================
//= OPropertyImport
- //=====================================================================
/** Helper class for importing property values
<p>This class imports properties which are stored as attributes as well as properties which
@@ -151,9 +145,7 @@ namespace xmloff
};
SV_DECL_IMPL_REF( OPropertyImport )
- //=====================================================================
//= OPropertyElementsContext
- //=====================================================================
/** helper class for importing the &lt;form:properties&gt; element
*/
class OPropertyElementsContext : public SvXMLImportContext
@@ -176,9 +168,7 @@ namespace xmloff
#endif
};
- //=====================================================================
//= OSinglePropertyContext
- //=====================================================================
/** helper class for importing a single &lt;form:property&gt; element
*/
class OSinglePropertyContext : public SvXMLImportContext
@@ -197,9 +187,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
};
- //=====================================================================
//= OListPropertyContext
- //=====================================================================
class OListPropertyContext : public SvXMLImportContext
{
OPropertyImportRef m_xPropertyImporter;
@@ -221,9 +209,7 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList);
};
- //=====================================================================
//= OListValueContext
- //=====================================================================
class OListValueContext : public SvXMLImportContext
{
OUString& m_rListValueHolder;
@@ -236,11 +222,8 @@ namespace xmloff
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList );
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_PROPERTYIMPORT_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx
index 1f21541a2e65..28603f685f5d 100644
--- a/xmloff/source/forms/valueproperties.cxx
+++ b/xmloff/source/forms/valueproperties.cxx
@@ -22,17 +22,12 @@
#include <com/sun/star/form/FormComponentType.hpp>
#include <sal/log.hxx>
-//.........................................................................
namespace xmloff
{
-//.........................................................................
using namespace ::com::sun::star::form;
- //=====================================================================
//= OValuePropertiesMetaData
- //=====================================================================
- //---------------------------------------------------------------------
void OValuePropertiesMetaData::getValuePropertyNames(
OControlElement::ElementType _eType, sal_Int16 _nFormComponentType,
sal_Char const * & _rpCurrentValuePropertyName, sal_Char const * & _rpValuePropertyName)
@@ -96,8 +91,6 @@ namespace xmloff
}
}
-
- //---------------------------------------------------------------------
void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType,
sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName)
{
@@ -131,7 +124,6 @@ namespace xmloff
}
}
- //---------------------------------------------------------------------
void OValuePropertiesMetaData::getRuntimeValuePropertyNames(
OControlElement::ElementType _eType, sal_Int16 _nFormComponentType,
sal_Char const * & _rpValuePropertyName, sal_Char const * & _rpDefaultValuePropertyName )
@@ -183,9 +175,6 @@ namespace xmloff
}
}
-//.........................................................................
} // namespace xmloff
-//.........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx
index 5dafb2b230c6..495a3b362c4a 100644
--- a/xmloff/source/forms/valueproperties.hxx
+++ b/xmloff/source/forms/valueproperties.hxx
@@ -22,14 +22,10 @@
#include "controlelement.hxx"
-//.........................................................................
namespace xmloff
{
-//.........................................................................
- //=====================================================================
//= OValuePropertiesMetaData
- //=====================================================================
class OValuePropertiesMetaData
{
protected:
@@ -67,11 +63,8 @@ namespace xmloff
sal_Char const * & _rpDefaultValuePropertyName);
};
-//.........................................................................
} // namespace xmloff
-//.........................................................................
#endif // _XMLOFF_FORMS_VALUEPROPERTIES_HXX_
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 07bf460122be..48b7340ff77c 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "MetaImportComponent.hxx"
#include "xmloff/xmlnmspe.hxx"
@@ -29,9 +28,6 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-
-//===========================================================================
-
// #110680#
XMLMetaImportComponent::XMLMetaImportComponent(
const uno::Reference< uno::XComponentContext >& xContext) throw()
@@ -43,7 +39,6 @@ XMLMetaImportComponent::~XMLMetaImportComponent() throw()
{
}
-
SvXMLImportContext* XMLMetaImportComponent::CreateContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index efe634c8b5dd..e48ac2054228 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -39,13 +39,9 @@
#include <string.h>
-
using namespace com::sun::star;
using namespace ::xmloff::token;
-
-//-------------------------------------------------------------------------
-
static void lcl_AddTwoDigits( OUStringBuffer& rStr, sal_Int32 nVal )
{
if ( nVal < 10 )
@@ -74,8 +70,6 @@ SvXMLMetaExport::GetISODateTimeString( const util::DateTime& rDateTime )
return sTmp.makeStringAndClear();
}
-//-------------------------------------------------------------------------
-
void SvXMLMetaExport::SimpleStringElement( const OUString& rText,
sal_uInt16 nNamespace, enum XMLTokenEnum eElementName )
{
@@ -301,8 +295,6 @@ void SvXMLMetaExport::_MExport()
}
}
-//-------------------------------------------------------------------------
-
static const char *s_xmlns = "xmlns";
static const char *s_xmlns2 = "xmlns:";
static const char *s_meta = "meta:";
@@ -499,5 +491,4 @@ SvXMLMetaExport::setDocumentLocator(const uno::Reference<xml::sax::XLocator>&)
// nothing to do here, move along...
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index e7b8b1c48ef2..9f0c19378780 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/xml/dom/SAXDocumentBuilder.hpp>
#include <com/sun/star/xml/dom/XSAXDocumentBuilder2.hpp>
@@ -31,13 +30,9 @@
#include <xmloff/xmltoken.hxx>
#include "xmloff/xmlnmspe.hxx"
-
using namespace com::sun::star;
using namespace ::xmloff::token;
-
-//===========================================================================
-
/// builds a DOM tree from SAX events, by forwarding to SAXDocumentBuilder
class XMLDocumentBuilderContext : public SvXMLImportContext
{
@@ -109,9 +104,6 @@ void XMLDocumentBuilderContext::EndElement()
GetImport().GetNamespaceMap().GetQNameByKey(GetPrefix(), GetLocalName()));
}
-
-//===========================================================================
-
static void
lcl_initDocumentProperties(SvXMLImport & rImport,
uno::Reference<xml::dom::XSAXDocumentBuilder2> const& xDocBuilder,
@@ -202,7 +194,6 @@ SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext(
}
}
-
void SvXMLMetaDocumentContext::StartElement(
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index e61ccd0838a4..c940b22c5615 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -37,11 +37,8 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-// ------------------------------------------------------------------------
-
const char XMLN_VERSIONSLIST[] = "VersionList.xml";
-// ------------------------------------------------------------------------
// #110897#
XMLVersionListExport::XMLVersionListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
@@ -57,7 +54,6 @@ XMLVersionListExport::XMLVersionListExport(
xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
}
-// ------------------------------------------------------------------------
sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
{
GetDocHandler()->startDocument();
@@ -103,7 +99,6 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
return 0;
}
-// ------------------------------------------------------------------------
XMLVersionListImport::XMLVersionListImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions )
@@ -114,11 +109,9 @@ XMLVersionListImport::XMLVersionListImport(
xmloff::token::GetXMLToken(xmloff::token::XML_N_VERSIONS_LIST), XML_NAMESPACE_FRAMEWORK );
}
-// ------------------------------------------------------------------------
XMLVersionListImport::~XMLVersionListImport( void ) throw()
{}
-// ------------------------------------------------------------------------
SvXMLImportContext *XMLVersionListImport::CreateContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -139,8 +132,6 @@ SvXMLImportContext *XMLVersionListImport::CreateContext(
return pContext;
}
-
-// ------------------------------------------------------------------------
XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
@@ -150,11 +141,9 @@ XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport,
{
}
-// ------------------------------------------------------------------------
XMLVersionListContext::~XMLVersionListContext( void )
{}
-// ------------------------------------------------------------------------
SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
@@ -174,7 +163,6 @@ SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefi
return pContext;
}
-// ------------------------------------------------------------------------
XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport,
sal_uInt16 nPref,
const OUString& rLocalName,
@@ -228,12 +216,9 @@ XMLVersionContext::XMLVersionContext( XMLVersionListImport& rImport,
aList[nLength] = aInfo;
}
-
-// ------------------------------------------------------------------------
XMLVersionContext::~XMLVersionContext( void )
{}
-// ------------------------------------------------------------------------
sal_Bool XMLVersionContext::ParseISODateTimeString(
const OUString& rString,
util::DateTime& rDateTime )
@@ -333,8 +318,6 @@ sal_Bool XMLVersionContext::ParseISODateTimeString(
return bSuccess;
}
-
-// ------------------------------------------------------------------------
void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XStorage >& xRoot, const uno::Sequence< util::RevisionTag >& rVersions )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
@@ -381,7 +364,6 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
}
}
-// ------------------------------------------------------------------------
uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( const uno::Reference< embed::XStorage >& xRoot )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx
index 107e47feb878..2a8eacaaa479 100644
--- a/xmloff/source/script/xmlbasici.cxx
+++ b/xmloff/source/script/xmlbasici.cxx
@@ -27,10 +27,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
-// =============================================================================
// XMLBasicImportContext
-// =============================================================================
XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< frame::XModel >& rxModel )
@@ -44,14 +41,10 @@ XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 n
m_xHandler->setTargetDocument( xComp );
}
-// -----------------------------------------------------------------------------
-
XMLBasicImportContext::~XMLBasicImportContext()
{
}
-// -----------------------------------------------------------------------------
-
SvXMLImportContext* XMLBasicImportContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList >& )
@@ -68,8 +61,6 @@ SvXMLImportContext* XMLBasicImportContext::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportContext::StartElement(
const Reference< xml::sax::XAttributeList >& rxAttrList )
{
@@ -96,8 +87,6 @@ void XMLBasicImportContext::StartElement(
}
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportContext::EndElement()
{
if ( m_xHandler.is() )
@@ -108,18 +97,13 @@ void XMLBasicImportContext::EndElement()
}
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportContext::Characters( const OUString& rChars )
{
if ( m_xHandler.is() )
m_xHandler->characters( rChars );
}
-
-// =============================================================================
// XMLBasicImportChildContext
-// =============================================================================
XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< xml::sax::XDocumentHandler >& rxHandler )
@@ -128,14 +112,10 @@ XMLBasicImportChildContext::XMLBasicImportChildContext( SvXMLImport& rImport, sa
{
}
-// -----------------------------------------------------------------------------
-
XMLBasicImportChildContext::~XMLBasicImportChildContext()
{
}
-// -----------------------------------------------------------------------------
-
SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList >& )
@@ -143,8 +123,6 @@ SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext(
return new XMLBasicImportChildContext( GetImport(), nPrefix, rLocalName, m_xHandler );
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportChildContext::StartElement(
const Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -156,8 +134,6 @@ void XMLBasicImportChildContext::StartElement(
}
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportChildContext::EndElement()
{
if ( m_xHandler.is() )
@@ -167,14 +143,10 @@ void XMLBasicImportChildContext::EndElement()
}
}
-// -----------------------------------------------------------------------------
-
void XMLBasicImportChildContext::Characters( const OUString& rChars )
{
if ( m_xHandler.is() )
m_xHandler->characters( rChars );
}
-// -----------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx
index 8c79d2edf764..0486fd7e9ce5 100644
--- a/xmloff/source/script/xmlbasici.hxx
+++ b/xmloff/source/script/xmlbasici.hxx
@@ -24,10 +24,7 @@
#include <com/sun/star/document/XXMLOasisBasicImporter.hpp>
#include <xmloff/xmlictxt.hxx>
-
-// =============================================================================
// class XMLBasicImportContext
-// =============================================================================
class XMLBasicImportContext : public SvXMLImportContext
{
@@ -51,10 +48,7 @@ public:
virtual void Characters( const OUString& rChars );
};
-
-// =============================================================================
// class XMLBasicImportChildContext
-// =============================================================================
class XMLBasicImportChildContext : public SvXMLImportContext
{
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 87f24b3def7d..3caec0a6887f 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmloff/xmlscripti.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
@@ -37,10 +36,7 @@ using namespace com::sun::star::document;
using namespace com::sun::star::xml::sax;
using namespace ::xmloff::token;
-
-// =============================================================================
// XMLScriptChildContext: context for <office:script> element
-// =============================================================================
class XMLScriptChildContext : public SvXMLImportContext
{
@@ -61,8 +57,6 @@ public:
virtual void EndElement();
};
-// -----------------------------------------------------------------------------
-
XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference< frame::XModel >& rxModel, const OUString& rLanguage )
:SvXMLImportContext( rImport, nPrfx, rLName )
@@ -72,14 +66,10 @@ XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 n
{
}
-// -----------------------------------------------------------------------------
-
XMLScriptChildContext::~XMLScriptChildContext()
{
}
-// -----------------------------------------------------------------------------
-
SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList >& xAttrList )
@@ -101,15 +91,11 @@ SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
-
void XMLScriptChildContext::EndElement()
{
}
-// =============================================================================
// XMLScriptContext: context for <office:scripts> element
-// =============================================================================
XMLScriptContext::XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const Reference<XModel>& rDocModel )
@@ -118,14 +104,10 @@ XMLScriptContext::XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, cons
{
}
-// -----------------------------------------------------------------------------
-
XMLScriptContext::~XMLScriptContext()
{
}
-// -----------------------------------------------------------------------------
-
SvXMLImportContext* XMLScriptContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLName,
const Reference<XAttributeList>& xAttrList )
@@ -168,12 +150,8 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext(
return pContext;
}
-// -----------------------------------------------------------------------------
-
void XMLScriptContext::EndElement()
{
}
-// -----------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx
index 169e1cd22c80..d09f0ddb36e0 100644
--- a/xmloff/source/style/AttributeContainerHandler.cxx
+++ b/xmloff/source/style/AttributeContainerHandler.cxx
@@ -25,12 +25,10 @@
#include "AttributeContainerHandler.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLAttributeContainerHandler
//
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 20ae5d287852..fc4137dc9a1c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/drawing/DashStyle.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
@@ -75,9 +74,7 @@ SvXMLEnumMapEntry const pXML_DashStyle_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-//-------------------------------------------------------------
// Import
-//-------------------------------------------------------------
XMLDashStyleImport::XMLDashStyleImport( SvXMLImport& rImp )
: rImport(rImp)
@@ -210,10 +207,7 @@ sal_Bool XMLDashStyleImport::importXML(
return sal_True;
}
-
-//-------------------------------------------------------------
// Export
-//-------------------------------------------------------------
XMLDashStyleExport::XMLDashStyleExport( SvXMLExport& rExp )
: rExport(rExp)
@@ -257,7 +251,6 @@ sal_Bool XMLDashStyleExport::exportXML(
aStrValue = aOut.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
-
// dots
if( aLineDash.Dots )
{
@@ -315,7 +308,6 @@ sal_Bool XMLDashStyleExport::exportXML(
aStrValue = aOut.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISTANCE, aStrValue );
-
// do Write
SvXMLElementExport rElem( rExport,
XML_NAMESPACE_DRAW, XML_STROKE_DASH,
diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx
index b39140babc76..14ff712f3508 100644
--- a/xmloff/source/style/DrawAspectHdl.cxx
+++ b/xmloff/source/style/DrawAspectHdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "DrawAspectHdl.hxx"
#include <com/sun/star/uno/Any.hxx>
@@ -31,12 +30,9 @@
#include <xmloff/xmlement.hxx>
#include <xmloff/xmltoken.hxx>
-
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLMeasurePropHdl
//
diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx
index 789baa04e799..6ab210a6c1da 100644
--- a/xmloff/source/style/EnumPropertyHdl.cxx
+++ b/xmloff/source/style/EnumPropertyHdl.cxx
@@ -24,10 +24,8 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star::uno;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEnumPropertyHdl
//
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 015629e628b8..3543145bbc6a 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -33,10 +33,6 @@
using namespace ::com::sun::star;
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLGradientStyleContext, SvXMLStyleContext );
XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -81,9 +77,6 @@ sal_Bool XMLGradientStyleContext::IsTransient() const
return sal_True;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext );
XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -127,9 +120,6 @@ sal_Bool XMLHatchStyleContext::IsTransient() const
return sal_True;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext );
XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -207,10 +197,6 @@ sal_Bool XMLBitmapStyleContext::IsTransient() const
return sal_True;
}
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext );
XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -254,9 +240,6 @@ sal_Bool XMLTransGradientStyleContext::IsTransient() const
return sal_True;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext );
XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -300,9 +283,6 @@ sal_Bool XMLMarkerStyleContext::IsTransient() const
return sal_True;
}
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext );
XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx
index 6bfae84fb858..336e55626d20 100644
--- a/xmloff/source/style/FillStyleContext.hxx
+++ b/xmloff/source/style/FillStyleContext.hxx
@@ -24,7 +24,6 @@
#include <xmloff/xmlstyle.hxx>
#include<rtl/ustring.hxx>
-//////////////////////////////////////////////////////////////////////////////
// draw:gardient context
class XMLGradientStyleContext: public SvXMLStyleContext
@@ -45,7 +44,6 @@ public:
virtual sal_Bool IsTransient() const;
};
-//////////////////////////////////////////////////////////////////////////////
// draw:hatch context
class XMLHatchStyleContext: public SvXMLStyleContext
@@ -66,7 +64,6 @@ public:
virtual sal_Bool IsTransient() const;
};
-//////////////////////////////////////////////////////////////////////////////
// draw:fill-image context
class XMLBitmapStyleContext: public SvXMLStyleContext
@@ -93,7 +90,6 @@ public:
virtual sal_Bool IsTransient() const;
};
-//////////////////////////////////////////////////////////////////////////////
// draw:transparency context
class XMLTransGradientStyleContext: public SvXMLStyleContext
@@ -114,7 +110,6 @@ public:
virtual sal_Bool IsTransient() const;
};
-//////////////////////////////////////////////////////////////////////////////
// draw:marker context
class XMLMarkerStyleContext: public SvXMLStyleContext
@@ -135,7 +130,6 @@ public:
virtual sal_Bool IsTransient() const;
};
-//////////////////////////////////////////////////////////////////////////////
// draw:marker context
class XMLDashStyleContext: public SvXMLStyleContext
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 435040f756ea..7683337569a4 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "xmloff/GradientStyle.hxx"
#include <com/sun/star/awt/Gradient.hpp>
@@ -36,8 +35,6 @@
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
-
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -58,7 +55,6 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-
SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
{
{ XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR },
@@ -70,9 +66,7 @@ SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-//-------------------------------------------------------------
// Import
-//-------------------------------------------------------------
XMLGradientStyleImport::XMLGradientStyleImport(
SvXMLImport& rImp )
: rImport(rImp)
@@ -218,10 +212,7 @@ sal_Bool XMLGradientStyleImport::importXML(
return bRet;
}
-
-//-------------------------------------------------------------
// Export
-//-------------------------------------------------------------
XMLGradientStyleExport::XMLGradientStyleExport(
SvXMLExport& rExp )
@@ -264,7 +255,6 @@ sal_Bool XMLGradientStyleExport::exportXML(
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME,
aStrName );
-
aStrValue = aOut.makeStringAndClear();
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue );
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index c42e6a3db026..e05a09b8ab2f 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "xmloff/HatchStyle.hxx"
#include <com/sun/star/drawing/Hatch.hpp>
@@ -50,7 +49,6 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-
SvXMLEnumMapEntry const pXML_HatchStyle_Enum[] =
{
{ XML_HATCHSTYLE_SINGLE, drawing::HatchStyle_SINGLE },
@@ -59,10 +57,7 @@ SvXMLEnumMapEntry const pXML_HatchStyle_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-
-//-------------------------------------------------------------
// Import
-//-------------------------------------------------------------
XMLHatchStyleImport::XMLHatchStyleImport( SvXMLImport& rImp )
: rImport(rImp)
@@ -175,10 +170,7 @@ sal_Bool XMLHatchStyleImport::importXML(
return bRet;
}
-
-//-------------------------------------------------------------
// Export
-//-------------------------------------------------------------
XMLHatchStyleExport::XMLHatchStyleExport( SvXMLExport& rExp )
: rExport(rExp)
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index 53bf23eca1d6..125d411ab50c 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -34,10 +34,7 @@ using namespace ::com::sun::star;
using namespace ::xmloff::token;
-
-//-------------------------------------------------------------
// Import
-//-------------------------------------------------------------
XMLMarkerStyleImport::XMLMarkerStyleImport( SvXMLImport& rImp )
: rImport( rImp )
@@ -146,10 +143,7 @@ sal_Bool XMLMarkerStyleImport::importXML(
return bHasViewBox && bHasPathData;
}
-
-//-------------------------------------------------------------
// Export
-//-------------------------------------------------------------
XMLMarkerStyleExport::XMLMarkerStyleExport( SvXMLExport& rExp )
: rExport( rExp )
@@ -172,7 +166,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
if(rValue >>= aBezier)
{
- /////////////////
// Name
sal_Bool bEncoded = sal_False;
OUString aStrName( rStrName );
@@ -183,7 +176,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME,
aStrName );
- /////////////////
// Viewbox (viewBox="0 0 1500 1000")
sal_Int32 nMinX(0x7fffffff);
sal_Int32 nMaxX(0x80000000);
@@ -235,7 +227,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
SdXMLImExViewBox aViewBox( 0, 0, nDifX, nDifY );
rExport.AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString() );
- /////////////////
// Pathdata
pOuterSequence = aBezier.Coordinates.getArray();
drawing::FlagSequence* pOuterFlags = aBezier.Flags.getArray();
@@ -255,7 +246,6 @@ sal_Bool XMLMarkerStyleExport::exportXML(
// write point array
rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString());
- /////////////////
// Do Write
SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER,
sal_True, sal_False );
diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index 7dacca646b3d..871e8003d698 100644
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
@@ -24,10 +24,8 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star::uno;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLNamedBoolPropertyHdl
//
diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx
index b58301f48b1b..04f4e04b8d23 100644
--- a/xmloff/source/style/PageHeaderFooterContext.cxx
+++ b/xmloff/source/style/PageHeaderFooterContext.cxx
@@ -26,8 +26,6 @@ using namespace com::sun::star;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES;
-//------------------------------------------------------------------
-
PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
@@ -69,7 +67,6 @@ SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPre
rMap, nStartIndex, nEndIndex, aType);
}
-
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index db50eb6a5669..0bf9d9ea4a65 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -32,9 +32,6 @@ using namespace ::com::sun::star::beans;
using namespace ::comphelper;
using namespace ::xmloff::token;
-
-//______________________________________________________________________________
-
static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
{
return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) &&
@@ -69,7 +66,6 @@ static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int3
rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True)));
}
-//______________________________________________________________________________
// helper struct to handle equal XMLPropertyState's for page, header and footer
struct XMLPropertyStateBuffer
@@ -214,8 +210,6 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& )
}
}
-//______________________________________________________________________________
-
XMLPageMasterExportPropMapper::XMLPageMasterExportPropMapper(
const UniReference< XMLPropertySetMapper >& rMapper,
SvXMLExport& rExport ) :
diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx
index 0d24df5f0885..2bd6dbbd022e 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.hxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.hxx
@@ -25,8 +25,6 @@
#include "XMLTextColumnsExport.hxx"
#include "XMLFootnoteSeparatorExport.hxx"
-//______________________________________________________________________________
-
class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper
{
protected:
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index d37db396b9b1..cd1212a6a984 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "PageMasterPropHdl.hxx"
#include <sax/tools/converter.hxx>
@@ -32,20 +31,14 @@
#include <comphelper/types.hxx>
#include <comphelper/extract.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
using namespace ::comphelper;
using namespace ::xmloff::token;
-
-//______________________________________________________________________________
-
#define DEFAULT_PAPERTRAY (sal_Int32(-1))
-
-//______________________________________________________________________________
// property handler for style:page-usage (style::PageStyleLayout)
XMLPMPropHdl_PageStyleLayout::~XMLPMPropHdl_PageStyleLayout()
@@ -112,8 +105,6 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::exportXML(
return bRet;
}
-
-//______________________________________________________________________________
// property handler for style:num-format (style::NumberingType)
XMLPMPropHdl_NumFormat::~XMLPMPropHdl_NumFormat()
@@ -171,8 +162,6 @@ sal_Bool XMLPMPropHdl_NumFormat::exportXML(
return bRet;
}
-
-//______________________________________________________________________________
// property handler for style:num-letter-sync (style::NumberingType)
XMLPMPropHdl_NumLetterSync::~XMLPMPropHdl_NumLetterSync()
@@ -227,8 +216,6 @@ sal_Bool XMLPMPropHdl_NumLetterSync::exportXML(
return bRet;
}
-
-//______________________________________________________________________________
// property handler for style:paper-tray-number
XMLPMPropHdl_PaperTrayNumber::~XMLPMPropHdl_PaperTrayNumber()
@@ -283,8 +270,6 @@ sal_Bool XMLPMPropHdl_PaperTrayNumber::exportXML(
return bRet;
}
-
-//______________________________________________________________________________
// property handler for style:print
XMLPMPropHdl_Print::XMLPMPropHdl_Print( enum XMLTokenEnum eValue ) :
@@ -330,7 +315,6 @@ sal_Bool XMLPMPropHdl_Print::exportXML(
return sal_True;
}
-//______________________________________________________________________________
// property handler for style:table-centering
XMLPMPropHdl_CenterHorizontal::~XMLPMPropHdl_CenterHorizontal()
@@ -352,7 +336,6 @@ sal_Bool XMLPMPropHdl_CenterHorizontal::importXML(
bRet = sal_True;
}
-
return bRet;
}
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index 43b2ec371909..7bfdedbd017e 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -24,8 +24,6 @@
#include <rtl/ustring.hxx>
#include <xmloff/xmltoken.hxx>
-
-//______________________________________________________________________________
// property handler for style:page-usage (style::PageStyleLayout)
class XMLPMPropHdl_PageStyleLayout : public XMLPropertyHandler
@@ -48,8 +46,6 @@ public:
) const;
};
-
-//______________________________________________________________________________
// property handler for style:num-format (style::NumberingType)
class XMLPMPropHdl_NumFormat : public XMLPropertyHandler
@@ -68,8 +64,6 @@ public:
) const;
};
-
-//______________________________________________________________________________
// property handler for style:num-letter-sync (style::NumberingType)
class XMLPMPropHdl_NumLetterSync : public XMLPropertyHandler
@@ -88,8 +82,6 @@ public:
) const;
};
-
-//______________________________________________________________________________
// property handler for style:paper-tray-number
class XMLPMPropHdl_PaperTrayNumber : public XMLPropertyHandler
@@ -108,8 +100,6 @@ public:
) const;
};
-
-//______________________________________________________________________________
// property handler for style:print
class XMLPMPropHdl_Print : public XMLPropertyHandler
@@ -133,7 +123,6 @@ public:
) const;
};
-//______________________________________________________________________________
// property handler for style:table-centering
class XMLPMPropHdl_CenterHorizontal : public XMLPropertyHandler
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 0923cee3a5f8..ca96939581b0 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -28,12 +28,9 @@
#include <xmloff/PageMasterStyleMap.hxx>
#include <com/sun/star/text/TextGridMode.hpp>
-
-
using namespace ::xmloff::token;
using namespace ::com::sun::star;
-
SvXMLEnumMapEntry aXML_TextGridMode_ConstantMap[] =
{
{ XML_NONE, text::TextGridMode::NONE },
@@ -42,8 +39,6 @@ SvXMLEnumMapEntry aXML_TextGridMode_ConstantMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-//______________________________________________________________________________
-
XMLPageMasterPropHdlFactory::XMLPageMasterPropHdlFactory() :
XMLPropertyHandlerFactory()
{
@@ -131,5 +126,4 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
return pHdl;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx
index 8b65c4fc2e77..8da183618b7e 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.hxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx
@@ -22,9 +22,6 @@
#include <xmloff/prhdlfac.hxx>
-
-//______________________________________________________________________________
-
class XMLPageMasterPropHdlFactory : public XMLPropertyHandlerFactory
{
public:
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx
index 273e1c3eaf35..60588799e397 100644
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
@@ -17,10 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "PageMasterPropMapper.hxx"
-
#include <xmloff/PageMasterStyleMap.hxx>
#include "PageMasterPropHdlFactory.hxx"
@@ -28,9 +26,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-
-//______________________________________________________________________________
-
XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper():
XMLPropertySetMapper( aXMLPageMasterStyleMap, new XMLPageMasterPropHdlFactory())
{
diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index 231a35911452..db2f237d382f 100644
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
@@ -22,9 +22,6 @@
#include <xmloff/xmlprmap.hxx>
-
-//______________________________________________________________________________
-
class XMLPageMasterPropSetMapper : public XMLPropertySetMapper
{
public:
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx
index 872672906272..f3c86b01e1f7 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmloff/PageMasterStyleMap.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
@@ -34,8 +33,6 @@ using namespace ::xmloff::token;
#define HFMAP(name,prefix,token,type,context) \
MAP(name,prefix,token,type|XML_TYPE_PROP_HEADER_FOOTER,context, SvtSaveOptions::ODFVER_010)
-//______________________________________________________________________________
-
const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
{
// page master
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index 93a66e8dd77d..82d8520a3074 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "TransGradientStyle.hxx"
#include <com/sun/star/awt/Gradient.hpp>
@@ -36,7 +35,6 @@
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -55,7 +53,6 @@ enum SvXMLTokenMapAttrs
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
-
SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
{
{ XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR },
@@ -67,10 +64,7 @@ SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-
-//-------------------------------------------------------------
// Import
-//-------------------------------------------------------------
XMLTransGradientStyleImport::XMLTransGradientStyleImport( SvXMLImport& rImp )
: rImport(rImp)
@@ -216,10 +210,7 @@ sal_Bool XMLTransGradientStyleImport::importXML(
return bRet;
}
-
-//-------------------------------------------------------------
// Export
-//-------------------------------------------------------------
XMLTransGradientStyleExport::XMLTransGradientStyleExport( SvXMLExport& rExp )
: rExport(rExp)
@@ -230,7 +221,6 @@ XMLTransGradientStyleExport::~XMLTransGradientStyleExport()
{
}
-
sal_Bool XMLTransGradientStyleExport::exportXML(
const OUString& rStrName,
const uno::Any& rValue )
@@ -277,7 +267,6 @@ sal_Bool XMLTransGradientStyleExport::exportXML(
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue );
}
-
Color aColor;
// Transparency start
diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx
index 04623adf6d0f..5c3f02f99ea6 100644
--- a/xmloff/source/style/WordWrapPropertyHdl.cxx
+++ b/xmloff/source/style/WordWrapPropertyHdl.cxx
@@ -26,10 +26,8 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star::uno;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLWordWrapPropertyHdl
//
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index bdcc4fe0e8cc..ff3964e4dec7 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -24,13 +24,11 @@
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmltoken.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLMeasurePropHdl
//
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 48e429550dd7..821f0099897d 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -33,7 +33,6 @@
#include "PageMasterPropMapper.hxx"
#include "PageMasterExportPropMapper.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
@@ -41,9 +40,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
using namespace ::xmloff::token;
-
-//______________________________________________________________________________
-
sal_Bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const
{
for( ::std::vector< XMLPageExportNameEntry >::const_iterator pEntry = aNameVector.begin();
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index 1f10b2a8fb7e..b473ac6f338e 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -50,7 +50,6 @@ SvXMLEnumMapEntry const pXML_Para_Align_Last_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLParaAdjustPropHdl
//
@@ -86,7 +85,6 @@ sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLLastLineAdjustPropHdl
//
diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx
index 53cc76470408..b0ec3e7deb59 100644
--- a/xmloff/source/style/backhdl.cxx
+++ b/xmloff/source/style/backhdl.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustrbuf.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -43,7 +42,6 @@ SvXMLEnumMapEntry pXML_BrushVerticalPos[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLBackGraphicPositionPropHdl
//
diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx
index 736551b9cb68..530441e720c4 100644
--- a/xmloff/source/style/bordrhdl.cxx
+++ b/xmloff/source/style/bordrhdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <bordrhdl.hxx>
#include <sax/tools/converter.hxx>
#include <xmloff/xmltoken.hxx>
@@ -26,7 +25,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/table/BorderLine2.hpp>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -78,7 +76,6 @@ SvXMLEnumMapEntry pXML_NamedBorderWidths[] =
};
// mapping tables to map external xml input to intarnal box line widths
-
static sal_uInt16 const aBorderWidths[] =
{
DEF_LINE_WIDTH_0,
@@ -95,8 +92,6 @@ static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sa
rBorderLine.LineStyle = eStyle;
}
-
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
//
@@ -180,7 +175,6 @@ sal_Bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& r
return sal_True;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementHeightPropHdl
//
diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx
index 3e9f15c8f79e..8b0b642f3d5d 100644
--- a/xmloff/source/style/breakhdl.cxx
+++ b/xmloff/source/style/breakhdl.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/style/BreakType.hpp>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -38,7 +37,6 @@ SvXMLEnumMapEntry pXML_BreakTypes[] =
{ XML_TOKEN_INVALID, 0}
};
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLFmtBreakBeforePropHdl
//
@@ -109,7 +107,6 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno:
return sal_True;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLFmtBreakBeforePropHdl
//
diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx
index c92b30b04016..e248491d5452 100644
--- a/xmloff/source/style/cdouthdl.cxx
+++ b/xmloff/source/style/cdouthdl.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/awt/FontStrikeout.hpp>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
using namespace ::xmloff::token;
@@ -72,10 +71,7 @@ SvXMLEnumMapEntry pXML_CrossedoutWidth_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCrossedOutTypePropHdl
-//
XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl()
{
@@ -150,10 +146,7 @@ sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno:
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCrossedOutStylePropHdl
-//
XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl()
{
@@ -201,10 +194,7 @@ sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCrossedOutWidthPropHdl
-//
XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl()
{
@@ -273,10 +263,7 @@ sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCrossedOutTextPropHdl
-//
XMLCrossedOutTextPropHdl::~XMLCrossedOutTextPropHdl()
{
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index 3d2602aa22b0..7363cc024840 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <chrhghdl.hxx>
#include <rtl/ustrbuf.hxx>
@@ -28,10 +27,8 @@
#include <xmloff/xmluconv.hxx>
-
using namespace ::com::sun::star;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
//
@@ -78,7 +75,6 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
return !rStrExpValue.isEmpty();
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementHeightPropHdl
//
@@ -117,7 +113,6 @@ sal_Bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any
return !rStrExpValue.isEmpty();
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
//
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index d23159d06505..855266aa2fbd 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -25,24 +25,20 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/lang/Locale.hpp>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-
/* TODO-BCP47: this fiddling with Locale is quite ugly and fragile, especially
* for the fo:script temporarily stored in Variant, it would be better to use
* LanguageTagODF but we have that nasty UNO API requirement here.
* => make LanguageTagODF (unpublished) API? */
-
// For runtime performance, instead of converting back and forth between
// com::sun::star::Locale and LanguageTag to decide if script or tag are
// needed, this code takes advantage of knowledge about the internal
// representation of BCP 47 language tags in a Locale if present as done in a
// LanguageTag.
-
XMLCharLanguageHdl::~XMLCharLanguageHdl()
{
// nothing to do
@@ -130,8 +126,6 @@ sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any&
return sal_True;
}
-// ===========================================================================
-
XMLCharScriptHdl::~XMLCharScriptHdl()
{
// nothing to do
@@ -246,8 +240,6 @@ sal_Bool XMLCharScriptHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
return sal_True;
}
-// ===========================================================================
-
XMLCharCountryHdl::~XMLCharCountryHdl()
{
// nothing to do
@@ -319,8 +311,6 @@ sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& r
return sal_True;
}
-// ===========================================================================
-
XMLCharRfcLanguageTagHdl::~XMLCharRfcLanguageTagHdl()
{
// nothing to do
diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx
index 1df628f8d48d..ba16e857f0f4 100644
--- a/xmloff/source/style/csmaphdl.cxx
+++ b/xmloff/source/style/csmaphdl.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/style/CaseMap.hpp>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -37,10 +36,7 @@ static SvXMLEnumMapEntry pXML_Casemap_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLPosturePropHdl
-//
XMLCaseMapPropHdl::~XMLCaseMapPropHdl()
{
@@ -75,10 +71,7 @@ sal_Bool XMLCaseMapPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& r
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCaseMapVariantHdl
-//
XMLCaseMapVariantHdl::~XMLCaseMapVariantHdl()
{
diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx
index 676f26050510..fcfd3bb5e3f4 100644
--- a/xmloff/source/style/durationhdl.cxx
+++ b/xmloff/source/style/durationhdl.cxx
@@ -23,13 +23,9 @@
#include <rtl/ustrbuf.hxx>
#include <sax/tools/converter.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
-// ---------------------------------------------------------------------------
-
-
sal_Bool XMLDurationMS16PropHdl_Impl::importXML(
const OUString& rStrImpValue,
Any& rValue,
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 0bfd631c84dd..8d395b325d20 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <escphdl.hxx>
#include <sax/tools/converter.hxx>
@@ -26,7 +25,6 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Any.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -35,7 +33,6 @@ using namespace ::xmloff::token;
#define DFLT_ESC_AUTO_SUPER 101
#define DFLT_ESC_AUTO_SUB -101
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
//
@@ -101,7 +98,6 @@ sal_Bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any
return sal_True;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementHeightPropHdl
//
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index 0e1e8365f3c9..50543844a9e1 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <fonthdl.hxx>
#include <sax/tools/converter.hxx>
@@ -28,7 +27,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <tools/fontenum.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -54,10 +52,8 @@ static SvXMLEnumMapEntry const aFontPitchMapping[] =
{ XML_VARIABLE, PITCH_VARIABLE },
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
-//
+
// class XMLFontFamilyNamePropHdl
-//
XMLFontFamilyNamePropHdl::~XMLFontFamilyNamePropHdl()
{
@@ -188,10 +184,7 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno:
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLFontFamilyPropHdl
-//
XMLFontFamilyPropHdl::~XMLFontFamilyPropHdl()
{
@@ -226,10 +219,7 @@ sal_Bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLFontEncodingPropHdl
-//
XMLFontEncodingPropHdl::~XMLFontEncodingPropHdl()
{
@@ -265,10 +255,7 @@ sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::A
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLFontPitchPropHdl
-//
XMLFontPitchPropHdl::~XMLFontPitchPropHdl()
{
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index b71368e93650..49e8e018b885 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -20,16 +20,8 @@
#include <tools/debug.hxx>
#include "impastpl.hxx"
-
-//#############################################################################
-//
// Class XMLFamilyData_Impl
-//
-
-///////////////////////////////////////////////////////////////////////////////
-//
// ctor/dtor class XMLFamilyData_Impl
-//
XMLFamilyData_Impl::XMLFamilyData_Impl(
sal_Int32 nFamily,
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
index 1cf90cd79ce5..86e2a4019946 100644
--- a/xmloff/source/style/impastp2.cxx
+++ b/xmloff/source/style/impastp2.cxx
@@ -22,16 +22,8 @@
using namespace std;
-
-//#############################################################################
-//
// Class SvXMLAutoStylePoolProperties_Impl
-//
-
-///////////////////////////////////////////////////////////////////////////////
-//
// ctor class SvXMLAutoStylePoolProperties_Impl
-//
SvXMLAutoStylePoolPropertiesP_Impl::SvXMLAutoStylePoolPropertiesP_Impl( XMLFamilyData_Impl& rFamilyData, const vector< XMLPropertyState >& rProperties )
: maProperties( rProperties ),
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index 41693a5d37d1..91fff88fad03 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -22,16 +22,8 @@
using namespace std;
-
-//#############################################################################
-//
// Class SvXMLAutoStylePoolParent_Impl
-//
-
-///////////////////////////////////////////////////////////////////////////////
-//
// dtor class SvXMLAutoStylePoolParent_Impl
-//
SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl()
{
@@ -40,11 +32,8 @@ SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl()
maPropertiesList.clear();
}
-///////////////////////////////////////////////////////////////////////////////
-//
// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
// if not added, yet.
-//
sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
{
@@ -86,7 +75,6 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl& rFamilyData, c
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
@@ -128,7 +116,6 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLFamilyData_Impl& rFamilyDa
return bAdded;
}
-///////////////////////////////////////////////////////////////////////////////
//
// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list
//
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 154d5b9dfa91..c211945b2937 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -34,15 +34,8 @@ using namespace ::std;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//#############################################################################
-//
// Class SvXMLAutoStylePool_Impl
-//
-
-///////////////////////////////////////////////////////////////////////////////
-//
// ctor/dtor class SvXMLAutoStylePool_Impl
-//
SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
: rExport( rExp )
@@ -53,10 +46,7 @@ SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
{
}
-///////////////////////////////////////////////////////////////////////////////
-//
// Adds stylefamily-information to sorted list
-//
void SvXMLAutoStylePoolP_Impl::AddFamily(
sal_Int32 nFamily,
@@ -105,11 +95,8 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
if (aFind != maFamilyList.end())
aFind->mxMapper = rMapper;
}
-///////////////////////////////////////////////////////////////////////////////
-//
-// Adds a name to list
-//
+// Adds a name to list
void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& rName )
{
XMLFamilyData_Impl aTmp( nFamily );
@@ -120,7 +107,6 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString&
aFind->mpNameList->insert(rName);
}
-///////////////////////////////////////////////////////////////////////////////
//
// Retrieve the list of registered names
//
@@ -159,11 +145,8 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
std::copy( aNames.begin(), aNames.end(), rNames.getArray() );
}
-///////////////////////////////////////////////////////////////////////////////
-//
// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
// if not added, yet.
-//
sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
const OUString& rParent,
@@ -255,7 +238,6 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
//
// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list
//
@@ -290,7 +272,6 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
return sName;
}
-///////////////////////////////////////////////////////////////////////////////
//
// export
//
@@ -316,7 +297,6 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
if (!nCount)
return;
- /////////////////////////////////////////////////////////////////////////////////////
// create, initialize and fill helper-structure (SvXMLAutoStylePoolProperties_Impl)
// which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl
//
@@ -354,7 +334,6 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
}
}
- /////////////////////////////////////////////////////////////////////////////////////
//
// create string to export for each XML-style. That means for each property-list
//
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index c81f6d1d5e8c..1d8969f91bb5 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -40,10 +40,7 @@ class SvXMLExport;
#define MAX_CACHE_SIZE 65536
-///////////////////////////////////////////////////////////////////////////////
-//
// Implementationclass for stylefamily-information
-//
typedef OUString* OUStringPtr;
typedef ::std::vector< OUStringPtr > SvXMLAutoStylePoolCache_Impl;
@@ -82,13 +79,10 @@ public:
void ClearEntries();
};
-/// A set that finds and sorts based only on mnFamily
+// A set that finds and sorts based only on mnFamily
typedef boost::ptr_set<XMLFamilyData_Impl> XMLFamilyDataList_Impl;
-///////////////////////////////////////////////////////////////////////////////
-//
// Properties of a pool
-//
class SvXMLAutoStylePoolPropertiesP_Impl
{
@@ -114,11 +108,7 @@ public:
typedef SvXMLAutoStylePoolPropertiesP_Impl* SvXMLAutoStylePoolPropertiesPPtr;
typedef ::std::vector< SvXMLAutoStylePoolPropertiesPPtr > SvXMLAutoStylePoolPropertiesPList_Impl;
-///////////////////////////////////////////////////////////////////////////////
-//
// Parents of AutoStylePool's
-//
-
class SvXMLAutoStylePoolParentP_Impl
{
OUString msParent;
@@ -160,10 +150,7 @@ public:
~SvXMLAutoStylePoolParentsP_Impl() { DeleteAndDestroyAll(); }
};
-///////////////////////////////////////////////////////////////////////////////
-//
// Implementationclass of SvXMLAutoStylePool
-//
class SvXMLAutoStylePoolP_Impl
{
diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index 74051eb33ff3..8f9734ec09aa 100644
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
@@ -25,11 +25,9 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmluconv.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLKerningPropHdl
//
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index a6fd84667e6e..7d6fdfb80534 100644
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
@@ -26,12 +26,10 @@
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
-
using namespace ::com::sun::star;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_CASEMAP_NORMAL;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
//
@@ -95,7 +93,6 @@ sal_Bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV
return !rStrExpValue.isEmpty();
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLLineHeightAtLeastHdl
//
@@ -136,7 +133,6 @@ sal_Bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno::
return !rStrExpValue.isEmpty();
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLLineSpacingHdl
//
diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx
index d61e576f01bf..88f6ed5af465 100644
--- a/xmloff/source/style/opaquhdl.cxx
+++ b/xmloff/source/style/opaquhdl.cxx
@@ -21,19 +21,13 @@
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustrbuf.hxx>
-// --
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmluconv.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLOpaquePropHdl
-//
XMLOpaquePropHdl::~XMLOpaquePropHdl()
{
diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx
index a05fa74a8aa0..ced4e82a818a 100644
--- a/xmloff/source/style/postuhdl.cxx
+++ b/xmloff/source/style/postuhdl.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/awt/FontSlant.hpp>
#include <tools/fontenum.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -37,7 +36,6 @@ SvXMLEnumMapEntry const aPostureGenericMapping[] =
{ XML_TOKEN_INVALID, 0 }
};
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLPosturePropHdl
//
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 305a5daf1fa7..3e9fd918f2f3 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/drawing/ColorMode.hpp>
#include <com/sun/star/text/HorizontalAdjust.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
@@ -95,21 +94,14 @@ SvXMLEnumMapEntry const aXML_WritingDirection_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-
-///////////////////////////////////////////////////////////////////////////
-//
// Dtor
-//
XMLPropertyHandlerFactory::~XMLPropertyHandlerFactory()
{
for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); ++pPos )
delete pPos->second;
}
-///////////////////////////////////////////////////////////////////////////
-//
// Interface
-//
const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int32 nType ) const
{
DBG_ASSERT( (nType & ~((sal_uInt32)MID_FLAG_MASK)) == 0,
@@ -117,10 +109,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int
return GetBasicHandler( nType );
}
-///////////////////////////////////////////////////////////////////////////
-//
// Helper-methods to create and cache PropertyHandler
-//
XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) const
{
XMLPropertyHandler* pRet = NULL;
diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index 596694793860..b991baab9d49 100644
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
@@ -28,11 +28,9 @@
#include <xmloff/xmluconv.hxx>
#include <xmloff/xmltoken.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLMeasurePropHdl
//
diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index 7fd14b598a2a..4fb594dbbd9c 100644
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
@@ -24,11 +24,9 @@
// --
#include <xmloff/xmltoken.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLFmtSplitPropHdl
//
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 318cc0d1c6f4..858d68a4c360 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -268,7 +268,6 @@ sal_Bool XMLStyleExport::exportStyle(
bool bNoInheritedListStyle( true );
- /////////////////////////////////////////////////
Reference<XStyle> xStyle( xPropState, UNO_QUERY );
while ( xStyle.is() )
{
@@ -295,7 +294,6 @@ sal_Bool XMLStyleExport::exportStyle(
}
}
}
- /////////////////////////////////////////////////
if ( bNoInheritedListStyle )
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_LIST_STYLE_NAME,
@@ -507,5 +505,4 @@ void XMLStyleExport::exportStyleFamily(
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx
index 4001950c3d0f..45e0c42d6253 100644
--- a/xmloff/source/style/tabsthdl.cxx
+++ b/xmloff/source/style/tabsthdl.cxx
@@ -23,7 +23,6 @@
using namespace ::com::sun::star;
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLFontFamilyNamePropHdl
//
diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx
index b238491958de..61e9db4acaec 100644
--- a/xmloff/source/style/undlihdl.cxx
+++ b/xmloff/source/style/undlihdl.cxx
@@ -22,11 +22,9 @@
#include <xmloff/xmluconv.hxx>
#include <rtl/ustrbuf.hxx>
-
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/awt/FontUnderline.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
using namespace ::xmloff::token;
@@ -102,9 +100,6 @@ SvXMLEnumMapEntry const pXML_UnderlineWidth_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-
-
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLUnderlineTypePropHdl
//
@@ -187,7 +182,6 @@ sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno::
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLUnderlineStylePropHdl
//
@@ -275,7 +269,6 @@ sal_Bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno:
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
//
// class XMLUnderlineWidthPropHdl
//
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 7c8d31b2af65..5fd5db811a95 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <weighhdl.hxx>
#include <sax/tools/converter.hxx>
@@ -33,7 +32,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/awt/FontWeight.hpp>
-
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
@@ -59,10 +57,7 @@ FontWeightMapper const aFontWeightMap[] =
{ ::com::sun::star::awt::FontWeight::DONTKNOW, 1000 }
};
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLFmtBreakBeforePropHdl
-//
XMLFontWeightPropHdl::~XMLFontWeightPropHdl()
{
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 9a7c0ed582bd..bad015ca3d0c 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <xmlbahdl.hxx>
#include <tools/debug.hxx>
@@ -26,7 +25,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <xmloff/xmltoken.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::xmloff::token;
@@ -83,10 +81,7 @@ static sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLNumberPropHdl
-//
XMLNumberPropHdl::~XMLNumberPropHdl()
{
@@ -119,9 +114,7 @@ sal_Bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
// class XMLNumberNonePropHdl
-//
XMLNumberNonePropHdl::XMLNumberNonePropHdl( sal_Int8 nB ) :
sZeroStr( GetXMLToken(XML_NO_LIMIT) ),
@@ -184,10 +177,7 @@ sal_Bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rVa
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLMeasurePropHdl
-//
XMLMeasurePropHdl::~XMLMeasurePropHdl()
{
@@ -222,10 +212,7 @@ sal_Bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLBoolFalsePropHdl
-//
XMLBoolFalsePropHdl::~XMLBoolFalsePropHdl()
{
@@ -242,10 +229,7 @@ sal_Bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rV
return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( sal_False ), rCnv );
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLBoolPropHdl
-//
XMLBoolPropHdl::~XMLBoolPropHdl()
{
@@ -278,10 +262,7 @@ sal_Bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, c
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLNBoolPropHdl
-//
XMLNBoolPropHdl::~XMLNBoolPropHdl()
{
@@ -314,10 +295,7 @@ sal_Bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLPercentPropHdl
-//
XMLPercentPropHdl::~XMLPercentPropHdl()
{
@@ -350,10 +328,7 @@ sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLDoublePercentPropHdl
-//
sal_Bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
@@ -398,11 +373,7 @@ sal_Bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any&
return bRet;
}
-
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLNegPercentPropHdl
-//
XMLNegPercentPropHdl::~XMLNegPercentPropHdl()
{
@@ -435,11 +406,7 @@ sal_Bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVa
return bRet;
}
-
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLMeasurePxPropHdl
-//
XMLMeasurePxPropHdl::~XMLMeasurePxPropHdl()
{
@@ -474,10 +441,7 @@ sal_Bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLColorPropHdl
-//
XMLColorPropHdl::~XMLColorPropHdl()
{
@@ -552,10 +516,7 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLHexPropHdl
-//
XMLHexPropHdl::~XMLHexPropHdl()
{
@@ -594,10 +555,7 @@ sal_Bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLStringPropHdl
-//
XMLStringPropHdl::~XMLStringPropHdl()
{
@@ -624,10 +582,7 @@ sal_Bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLStyleNamePropHdl
-//
XMLStyleNamePropHdl::~XMLStyleNamePropHdl()
{
@@ -647,11 +602,7 @@ sal_Bool XMLStyleNamePropHdl::exportXML( OUString& rStrExpValue, const Any& rVal
return bRet;
}
-
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLDoublePropHdl
-//
XMLDoublePropHdl::~XMLDoublePropHdl()
{
@@ -683,10 +634,7 @@ sal_Bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue,
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLColorTransparentPropHdl
-//
XMLColorTransparentPropHdl::XMLColorTransparentPropHdl(
enum XMLTokenEnum eTransparent ) :
@@ -734,11 +682,7 @@ sal_Bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const An
return bRet;
}
-
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLIsTransparentPropHdl
-//
XMLIsTransparentPropHdl::XMLIsTransparentPropHdl(
enum XMLTokenEnum eTransparent, sal_Bool bTransPropVal ) :
@@ -780,10 +724,7 @@ sal_Bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any&
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLColorAutoPropHdl
-//
XMLColorAutoPropHdl::XMLColorAutoPropHdl()
{
@@ -829,10 +770,7 @@ sal_Bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLIsAutoColorPropHdl
-//
XMLIsAutoColorPropHdl::XMLIsAutoColorPropHdl()
{
@@ -871,10 +809,7 @@ sal_Bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rV
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
-//
// class XMLCompareOnlyPropHdl
-//
XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl()
{
@@ -893,9 +828,7 @@ sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUni
return sal_False;
}
-///////////////////////////////////////////////////////////////////////////////
// class XMLNumberWithoutZeroPropHdl
-//
XMLNumberWithoutZeroPropHdl::XMLNumberWithoutZeroPropHdl( sal_Int8 nB ) :
nBytes( nB )
@@ -935,9 +868,7 @@ sal_Bool XMLNumberWithoutZeroPropHdl::exportXML( OUString& rStrExpValue, const A
return bRet;
}
-///////////////////////////////////////////////////////////////////////////////
// class XMLNumberWithAutoInsteadZeroPropHdl
-//
XMLNumberWithAutoInsteadZeroPropHdl::~XMLNumberWithAutoInsteadZeroPropHdl()
{
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index c2c414b100d7..0637cd220e81 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -39,7 +39,6 @@
#include <xmloff/PropertySetInfoHash.hxx>
#include <comphelper/stl_types.hxx>
-
using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -78,19 +77,12 @@ static XMLPropTokens_Impl aPropTokens[MAX_PROP_TYPES] =
ENTRY(SECTION)
};
-///////////////////////////////////////////////////////////////////////////////
-//
// public methods
-//
-///////////////////////////////////////////////////////////////////////////
-//
// Take all properties of the XPropertySet which are also found in the
// XMLPropertyMapEntry-array and which are not set to their default-value,
// if a state is available.
-//
// After that I call the method 'ContextFilter'.
-//
typedef std::list<XMLPropertyState> XMLPropertyStateList_Impl;
@@ -190,8 +182,6 @@ FilterPropertyInfo_Impl::FilterPropertyInfo_Impl(
typedef std::list<FilterPropertyInfo_Impl> FilterPropertyInfoList_Impl;
-// ----------------------------------------------------------------------------
-
class FilterPropertiesInfo_Impl
{
sal_uInt32 nCount;
@@ -214,8 +204,6 @@ public:
sal_uInt32 GetPropertyCount() const { return nCount; }
};
-// ----------------------------------------------------------------------------
-
typedef boost::unordered_map
<
PropertySetInfoKey,
@@ -243,8 +231,6 @@ FilterPropertiesInfos_Impl::~FilterPropertiesInfos_Impl ()
}
}
-// ----------------------------------------------------------------------------
-
FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
nCount(0),
aPropInfos(),
@@ -554,10 +540,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
aPropStates.FillPropertyStateVector(rPropStates);
}
-///////////////////////////////////////////////////////////////////////////////
-//
// ctor/dtor , class SvXMLExportPropertyMapper
-//
SvXMLExportPropertyMapper::SvXMLExportPropertyMapper(
const UniReference< XMLPropertySetMapper >& rMapper ) :
@@ -602,7 +585,6 @@ void SvXMLExportPropertyMapper::ChainExportMapper(
}
}
-
vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter(
const Reference< XPropertySet > xPropSet,
const sal_Bool bDefault ) const
@@ -725,13 +707,10 @@ void SvXMLExportPropertyMapper::ContextFilter(
mxNextMapper->ContextFilter( rProperties, rPropSet );
}
-///////////////////////////////////////////////////////////////////////////
-//
// Compares two Sequences of XMLPropertyState:
// 1.Number of elements equal ?
// 2.Index of each element equal ? (So I know whether the propertynames are the same)
// 3.Value of each element equal ?
-//
sal_Bool SvXMLExportPropertyMapper::Equals(
const vector< XMLPropertyState >& aProperties1,
const vector< XMLPropertyState >& aProperties2 ) const
@@ -776,7 +755,6 @@ sal_Bool SvXMLExportPropertyMapper::Equals(
return bRet;
}
-
/** fills the given attribute list with the items in the given set
void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList,
const ::std::vector< XMLPropertyState >& rProperties,
@@ -788,7 +766,6 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList,
nFlags, 0, -1, -1 );
}
-
void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList,
const ::std::vector< XMLPropertyState >& rProperties,
const SvXMLUnitConverter& rUnitConverter,
@@ -876,10 +853,7 @@ void SvXMLExportPropertyMapper::handleElementItem(
pProperties, nIdx );
}
-///////////////////////////////////////////////////////////////////////////////
-//
// protected methods
-//
/** fills the given attribute list with the items in the given set */
void SvXMLExportPropertyMapper::_exportXML(
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index e3ca3a76430b..61d36b1b9040 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -48,17 +48,12 @@
#include <set>
#include <boost/ptr_container/ptr_vector.hpp>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
using namespace ::svt;
-//-------------------------------------------------------------------------
-
#define XMLNUM_MAX_PARTS 3
-//-------------------------------------------------------------------------
-
struct LessuInt32
{
sal_Bool operator() (const sal_uInt32 rValue1, const sal_uInt32 rValue2) const
@@ -93,8 +88,6 @@ public:
void SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed);
};
-//-------------------------------------------------------------------------
-
struct SvXMLEmbeddedTextEntry
{
sal_uInt16 nSourcePos; // position in NumberFormat (to skip later)
@@ -107,11 +100,7 @@ struct SvXMLEmbeddedTextEntry
class SvXMLEmbeddedTextEntryArr : public boost::ptr_vector<SvXMLEmbeddedTextEntry> {};
-//-------------------------------------------------------------------------
-
-//
//! SvXMLNumUsedList_Impl should be optimized!
-//
SvXMLNumUsedList_Impl::SvXMLNumUsedList_Impl() :
nUsedCount(0),
@@ -216,8 +205,6 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
}
}
-//-------------------------------------------------------------------------
-
SvXMLNumFmtExport::SvXMLNumFmtExport(
SvXMLExport& rExp,
const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
@@ -293,11 +280,7 @@ SvXMLNumFmtExport::~SvXMLNumFmtExport()
delete pCharClass;
}
-//-------------------------------------------------------------------------
-
-//
// helper methods
-//
static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const OUString& rPrefix )
{
@@ -345,11 +328,7 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32 nLang )
}
}
-//-------------------------------------------------------------------------
-
-//
// methods to write individual elements within a format
-//
void SvXMLNumFmtExport::AddToTextElement_Impl( const OUString& rString )
{
@@ -752,7 +731,6 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
}
}
-//-------------------------------------------------------------------------
// for old (automatic) currency formats: parse currency symbol from text
sal_Int32 lcl_FindSymbol( const OUString& sUpperStr, const OUString& sCurString )
@@ -837,8 +815,6 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString,
return bRet; // sal_True: currency element written
}
-//-------------------------------------------------------------------------
-
static OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLang )
{
// get name of first non-gregorian calendar for the language
@@ -864,8 +840,6 @@ static OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageT
return aCalendar;
}
-//-------------------------------------------------------------------------
-
static sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sal_uInt16 nPos )
{
sal_uInt16 nCount = rEmbeddedEntries.size();
@@ -947,18 +921,14 @@ static sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool
}
}
-//
// export one part (condition)
-//
void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey,
sal_uInt16 nPart, sal_Bool bDefPart )
{
//! for the default part, pass the coditions from the other parts!
- //
// element name
- //
NfIndexTableOffset eBuiltIn = pFormatter->GetIndexTableOffset( nKey );
@@ -1020,9 +990,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
OUString sAttrValue;
sal_Bool bUserDef = ( ( rFormat.GetType() & NUMBERFORMAT_DEFINED ) != 0 );
- //
// common attributes for format
- //
// format name (generated from key) - style namespace
rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_NAME,
@@ -1100,9 +1068,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
XML_FALSE );
}
- //
// Native number transliteration
- //
::com::sun::star::i18n::NativeNumberXmlAttributes aAttr;
rFormat.GetNatNumXml( aAttr, nPart );
if ( !aAttr.Format.isEmpty() )
@@ -1122,28 +1088,21 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
aAttr.Style );
}
- //
// The element
- //
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, eType,
sal_True, sal_True );
- //
// color (properties element)
- //
const Color* pCol = rFormat.GetColor( nPart );
if (pCol)
WriteColorElement_Impl(*pCol);
-
// detect if there is "real" content, excluding color and maps
//! move to implementation of Write... methods?
sal_Bool bAnyContent = sal_False;
- //
// format elements
- //
SvXMLEmbeddedTextEntryArr aEmbeddedEntries;
if ( eBuiltIn == NF_NUMBER_STANDARD )
@@ -1609,9 +1568,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
sal_True, sal_False );
}
- //
// mapping (conditions) must be last elements
- //
if (bDefPart)
{
@@ -1656,11 +1613,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
}
}
-//-------------------------------------------------------------------------
-
-//
// export one format
-//
void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey )
{
@@ -1690,11 +1643,7 @@ void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uI
}
}
-//-------------------------------------------------------------------------
-
-//
// export method called by application
-//
void SvXMLNumFmtExport::Export( sal_Bool bIsAutoStyle )
{
@@ -1779,8 +1728,6 @@ void SvXMLNumFmtExport::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed)
pUsedList->SetWasUsed(rWasUsed);
}
-
-
static const SvNumberformat* lcl_GetFormat( SvNumberFormatter* pFormatter,
sal_uInt32 nKey )
{
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 32ca705884f9..bf2b24500b02 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <comphelper/string.hxx>
#include <unotools/syslocale.hxx>
@@ -47,12 +46,9 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/ptr_container/ptr_set.hpp>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-//-------------------------------------------------------------------------
-
struct SvXMLNumFmtEntry
{
OUString aName;
@@ -80,8 +76,6 @@ struct SvXMLEmbeddedElement
typedef boost::ptr_set<SvXMLEmbeddedElement> SvXMLEmbeddedElementArr;
-//-------------------------------------------------------------------------
-
class SvXMLNumImpData
{
SvNumberFormatter* pFormatter;
@@ -112,7 +106,6 @@ public:
void RemoveVolatileFormats();
};
-
struct SvXMLNumberInfo
{
sal_Int32 nDecimals;
@@ -164,7 +157,6 @@ public:
void AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent );
};
-
class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext
{
SvXMLNumFmtElementContext& rParent;
@@ -187,7 +179,6 @@ public:
virtual void EndElement();
};
-
class SvXMLNumFmtMapContext : public SvXMLImportContext
{
SvXMLNumFormatContext& rParent;
@@ -210,7 +201,6 @@ public:
virtual void EndElement();
};
-
class SvXMLNumFmtPropContext : public SvXMLImportContext
{
SvXMLNumFormatContext& rParent;
@@ -233,9 +223,6 @@ public:
virtual void EndElement();
};
-
-//-------------------------------------------------------------------------
-
enum SvXMLStyleTokens
{
XML_TOK_STYLE_TEXT,
@@ -301,8 +288,6 @@ enum SvXMLStyleElemAttrTokens
XML_TOK_ELEM_ATTR_CALENDAR
};
-//-------------------------------------------------------------------------
-
//
// standard colors
//
@@ -343,8 +328,6 @@ static const SvXMLEnumMapEntry aFormatSourceMap[] =
{ XML_TOKEN_INVALID, 0 }
};
-//-------------------------------------------------------------------------
-
struct SvXMLDefaultDateFormat
{
NfIndexTableOffset eFormat;
@@ -378,8 +361,6 @@ 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
//
@@ -617,8 +598,6 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang )
return *pLocaleData;
}
-//-------------------------------------------------------------------------
-
//
// SvXMLNumFmtMapContext
//
@@ -668,8 +647,6 @@ void SvXMLNumFmtMapContext::EndElement()
rParent.AddCondition( sCondition, sName );
}
-//-------------------------------------------------------------------------
-
//
// SvXMLNumFmtPropContext
//
@@ -718,8 +695,6 @@ void SvXMLNumFmtPropContext::EndElement()
rParent.AddColor( m_nColor );
}
-//-------------------------------------------------------------------------
-
//
// SvXMLNumFmtEmbeddedTextContext
//
@@ -771,8 +746,6 @@ void SvXMLNumFmtEmbeddedTextContext::EndElement()
rParent.AddEmbeddedElement( nTextPosition, aContent.makeStringAndClear() );
}
-//-------------------------------------------------------------------------
-
static sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rParent )
{
sal_uInt16 nFormatType = rParent.GetType();
@@ -1259,8 +1232,6 @@ void SvXMLNumFmtElementContext::EndElement()
}
}
-//-------------------------------------------------------------------------
-
sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth,
SvXMLDateElementAttributes eYear, SvXMLDateElementAttributes eHours,
@@ -1287,8 +1258,6 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes
return NF_INDEX_TABLE_ENTRIES; // invalid
}
-//-------------------------------------------------------------------------
-
//
// SvXMLNumFormatContext
//
@@ -2173,8 +2142,6 @@ sal_Bool SvXMLNumFormatContext::IsSystemLanguage()
return nFormatLang == LANGUAGE_SYSTEM;
}
-//-------------------------------------------------------------------------
-
//
// SvXMLNumFmtHelper
//
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 3047c9047dc7..4ac569edae5a 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -53,7 +53,6 @@
#include <xmloff/xmlnumi.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
@@ -65,8 +64,6 @@ using namespace ::com::sun::star::frame;
using namespace ::xmloff::token;
using namespace ::com::sun::star::io;
-// ---------------------------------------------------------------------
-
class SvxXMLListLevelStyleContext_Impl;
class SvxXMLListLevelStyleAttrContext_Impl : public SvXMLImportContext
@@ -87,8 +84,6 @@ public:
const Reference< xml::sax::XAttributeList > & xAttrList );
};
-// ---------------------------------------------------------------------
-
class SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl : public SvXMLImportContext
{
SvxXMLListLevelStyleContext_Impl& rListLevel;
@@ -103,8 +98,6 @@ public:
virtual ~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl();
};
-// ---------------------------------------------------------------------
-
enum SvxXMLTextListLevelStyleAttrTokens
{
XML_TOK_TEXT_LEVEL_ATTR_LEVEL,
@@ -599,8 +592,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
return aPropSeq;
}
-// ---------------------------------------------------------------------
-
enum SvxXMLStyleAttributesAttrTokens
{
XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE,
@@ -935,8 +926,6 @@ SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
enum SvxXMLStyleAttributesLabelAlignmentAttrTokens
{
XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY,
@@ -1017,8 +1006,6 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAl
{
}
-// ---------------------------------------------------------------------
-
class SvxXMLListStyle_Impl : public std::vector<SvxXMLListLevelStyleContext_Impl *> {};
void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
@@ -1036,7 +1023,6 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
}
}
-
SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 351c9127cb6c..7ad12d57d1ab 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/uno/Any.hxx>
#include <xmloff/xmltoken.hxx>
-
using namespace ::std;
using namespace ::com::sun::star::uno;
@@ -61,10 +60,7 @@ XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl(
DBG_ASSERT( pHdl, "Unknown XML property type handler!" );
}
-///////////////////////////////////////////////////////////////////////////
-//
// Ctor
-//
XMLPropertySetMapper::XMLPropertySetMapper(
const XMLPropertyMapEntry* pEntries,
const UniReference< XMLPropertyHandlerFactory >& rFactory )
@@ -108,10 +104,7 @@ void XMLPropertySetMapper::AddMapperEntry(
}
}
-///////////////////////////////////////////////////////////////////////////
-//
// Export a Property
-//
sal_Bool XMLPropertySetMapper::exportXML(
OUString& rStrExpValue,
const XMLPropertyState& rProperty,
@@ -129,10 +122,7 @@ sal_Bool XMLPropertySetMapper::exportXML(
return bRet;
}
-///////////////////////////////////////////////////////////////////////////
-//
// Import a Property
-//
sal_Bool XMLPropertySetMapper::importXML(
const OUString& rStrImpValue,
XMLPropertyState& rProperty,
@@ -149,12 +139,9 @@ sal_Bool XMLPropertySetMapper::importXML(
return bRet;
}
-///////////////////////////////////////////////////////////////////////////
-//
// Search for the given name and the namespace in the list and return
// the index of the entry
// If there is no matching entry the method returns -1
-//
sal_Int32 XMLPropertySetMapper::GetEntryIndex(
sal_uInt16 nNamespace,
const OUString& rStrName,
@@ -182,7 +169,6 @@ sal_Int32 XMLPropertySetMapper::GetEntryIndex(
return -1;
}
-
/** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */
sal_Int32 XMLPropertySetMapper::FindEntryIndex(
const sal_Char* sApiName,
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index c54d7ffbe5f5..d9d18f6ef95f 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -62,8 +62,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::style;
using namespace ::xmloff::token;
-// ---------------------------------------------------------------------
-
static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] =
{
{ XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE },
@@ -93,8 +91,6 @@ const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap()
return *mpStyleStylesElemTokenMap;
}
-// ---------------------------------------------------------------------
-
void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
const OUString& rValue )
@@ -206,8 +202,6 @@ sal_Bool SvXMLStyleContext::IsTransient() const
return sal_False;
}
-// ---------------------------------------------------------------------
-
class SvXMLStyleIndex_Impl
{
OUString sName;
@@ -252,7 +246,6 @@ struct SvXMLStyleIndexCmp_Impl
}
};
-
class SvXMLStylesContext_Impl
{
typedef std::vector<SvXMLStyleContext*> StylesType;
@@ -372,8 +365,6 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uIn
return pStyle;
}
-// ---------------------------------------------------------------------
-
TYPEINIT1( SvXMLStylesContext, SvXMLImportContext );
sal_uInt32 SvXMLStylesContext::GetStyleCount() const
@@ -556,7 +547,6 @@ SvXMLStyleContext *SvXMLStylesContext::CreateDefaultStyleStyleChildContext(
return 0;
}
-
sal_Bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const
{
return sal_True;
@@ -793,7 +783,6 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const
return sServiceName;
}
-
SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) :
@@ -805,7 +794,6 @@ SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
{
}
-
SvXMLStylesContext::~SvXMLStylesContext()
{
delete mpStyleStylesElemTokenMap;
@@ -913,7 +901,6 @@ void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite )
}
}
-
const SvXMLStyleContext *SvXMLStylesContext::FindStyleChildContext(
sal_uInt16 nFamily,
const OUString& rName,
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index f5685e8aa1ea..84792c7e536d 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -52,15 +52,11 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::style;
-// --------------------------------------------------------------------
-
#define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 }
#define CMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TABLE_COLUMN,context)
#define RMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_TABLE_ROW,context)
#define MAP_END { 0L, 0, 0, XML_EMPTY, 0, 0, SvtSaveOptions::ODFVER_010 }
-// --------------------------------------------------------------------
-
const XMLPropertyMapEntry* getColumnPropertiesMap()
{
static const XMLPropertyMapEntry aXMLColumnProperties[] =
@@ -73,8 +69,6 @@ const XMLPropertyMapEntry* getColumnPropertiesMap()
return &aXMLColumnProperties[0];
}
-// --------------------------------------------------------------------
-
const XMLPropertyMapEntry* getRowPropertiesMap()
{
static const XMLPropertyMapEntry aXMLRowProperties[] =
@@ -88,8 +82,6 @@ const XMLPropertyMapEntry* getRowPropertiesMap()
return &aXMLRowProperties[0];
}
-// --------------------------------------------------------------------
-
class StringStatisticHelper : public std::map< OUString, sal_Int32 >
{
public:
@@ -99,8 +91,6 @@ public:
sal_Int32 getModeString( /* out */ OUString& rModeString );
};
-// --------------------------------------------------------------------
-
void StringStatisticHelper::add( const OUString& rStyleName )
{
std::map< OUString, sal_Int32 >::iterator iter( find( rStyleName ) );
@@ -114,8 +104,6 @@ void StringStatisticHelper::add( const OUString& rStyleName )
}
}
-// --------------------------------------------------------------------
-
sal_Int32 StringStatisticHelper::getModeString( OUString& rStyleName )
{
sal_Int32 nMax = 0;
@@ -133,9 +121,7 @@ sal_Int32 StringStatisticHelper::getModeString( OUString& rStyleName )
return nMax;
}
-// --------------------------------------------------------------------
// class XMLTableExport
-// --------------------------------------------------------------------
XMLTableExport::XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExportPropertyMapper >& xExportPropertyMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef )
: mrExport( rExp )
@@ -180,14 +166,10 @@ XMLTableExport::XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExp
OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX));
}
-// --------------------------------------------------------------------
-
XMLTableExport::~XMLTableExport ()
{
}
-// --------------------------------------------------------------------
-
static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
{
if( !xPropStates.empty() )
@@ -204,8 +186,6 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
return false;
}
-// --------------------------------------------------------------------
-
void XMLTableExport::collectTableAutoStyles(const Reference < XColumnRowRange >& xColumnRowRange)
{
if( !mbExportTables )
@@ -309,8 +289,6 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
}
}
- // --------------------------------------------------------------------
-
void XMLTableExport::exportTable( const Reference < XColumnRowRange >& xColumnRowRange )
{
if( !mbExportTables )
@@ -375,9 +353,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
}
}
-// --------------------------------------------------------------------
// Export the table columns
-// --------------------------------------------------------------------
void XMLTableExport::ExportTableColumns( const Reference < XIndexAccess >& xtableColumnsIndexAccess, const boost::shared_ptr< XMLTableInfo >& pTableInfo )
{
@@ -404,9 +380,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
}
}
-// --------------------------------------------------------------------
// ODF export for a table cell.
-// --------------------------------------------------------------------
void XMLTableExport::ExportCell( const Reference < XCell >& xCell, const boost::shared_ptr< XMLTableInfo >& pTableInfo, const OUString& rDefaultCellStyle )
{
@@ -457,11 +431,9 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
ImpExportText( xCell );
}
-// --------------------------------------------------------------------
// ODF export of the text contents of a table cell.
// Remarks: Up to now we only export text contents!
// TODO: Check against nested tables ....
-// --------------------------------------------------------------------
void XMLTableExport::ImpExportText( const Reference< XCell >& xCell )
{
@@ -470,8 +442,6 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
mrExport.GetTextParagraphExport()->exportText( xText );
}
-// --------------------------------------------------------------------
-
void XMLTableExport::exportTableStyles()
{
if( !mbExportTables )
@@ -485,9 +455,7 @@ void XMLTableExport::exportTableStyles()
exportTableTemplates();
}
-// --------------------------------------------------------------------
// Export the collected automatic styles
-// --------------------------------------------------------------------
void XMLTableExport::exportAutoStyles()
{
@@ -499,8 +467,6 @@ void XMLTableExport::exportAutoStyles()
mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_CELL, mrExport.GetDocHandler(), mrExport.GetMM100UnitConverter(), mrExport.GetNamespaceMap() );
}
-// --------------------------------------------------------------------
-
const TableStyleElement* getTableStyleMap()
{
static const struct TableStyleElement gTableStyleElements[] =
@@ -520,8 +486,6 @@ const TableStyleElement* getTableStyleMap()
return &gTableStyleElements[0];
}
-// --------------------------------------------------------------------
-
void XMLTableExport::exportTableTemplates()
{
if( !mbExportTables )
@@ -576,6 +540,4 @@ void XMLTableExport::exportTableTemplates()
}
}
-// --------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index 59254909af26..914319d03c63 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/table/XTableRows.hpp>
#include <com/sun/star/table/XMergeableCell.hpp>
@@ -42,8 +41,6 @@
#include <boost/shared_ptr.hpp>
-// --------------------------------------------------------------------
-
using namespace ::xmloff::token;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
@@ -54,8 +51,6 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-// --------------------------------------------------------------------
-
struct ColumnInfo
{
OUString msStyleName;
@@ -63,8 +58,6 @@ struct ColumnInfo
OUString msDefaultCellStyleName;
};
-// --------------------------------------------------------------------
-
class XMLProxyContext : public SvXMLImportContext
{
public:
@@ -76,8 +69,6 @@ private:
SvXMLImportContextRef mxParent;
};
-// --------------------------------------------------------------------
-
struct MergeInfo
{
sal_Int32 mnStartColumn;
@@ -91,8 +82,6 @@ struct MergeInfo
typedef std::vector< boost::shared_ptr< MergeInfo > > MergeInfoVector;
-// --------------------------------------------------------------------
-
class XMLTableImportContext : public SvXMLImportContext
{
public:
@@ -128,8 +117,6 @@ public:
MergeInfoVector maMergeInfos;
};
-// --------------------------------------------------------------------
-
class XMLCellImportContext : public SvXMLImportContext
{
public:
@@ -157,8 +144,6 @@ public:
sal_Int32 mnColSpan, mnRowSpan, mnRepeated;
};
-// --------------------------------------------------------------------
-
class XMLTableTemplateContext : public SvXMLStyleContext
{
public:
@@ -175,9 +160,7 @@ private:
OUString msTemplateStyleName;
};
-// --------------------------------------------------------------------
// class XMLProxyContext
-// --------------------------------------------------------------------
XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName )
: SvXMLImportContext( rImport, nPrfx, rLName )
@@ -185,8 +168,6 @@ XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContext
{
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
if( mxParent.Is() )
@@ -195,9 +176,7 @@ SvXMLImportContext * XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, co
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
}
-// --------------------------------------------------------------------
// class XMLTableImport
-// --------------------------------------------------------------------
XMLTableImport::XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef )
: mrImport( rImport )
@@ -205,7 +184,6 @@ XMLTableImport::XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLP
mxCellImportPropertySetMapper = new SvXMLImportPropertyMapper( xCellPropertySetMapper.get(), rImport );
mxCellImportPropertySetMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(rImport));
-
UniReference < XMLPropertySetMapper > xRowMapper( new XMLPropertySetMapper( getRowPropertiesMap(), xFactoryRef.get() ) );
mxRowImportPropertySetMapper = new SvXMLImportPropertyMapper( xRowMapper, rImport );
@@ -213,29 +191,21 @@ XMLTableImport::XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLP
mxColumnImportPropertySetMapper = new SvXMLImportPropertyMapper( xColMapper, rImport );
}
-// --------------------------------------------------------------------
-
XMLTableImport::~XMLTableImport()
{
}
-// --------------------------------------------------------------------
-
SvXMLImportContext* XMLTableImport::CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
{
rtl::Reference< XMLTableImport > xThis( this );
return new XMLTableImportContext( xThis, nPrfx, rLName, xColumnRowRange );
}
-// --------------------------------------------------------------------
-
SvXMLStyleContext* XMLTableImport::CreateTableTemplateContext( sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
{
return new XMLTableTemplateContext( mrImport, nPrfx, rLName, xAttrList );
}
-// --------------------------------------------------------------------
-
void XMLTableImport::addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate )
{
boost::shared_ptr< XMLTableTemplate > xPtr( new XMLTableTemplate );
@@ -243,8 +213,6 @@ void XMLTableImport::addTableTemplate( const OUString& rsStyleName, XMLTableTemp
maTableTemplates[rsStyleName] = xPtr;
}
-// --------------------------------------------------------------------
-
void XMLTableImport::finishStyles()
{
if( !maTableTemplates.empty() ) try
@@ -297,10 +265,7 @@ void XMLTableImport::finishStyles()
}
}
-// --------------------------------------------------------------------
// class XMLTableImport
-// --------------------------------------------------------------------
-
XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
: SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
@@ -313,14 +278,10 @@ XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImpo
{
}
-// --------------------------------------------------------------------
-
XMLTableImportContext::~XMLTableImportContext()
{
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
if( mxColumns.is() && (mnCurrentRow == -1) ) try
@@ -382,8 +343,6 @@ SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, co
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
}
-// --------------------------------------------------------------------
-
void XMLTableImportContext::InitColumns()
{
if( mxColumns.is() ) try
@@ -420,8 +379,6 @@ void XMLTableImportContext::InitColumns()
}
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
if( mxRows.is() )
@@ -492,8 +449,6 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const
return new XMLProxyContext( GetImport(), xThis, nPrefix, rLocalName );
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
mnCurrentColumn++;
@@ -527,8 +482,6 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, cons
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
}
-// --------------------------------------------------------------------
-
SvXMLImportContext *XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
if( nPrefix == XML_NAMESPACE_TABLE )
@@ -549,14 +502,10 @@ SvXMLImportContext *XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefi
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
}
-// --------------------------------------------------------------------
-
void XMLTableImportContext::StartElement( const Reference< XAttributeList >& /*xAttrList*/ )
{
}
-// --------------------------------------------------------------------
-
void XMLTableImportContext::EndElement()
{
if( !maMergeInfos.empty() )
@@ -580,8 +529,6 @@ void XMLTableImportContext::EndElement()
}
}
-// --------------------------------------------------------------------
-
OUString XMLTableImportContext::GetDefaultCellStyleName() const
{
OUString sStyleName( msDefaultCellStyleName );
@@ -593,9 +540,7 @@ OUString XMLTableImportContext::GetDefaultCellStyleName() const
return sStyleName;
}
-// --------------------------------------------------------------------
// XMLCellImportContext
-// --------------------------------------------------------------------
XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Reference< XMergeableCell >& xCell, const OUString& sDefaultCellStyleName, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList )
: SvXMLImportContext( rImport, nPrfx, rLName )
@@ -667,14 +612,10 @@ XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Referenc
}
}
-// --------------------------------------------------------------------
-
XMLCellImportContext::~XMLCellImportContext()
{
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
// create text cursor on demand
@@ -710,10 +651,6 @@ SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefi
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList);
}
-// --------------------------------------------------------------------
-
-// --------------------------------------------------------------------
-
void XMLCellImportContext::EndElement()
{
if(mxCursor.is())
@@ -737,17 +674,13 @@ void XMLCellImportContext::EndElement()
}
}
-// --------------------------------------------------------------------
// class XMLTableTemplateContext
-// --------------------------------------------------------------------
XMLTableTemplateContext::XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_TABLE_TEMPLATE_ID, sal_False )
{
}
-// --------------------------------------------------------------------
-
void XMLTableTemplateContext::StartElement( const Reference< XAttributeList >& xAttrList )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -763,8 +696,6 @@ void XMLTableTemplateContext::StartElement( const Reference< XAttributeList >& x
}
}
-// --------------------------------------------------------------------
-
void XMLTableTemplateContext::EndElement()
{
rtl::Reference< XMLTableImport > xTableImport( GetImport().GetShapeImport()->GetShapeTableImport() );
@@ -772,8 +703,6 @@ void XMLTableTemplateContext::EndElement()
xTableImport->addTableTemplate( msTemplateStyleName, maTableTemplate );
}
-// --------------------------------------------------------------------
-
SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList )
{
if( nPrefix == XML_NAMESPACE_TABLE )
@@ -802,6 +731,4 @@ SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPr
return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
}
-// --------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index 9f486d3582d5..2e5f1b03093b 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -31,7 +31,6 @@
#include <xmloff/xmltoken.hxx>
#include "XMLTextColumnsContext.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -171,8 +170,6 @@ XMLTextColumnContext_Impl::~XMLTextColumnContext_Impl()
{
}
-// --------------------------------------------------------------------------
-
class XMLTextColumnSepContext_Impl: public SvXMLImportContext
{
sal_Int32 nWidth;
@@ -181,7 +178,6 @@ class XMLTextColumnSepContext_Impl: public SvXMLImportContext
sal_Int8 nStyle;
VerticalAlignment eVertAlign;
-
public:
TYPEINFO();
@@ -200,7 +196,6 @@ public:
VerticalAlignment GetVertAlign() const { return eVertAlign; }
};
-
TYPEINIT1( XMLTextColumnSepContext_Impl, SvXMLImportContext );
XMLTextColumnSepContext_Impl::XMLTextColumnSepContext_Impl(
@@ -270,8 +265,6 @@ XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl()
{
}
-// --------------------------------------------------------------------------
-
class XMLTextColumnsArray_Impl : public std::vector<XMLTextColumnContext_Impl *> {};
TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext );
@@ -484,11 +477,9 @@ void XMLTextColumnsContext::EndElement( )
xPropSet->setPropertyValue( sSeparatorLineStyle, aAny );
}
-
aAny <<= pColumnSep->GetColor();
xPropSet->setPropertyValue( sSeparatorLineColor, aAny );
-
aAny <<= pColumnSep->GetVertAlign();
xPropSet->setPropertyValue( sSeparatorLineVerticalAlignment, aAny );
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 4c268e6d303c..dfaa7c2f6410 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -55,8 +55,6 @@
#include <map>
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -148,8 +146,6 @@ void XMLTextFrameTitleOrDescContext_Impl::Characters( const OUString& rText )
mrTitleOrDesc += rText;
}
-// ------------------------------------------------------------------------
-
class XMLTextFrameParam_Impl : public SvXMLImportContext
{
public:
@@ -332,8 +328,6 @@ XMLTextFrameContourContext_Impl::~XMLTextFrameContourContext_Impl()
{
}
-// ------------------------------------------------------------------------
-
class XMLTextFrameContext_Impl : public SvXMLImportContext
{
::com::sun::star::uno::Reference <
@@ -620,7 +614,6 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
if( pStyle )
pStyle->FillPropertySet( xPropSet );
-
// x and y
sal_Int16 nHoriOrient = HoriOrientation::NONE;
aAny = xPropSet->getPropertyValue( sHoriOrient );
@@ -772,7 +765,6 @@ void XMLTextFrameContext_Impl::Create( sal_Bool /*bHRefOrBase64*/ )
}
}
-
void XMLTextFrameContext::removeGraphicFromImportContext(const SvXMLImportContext& rContext) const
{
const XMLTextFrameContext_Impl* pXMLTextFrameContext_Impl = dynamic_cast< const XMLTextFrameContext_Impl* >(&rContext);
@@ -1309,8 +1301,6 @@ void XMLTextFrameContext_Impl::SetDesc( const OUString& rDesc )
}
}
-//-----------------------------------------------------------------------------------------------------
-
TYPEINIT1( XMLTextFrameContext, SvXMLImportContext );
sal_Bool XMLTextFrameContext::CreateIfNotThere( ::com::sun::star::uno::Reference <
diff --git a/xmloff/source/text/XMLTextMasterStylesContext.cxx b/xmloff/source/text/XMLTextMasterStylesContext.cxx
index 119920ba25b5..6781163a0df5 100644
--- a/xmloff/source/text/XMLTextMasterStylesContext.cxx
+++ b/xmloff/source/text/XMLTextMasterStylesContext.cxx
@@ -25,15 +25,12 @@
#include <xmloff/XMLTextMasterPageContext.hxx>
#include <xmloff/XMLTextMasterStylesContext.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_MASTER_PAGE;
-// ------------------------------------------------------------------------
-
TYPEINIT1( XMLTextMasterStylesContext, SvXMLStylesContext );
sal_Bool XMLTextMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 9296c3f45db4..332f745488fc 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -31,7 +31,6 @@
#include <xmloff/XMLTextShapeStyleContext.hxx>
-
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
@@ -121,8 +120,6 @@ SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext(
return pContext;
}
-//-----------------------------------------------------------------------------
-
void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
const OUString& rValue )
@@ -230,7 +227,6 @@ void XMLTextShapeStyleContext::CreateAndInsert( sal_Bool bOverwrite )
}
}
-
void XMLTextShapeStyleContext::Finish( sal_Bool bOverwrite )
{
XMLPropStyleContext::Finish( bOverwrite );
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 6a529a8addd5..66866698edb0 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -112,7 +112,6 @@
#include <txtlists.hxx>
#include <com/sun/star/rdf/XMetadatable.hpp>
-
using namespace ::std;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -263,7 +262,7 @@ static int txtparae_bContainsIllegalCharacters = sal_False;
// 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
@@ -979,7 +978,6 @@ void XMLTextParagraphExport::exportListChange(
GetExport().EncodeStyleName( sListStyleName ) );
bExportListStyle = false;
-
}
else
{
@@ -2044,8 +2042,6 @@ void XMLTextParagraphExport::exportParagraph(
rPropSetHelper.getValue(
PARA_NUMBERING_STYLENAME, xPropSet ) >>= sListStyleName;
-
-
bool bAssignedtoOutlineStyle = false;
{
Reference< XChapterNumberingSupplier > xCNSupplier( GetExport().GetModel(), UNO_QUERY );
@@ -2096,7 +2092,6 @@ void XMLTextParagraphExport::exportParagraph(
OUString sNumberingStartValue("NumberingStartValue");
-
if (xPropSetInfo->
hasPropertyByName(sNumberingStartValue))
{
@@ -2670,7 +2665,6 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
nShapeFeatures = (nShapeFeatures & ~SEF_EXPORT_Y);
}
-
Reference< XPropertySetInfo > xPropSetInfo(rPropSet->getPropertySetInfo());
// svg:width
@@ -3605,7 +3599,6 @@ void XMLTextParagraphExport::exportUsedDeclarations( sal_Bool bOnlyUsed )
pFieldExport->SetExportOnlyUsedFieldDeclarations( bOnlyUsed );
}
-
void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
{
if (NULL != pRedlineExport)
@@ -3633,7 +3626,6 @@ void XMLTextParagraphExport::recordTrackedChangesNoXText()
pRedlineExport->SetCurrentXText();
}
-
void XMLTextParagraphExport::exportTextAutoStyles()
{
GetAutoStylePool().exportXML( XML_STYLE_FAMILY_TEXT_PARAGRAPH,
@@ -3784,7 +3776,6 @@ void XMLTextParagraphExport::exportMeta(
exportTextRangeEnumeration( xTextEnum, i_bAutoStyles, i_isProgress );
}
-
void XMLTextParagraphExport::PreventExportOfControlsInMuteSections(
const Reference<XIndexAccess> & rShapes,
UniReference<xmloff::OFormLayerXMLExport> xFormExport )
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index a8a9d3321530..c6dd03170b29 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -52,13 +52,11 @@
#include "XMLChangeImportContext.hxx"
#include "txtlists.hxx"
-
// OD 2004-04-21 #i26791#
#include <txtparaimphint.hxx>
class XMLHints_Impl : public boost::ptr_vector<XMLHint_Impl> {};
// OD 2004-04-21 #i26791#
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -68,7 +66,6 @@ using namespace ::xmloff::token;
using ::com::sun::star::container::XEnumerationAccess;
using ::com::sun::star::container::XEnumeration;
-
TYPEINIT1( XMLCharContext, SvXMLImportContext );
XMLCharContext::XMLCharContext(
@@ -124,7 +121,6 @@ XMLCharContext::XMLCharContext(
XMLCharContext::~XMLCharContext()
{
}
-// -----------------------------------------------------------------------------
void XMLCharContext::EndElement()
{
if ( !m_nCount )
@@ -146,7 +142,6 @@ void XMLCharContext::EndElement()
}
}
}
-// -----------------------------------------------------------------------------
void XMLCharContext::InsertControlCharacter(sal_Int16 _nControl)
{
GetImport().GetTextImport()->InsertControlCharacter( _nControl );
@@ -156,8 +151,6 @@ void XMLCharContext::InsertString(const OUString& _sString)
GetImport().GetTextImport()->InsertString( _sString );
}
-// ---------------------------------------------------------------------
-
/** import start of reference (<text:reference-start>) */
class XMLStartReferenceContext_Impl : public SvXMLImportContext
{
@@ -229,8 +222,6 @@ sal_Bool XMLStartReferenceContext_Impl::FindName(
return bNameOK;
}
-// ---------------------------------------------------------------------
-
/** import end of reference (<text:reference-end>) */
class XMLEndReferenceContext_Impl : public SvXMLImportContext
{
@@ -279,8 +270,6 @@ XMLEndReferenceContext_Impl::XMLEndReferenceContext_Impl(
}
}
-// ---------------------------------------------------------------------
-
class XMLImpSpanContext_Impl : public SvXMLImportContext
{
const OUString sTextFrame;
@@ -322,7 +311,6 @@ public:
virtual void Characters( const OUString& rChars );
};
-// ---------------------------------------------------------------------
class XMLImpHyperlinkContext_Impl : public SvXMLImportContext
{
@@ -452,8 +440,6 @@ void XMLImpHyperlinkContext_Impl::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( rChars, rIgnoreLeadingSpace );
}
-// ---------------------------------------------------------------------
-
class XMLImpRubyBaseContext_Impl : public SvXMLImportContext
{
XMLHints_Impl& rHints;
@@ -518,8 +504,6 @@ void XMLImpRubyBaseContext_Impl::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( rChars, rIgnoreLeadingSpace );
}
-// ---------------------------------------------------------------------
-
class XMLImpRubyContext_Impl : public SvXMLImportContext
{
XMLHints_Impl& rHints;
@@ -553,8 +537,6 @@ public:
void AppendText( const OUString& s ) { m_sText += s; }
};
-// ---------------------------------------------------------------------
-
class XMLImpRubyTextContext_Impl : public SvXMLImportContext
{
XMLImpRubyContext_Impl & m_rRubyContext;
@@ -614,8 +596,6 @@ void XMLImpRubyTextContext_Impl::Characters( const OUString& rChars )
m_rRubyContext.AppendText( rChars );
}
-// ---------------------------------------------------------------------
-
TYPEINIT1( XMLImpRubyContext_Impl, SvXMLImportContext );
XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
@@ -690,8 +670,6 @@ SvXMLImportContext *XMLImpRubyContext_Impl::CreateChildContext(
return pContext;
}
-// ---------------------------------------------------------------------
-
/** for text:meta and text:meta-field
*/
class XMLMetaImportContextBase : public SvXMLImportContext
@@ -815,9 +793,6 @@ void XMLMetaImportContextBase::ProcessAttribute(sal_uInt16 const i_nPrefix,
}
}
-
-// ---------------------------------------------------------------------
-
/** text:meta */
class XMLMetaImportContext : public XMLMetaImportContextBase
{
@@ -917,8 +892,6 @@ void XMLMetaImportContext::InsertMeta(
}
}
-// ---------------------------------------------------------------------
-
/** text:meta-field */
class XMLMetaFieldImportContext : public XMLMetaImportContextBase
{
@@ -1015,10 +988,6 @@ void XMLMetaFieldImportContext::InsertMeta(
}
}
-
-// ---------------------------------------------------------------------
-
-
/**
* Process index marks.
*
@@ -1072,7 +1041,6 @@ protected:
const OUString& rServiceName);
};
-
TYPEINIT1( XMLIndexMarkImportContext_Impl, SvXMLImportContext );
XMLIndexMarkImportContext_Impl::XMLIndexMarkImportContext_Impl(
@@ -1240,7 +1208,6 @@ static const sal_Char sAPI_com_sun_star_text_UserIndexMark[] =
static const sal_Char sAPI_com_sun_star_text_DocumentIndexMark[] =
"com.sun.star.text.DocumentIndexMark";
-
void XMLIndexMarkImportContext_Impl::GetServiceName(
OUString& sServiceName,
enum XMLTextPElemTokens eToken)
@@ -1287,7 +1254,6 @@ void XMLIndexMarkImportContext_Impl::GetServiceName(
}
}
-
sal_Bool XMLIndexMarkImportContext_Impl::CreateMark(
Reference<beans::XPropertySet>& rPropSet,
const OUString& rServiceName)
@@ -1306,7 +1272,6 @@ sal_Bool XMLIndexMarkImportContext_Impl::CreateMark(
return sal_False;
}
-
class XMLTOCMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl
{
const OUString sLevel;
@@ -1332,7 +1297,6 @@ protected:
TYPEINIT1( XMLTOCMarkImportContext_Impl, XMLIndexMarkImportContext_Impl );
-
XMLTOCMarkImportContext_Impl::XMLTOCMarkImportContext_Impl(
SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
enum XMLTextPElemTokens nTok, XMLHints_Impl& rHnts) :
@@ -1445,7 +1409,6 @@ void XMLUserIndexMarkImportContext_Impl::ProcessAttribute(
}
}
-
class XMLAlphaIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl
{
const OUString sPrimaryKey;
@@ -1540,9 +1503,6 @@ void XMLAlphaIndexMarkImportContext_Impl::ProcessAttribute(
}
}
-
-// ---------------------------------------------------------------------
-
TYPEINIT1( XMLImpSpanContext_Impl, SvXMLImportContext );
XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
@@ -1861,8 +1821,6 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
}
-// ---------------------------------------------------------------------
-
TYPEINIT1( XMLParaContext, SvXMLImportContext );
XMLParaContext::XMLParaContext(
@@ -2287,8 +2245,6 @@ void XMLParaContext::Characters( const OUString& rChars )
GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
}
-
-
TYPEINIT1( XMLNumberedParaContext, SvXMLImportContext );
XMLNumberedParaContext::XMLNumberedParaContext(
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index f92e12f82839..192c45b85465 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -25,8 +25,6 @@
#include "XMLTextFrameContext.hxx"
#include <xmloff/XMLEventsImportContext.hxx>
-// ---------------------------------------------------------------------
-
#define XML_HINT_STYLE 1
#define XML_HINT_REFERENCE 2
#define XML_HINT_HYPERLINK 3
@@ -155,7 +153,6 @@ public:
}
};
-
class XMLIndexMarkHint_Impl : public XMLHint_Impl
{
const css::uno::Reference<css::beans::XPropertySet> xIndexMarkPropSet;
@@ -188,7 +185,6 @@ public:
const OUString& GetID() const { return sID; }
};
-
class XMLTextFrameHint_Impl : public XMLHint_Impl
{
// OD 2004-04-20 #i26791#
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 3f2f5bee9de0..7cd2a7898fa2 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -46,16 +46,12 @@
// OD 2004-05-05 #i28701#
#include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::style;
using namespace ::com::sun::star::text;
using namespace ::xmloff::token;
-// ---------------------------------------------------------------------------
-
SvXMLEnumMapEntry const pXML_HoriPos_Enum[] =
{
{ XML_FROM_LEFT, HoriOrientation::NONE },
@@ -245,8 +241,6 @@ SvXMLEnumMapEntry const pXML_FillStyle_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-// ---------------------------------------------------------------------------
-
class XMLDropCapPropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -303,8 +297,6 @@ sal_Bool XMLDropCapPropHdl_Impl::exportXML(
return sal_False;
}
-// ---------------------------------------------------------------------------
-
class XMLOpaquePropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -355,8 +347,6 @@ XMLOpaquePropHdl_Impl::~XMLOpaquePropHdl_Impl ()
{
}
-// ---------------------------------------------------------------------------
-
class XMLContourModePropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -407,8 +397,6 @@ XMLContourModePropHdl_Impl::~XMLContourModePropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
class XMLParagraphOnlyPropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -462,8 +450,6 @@ XMLParagraphOnlyPropHdl_Impl::~XMLParagraphOnlyPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
SvXMLEnumMapEntry const pXML_Wrap_Enum[] =
{
{ XML_NONE, WrapTextMode_NONE },
@@ -526,8 +512,6 @@ XMLWrapPropHdl_Impl::~XMLWrapPropHdl_Impl ()
{
}
-// ---------------------------------------------------------------------------
-
class XMLFrameProtectPropHdl_Impl : public XMLPropertyHandler
{
const OUString sVal;
@@ -609,8 +593,6 @@ XMLFrameProtectPropHdl_Impl::~XMLFrameProtectPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
SvXMLEnumMapEntry const pXML_Anchor_Enum[] =
{
{ XML_CHAR, TextContentAnchorType_AT_CHARACTER },
@@ -621,7 +603,6 @@ SvXMLEnumMapEntry const pXML_Anchor_Enum[] =
{ XML_TOKEN_INVALID, 0 }
};
-
sal_Bool XMLAnchorTypePropHdl::importXML(
const OUString& rStrImpValue,
Any& rValue,
@@ -669,9 +650,6 @@ sal_Bool XMLAnchorTypePropHdl::convert( const OUString& rStrImpValue,
return bRet;
}
-// ---------------------------------------------------------------------------
-
-
XMLTextColumnsPropertyHandler::~XMLTextColumnsPropertyHandler ()
{
}
@@ -731,8 +709,6 @@ sal_Bool XMLTextColumnsPropertyHandler::exportXML(
return sal_False;
}
-// ---------------------------------------------------------------------------
-
class XMLHoriMirrorPropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -780,8 +756,6 @@ XMLHoriMirrorPropHdl_Impl::~XMLHoriMirrorPropHdl_Impl ()
{
}
-// ---------------------------------------------------------------------------
-
class XMLGrfMirrorPropHdl_Impl : public XMLPropertyHandler
{
const OUString sVal;
@@ -877,8 +851,6 @@ XMLGrfMirrorPropHdl_Impl::~XMLGrfMirrorPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
SvXMLEnumMapEntry const pXML_Emphasize_Enum[] =
{
{ XML_NONE, FontEmphasis::NONE },
@@ -989,9 +961,6 @@ XMLTextEmphasizePropHdl_Impl::~XMLTextEmphasizePropHdl_Impl()
{
}
-
-// ---------------------------------------------------------------------------
-
class XMLTextCombineCharPropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -1036,8 +1005,6 @@ XMLTextCombineCharPropHdl_Impl::~XMLTextCombineCharPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
class XMLTextRelWidthHeightPropHdl_Impl : public XMLPropertyHandler
{
public:
@@ -1090,8 +1057,6 @@ XMLTextRelWidthHeightPropHdl_Impl::~XMLTextRelWidthHeightPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
class XMLTextSyncWidthHeightPropHdl_Impl : public XMLPropertyHandler
{
const OUString sValue;
@@ -1141,8 +1106,6 @@ XMLTextSyncWidthHeightPropHdl_Impl::~XMLTextSyncWidthHeightPropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
-
class XMLTextRotationAnglePropHdl_Impl : public XMLPropertyHandler
{
@@ -1206,7 +1169,6 @@ sal_Bool XMLTextRotationAnglePropHdl_Impl::exportXML(
XMLTextRotationAnglePropHdl_Impl::~XMLTextRotationAnglePropHdl_Impl()
{
}
-// ---------------------------------------------------------------------------
class XMLNumber8OneBasedHdl : public XMLPropertyHandler
{
@@ -1251,7 +1213,6 @@ sal_Bool XMLNumber8OneBasedHdl::exportXML(
}
return bRet;
}
-// ---------------------------------------------------------------------------
class XMLTextPropertyHandlerFactory_Impl
{
public:
@@ -1445,8 +1406,6 @@ XMLTextPropertyHandlerFactory_Impl::~XMLTextPropertyHandlerFactory_Impl()
{
}
-// ----------------------------------------------------------------------------
-
XMLTextPropertyHandlerFactory::XMLTextPropertyHandlerFactory() :
XMLPropertyHandlerFactory(),
pImpl( new XMLTextPropertyHandlerFactory_Impl )
@@ -1477,5 +1436,4 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler(
return pHdl;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx
index d0a177bbea26..eaacc4bfebdf 100644
--- a/xmloff/source/transform/ChartOASISTContext.cxx
+++ b/xmloff/source/transform/ChartOASISTContext.cxx
@@ -25,13 +25,10 @@
#include "TransformerActions.hxx"
#include "TransformerBase.hxx"
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
-// -----------------------------------------------------------------------------
-
TYPEINIT1( XMLChartOASISTransformerContext, XMLTransformerContext );
XMLChartOASISTransformerContext::XMLChartOASISTransformerContext(
diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx
index de86f2895b0f..0f5071104ea2 100644
--- a/xmloff/source/transform/ChartOOoTContext.cxx
+++ b/xmloff/source/transform/ChartOOoTContext.cxx
@@ -25,13 +25,10 @@
#include "TransformerActions.hxx"
#include "TransformerBase.hxx"
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
-// -----------------------------------------------------------------------------
-
TYPEINIT1( XMLChartOOoTransformerContext, XMLTransformerContext );
XMLChartOOoTransformerContext::XMLChartOOoTransformerContext(
diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx
index 72d60397b40b..dfcd522dfe96 100644
--- a/xmloff/source/transform/DlgOASISTContext.cxx
+++ b/xmloff/source/transform/DlgOASISTContext.cxx
@@ -25,13 +25,10 @@
#include "TransformerActions.hxx"
#include "TransformerBase.hxx"
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
-// -----------------------------------------------------------------------------
-
TYPEINIT1( XMLDlgOASISTransformerContext, XMLTransformerContext);
XMLDlgOASISTransformerContext::XMLDlgOASISTransformerContext(
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index a06ea44f741d..b43ad1c9e607 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -35,7 +35,6 @@
#include <boost/unordered_map.hpp>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
@@ -76,8 +75,6 @@ XMLTransformerOASISEventMap_Impl::~XMLTransformerOASISEventMap_Impl()
{
}
-// -----------------------------------------------------------------------------
-
TYPEINIT1( XMLEventOASISTransformerContext, XMLRenameElemTransformerContext);
XMLEventOASISTransformerContext::XMLEventOASISTransformerContext(
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 6165c9fd184c..edfd51cd6e97 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -85,8 +85,6 @@ XMLTransformerOOoEventMap_Impl::~XMLTransformerOOoEventMap_Impl()
{
}
-// -----------------------------------------------------------------------------
-
TYPEINIT1( XMLEventOOoTransformerContext, XMLPersElemContentTContext );
XMLEventOOoTransformerContext::XMLEventOOoTransformerContext(
@@ -135,7 +133,6 @@ sal_uInt16 XMLEventOOoTransformerContext::GetEventName(
}
}
-
void XMLEventOOoTransformerContext::StartElement(
const Reference< XAttributeList >& rAttrList )
{
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index 2547fad99cfe..2d8cc00bde47 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -132,14 +132,11 @@ void XMLFormPropValueTContext_Impl::Characters( const OUString& rChars )
m_aCharacters += rChars;
}
-
sal_Bool XMLFormPropValueTContext_Impl::IsPersistent() const
{
return m_bPersistent;
}
-//------------------------------------------------------------------------------
-
TYPEINIT1( XMLFormPropOOoTransformerContext, XMLTransformerContext );
XMLFormPropOOoTransformerContext::XMLFormPropOOoTransformerContext(
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index b219f6376f5a..45f9323575ed 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -642,7 +642,6 @@ static XMLTransformerActionInit aEventActionTable[] =
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
-
// action table for OOO_MASTER_PAGE_ACTIONS
static XMLTransformerActionInit aMasterPageActionTable[] =
{
@@ -1082,8 +1081,6 @@ static XMLTokenEnum aTokenMap[] =
XML_TOKEN_END
};
-//-----------------------------------------------------------------------------
-
class XMLDocumentTransformerContext_Impl : public XMLTransformerContext
{
OUString m_aElemQName;
@@ -1234,8 +1231,6 @@ void XMLDocumentTransformerContext_Impl::EndElement()
GetTransformer().SetClass( m_aOldClass );
}
-//-----------------------------------------------------------------------------
-
class XMLBodyTransformerContext_Impl : public XMLTransformerContext
{
OUString m_aClassQName;
@@ -1300,8 +1295,6 @@ void XMLBodyTransformerContext_Impl::EndElement()
XMLTransformerContext::EndElement();
}
-//-----------------------------------------------------------------------------
-
class XMLTabStopOOoTContext_Impl : public XMLPersElemContentTContext
{
public:
@@ -1399,8 +1392,6 @@ void XMLTabStopOOoTContext_Impl::StartElement(
XMLPersElemContentTContext::StartElement( xAttrList );
}
-// -----------------------------------------------------------------------------
-
class XMLTrackedChangesOOoTContext_Impl : public XMLTransformerContext
{
sal_uInt16 m_nPrefix;
@@ -1479,8 +1470,6 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement(
XMLTransformerContext::StartElement( xAttrList );
}
-// -----------------------------------------------------------------------------
-
class XMLTableOOoTransformerContext_Impl : public XMLTransformerContext
{
OUString m_aElemQName;
@@ -1553,9 +1542,6 @@ void XMLTableOOoTransformerContext_Impl::EndElement()
GetTransformer().GetDocHandler()->endElement( m_aElemQName );
}
-
-//-----------------------------------------------------------------------------
-
XMLTransformerContext *OOo2OasisTransformer::CreateUserDefinedContext(
const TransformerAction_Impl& rAction,
const OUString& rQName,
@@ -1803,7 +1789,6 @@ OUString OOo2OasisTransformer::GetEventName( const OUString& rName, sal_Bool )
return aNewName;
}
-
OOo2OasisTransformer::OOo2OasisTransformer( const sal_Char *pImplName,
const sal_Char *pSubServiceName )
throw() :
@@ -1960,7 +1945,6 @@ void SAL_CALL OOo2OasisTransformer::startDocument( void )
XMLTransformerBase::startDocument();
}
-
void SAL_CALL OOo2OasisTransformer::Initialize(
const Sequence< Any >& rArguments )
throw( Exception, RuntimeException )
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index f0bd47f8459a..333b5d174b03 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -241,7 +241,6 @@ static XMLTransformerActionInit aActionTable[] =
ENTRY1Q( TEXT, TAB, XML_ETACTION_RENAME_ELEM,
XML_NAMESPACE_TEXT, XML_TAB_STOP ),
-
// replace <table:table tabke:is-sub-table> with <table:sub-table>
ENTRY0( TABLE, TABLE, XML_ETACTION_TABLE ),
@@ -655,7 +654,6 @@ static XMLTransformerActionInit aParaStyleRefActionTable[] =
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
-
// action table for OASIS_LIST_STYLE_REF_ACTIONS
static XMLTransformerActionInit aListStyleRefActionTable[] =
{
@@ -965,7 +963,6 @@ static XMLTransformerActionInit aDDEConnectionDeclActionTable[] =
ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
};
-
// OASIS_FORM_CONTROL_ACTIONS
static XMLTransformerActionInit aFormControlActionTable[] =
{
@@ -1144,8 +1141,6 @@ static XMLTokenEnum aTokenMap[] =
XML_DOT_DOT_DASH, XML_WAVE, XML_SMALL_WAVE, XML_TOKEN_END
};
-// -----------------------------------------------------------------------------
-
class XMLTableTransformerContext_Impl : public XMLTransformerContext
{
OUString m_aElemQName;
@@ -1248,8 +1243,6 @@ void XMLTableTransformerContext_Impl::EndElement()
GetTransformer().GetDocHandler()->endElement( m_aElemQName );
}
-// -----------------------------------------------------------------------------
-
class XMLBodyOASISTransformerContext_Impl : public XMLTransformerContext
{
sal_Bool m_bFirstChild;
@@ -1312,8 +1305,6 @@ void XMLBodyOASISTransformerContext_Impl::EndElement()
XMLTransformerContext::EndElement();
}
-//-----------------------------------------------------------------------------
-
class XMLTabStopOASISTContext_Impl : public XMLPersElemContentTContext
{
public:
@@ -1443,8 +1434,6 @@ void XMLTabStopOASISTContext_Impl::StartElement(
XMLPersElemContentTContext::StartElement( xAttrList );
}
-// -----------------------------------------------------------------------------
-
class XMLConfigItemTContext_Impl : public XMLTransformerContext
{
OUString m_aContent;
@@ -1563,8 +1552,6 @@ void XMLConfigItemTContext_Impl::EndElement()
XMLTransformerContext::EndElement();
}
-// -----------------------------------------------------------------------------
-
class XMLTrackedChangesOASISTContext_Impl : public XMLTransformerContext
{
OUString m_aAttrQName;
@@ -1633,8 +1620,6 @@ void XMLTrackedChangesOASISTContext_Impl::StartElement(
XMLTransformerContext::StartElement( xAttrList );
}
-// -----------------------------------------------------------------------------
-
XMLTransformerContext *Oasis2OOoTransformer::CreateUserDefinedContext(
const TransformerAction_Impl& rAction,
const OUString& rQName,
@@ -1977,7 +1962,6 @@ Oasis2OOoTransformer::Oasis2OOoTransformer() throw() :
GetNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG );
GetReplaceNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG );
-
for( sal_uInt16 i=0; i<MAX_OASIS_ACTIONS; ++i )
m_aActions[i] = 0;
}
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index 7d20c02be1b1..ce78be5e7e96 100644
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "TransformerBase.hxx"
#include "PersMixedContentTContext.hxx"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-//------------------------------------------------------------------------------
class XMLPersTextTContext_Impl : public XMLTransformerContext
{
OUString m_aCharacters;
@@ -99,8 +97,6 @@ void XMLPersTextTContext_Impl::Export()
GetTransformer().GetDocHandler()->characters( m_aCharacters );
}
-//------------------------------------------------------------------------------
-
TYPEINIT1( XMLPersMixedContentTContext, XMLPersElemContentTContext );
XMLPersMixedContentTContext::XMLPersMixedContentTContext(
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index badf7df3af6d..db8fbe3a3853 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -40,7 +40,6 @@
using namespace ::xmloff::token;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-//------------------------------------------------------------------------------
static sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] =
{
@@ -60,8 +59,6 @@ static sal_uInt16 aAttrActionMaps[XML_PROP_TYPE_END] =
PROP_OASIS_CHART_ATTR_ACTIONS
};
-//------------------------------------------------------------------------------
-
class XMLPropertiesTContext_Impl : public XMLPersElemContentTContext
{
::com::sun::star::uno::Reference<
@@ -744,8 +741,6 @@ OUString XMLPropertiesTContext_Impl::MergeLineThrough(
return GetXMLToken( eLineThrough );
}
-//------------------------------------------------------------------------------
-
TYPEINIT1( XMLStyleOASISTContext, XMLPersElemContentTContext );
XMLStyleOASISTContext::XMLStyleOASISTContext( XMLTransformerBase& rImp,
@@ -911,7 +906,6 @@ void XMLStyleOASISTContext::StartElement(
if( m_bControlStyle && nFamilyAttr != -1 )
pMutableAttrList->SetValueByIndex( nFamilyAttr, GetXMLToken( XML_CONTROL ) );
-
if( m_bPersistent )
XMLPersElemContentTContext::StartElement( xAttrList );
else
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index a56827e82ab3..26f30cf27fbb 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -141,9 +141,6 @@ static sal_uInt16 aElemActionMaps[XML_PROP_TYPE_END] =
PROP_OOO_CHART_ELEM_ACTIONS
};
-
-//------------------------------------------------------------------------------
-
class XMLTypedPropertiesOOoTContext_Impl : public XMLPersElemContentTContext
{
::com::sun::star::uno::Reference<
@@ -218,8 +215,6 @@ void XMLTypedPropertiesOOoTContext_Impl::Export()
}
}
-//------------------------------------------------------------------------------
-
class XMLPropertiesOOoTContext_Impl : public XMLTransformerContext
{
::rtl::Reference < XMLTypedPropertiesOOoTContext_Impl >
@@ -239,7 +234,6 @@ class XMLPropertiesOOoTContext_Impl : public XMLTransformerContext
XMLTypedPropertiesOOoTContext_Impl *GetPropContext(
XMLPropType eType );
-
public:
TYPEINFO();
@@ -300,7 +294,6 @@ XMLTypedPropertiesOOoTContext_Impl
return m_aPropContexts[nIndex].get();
}
-
XMLTypedPropertiesOOoTContext_Impl
*XMLPropertiesOOoTContext_Impl::GetPropContextAndAction(
TransformerAction_Impl& rAction,
@@ -406,7 +399,6 @@ XMLTransformerContext *XMLPropertiesOOoTContext_Impl::CreateChildContext(
->CreateChildContext( nPrefix, rLocalName, rQName, rAttrList );
}
-
void XMLPropertiesOOoTContext_Impl::StartElement(
const Reference< XAttributeList >& rAttrList )
{
@@ -1057,9 +1049,6 @@ sal_Bool XMLPropertiesOOoTContext_Impl::IsPersistent() const
return m_bPersistent;
}
-
-//------------------------------------------------------------------------------
-
TYPEINIT1( XMLStyleOOoTContext, XMLPersElemContentTContext );
XMLStyleOOoTContext::XMLStyleOOoTContext( XMLTransformerBase& rImp,
diff --git a/xmloff/source/transform/TransformerActions.hxx b/xmloff/source/transform/TransformerActions.hxx
index 03d272325d0a..dd25e7b170e2 100644
--- a/xmloff/source/transform/TransformerActions.hxx
+++ b/xmloff/source/transform/TransformerActions.hxx
@@ -56,8 +56,6 @@ struct NameKey_Impl
}
};
-// -----------------------------------------------------------------------------
-
struct NameHash_Impl
{
inline size_t operator()( const NameKey_Impl& r ) const;
@@ -78,8 +76,6 @@ inline bool NameHash_Impl::operator()(
return r1.m_nPrefix == r2.m_nPrefix && r1.m_aLocalName == r2.m_aLocalName;
}
-// -----------------------------------------------------------------------------
-
struct TransformerAction_Impl
{
sal_uInt32 m_nActionType;
@@ -136,9 +132,6 @@ struct TransformerAction_Impl
};
-
-// -----------------------------------------------------------------------------
-
class XMLTransformerActions :
public ::boost::unordered_map< NameKey_Impl, TransformerAction_Impl,
NameHash_Impl, NameHash_Impl >
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 6bd93ff06249..062545948cae 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <cppuhelper/factory.hxx>
@@ -33,7 +32,6 @@ using namespace ::com::sun::star;
#define ENUMERATE_SERVICE( classname ) \
{ classname##_getImplementationName, classname##_getSupportedServiceNames, classname##_createInstance }
-// ============================================================================
DECLARE_SERVICE( OOo2OasisTransformer )
DECLARE_SERVICE( Oasis2OOoTransformer )
@@ -65,9 +63,6 @@ DECLARE_SERVICE( XMLImpressContentImportOOO )
DECLARE_SERVICE( XMLImpressStylesImportOOO )
DECLARE_SERVICE( XMLImpressImportOOO )
-// ============================================================================
-
-// ----------------------------------------------------------------------------
namespace
{
typedef OUString (SAL_CALL * GetImplementationName)();
@@ -82,12 +77,10 @@ namespace
CreateInstance createInstance;
};
- // ------------------------------------------------------------------------
static const ServiceDescriptor* getServiceDescriptors()
{
static const ServiceDescriptor aDescriptors[] =
{
- // ================================================================
ENUMERATE_SERVICE( OOo2OasisTransformer ),
ENUMERATE_SERVICE( Oasis2OOoTransformer ),
@@ -118,13 +111,11 @@ namespace
ENUMERATE_SERVICE( XMLImpressContentImportOOO ),
ENUMERATE_SERVICE( XMLImpressStylesImportOOO ),
ENUMERATE_SERVICE( XMLImpressImportOOO ),
- // ================================================================
{ NULL, NULL, NULL }
};
return aDescriptors;
};
}
-// ----------------------------------------------------------------------------
#ifdef __cplusplus
extern "C"