diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:06:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 09:51:32 -0600 |
commit | 8792ec7b2129650777b7b4bfacaa7c13d923279b (patch) | |
tree | f181e37b61533b460397cc68625fd21f46bb6393 /include/xmloff | |
parent | dff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff) |
Remove visual noise from include
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/PageMasterStyleMap.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/SchXMLImportHelper.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLCharContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/XMLConstantsPropertyHandler.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/XMLPageExport.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/XMLSettingsExportContext.hxx | 12 | ||||
-rw-r--r-- | include/xmloff/XMLShapeStyleContext.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/controlpropertyhdl.hxx | 32 | ||||
-rw-r--r-- | include/xmloff/formlayerexport.hxx | 16 | ||||
-rw-r--r-- | include/xmloff/formlayerimport.hxx | 12 | ||||
-rw-r--r-- | include/xmloff/maptype.hxx | 8 | ||||
-rw-r--r-- | include/xmloff/shapeexport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/shapeimport.hxx | 10 | ||||
-rw-r--r-- | include/xmloff/table/XMLTableExport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/uniref.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/xmlmultiimagehelper.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlprhdl.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlprmap.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmltypes.hxx | 12 | ||||
-rw-r--r-- | include/xmloff/xmluconv.hxx | 2 |
20 files changed, 71 insertions, 71 deletions
diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx index c229f517354e..a4bd011fb229 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/include/xmloff/PageMasterStyleMap.hxx @@ -24,7 +24,7 @@ #include <xmloff/xmltypes.hxx> #include <xmloff/contextid.hxx> -//______________________________________________________________________________ + #define XML_PM_TYPE_PAGESTYLELAYOUT (XML_PM_TYPES_START + 0) #define XML_PM_TYPE_NUMFORMAT (XML_PM_TYPES_START + 1) diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 5579aec3da0c..713174bd1e86 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -53,7 +53,7 @@ class SvXMLTokenMap; class SvXMLImportContext; class SvXMLImport; -// ======================================== + /** With this class you can import a <chart:chart> element containing its data as <table:table> element or without internal table. In diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 20ed302d6064..c147d4d79251 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -59,7 +59,7 @@ public: virtual void InsertControlCharacter(sal_Int16 _nControl); virtual void InsertString(const OUString& _sString); }; -// --------------------------------------------------------------------- + #endif // INCLUDED_XMLOFF_XMLCHARCONTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index b7346473b01e..fef11b831a14 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -27,8 +27,8 @@ 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/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index a9da8ec368a9..7abb531579e0 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -40,7 +40,7 @@ class XMLPropertyHandlerFactory; class XMLPropertySetMapper; class SvXMLExportPropertyMapper; -//______________________________________________________________________________ + struct XMLPageExportNameEntry { @@ -48,7 +48,7 @@ struct XMLPageExportNameEntry OUString sStyleName; }; -//______________________________________________________________________________ + class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase { diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx index 36b985cef075..f8eeab2fa244 100644 --- a/include/xmloff/XMLSettingsExportContext.hxx +++ b/include/xmloff/XMLSettingsExportContext.hxx @@ -24,14 +24,14 @@ #include <xmloff/xmltoken.hxx> -//........................................................................ + namespace xmloff { -//........................................................................ - //==================================================================== + + //= XMLExporter - //==================================================================== + class SAL_NO_VTABLE XMLSettingsExportContext { public: @@ -53,9 +53,9 @@ namespace xmloff ~XMLSettingsExportContext() {} }; -//........................................................................ + } // namespace xmloff -//........................................................................ + #endif // INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 537ed67a6217..cedd322ef6c1 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -27,7 +27,7 @@ class SvXMLImport; -////////////////////////////////////////////////////////////////////////////// + // style:style context class XMLOFF_DLLPUBLIC XMLShapeStyleContext: public XMLPropStyleContext diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx index 728d04d45a80..5b7775f421b0 100644 --- a/include/xmloff/controlpropertyhdl.hxx +++ b/include/xmloff/controlpropertyhdl.hxx @@ -30,17 +30,17 @@ struct SvXMLEnumMapEntry; class Color; -//......................................................................... + namespace xmloff { -//......................................................................... + class IFormsExportContext; class OFormLayerXMLImport_Impl; - //===================================================================== + //= ORotationAngleHandler - //===================================================================== + class ORotationAngleHandler : public XMLPropertyHandler { public: @@ -50,9 +50,9 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= OFontWidthHandler - //===================================================================== + class OFontWidthHandler : public XMLPropertyHandler { public: @@ -62,9 +62,9 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= OControlBorderHandlerBase - //===================================================================== + class OControlBorderHandler : public XMLPropertyHandler { public: @@ -83,9 +83,9 @@ namespace xmloff BorderFacet m_eFacet; }; - //===================================================================== + //= OControlTextEmphasisHandler - //===================================================================== + class OControlTextEmphasisHandler : public XMLPropertyHandler { public: @@ -95,18 +95,18 @@ namespace xmloff virtual bool exportXML( OUString& _rStrExpValue, const ::com::sun::star::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const; }; - //===================================================================== + //= ImageScaleModeHandler - //===================================================================== + class XMLOFF_DLLPUBLIC ImageScaleModeHandler : public XMLConstantsPropertyHandler { public: ImageScaleModeHandler(); }; - //===================================================================== + //= OControlPropertyHandlerFactory - //===================================================================== + class XMLOFF_DLLPUBLIC OControlPropertyHandlerFactory : public XMLPropertyHandlerFactory { protected: @@ -127,9 +127,9 @@ namespace xmloff virtual const XMLPropertyHandler* GetPropertyHandler(sal_Int32 _nType) const; }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_CONTROLPROPERTYHDL_HXX diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 57c1eed71481..92828adcffe7 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -35,17 +35,17 @@ namespace com { namespace sun { namespace star { namespace awt { } } } } class SvXMLExport; -//......................................................................... + namespace xmloff { -//......................................................................... + class OFormLayerXMLExport_Impl; class OFormsRootExport; - //===================================================================== + //= OFormLayerXMLExport - //===================================================================== + /** provides functionallity for exporting a complete form layer. */ class XMLOFF_DLLPUBLIC OFormLayerXMLExport @@ -166,9 +166,9 @@ namespace xmloff void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > _rxControl ); }; - //========================================================================= + //= OOfficeFormsExport - //========================================================================= + /// export helper for the office::forms element class XMLOFF_DLLPUBLIC OOfficeFormsExport { @@ -180,9 +180,9 @@ namespace xmloff ~OOfficeFormsExport(); }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_FORMLAYEREXPORT_HXX diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index b9f167e79a55..54d9c00a330d 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -34,14 +34,14 @@ class SvXMLImportContext; class SvXMLStylesContext; class XMLPropStyleContext; -//......................................................................... + namespace xmloff { -//......................................................................... - //===================================================================== + + //= OFormLayerXMLImport - //===================================================================== + class OFormLayerXMLImport_Impl; /** allows you to import a <form:form> element */ @@ -127,9 +127,9 @@ namespace xmloff void documentDone( ); }; -//......................................................................... + } // namespace xmloff -//......................................................................... + #endif // INCLUDED_XMLOFF_FORMLAYERIMPORT_HXX diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx index a8c3c523bcd3..8bff58daec76 100644 --- a/include/xmloff/maptype.hxx +++ b/include/xmloff/maptype.hxx @@ -24,8 +24,8 @@ #include <xmloff/xmltoken.hxx> #include <unotools/saveopt.hxx> -/////////////////////////////////////////////////////////////////////////// -// + + /** Represents a property with its API-name, its XML-name and the type of its value. */ @@ -52,8 +52,8 @@ struct XMLPropertyMapEntry bool mbImportOnly; }; -/////////////////////////////////////////////////////////////////////////// -// + + /** Smart struct to transport an Any with an index to the appropriate property-name */ diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 53c4e86dd4f6..f15c8fab3d86 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -142,7 +142,7 @@ typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector; /** a map to store all cache data for already collected XShapes */ typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos; -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SvXMLExport; diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index c54a57f3448d..1f616ec8fe0d 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -44,7 +44,7 @@ class XMLSdPropHdlFactory; class XMLPropertySetMapper; class SvXMLImportPropertyMapper; -////////////////////////////////////////////////////////////////////////////// + enum SdXMLGroupShapeElemTokenMap { @@ -173,7 +173,7 @@ enum SdXML3DLightAttrTokenMap XML_TOK_3DLIGHT_SPECULAR }; -////////////////////////////////////////////////////////////////////////////// + // dr3d:3dlight context class SdXML3DLightContext: public SvXMLImportContext @@ -198,7 +198,7 @@ public: sal_Bool GetSpecular() { return mbSpecular; } }; -////////////////////////////////////////////////////////////////////////////// + typedef ::std::vector< SdXML3DLightContext* > Imp3DLightList; @@ -243,7 +243,7 @@ public: void setSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ); }; -////////////////////////////////////////////////////////////////////////////// + class SvXMLShapeContext : public SvXMLImportContext { @@ -263,7 +263,7 @@ public: void setHyperlink( const OUString& rHyperlink ); }; -////////////////////////////////////////////////////////////////////////////// + class ShapeSortContext; struct XMLShapeImportHelperImpl; diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index 5c077fdc97c9..8fe048c120e2 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -43,7 +43,7 @@ #include <xmloff/xmlexppr.hxx> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class SvXMLExport; diff --git a/include/xmloff/uniref.hxx b/include/xmloff/uniref.hxx index d6aba789b922..578e45acace8 100644 --- a/include/xmloff/uniref.hxx +++ b/include/xmloff/uniref.hxx @@ -110,10 +110,10 @@ public: }; -/////////////////////////////////////////////////////////////////////////////// -// + + // Inline-implementations of UniReference -// + /** Create a new reference with the same element as in rRef and acquire this one.*/ template< class T > diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx index 3ab3b79a3c89..1da3fa4653f3 100644 --- a/include/xmloff/xmlmultiimagehelper.hxx +++ b/include/xmloff/xmlmultiimagehelper.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <xmloff/xmlimp.hxx> -////////////////////////////////////////////////////////////////////////////// + class MultiImageImportHelper { @@ -54,7 +54,7 @@ public: void setSupportsMultipleContents(bool bNew) { mbSupportsMultipleContents = bNew; } }; -////////////////////////////////////////////////////////////////////////////// + #endif // INCLUDED_XMLOFF_XMLMULTIIMAGEHELPER_HXX diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx index 73d4d05d1a05..b57da8740ed4 100644 --- a/include/xmloff/xmlprhdl.hxx +++ b/include/xmloff/xmlprhdl.hxx @@ -30,8 +30,8 @@ namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } } class SvXMLUnitConverter; struct XMLPropertyState; -/////////////////////////////////////////////////////////////////////////// -// + + /** Abstract base-class for different XML-types. Derivations of this class knows how to compare, im/export a special XML-type */ diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index fed1411a5183..8a6b27623fdd 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -37,8 +37,8 @@ class SvXMLUnitConverter; class XMLPropertyHandler; -/////////////////////////////////////////////////////////////////////////// -// + + /** Helper-class for XML-im/export: - Holds a pointer to a given array of XMLPropertyMapEntry - Provides several methods to access data from this array diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx index 3c8d7376db92..5511bf1abea2 100644 --- a/include/xmloff/xmltypes.hxx +++ b/include/xmloff/xmltypes.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_XMLOFF_XMLTYPES_HXX #define INCLUDED_XMLOFF_XMLTYPES_HXX -/////////////////////////////////////////////////////////////////////////////// + // Flags to specify how to im/export the property -// + // OLD: // 8421.8421.8421.8421.8421.8421.8421.8421 // n n m mmmd m baaa tttt.tttt.tttt @@ -57,7 +57,7 @@ #define MID_FLAG_NO_PROPERTY 0x50000000 // both import and export // Import only: there are more entries for the same xml attribute existing -#define MID_FLAG_MULTI_PROPERTY 0x02000000 // +#define MID_FLAG_MULTI_PROPERTY 0x02000000 // Import only: If a property with the same name has been set already, supply // the current value to the importXML call. @@ -104,10 +104,10 @@ #define XML_TYPE_PROP_CHART (0xe << XML_TYPE_PROP_SHIFT) #define XML_TYPE_PROP_END (0xf << XML_TYPE_PROP_SHIFT) -/////////////////////////////////////////////////////////////////////////////// -// + + // XML-data-type-ID's -// + // simple types, no special compare necessary #define XML_TYPE_BUILDIN_CMP 0x00002000 diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 772fc3274ecb..1ea19a756f11 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -39,7 +39,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> -////////////////////////////////////////////////////////////////////////////// + // predeclarations class Time; |