diff options
Diffstat (limited to 'include/oox')
112 files changed, 574 insertions, 574 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index 08ea66ecb4c3..5fb1682cb63d 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -32,7 +32,7 @@ namespace oox { class AttributeList; } namespace oox { namespace core { -// ============================================================================ + class OOX_DLLPUBLIC CodecHelper { @@ -45,7 +45,7 @@ private: ~CodecHelper(); }; -// ============================================================================ + /** Encodes and decodes data from/to protected MS Office documents. @@ -170,7 +170,7 @@ private: sal_uInt16 mnHash; ///< Hash value from password. }; -// ============================================================================ + /** Encodes and decodes data from protected MSO 97+ documents. @@ -306,7 +306,7 @@ private: sal_uInt8 mpnUnique[16]; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index 2dda0122e11f..f49eb77844b6 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -42,7 +42,7 @@ class FragmentHandler; struct Relation; class Relations; -// ============================================================================ + class ContextHandler; typedef ::rtl::Reference< ContextHandler > ContextHandlerRef; @@ -108,7 +108,7 @@ private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index f1953f2c2aaa..7ee191eff6bd 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -30,11 +30,11 @@ namespace oox { namespace core { -// ============================================================================ + const sal_Int32 XML_ROOT_CONTEXT = SAL_MAX_INT32; -// ============================================================================ + struct ElementInfo; @@ -211,7 +211,7 @@ protected: bool mbEnableTrimSpace; ///< True = trim whitespace in characters(). }; -// ============================================================================ + class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper { @@ -264,7 +264,7 @@ public: virtual void onEndRecord(); }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index a673217c0eab..8d41deee87f5 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -35,7 +35,7 @@ namespace sax_fastparser { namespace oox { namespace core { -// ============================================================================ + /** Wrapper for a fast SAX parser that works on automatically generated OOXML token and namespace identifiers. @@ -95,7 +95,7 @@ private: sax_fastparser::FastSaxParser* mpParser; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 12b18667b3cc..5101197d4797 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -30,7 +30,7 @@ namespace oox { class TokenMap; } namespace oox { namespace core { -// ============================================================================ + typedef ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::xml::sax::XFastTokenHandler > FastTokenHandler_BASE; @@ -62,7 +62,7 @@ private: const TokenMap& mrTokenMap; ///< Reference to global token map singleton. }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 45c1ef591132..32b8a13901f8 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -74,7 +74,7 @@ namespace oox { namespace ole { namespace oox { namespace core { -// ============================================================================ + enum OoxmlVersion { @@ -114,7 +114,7 @@ public: /** Derived classes implement export of the entire document. */ virtual bool exportDocument() = 0; - // ------------------------------------------------------------------------ + /** Returns the component context passed in the filter constructor (always existing). */ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& @@ -253,7 +253,7 @@ public: virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - // ------------------------------------------------------------------------ + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; @@ -287,7 +287,7 @@ private: boost::scoped_ptr< FilterBaseImpl > mxImpl; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 57759f835fa0..7526dc3fb26c 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -40,7 +40,7 @@ namespace oox { class AttributeList; } namespace oox { namespace core { -// ============================================================================ + /** Document handler specifically designed for detecting OOXML file formats. @@ -85,7 +85,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; }; -// ============================================================================ + class OOX_DLLPUBLIC FilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { @@ -152,7 +152,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index bd7a220bfd44..c33a49e5fd7a 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace core { -// ============================================================================ + /** Base data of a fragment. @@ -54,7 +54,7 @@ struct FragmentBaseData RelationsRef xRelations ); }; -// ============================================================================ + /** Describes record identifiers used to create contexts in a binary stream. @@ -72,7 +72,7 @@ struct RecordInfo sal_Int32 mnEndRecId; ///< Record identifier for context end, -1 = no record. }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ContextHandler, ::com::sun::star::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; @@ -121,7 +121,7 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 04a3eb4883fa..a10d51b3c87f 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { -// ============================================================================ + class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper { @@ -113,7 +113,7 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index d358c13552ac..f3d1243ef29f 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -33,7 +33,7 @@ namespace core { namespace prv { class Locator; } namespace prv { class ContextStack; } -// ============================================================================ + struct RecordInputSource { @@ -42,7 +42,7 @@ struct RecordInputSource OUString maSystemId; }; -// ============================================================================ + class RecordParser { @@ -78,7 +78,7 @@ private: RecordInfoMap maEndMap; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 05d00adbfeeb..4254b99bac42 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { -// ============================================================================ + /** Expands to an OUString containing an 'officeDocument' transitional relation type created from the passed literal(!) ASCII(!) character array. */ @@ -50,7 +50,7 @@ namespace core { #define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \ ( "http://schemas.microsoft.com/office/2006/relationships/" ascii ) -// ============================================================================ + struct Relation { @@ -62,7 +62,7 @@ struct Relation Relation() : mbExternal( false ) {} }; -// ============================================================================ + class Relations; typedef ::boost::shared_ptr< Relations > RelationsRef; @@ -102,7 +102,7 @@ private: OUString maFragmentPath; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index dea1a0adf7d6..756ef3e99f6c 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -25,7 +25,7 @@ namespace oox { namespace core { -// ============================================================================ + class RelationsFragment : public FragmentHandler { @@ -44,7 +44,7 @@ private: RelationsRef mxRelations; }; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 351910d29926..d39397b36066 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -65,7 +65,7 @@ struct TextField { }; typedef std::vector< TextField > TextFieldStack; -// ============================================================================ + struct XmlFilterBaseImpl; @@ -95,7 +95,7 @@ public: /** Has to be implemented by each filter to return the table style list. */ virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; - // ------------------------------------------------------------------------ + /** Returns the fragment path from the first relation of the passed type, used for fragments referred by the root relations. */ @@ -260,7 +260,7 @@ private: typedef ::rtl::Reference< XmlFilterBase > XmlFilterRef; -// ============================================================================ + } // namespace core } // namespace oox diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx index 3b996592e46f..08ba65860075 100644 --- a/include/oox/drawingml/chart/axiscontext.hxx +++ b/include/oox/drawingml/chart/axiscontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel; @@ -41,7 +41,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct AxisModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a category axis context (c:catAx element). */ @@ -70,7 +70,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a date axis context (c:dateAx element). */ @@ -83,7 +83,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a series axis context (c:serAx element). */ @@ -96,7 +96,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a value axis context (c:valAx element). */ @@ -109,7 +109,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx index 7224b97fa508..3b7a58720004 100644 --- a/include/oox/drawingml/chart/axisconverter.hxx +++ b/include/oox/drawingml/chart/axisconverter.hxx @@ -31,7 +31,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel; @@ -68,7 +68,7 @@ public: sal_Int32 nAxisIdx ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx index d29af7fedfa3..b3a18f05bbff 100644 --- a/include/oox/drawingml/chart/axismodel.hxx +++ b/include/oox/drawingml/chart/axismodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct AxisDispUnitsModel { @@ -47,7 +47,7 @@ struct AxisDispUnitsModel ~AxisDispUnitsModel(); }; -// ============================================================================ + struct AxisModel { @@ -94,7 +94,7 @@ struct AxisModel ~AxisModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx index 057f133a5cdd..5c5b3b6d52f0 100644 --- a/include/oox/drawingml/chart/chartcontextbase.hxx +++ b/include/oox/drawingml/chart/chartcontextbase.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + template< typename ModelType > class ContextBase : public ::oox::core::ContextHandler2 @@ -42,7 +42,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + template< typename ModelType > class FragmentBase : public ::oox::core::FragmentHandler2 @@ -56,7 +56,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + /** Help class for all contexts that have only the c:spPr child element. */ @@ -69,7 +69,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct LayoutModel; @@ -84,7 +84,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index eefc11c8b3a8..4807655bd25e 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -41,7 +41,7 @@ namespace chart { struct ChartSpaceModel; struct DataSequenceModel; -// ============================================================================ + class OOX_DLLPUBLIC ChartConverter { @@ -93,7 +93,7 @@ private: ChartConverter& operator=( const ChartConverter& ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx index e86bffd4c645..b904e2f4e831 100644 --- a/include/oox/drawingml/chart/chartdrawingfragment.hxx +++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Relative shape position in a chart object. */ struct AnchorPosModel @@ -39,7 +39,7 @@ struct AnchorPosModel bool isValid() const { return (0.0 <= mfX) && (mfX <= 1.0) && (0.0 <= mfY) && (mfY <= 1.0); } }; -// ---------------------------------------------------------------------------- + /** Absolute shape size in a chart object (in EMUs). */ struct AnchorSizeModel : public EmuSize @@ -48,7 +48,7 @@ struct AnchorSizeModel : public EmuSize bool isValid() const { return (Width >= 0) && (Height >= 0); } }; -// ============================================================================ + /** Contains the position of a shape in the chart object. Supports different shape anchor modes (absolute, relative). @@ -75,7 +75,7 @@ private: typedef ::boost::shared_ptr< ShapeAnchor > ShapeAnchorRef; -// ============================================================================ + /** Handler for a chart drawing fragment (c:userShapes root element). */ @@ -104,7 +104,7 @@ private: bool mbOleSupport; /// True = allow to insert OLE objects into the drawing page. }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx index e79cb70f1685..a273ba91dbd8 100644 --- a/include/oox/drawingml/chart/chartspaceconverter.hxx +++ b/include/oox/drawingml/chart/chartspaceconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel; @@ -46,7 +46,7 @@ public: const ::com::sun::star::awt::Point& rChartPos ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx index 6e927ba1d51a..83c35621c89c 100644 --- a/include/oox/drawingml/chart/chartspacefragment.hxx +++ b/include/oox/drawingml/chart/chartspacefragment.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel; @@ -46,7 +46,7 @@ public: ::oox::core::XmlFilterBase& mpFilterBase; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx index 07f119e58240..cc9015d2020a 100644 --- a/include/oox/drawingml/chart/chartspacemodel.hxx +++ b/include/oox/drawingml/chart/chartspacemodel.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct ChartSpaceModel { @@ -62,7 +62,7 @@ struct ChartSpaceModel ~ChartSpaceModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx index f16950f85564..e58eb9df3456 100644 --- a/include/oox/drawingml/chart/converterbase.hxx +++ b/include/oox/drawingml/chart/converterbase.hxx @@ -44,7 +44,7 @@ class ChartConverter; struct ChartSpaceModel; struct ConverterData; -// ============================================================================ + const sal_Int32 API_PRIM_AXESSET = 0; const sal_Int32 API_SECN_AXESSET = 1; @@ -53,7 +53,7 @@ const sal_Int32 API_X_AXIS = 0; const sal_Int32 API_Y_AXIS = 1; const sal_Int32 API_Z_AXIS = 2; -// ============================================================================ + class ConverterRoot { @@ -98,7 +98,7 @@ private: ::boost::shared_ptr< ConverterData > mxData; }; -// ============================================================================ + /** Base class of all converter classes. Holds a reference to a model structure of the specified type. @@ -118,7 +118,7 @@ protected: ModelType& mrModel; }; -// ============================================================================ + /** A layout converter calculates positions and sizes for various chart objects. */ @@ -144,7 +144,7 @@ public: bool getAutoLayout(){return mrModel.mbAutoLayout;} }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx index 9fbe866944a2..d9274d70ab4c 100644 --- a/include/oox/drawingml/chart/datasourcecontext.hxx +++ b/include/oox/drawingml/chart/datasourcecontext.hxx @@ -26,13 +26,13 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel; typedef ContextBase< DataSequenceModel > DataSequenceContextBase; -// ============================================================================ + /** Handler for a double sequence context (c:numLit, c:numRef elements). */ @@ -49,7 +49,7 @@ private: sal_Int32 mnPtIndex; /// Current data point index. }; -// ============================================================================ + /** Handler for a string sequence context (c:multiLvlStrRef, c:strLit, c:strRef elements). @@ -67,7 +67,7 @@ private: sal_Int32 mnPtIndex; /// Current data point index. }; -// ============================================================================ + struct DataSourceModel; @@ -83,7 +83,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx index 4f8b2523c355..6b6ce95d8dfe 100644 --- a/include/oox/drawingml/chart/datasourceconverter.hxx +++ b/include/oox/drawingml/chart/datasourceconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel; @@ -45,7 +45,7 @@ public: createDataSequence( const OUString& rRole ); }; -// ============================================================================ + struct DataSourceModel; @@ -60,7 +60,7 @@ public: createDataSequence( const OUString& rRole ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index efbcf6868274..75a5d012f82b 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataSequenceModel { @@ -42,7 +42,7 @@ struct DataSequenceModel ~DataSequenceModel(); }; -// ============================================================================ + struct DataSourceModel { @@ -54,7 +54,7 @@ struct DataSourceModel ~DataSourceModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx index 12370e273c5f..d46ebbda7c50 100644 --- a/include/oox/drawingml/chart/modelbase.hxx +++ b/include/oox/drawingml/chart/modelbase.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + template< typename ModelType > class ModelRef : public ::boost::shared_ptr< ModelType > @@ -51,7 +51,7 @@ public: ModelType& getOrCreate( const Param1Type& rParam1 ) { if( !*this ) this->reset( new ModelType( rParam1 ) ); return **this; } }; -// ============================================================================ + template< typename ModelType > class ModelVector : public RefVector< ModelType > @@ -71,7 +71,7 @@ private: ModelType& append( ModelType* pModel ) { this->push_back( value_type( pModel ) ); return *pModel; } }; -// ============================================================================ + template< typename KeyType, typename ModelType > class ModelMap : public RefMap< KeyType, ModelType > @@ -92,7 +92,7 @@ private: ModelType& insert( KeyType eKey, ModelType* pModel ) { (*this)[ eKey ].reset( pModel ); return *pModel; } }; -// ============================================================================ + struct NumberFormat { @@ -104,7 +104,7 @@ struct NumberFormat void setAttributes( const AttributeList& rAttribs ); }; -// ============================================================================ + struct LayoutModel { @@ -123,7 +123,7 @@ struct LayoutModel ~LayoutModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx index dd3d15aa5653..ebe5a01d8991 100644 --- a/include/oox/drawingml/chart/objectformatter.hxx +++ b/include/oox/drawingml/chart/objectformatter.hxx @@ -34,7 +34,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Enumerates different object types for specific automatic formatting behaviour. */ enum ObjectType @@ -67,7 +67,7 @@ enum ObjectType OBJECTTYPE_DATATABLE /// Data table. }; -// ============================================================================ + struct ChartSpaceModel; struct ObjectFormatterData; @@ -146,7 +146,7 @@ private: ::boost::shared_ptr< ObjectFormatterData > mxData; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx index 9caec48c0d73..bb7195f2e75d 100644 --- a/include/oox/drawingml/chart/plotareacontext.hxx +++ b/include/oox/drawingml/chart/plotareacontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel; @@ -41,7 +41,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct WallFloorModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct DataTableModel; @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct PlotAreaModel; @@ -87,7 +87,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx index aa38194c0ffe..3123c1595ec4 100644 --- a/include/oox/drawingml/chart/plotareaconverter.hxx +++ b/include/oox/drawingml/chart/plotareaconverter.hxx @@ -30,7 +30,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel; class TypeGroupConverter; @@ -47,7 +47,7 @@ public: TypeGroupConverter& rTypeGroup ); }; -// ============================================================================ + struct WallFloorModel; @@ -63,7 +63,7 @@ public: ObjectType eObjType ); }; -// ============================================================================ + struct DataTableModel; @@ -78,7 +78,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram); }; -// ============================================================================ + struct PlotAreaModel; @@ -107,7 +107,7 @@ private: bool mbPieChart; }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx index 7852ba868278..f0dd30469ef7 100644 --- a/include/oox/drawingml/chart/plotareamodel.hxx +++ b/include/oox/drawingml/chart/plotareamodel.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct View3DModel { @@ -44,7 +44,7 @@ struct View3DModel ~View3DModel(); }; -// ============================================================================ + struct WallFloorModel { @@ -58,7 +58,7 @@ struct WallFloorModel ~WallFloorModel(); }; -// ============================================================================ + struct DataTableModel { @@ -69,7 +69,7 @@ struct DataTableModel ~DataTableModel(); }; -// ============================================================================ + struct PlotAreaModel { @@ -89,7 +89,7 @@ struct PlotAreaModel ~PlotAreaModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx index 730ea6735ccb..6ee9a83b32ab 100644 --- a/include/oox/drawingml/chart/seriescontext.hxx +++ b/include/oox/drawingml/chart/seriescontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataLabelModel; @@ -42,7 +42,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct DataLabelsModel; @@ -58,7 +58,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct PictureOptionsModel; @@ -73,7 +73,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct ErrorBarModel; @@ -88,7 +88,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TrendlineLabelModel; @@ -103,7 +103,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TrendlineModel; @@ -119,7 +119,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct DataPointModel; @@ -134,7 +134,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct SeriesModel; @@ -149,7 +149,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for area chart types (c:ser element). */ @@ -162,7 +162,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for bar chart types (c:ser element). */ @@ -175,7 +175,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for bubble chart types (c:ser element). */ @@ -188,7 +188,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for line and stock chart types (c:ser element). @@ -202,7 +202,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for pie and doughnut chart types (c:ser element). @@ -216,7 +216,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for radar chart types (c:ser element). */ @@ -229,7 +229,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for scatter chart types (c:ser element). */ @@ -242,7 +242,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for a data series context for scatter chart types (c:ser element). */ @@ -255,7 +255,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx index 0e7a5493649f..2cbd5665a5c5 100644 --- a/include/oox/drawingml/chart/seriesconverter.hxx +++ b/include/oox/drawingml/chart/seriesconverter.hxx @@ -37,7 +37,7 @@ class TypeGroupConverter; // #i66858# enable this when Chart2 supports smoothed lines per data series #define OOX_CHART_SMOOTHED_PER_SERIES 0 -// ============================================================================ + class DataLabelConverter : public ConverterBase< DataLabelModel > { @@ -59,7 +59,7 @@ public: bool bDataSeriesLabel ); }; -// ============================================================================ + class DataLabelsConverter : public ConverterBase< DataLabelsModel > { @@ -73,7 +73,7 @@ public: const TypeGroupConverter& rTypeGroup ); }; -// ============================================================================ + class ErrorBarConverter : public ConverterBase< ErrorBarModel > { @@ -90,7 +90,7 @@ private: createLabeledDataSequence( ErrorBarModel::SourceType eSourceType ); }; -// ============================================================================ + class TrendlineLabelConverter : public ConverterBase< TrendlineLabelModel > { @@ -102,7 +102,7 @@ public: void convertFromModel( PropertySet& rPropSet ); }; -// ============================================================================ + class TrendlineConverter : public ConverterBase< TrendlineModel > { @@ -115,7 +115,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& rxDataSeries ); }; -// ============================================================================ + class DataPointConverter : public ConverterBase< DataPointModel > { @@ -130,7 +130,7 @@ public: const SeriesModel& rSeries ); }; -// ============================================================================ + class SeriesConverter : public ConverterBase< SeriesModel > { @@ -156,7 +156,7 @@ private: bool bUseTextLabel ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx index 1d426cbbd699..e6e8a01639a5 100644 --- a/include/oox/drawingml/chart/seriesmodel.hxx +++ b/include/oox/drawingml/chart/seriesmodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct DataLabelModelBase { @@ -51,7 +51,7 @@ struct DataLabelModelBase ~DataLabelModelBase(); }; -// ============================================================================ + struct DataLabelModel : public DataLabelModelBase { @@ -66,7 +66,7 @@ struct DataLabelModel : public DataLabelModelBase ~DataLabelModel(); }; -// ============================================================================ + struct DataLabelsModel : public DataLabelModelBase { @@ -81,7 +81,7 @@ struct DataLabelsModel : public DataLabelModelBase ~DataLabelsModel(); }; -// ============================================================================ + struct PictureOptionsModel { @@ -95,7 +95,7 @@ struct PictureOptionsModel ~PictureOptionsModel(); }; -// ============================================================================ + struct ErrorBarModel { @@ -120,7 +120,7 @@ struct ErrorBarModel ~ErrorBarModel(); }; -// ============================================================================ + struct TrendlineLabelModel { @@ -139,7 +139,7 @@ struct TrendlineLabelModel ~TrendlineLabelModel(); }; -// ============================================================================ + struct TrendlineModel { @@ -162,7 +162,7 @@ struct TrendlineModel ~TrendlineModel(); }; -// ============================================================================ + struct DataPointModel { @@ -183,7 +183,7 @@ struct DataPointModel ~DataPointModel(); }; -// ============================================================================ + struct SeriesModel { @@ -226,7 +226,7 @@ struct SeriesModel ~SeriesModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx index 75305ac03d84..4a7327290873 100644 --- a/include/oox/drawingml/chart/titlecontext.hxx +++ b/include/oox/drawingml/chart/titlecontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel; @@ -42,7 +42,7 @@ public: virtual void onCharacters( const OUString& rChars ); }; -// ============================================================================ + struct TitleModel; @@ -57,7 +57,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct LegendModel; @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx index c93682dd4a32..5515efbc5821 100644 --- a/include/oox/drawingml/chart/titleconverter.hxx +++ b/include/oox/drawingml/chart/titleconverter.hxx @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel; @@ -63,7 +63,7 @@ private: bool bAddNewLine ) const; }; -// ============================================================================ + struct TitleModel; @@ -80,7 +80,7 @@ public: sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 ); }; -// ============================================================================ + struct LegendModel; @@ -95,7 +95,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& rxDiagram ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx index 0a138be9d3cd..3d140c93f755 100644 --- a/include/oox/drawingml/chart/titlemodel.hxx +++ b/include/oox/drawingml/chart/titlemodel.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct TextModel { @@ -41,7 +41,7 @@ struct TextModel ~TextModel(); }; -// ============================================================================ + struct TitleModel { @@ -60,7 +60,7 @@ struct TitleModel ~TitleModel(); }; -// ============================================================================ + struct LegendModel { @@ -78,7 +78,7 @@ struct LegendModel ~LegendModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx index ef3d5d19c199..9a6e559f823e 100644 --- a/include/oox/drawingml/chart/typegroupcontext.hxx +++ b/include/oox/drawingml/chart/typegroupcontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct UpDownBarsModel; @@ -41,12 +41,12 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + struct TypeGroupModel; typedef ContextBase< TypeGroupModel > TypeGroupContextBase; -// ============================================================================ + /** Handler for area type group contexts (c:area3DChart, c:areaChart elements). */ @@ -59,7 +59,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for bar type group contexts (c:bar3DChart, c:barChart elements). */ @@ -72,7 +72,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for bubble type group context (c:bubbleChart element). */ @@ -85,7 +85,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for line type group contexts (c:line3DChart, c:lineChart, c:stockChart elements). @@ -99,7 +99,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for pie type group contexts (c:doughnutChart, c:ofPieChart, c:pie3DChart, c:pieChart elements). @@ -113,7 +113,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for radar type group context (c:radarChart element). */ @@ -126,7 +126,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for scatter type group context (c:scatterChart element). */ @@ -139,7 +139,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + /** Handler for surface type group contexts (c:surface3DChart, c:surfaceChart elements). @@ -153,7 +153,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx index 510ebfae231e..2219e88df9fb 100644 --- a/include/oox/drawingml/chart/typegroupconverter.hxx +++ b/include/oox/drawingml/chart/typegroupconverter.hxx @@ -34,7 +34,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + /** Enumerates different chart types. */ enum TypeId @@ -55,7 +55,7 @@ enum TypeId TYPEID_UNKNOWN /// Default for unknown chart types. }; -// ---------------------------------------------------------------------------- + /** Enumerates different categories of similar chart types. */ enum TypeCategory @@ -68,7 +68,7 @@ enum TypeCategory TYPECATEGORY_SURFACE /// Surface charts. }; -// ---------------------------------------------------------------------------- + /** Enumerates modes for varying point colors in a series. */ enum VarPointMode @@ -78,7 +78,7 @@ enum VarPointMode VARPOINTMODE_MULTI /// Supported for multiple series in a chart type group. }; -// ============================================================================ + /** Contains info for a chart type related to the OpenOffice.org chart module. */ struct TypeGroupInfo @@ -101,7 +101,7 @@ struct TypeGroupInfo bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions. }; -// ============================================================================ + struct UpDownBarsModel; @@ -116,7 +116,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& rxChartType ); }; -// ============================================================================ + struct TypeGroupModel; struct View3DModel; @@ -187,7 +187,7 @@ private: bool mb3dChart; /// True = type is a 3D chart type. }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx index 5d705a47d5c4..695634ca246c 100644 --- a/include/oox/drawingml/chart/typegroupmodel.hxx +++ b/include/oox/drawingml/chart/typegroupmodel.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { namespace chart { -// ============================================================================ + struct UpDownBarsModel { @@ -40,7 +40,7 @@ struct UpDownBarsModel ~UpDownBarsModel(); }; -// ============================================================================ + struct TypeGroupModel { @@ -85,7 +85,7 @@ struct TypeGroupModel ~TypeGroupModel(); }; -// ============================================================================ + } // namespace chart } // namespace drawingml diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index d3cd6a697e64..951e52b82e04 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -35,7 +35,7 @@ namespace oox { class GraphicHelper; } namespace oox { namespace drawingml { -// ============================================================================ + class OOX_DLLPUBLIC Color { @@ -152,7 +152,7 @@ private: typedef boost::shared_ptr< Color > ColorPtr; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx index b2246db719c0..8f283dd85285 100644 --- a/include/oox/drawingml/colorchoicecontext.hxx +++ b/include/oox/drawingml/colorchoicecontext.hxx @@ -27,7 +27,7 @@ namespace drawingml { class Color; -// ============================================================================ + /** Context handler for the different color value elements (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ @@ -49,7 +49,7 @@ private: Color& mrColor; }; -// ============================================================================ + /** Context handler for elements that *contain* a color value element (a:scrgbClr, a:srgbClr, a:hslClr, a:sysClr, a:schemeClr, a:prstClr). */ @@ -67,7 +67,7 @@ private: Color& mrColor; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx index 9843138dc312..15fc22a440d5 100644 --- a/include/oox/drawingml/customshapegeometry.hxx +++ b/include/oox/drawingml/customshapegeometry.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + // CT_CustomGeometry2D class CustomShapeGeometryContext : public ::oox::core::ContextHandler2 { @@ -40,7 +40,7 @@ private: CustomShapeProperties& mrCustomShapeProperties; }; -// --------------------------------------------------------------------- + // CT_PresetGeometry2D class PresetShapeGeometryContext : public ::oox::core::ContextHandler2 { @@ -52,7 +52,7 @@ private: CustomShapeProperties& mrCustomShapeProperties; }; -// --------------------------------------------------------------------- + // CT_PresetTextShape class PresetTextShapeContext : public ::oox::core::ContextHandler2 { diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 4500428de628..340c93003148 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -35,7 +35,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + const sal_Int32 PER_PERCENT = 1000; const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; @@ -43,7 +43,7 @@ const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; const sal_Int32 PER_DEGREE = 60000; const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; -// ============================================================================ + struct LineProperties; typedef ::boost::shared_ptr< LineProperties > LinePropertiesPtr; @@ -75,7 +75,7 @@ typedef ::boost::shared_ptr< Shape > ShapePtr; class Theme; typedef ::boost::shared_ptr< Theme > ThemePtr; -// --------------------------------------------------------------------------- + namespace table { @@ -84,7 +84,7 @@ typedef ::boost::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table -// ============================================================================ + /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs ); @@ -138,7 +138,7 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::Text // Converts a Hatch object to an ooxml pattern. const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch ); -// ============================================================================ + // CT_IndexRange struct IndexRange { @@ -149,7 +149,7 @@ struct IndexRange { /** retrieve the content of CT_IndexRange */ IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes ); -// ============================================================================ + const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm. @@ -166,7 +166,7 @@ inline sal_Int32 convertEmuToHmm( sal_Int64 nValue ) return getLimitedValue< sal_Int32, sal_Int64 >( (nValue + nCorrection) / EMU_PER_HMM, SAL_MIN_INT32, SAL_MAX_INT32 ); } -// ============================================================================ + /** A structure for a point with 64-bit interger components. */ struct EmuPoint @@ -178,7 +178,7 @@ struct EmuPoint explicit EmuPoint( sal_Int64 nX, sal_Int64 nY ) : X( nX ), Y( nY ) {} }; -// ============================================================================ + /** A structure for a size with 64-bit interger components. */ struct EmuSize @@ -190,7 +190,7 @@ struct EmuSize explicit EmuSize( sal_Int64 nWidth, sal_Int64 nHeight ) : Width( nWidth ), Height( nHeight ) {} }; -// ============================================================================ + /** A structure for a rectangle with 64-bit interger components. */ struct EmuRectangle : public EmuPoint, public EmuSize @@ -203,7 +203,7 @@ struct EmuRectangle : public EmuPoint, public EmuSize void setSize( const EmuSize& rSize ) { static_cast< EmuSize& >( *this ) = rSize; } }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx index ed64d34bd1cd..83519c0221a7 100644 --- a/include/oox/drawingml/effectproperties.hxx +++ b/include/oox/drawingml/effectproperties.hxx @@ -15,7 +15,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct EffectShadowProperties { @@ -28,7 +28,7 @@ struct EffectShadowProperties void assignUsed( const EffectShadowProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC EffectProperties { @@ -43,7 +43,7 @@ struct OOX_DLLPUBLIC EffectProperties const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx index dde9015085a4..570b273ad507 100644 --- a/include/oox/drawingml/effectpropertiescontext.hxx +++ b/include/oox/drawingml/effectpropertiescontext.hxx @@ -15,7 +15,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + struct EffectProperties; diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx index fba56a617997..f58803374f7e 100644 --- a/include/oox/drawingml/fillproperties.hxx +++ b/include/oox/drawingml/fillproperties.hxx @@ -38,7 +38,7 @@ namespace drawingml { class ShapePropertyMap; -// ============================================================================ + struct GradientFillProperties { @@ -57,7 +57,7 @@ struct GradientFillProperties void assignUsed( const GradientFillProperties& rSourceProps ); }; -// ============================================================================ + struct PatternFillProperties { @@ -69,7 +69,7 @@ struct PatternFillProperties void assignUsed( const PatternFillProperties& rSourceProps ); }; -// ============================================================================ + struct BlipFillProperties { @@ -99,7 +99,7 @@ struct BlipFillProperties void assignUsed( const BlipFillProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC FillProperties { @@ -126,7 +126,7 @@ struct OOX_DLLPUBLIC FillProperties bool bFlipV = false ) const; }; -// ============================================================================ + struct GraphicProperties { @@ -143,7 +143,7 @@ struct GraphicProperties sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx index 3e8795e4a554..bbeed0837903 100644 --- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx +++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + /** Context handler that imports the a:solidFill element. */ class SolidFillContext : public ColorContext @@ -38,7 +38,7 @@ public: FillProperties& rFillProps ); }; -// ============================================================================ + /** Context handler that imports the a:gradFill element. */ class GradientFillContext : public ::oox::core::ContextHandler2 @@ -76,7 +76,7 @@ private: PatternFillProperties& mrPatternProps; }; - // ============================================================================ + /** Context handler that imports the a:duotone element containing the colors of a bitmap duotone transformation. */ @@ -99,7 +99,7 @@ private: int mnColorIndex; }; - // ============================================================================ + /** Context handler that imports the a:clrChange element containing the colors of a bitmap color change transformation. */ diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 322f08e2f95c..a9afc0b20ebd 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -36,7 +36,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; -// ==================================================================== + class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext { @@ -49,7 +49,7 @@ private: bool mbEmbedShapesInChart; }; -// ==================================================================== + class OleObjectGraphicDataContext : public ShapeContext { @@ -62,7 +62,7 @@ private: ::oox::vml::OleObjectInfo& mrOleObjectInfo; }; -// ==================================================================== + class Diagram; @@ -81,7 +81,7 @@ private: OUString msCs; }; -// ==================================================================== + class ChartGraphicDataContext : public ShapeContext { @@ -99,7 +99,7 @@ private: ChartShapeInfo& mrChartShapeInfo; }; -// ==================================================================== + } } diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx index 2b6494e13cfe..5e0c06212eaa 100644 --- a/include/oox/drawingml/lineproperties.hxx +++ b/include/oox/drawingml/lineproperties.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct LineArrowProperties { @@ -39,7 +39,7 @@ struct LineArrowProperties void assignUsed( const LineArrowProperties& rSourceProps ); }; -// ============================================================================ + struct OOX_DLLPUBLIC LineProperties { @@ -73,7 +73,7 @@ struct OOX_DLLPUBLIC LineProperties sal_Int32 getLineWidth() const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx index f888e9d76ba8..f302f11431b0 100644 --- a/include/oox/drawingml/linepropertiescontext.hxx +++ b/include/oox/drawingml/linepropertiescontext.hxx @@ -25,7 +25,7 @@ namespace oox { namespace drawingml { -// --------------------------------------------------------------------- + struct LineProperties; diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 1419a1563fc0..fa3f58c83d9c 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -54,7 +54,7 @@ struct ShapeStyleRef typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap; -// ============================================================================ + /** Additional information for a chart embedded in a drawing shape. */ struct ChartShapeInfo @@ -65,7 +65,7 @@ struct ChartShapeInfo explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} }; -// ============================================================================ + class OOX_DLLPUBLIC Shape : public boost::enable_shared_from_this< Shape > @@ -286,7 +286,7 @@ private: com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms; }; -// ============================================================================ + } } diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx index 8e5d4fae7fa1..24c22afbd744 100644 --- a/include/oox/drawingml/shape3dproperties.hxx +++ b/include/oox/drawingml/shape3dproperties.hxx @@ -34,7 +34,7 @@ namespace oox { namespace core { class ModelObjectContainer; } } namespace oox { namespace drawingml { -// ============================================================================ + struct Shape3DPropertyNames { @@ -59,7 +59,7 @@ struct Shape3DPropertyNames Shape3DPropertyNames(); }; -// ============================================================================ + struct Shape3DProperties { @@ -115,7 +115,7 @@ struct Shape3DProperties sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 6a6628b02805..16daf319356a 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -28,7 +28,7 @@ namespace oox { class ModelObjectHelper; } namespace oox { namespace drawingml { -// ============================================================================ + /** Enumeration for various properties related to drawing shape formatting. @@ -66,7 +66,7 @@ enum ShapePropertyId SHAPEPROP_END }; -// ============================================================================ + struct OOX_DLLPUBLIC ShapePropertyInfo { @@ -89,7 +89,7 @@ struct OOX_DLLPUBLIC ShapePropertyInfo sal_Int32 operator[]( ShapePropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; } }; -// ============================================================================ + class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap { @@ -138,7 +138,7 @@ private: ShapePropertyInfo maShapePropInfo; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx index 725f7b95c599..c32c91a58721 100644 --- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx +++ b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx @@ -27,7 +27,7 @@ namespace oox { namespace drawingml { namespace table { -// ============================================================================ + class TableStyleListFragmentHandler : public ::oox::core::FragmentHandler2 { @@ -45,7 +45,7 @@ private: TableStyleList& mrTableStyleList; }; -// ============================================================================ + } // namespace table } // namespace drawingml diff --git a/include/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx index 3fb0684ec95a..4a3be878688a 100644 --- a/include/oox/drawingml/textbodyproperties.hxx +++ b/include/oox/drawingml/textbodyproperties.hxx @@ -28,7 +28,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + struct TextBodyProperties { @@ -46,7 +46,7 @@ struct TextBodyProperties void pushVertSimulation(); }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx index bddd25c5f735..cdcdd268acfc 100644 --- a/include/oox/drawingml/textcharacterproperties.hxx +++ b/include/oox/drawingml/textcharacterproperties.hxx @@ -30,7 +30,7 @@ namespace oox { class PropertySet; } namespace oox { namespace drawingml { -// ============================================================================ + struct TextCharacterProperties { @@ -78,7 +78,7 @@ struct TextCharacterProperties bool bUseOptional = false ) const; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/textfont.hxx b/include/oox/drawingml/textfont.hxx index d3361fc3757c..bb6ae6d2af82 100644 --- a/include/oox/drawingml/textfont.hxx +++ b/include/oox/drawingml/textfont.hxx @@ -28,7 +28,7 @@ namespace oox { namespace core { class XmlFilterBase; } } namespace oox { namespace drawingml { -// ============================================================================ + /** carries a CT_TextFont*/ class TextFont @@ -66,7 +66,7 @@ private: sal_Int32 mnCharset; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 2f0938f62295..d0c18100d734 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -29,7 +29,7 @@ namespace oox { namespace drawingml { -// ============================================================================ + const sal_Int32 THEMED_STYLE_SUBTLE = 1; const sal_Int32 THEMED_STYLE_MODERATE = 2; @@ -40,7 +40,7 @@ typedef RefVector< LineProperties > LineStyleList; typedef RefVector< EffectProperties > EffectStyleList; typedef RefMap< sal_Int32, TextCharacterProperties > FontScheme; -// ============================================================================ + class OOX_DLLPUBLIC Theme { @@ -106,7 +106,7 @@ private: ::com::sun::star::xml::dom::XDocument> mxFragment; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index cf17903da7df..c0db743ebd7a 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -28,7 +28,7 @@ namespace drawingml { class Theme; -// ============================================================================ + class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 { @@ -45,7 +45,7 @@ private: Theme& mrTheme; }; -// ============================================================================ + } // namespace drawingml } // namespace oox diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 1a269553c50a..5c500e847161 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -27,7 +27,7 @@ namespace oox { namespace dump { -// ============================================================================ + class DffStreamObject : public SequenceRecordObjectBase { @@ -59,7 +59,7 @@ private: sal_Int32 mnRealSize; }; -// ============================================================================ + } // namespace dump } // namespace oox diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index ae879556e6ab..7cca4b4490f9 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -61,7 +61,7 @@ namespace oox { namespace core { namespace oox { namespace dump { -// ============================================================================ + #define OOX_DUMP_UNUSED "unused" #define OOX_DUMP_UNKNOWN "?unknown" @@ -97,8 +97,8 @@ typedef ::std::pair< sal_Int64, sal_Int64 > Int64Pair; typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; -// ============================================================================ -// ============================================================================ + + /** Static helper functions for system file and stream access. */ class InputOutputHelper @@ -137,7 +137,7 @@ public: rtl_TextEncoding eTextEnc ); }; -// ============================================================================ + class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { @@ -155,8 +155,8 @@ public: ::oox::BinaryInputStreamRef( rxInStrm ) {} }; -// ============================================================================ -// ============================================================================ + + /** Specifiers for atomic data types. */ enum DataType @@ -174,7 +174,7 @@ enum DataType DATATYPE_DOUBLE ///< Floating-point, double precision. }; -// ---------------------------------------------------------------------------- + /** Specifiers for the output format of values. */ enum FormatType @@ -188,7 +188,7 @@ enum FormatType FORMATTYPE_BOOL ///< Boolean ('true' or 'false'). }; -// ---------------------------------------------------------------------------- + /** Describes the output format of a data item. @@ -249,8 +249,8 @@ struct ItemFormat OUStringVector parse( const OUString& rFormatStr ); }; -// ============================================================================ -// ============================================================================ + + struct Address { @@ -260,7 +260,7 @@ struct Address explicit Address( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} }; -// ---------------------------------------------------------------------------- + struct Range { @@ -269,11 +269,11 @@ struct Range Range() {} }; -// ---------------------------------------------------------------------------- + typedef ::std::vector< Range > RangeList; -// ============================================================================ + struct TokenAddress : public Address { @@ -282,7 +282,7 @@ struct TokenAddress : public Address TokenAddress() : mbRelCol( false ), mbRelRow( false ) {} }; -// ---------------------------------------------------------------------------- + struct TokenRange { @@ -291,8 +291,8 @@ struct TokenRange TokenRange() {} }; -// ============================================================================ -// ============================================================================ + + /** Static helper functions for formatted output to strings. */ class StringHelper @@ -404,7 +404,7 @@ public: static void convertStringToIntList( Int64Vector& orVec, const OUString& rData, bool bIgnoreEmpty ); }; -// ---------------------------------------------------------------------------- + template< typename Type > void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) @@ -427,7 +427,7 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm } } -// ============================================================================ + class String : public OUString { @@ -443,8 +443,8 @@ public: static const String EMPTY_STRING; -// ============================================================================ -// ============================================================================ + + class Base; typedef ::boost::shared_ptr< Base > BaseRef; @@ -512,8 +512,8 @@ protected: virtual bool implIsValid() const = 0; }; -// ============================================================================ -// ============================================================================ + + class ConfigItemBase { @@ -551,7 +551,7 @@ private: const OUString& rData ); }; -// ============================================================================ + class SharedConfigData; class Config; @@ -641,7 +641,7 @@ private: const SharedConfigData& mrCfgData; }; -// ============================================================================ + class ConstList : public NameListBase { @@ -673,7 +673,7 @@ private: bool mbQuoteNames; }; -// ============================================================================ + class MultiList : public ConstList { @@ -697,7 +697,7 @@ private: bool mbIgnoreEmpty; }; -// ============================================================================ + class FlagsList : public NameListBase { @@ -728,7 +728,7 @@ private: sal_Int64 mnIgnore; }; -// ============================================================================ + class CombiList : public FlagsList { @@ -761,7 +761,7 @@ private: ExtItemFormatMap maFmtMap; }; -// ============================================================================ + class UnitConverter : public NameListBase { @@ -786,7 +786,7 @@ private: double mfFactor; }; -// ============================================================================ + class NameListWrapper { @@ -806,7 +806,7 @@ private: static const NameListWrapper NO_LIST; -// ============================================================================ + class ItemFormatMap : public ::std::map< sal_Int64, ItemFormat > { @@ -817,8 +817,8 @@ public: void insertFormats( const NameListRef& rxNameList ); }; -// ============================================================================ -// ============================================================================ + + class SharedConfigData : public Base, public ConfigItemBase { @@ -876,7 +876,7 @@ private: bool mbPwCancelled; }; -// ---------------------------------------------------------------------------- + template< typename ListType > ::boost::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) @@ -898,7 +898,7 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi xList->readConfigBlock( rStrm ); } -// ============================================================================ + class Config : public Base { @@ -964,7 +964,7 @@ private: typedef ::boost::shared_ptr< Config > ConfigRef; -// ---------------------------------------------------------------------------- + template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const @@ -995,8 +995,8 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const return xList.get() && xList->hasName( nKey ); } -// ============================================================================ -// ============================================================================ + + class Output : public Base { @@ -1005,7 +1005,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& rFileName ); - // ------------------------------------------------------------------------ + void newLine(); void emptyLine( size_t nCount = 1 ); @@ -1031,7 +1031,7 @@ public: void startMultiItems(); void endMultiItems(); - // ------------------------------------------------------------------------ + void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 ); void writeAscii( const sal_Char* pcStr ); @@ -1062,7 +1062,7 @@ public: void writeName( const Config& rCfg, Type nData, const NameListWrapper& rListWrp ) { writeString( rCfg.getName( rListWrp, nData ) ); } - // ------------------------------------------------------------------------ + protected: virtual bool implIsValid() const; @@ -1086,7 +1086,7 @@ private: typedef ::boost::shared_ptr< Output > OutputRef; -// ============================================================================ + class IndentGuard { @@ -1100,7 +1100,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class TableGuard { @@ -1124,7 +1124,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class ItemGuard { @@ -1140,7 +1140,7 @@ private: Output& mrOut; }; -// ---------------------------------------------------------------------------- + class MultiItemsGuard { @@ -1154,7 +1154,7 @@ private: Output& mrOut; }; -// ============================================================================ + class StorageIterator : public Base { @@ -1177,8 +1177,8 @@ private: OUStringVector::const_iterator maIt; }; -// ============================================================================ -// ============================================================================ + + class ObjectBase : public Base { @@ -1190,7 +1190,7 @@ public: void dump(); - // ------------------------------------------------------------------------ + protected: ObjectBase() {} @@ -1200,7 +1200,7 @@ protected: virtual bool implIsValid() const; virtual void implDump(); - // ------------------------------------------------------------------------ + Config& cfg() const { return *mxConfig; } @@ -1210,8 +1210,8 @@ private: typedef ::boost::shared_ptr< ObjectBase > ObjectRef; -// ============================================================================ -// ============================================================================ + + class StorageObjectBase : public ObjectBase { @@ -1284,15 +1284,15 @@ private: typedef ::boost::shared_ptr< StorageObjectBase > StorageObjectRef; -// ============================================================================ -// ============================================================================ + + class OutputObjectBase : public ObjectBase { public: virtual ~OutputObjectBase(); - // ------------------------------------------------------------------------ + protected: OutputObjectBase() {} @@ -1302,7 +1302,7 @@ protected: virtual bool implIsValid() const; - // ------------------------------------------------------------------------ + void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); @@ -1347,7 +1347,7 @@ protected: typedef ::boost::shared_ptr< OutputObjectBase > OutputObjectRef; -// ---------------------------------------------------------------------------- + template< typename Type > void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp ) @@ -1454,15 +1454,15 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type mxOut->writeHex( nData2 ); } -// ============================================================================ -// ============================================================================ + + class InputObjectBase : public OutputObjectBase { public: virtual ~InputObjectBase(); - // ------------------------------------------------------------------------ + protected: InputObjectBase() {} @@ -1473,12 +1473,12 @@ protected: virtual bool implIsValid() const; - // ------------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getXInputStream() const; - // ------------------------------------------------------------------------ + void skipBlock( sal_Int64 nBytes, bool bShowSize = true ); void dumpRawBinary( sal_Int64 nBytes, bool bShowOffset = true, bool bStream = false ); @@ -1543,7 +1543,7 @@ protected: typedef ::boost::shared_ptr< InputObjectBase > InputObjectRef; -// ---------------------------------------------------------------------------- + template< typename Type > Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp ) @@ -1666,8 +1666,8 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) writeHexPairItem( rName, nData1, nData2, cSep ); } -// ============================================================================ -// ============================================================================ + + class BinaryStreamObject : public InputObjectBase { @@ -1683,8 +1683,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class TextStreamObjectBase : public InputObjectBase { @@ -1714,7 +1714,7 @@ protected: ::boost::shared_ptr< TextInputStream > mxTextStrm; }; -// ============================================================================ + class TextLineStreamObject : public TextStreamObjectBase { @@ -1735,7 +1735,7 @@ protected: virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; -// ============================================================================ + class XmlStreamObject : public TextStreamObjectBase { @@ -1749,8 +1749,8 @@ protected: virtual void implDumpText( TextInputStream& rTextStrm ); }; -// ============================================================================ -// ============================================================================ + + class RecordObjectBase : public InputObjectBase { @@ -1800,7 +1800,7 @@ private: bool mbBinaryOnly; }; -// ============================================================================ + class SequenceRecordObjectBase : public RecordObjectBase { @@ -1825,8 +1825,8 @@ private: StreamDataSeqRef mxRecData; }; -// ============================================================================ -// ============================================================================ + + /** Base class for a file dumper. Derived classes implement the implDump() function to add functionality. @@ -1846,8 +1846,8 @@ protected: void construct( const ConfigRef& rxConfig ); }; -// ============================================================================ -// ============================================================================ + + } // namespace dump } // namespace oox diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index b9cac39f7adb..014bdeb2974b 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -32,8 +32,8 @@ namespace com { namespace sun { namespace star { namespace oox { namespace dump { -// ============================================================================ -// ============================================================================ + + class OleInputObjectBase : public InputObjectBase { @@ -51,8 +51,8 @@ protected: sal_uInt32 dumpOleColor( const String& rName ); }; -// ============================================================================ -// ============================================================================ + + class StdFontObject : public OleInputObjectBase { @@ -63,7 +63,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + class StdPicObject : public OleInputObjectBase { @@ -74,8 +74,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class OleStreamObject : public OleInputObjectBase { @@ -83,7 +83,7 @@ public: explicit OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); }; -// ============================================================================ + class OleCompObjObject : public OleStreamObject { @@ -94,8 +94,8 @@ protected: virtual void implDump(); }; -// ============================================================================ -// ============================================================================ + + class OlePropertyStreamObject : public InputObjectBase { @@ -136,7 +136,7 @@ private: bool mbIsUnicode; }; -// ============================================================================ + class OleStorageObject : public StorageObjectBase { @@ -156,8 +156,8 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ -// ============================================================================ + + class ComCtlObjectBase : public OleInputObjectBase { @@ -187,7 +187,7 @@ protected: bool mbComplexPart; }; -// ============================================================================ + class ComCtlScrollBarObject : public ComCtlObjectBase { @@ -198,7 +198,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlProgressBarObject : public ComCtlObjectBase { @@ -209,7 +209,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlSliderObject : public ComCtlObjectBase { @@ -220,7 +220,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlUpDownObject : public ComCtlObjectBase { @@ -231,7 +231,7 @@ protected: virtual void implDumpProperties(); }; -// ============================================================================ + class ComCtlImageListObject : public ComCtlObjectBase { @@ -244,7 +244,7 @@ protected: virtual void implDumpCommonTrailing(); }; -// ============================================================================ + class ComCtlTabStripObject : public ComCtlObjectBase { @@ -256,7 +256,7 @@ protected: virtual void implDumpCommonExtra( sal_Int64 nEndPos ); }; -// ============================================================================ + class ComCtlTreeViewObject : public ComCtlObjectBase { @@ -271,7 +271,7 @@ private: sal_uInt32 mnStringFlags; }; -// ============================================================================ + class ComCtlStatusBarObject : public ComCtlObjectBase { @@ -284,8 +284,8 @@ protected: virtual void implDumpCommonTrailing(); }; -// ============================================================================ -// ============================================================================ + + class AxPropertyObjectBase : public OleInputObjectBase { @@ -395,7 +395,7 @@ private: bool mbValid; }; -// ---------------------------------------------------------------------------- + template< typename Type > void AxPropertyObjectBase::alignInput() @@ -425,7 +425,7 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper return nDefault; } -// ============================================================================ + class AxCFontNewObject : public AxPropertyObjectBase { @@ -436,7 +436,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxColumnInfoObject : public AxPropertyObjectBase { @@ -447,7 +447,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxCommandButtonObject : public AxPropertyObjectBase { @@ -459,7 +459,7 @@ protected: virtual void implDumpExtended(); }; -// ============================================================================ + class AxMorphControlObject : public AxPropertyObjectBase { @@ -478,7 +478,7 @@ private: sal_uInt8 mnCtrlType; }; -// ============================================================================ + class AxLabelObject : public AxPropertyObjectBase { @@ -490,7 +490,7 @@ protected: virtual void implDumpExtended(); }; -// ============================================================================ + class AxImageObject : public AxPropertyObjectBase { @@ -501,7 +501,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxScrollBarObject : public AxPropertyObjectBase { @@ -512,7 +512,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxSpinButtonObject : public AxPropertyObjectBase { @@ -523,7 +523,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class AxTabStripObject : public AxPropertyObjectBase { @@ -538,8 +538,8 @@ private: sal_Int32 mnTabFlagCount; }; -// ============================================================================ -// ============================================================================ + + class FormControlStreamObject : public OleInputObjectBase { @@ -565,8 +565,8 @@ private: bool mbReadGuid; }; -// ============================================================================ -// ============================================================================ + + struct VbaFormSiteInfo { @@ -580,7 +580,7 @@ struct VbaFormSiteInfo typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; -// ============================================================================ + struct VbaFormSharedData { @@ -588,7 +588,7 @@ struct VbaFormSharedData VbaFormSiteInfoVector maSiteInfos; }; -// ============================================================================ + class VbaFormClassInfoObject : public AxPropertyObjectBase { @@ -602,7 +602,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaFormSiteObject : public AxPropertyObjectBase { @@ -616,7 +616,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaFormDesignExtObject : public AxPropertyObjectBase { @@ -627,7 +627,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class VbaFStreamObject : public AxPropertyObjectBase { @@ -653,7 +653,7 @@ private: sal_uInt32 mnFlags; }; -// ============================================================================ + class VbaOStreamObject : public OleInputObjectBase { @@ -671,7 +671,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaPageObject : public AxPropertyObjectBase { @@ -682,7 +682,7 @@ protected: virtual void implDumpShortProperties(); }; -// ============================================================================ + class VbaMultiPageObject : public AxPropertyObjectBase { @@ -697,7 +697,7 @@ private: sal_Int32 mnPageCount; }; -// ============================================================================ + class VbaXStreamObject : public InputObjectBase { @@ -715,7 +715,7 @@ private: VbaFormSharedData& mrFormData; }; -// ============================================================================ + class VbaContainerStorageObject : public OleStorageObject { @@ -744,8 +744,8 @@ private: VbaFormSharedData maFormData; }; -// ============================================================================ -// ============================================================================ + + struct VbaSharedData { @@ -760,7 +760,7 @@ struct VbaSharedData sal_Int32 getStreamOffset( const OUString& rStrmName ) const; }; -// ============================================================================ + class VbaDirStreamObject : public SequenceRecordObjectBase { @@ -789,7 +789,7 @@ private: sal_Int32 mnCurrOffset; }; -// ============================================================================ + class VbaModuleStreamObject : public InputObjectBase { @@ -809,7 +809,7 @@ private: sal_Int32 mnStrmOffset; }; -// ============================================================================ + class VbaStorageObject : public OleStorageObject { @@ -831,7 +831,7 @@ private: VbaSharedData& mrVbaData; }; -// ============================================================================ + class VbaFormStorageObject : public VbaContainerStorageObject { @@ -853,7 +853,7 @@ private: VbaSharedData& mrVbaData; }; -// ============================================================================ + class VbaProjectStorageObject : public OleStorageObject { @@ -876,8 +876,8 @@ private: VbaSharedData maVbaData; }; -// ============================================================================ -// ============================================================================ + + class ActiveXStorageObject : public VbaContainerStorageObject { @@ -893,8 +893,8 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ -// ============================================================================ + + } // namespace dump } // namespace oox diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 05f9dc61200f..cdcf7e52dcfc 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -28,7 +28,7 @@ namespace oox { namespace dump { namespace pptx { -// ============================================================================ + class RootStorageObject : public StorageObjectBase { @@ -43,7 +43,7 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ + class Dumper : public DumperBase { @@ -59,7 +59,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + } // namespace pptx } // namespace dump diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 72b57d20cdfe..8f0845738d44 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -35,7 +35,7 @@ namespace oox { namespace dump { namespace xlsb { -// ============================================================================ + class RecordObjectBase : public SequenceRecordObjectBase { @@ -51,13 +51,13 @@ protected: OUString getErrorName( sal_uInt8 nErrCode ) const; - // ------------------------------------------------------------------------ + void readAddress( Address& orAddress ); void readRange( Range& orRange ); void readRangeList( RangeList& orRanges ); - // ------------------------------------------------------------------------ + void writeBooleanItem( const String& rName, sal_uInt8 nBool ); void writeErrorCodeItem( const String& rName, sal_uInt8 nErrCode ); @@ -65,7 +65,7 @@ protected: void writeFontPortions( const ::oox::xls::FontPortionModelList& rPortions ); void writePhoneticPortions( const ::oox::xls::PhoneticPortionModelList& rPhonetics ); - // ------------------------------------------------------------------------ + sal_uInt8 dumpBoolean( const String& rName = EMPTY_STRING ); sal_uInt8 dumpErrorCode( const String& rName = EMPTY_STRING ); @@ -82,7 +82,7 @@ protected: Range dumpRange( const String& rName = EMPTY_STRING ); void dumpRangeList( const String& rName = EMPTY_STRING ); - // ------------------------------------------------------------------------ + private: bool readCompressedInt( BinaryInputStream& rStrm, sal_Int32& ornValue ); @@ -93,7 +93,7 @@ private: NameListRef mxErrCodes; }; -// ============================================================================ + class RootStorageObject : public StorageObjectBase { @@ -108,7 +108,7 @@ protected: const OUString& rSysFileName ); }; -// ============================================================================ + class Dumper : public DumperBase { @@ -124,7 +124,7 @@ protected: virtual void implDump(); }; -// ============================================================================ + } // namespace xlsb } // namespace dump diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index 657ee4d38e98..186d50a53bcc 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -33,21 +33,21 @@ # endif #endif -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT ) { return (sal_Int64)( (double)nPPT * 1587.5 ); } -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 MM100toEMU( sal_Int32 nMM100 ) { return (sal_Int64)nMM100 * 360; } -// --------------------------------------------------------------------------------------------- + static inline sal_Int64 TwipsToEMU( sal_Int32 nTwips ) { diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index e22e8164caf1..e95d82404159 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -33,7 +33,7 @@ namespace sax_fastparser { namespace oox { -// ============================================================================ + /** Static helpers for conversion of strings to attribute values of various different data types. @@ -64,7 +64,7 @@ public: static sal_Int32 decodeIntegerHex( const OUString& rValue ); }; -// ============================================================================ + /** Provides access to attribute values of an element. @@ -170,7 +170,7 @@ private: sax_fastparser::FastAttributeList *getAttribList() const; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index a63a36b6708a..6ad33a3dcf8b 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -32,7 +32,7 @@ namespace oox { class BinaryOutputStream; -// ============================================================================ + /** Interface for binary input stream classes. @@ -223,7 +223,7 @@ protected: typedef ::boost::shared_ptr< BinaryInputStream > BinaryInputStreamRef; -// ---------------------------------------------------------------------------- + template< typename Type > void BinaryInputStream::readValue( Type& ornValue ) @@ -266,7 +266,7 @@ void BinaryInputStream::skipArray( sal_Int32 nElemCount ) skip( nSkipSize, sizeof( Type ) ); } -// ============================================================================ + /** Wraps a UNO input stream and provides convenient access functions. @@ -318,7 +318,7 @@ private: bool mbAutoClose; ///< True = automatically close stream on destruction. }; -// ============================================================================ + /** Wraps a StreamDataSequence and provides convenient access functions. @@ -358,7 +358,7 @@ private: { return getLimitedValue< sal_Int32, sal_Int32 >( nBytes, 0, mpData->getLength() - mnPos ); } }; -// ============================================================================ + /** Wraps a BinaryInputStream and provides access to a specific part of the stream data. @@ -429,7 +429,7 @@ private: sal_Int64 mnSize; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 19fabc20217e..007a7e8e7865 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Interface for binary output stream classes. @@ -90,7 +90,7 @@ void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount ) typedef ::boost::shared_ptr< BinaryOutputStream > BinaryOutputStreamRef; -// ---------------------------------------------------------------------------- + template< typename Type > void BinaryOutputStream::writeValue( Type nValue ) @@ -99,7 +99,7 @@ void BinaryOutputStream::writeValue( Type nValue ) writeMemory( &nValue, static_cast< sal_Int32 >( sizeof( Type ) ), sizeof( Type ) ); } -// ============================================================================ + /** Wraps a UNO output stream and provides convenient access functions. @@ -149,7 +149,7 @@ private: bool mbAutoClose; ///< True = automatically close stream on destruction. }; -// ============================================================================ + /** Wraps a StreamDataSequence and provides convenient access functions. @@ -180,7 +180,7 @@ public: SequenceOutputStream& operator<<( Type nValue ) { writeValue( nValue ); return *this; } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 29deac9d6424..0f794ede13b0 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -33,7 +33,7 @@ namespace oox { typedef ::com::sun::star::uno::Sequence< sal_Int8 > StreamDataSequence; -// ============================================================================ + /** Base class for binary stream classes. */ @@ -121,7 +121,7 @@ private: const bool mbSeekable; ///< True = implementation supports seeking. }; -// ============================================================================ + /** Base class for binary input and output streams wrapping a UNO stream, seekable via the com.sun.star.io.XSeekable interface. @@ -149,7 +149,7 @@ private: mxSeekable; ///< Stream seeking interface. }; -// ============================================================================ + /** Base class for binary input and output streams wrapping a StreamDataSequence, which is always seekable. @@ -178,7 +178,7 @@ protected: sal_Int32 mnPos; ///< Current position in the sequence. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 7e3b98b22daf..989c7e2d7bcf 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** A range of signed 32-bit integer values. */ struct ValueRange @@ -55,11 +55,11 @@ struct ValueRange bool intersects( const ValueRange& rRange ) const { return (mnFirst <= rRange.mnLast) && (rRange.mnFirst <= mnLast); } }; -// ---------------------------------------------------------------------------- + typedef ::std::vector< ValueRange > ValueRangeVector; -// ---------------------------------------------------------------------------- + /** An ordered list of value ranges. The insertion operation will merge consecutive value ranges. @@ -81,7 +81,7 @@ private: ValueRangeVector maRanges; }; -// ============================================================================ + /** Template for a 2-dimensional array of objects. @@ -150,7 +150,7 @@ private: size_type mnWidth; }; -// ============================================================================ + /** Static helper functions for improved API container handling. */ class OOX_DLLPUBLIC ContainerHelper @@ -310,7 +310,7 @@ public: matrixToSequenceSequence( const MatrixType& rMatrix ); }; -// ---------------------------------------------------------------------------- + template< typename VectorType > /*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex ) @@ -401,7 +401,7 @@ template< typename MatrixType > return aSeq; } -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index b96e99395708..8def09e3d31d 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Provides helper functions for colors, device measurement conversion, graphics, and graphic objects handling. @@ -140,7 +140,7 @@ public: @return The original Graphic size in 100thmm */ ::com::sun::star::awt::Size getOriginalSize( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ) const; - // ------------------------------------------------------------------------ + private: typedef ::std::map< sal_Int32, sal_Int32 > SystemPalette; typedef ::std::deque< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > > GraphicObjectDeque; @@ -159,7 +159,7 @@ private: double mfPixelPerHmmY; ///< Number of screen pixels per 1/100 mm in Y direction. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 9f4cac598e2d..a5563f40ac35 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -78,7 +78,7 @@ const sal_uInt8 WINDOWS_CHARSET_THAI = 222; const sal_uInt8 WINDOWS_CHARSET_EASTERN = 238; const sal_uInt8 WINDOWS_CHARSET_OEM = 255; -// ---------------------------------------------------------------------------- + const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. @@ -103,7 +103,7 @@ const sal_Int16 API_ESCAPE_SUBSCRIPT = -101; ///< Subscript: lower ch const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; ///< Relative character height if not escaped. const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; ///< Relative character height if escaped. -// ============================================================================ + // Limitate values ------------------------------------------------------------ @@ -183,7 +183,7 @@ void insertValue( Type& ornBitField, InsertType nValue, sal_uInt8 nStartBit, sal (ornBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } -// ============================================================================ + /** Optional value, similar to ::boost::optional<>, with convenience accessors. */ @@ -218,7 +218,7 @@ private: bool mbHasValue; }; -// ============================================================================ + /** Provides platform independent functions to convert from or to little-endian byte order, e.g. for reading data from or writing data to memory or a @@ -282,7 +282,7 @@ private: #endif }; -// ---------------------------------------------------------------------------- + template< typename Type > inline void ByteOrderConverter::readLittleEndian( Type& ornValue, const void* pSrcBuffer ) @@ -326,7 +326,7 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData ) } #endif -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 5efa05440165..e57e0149a3e1 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** This helper manages named objects in a container, which is created on demand. */ @@ -66,7 +66,7 @@ private: sal_Int32 mnIndex; ///< Index to create unique identifiers. }; -// ============================================================================ + /** Contains tables for named drawing objects for a document model. @@ -116,7 +116,7 @@ private: const OUString maBitmapUrlNameBase; ///< Base name for all named fill bitmap URLs. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index cdcbd0f462e3..ce08a6beccfd 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -58,7 +58,7 @@ public: typedef ::boost::shared_ptr< IProgressBar > IProgressBarRef; -// ---------------------------------------------------------------------------- + class ISegmentProgressBar; typedef ::boost::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; @@ -78,8 +78,8 @@ public: virtual ISegmentProgressBarRef createSegment( double fLength ) = 0; }; -// ============================================================================ -// ============================================================================ + + /** A simple progress bar. */ @@ -103,7 +103,7 @@ private: double mfPosition; }; -// ============================================================================ + /** A progress bar containing several independent segments. */ @@ -129,7 +129,7 @@ private: double mfFreeStart; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index e1dcb3989458..8c8f212ae967 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -37,7 +37,7 @@ namespace oox { struct PropertyNameVector; -// ============================================================================ + typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > PropertyMapBase; @@ -102,7 +102,7 @@ private: const PropertyNameVector* mpPropNames; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index 0e9170537559..359d27db4351 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -29,7 +29,7 @@ namespace oox { class PropertyMap; -// ============================================================================ + /** A wrapper for a UNO property set. @@ -119,7 +119,7 @@ public: void dump(); #endif - // ------------------------------------------------------------------------ + private: /** Gets the specified property from the property set. @return true, if the any could be filled with the property value. */ @@ -137,7 +137,7 @@ private: mxPropSetInfo; ///< Property information. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index a9fdfe071e35..d2bcd6215536 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + /** Template for a map of ref-counted objects with additional accessor functions. @@ -176,7 +176,7 @@ private: } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index dd9fa14b7646..0b3595279ff4 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + /** Template for a vector of ref-counted objects with additional accessor functions. @@ -186,7 +186,7 @@ private: } }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 68f594015e91..84e86373aff0 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + class StorageBase; typedef ::boost::shared_ptr< StorageBase > StorageRef; @@ -182,7 +182,7 @@ private: bool mbReadOnly; ///< True = storage opened read-only (based on input stream). }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index af412dede090..3158d88379b0 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -33,7 +33,7 @@ namespace oox { class BinaryInputStream; -// ============================================================================ + class TextInputStream { @@ -87,7 +87,7 @@ public: */ OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); - // ------------------------------------------------------------------------ + /** Creates a UNO text input stream object from the passed UNO input stream. */ @@ -97,7 +97,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc ); - // ------------------------------------------------------------------------ + private: void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, @@ -113,7 +113,7 @@ private: sal_Unicode mcPendingChar; }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 0338b8b7cc58..e3e544bcca33 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { namespace oox { -// ============================================================================ + /** Implements stream access for ZIP storages containing XML streams. */ class ZipStorage : public StorageBase @@ -79,7 +79,7 @@ private: mxStorage; ///< Storage based on input or output stream. }; -// ============================================================================ + } // namespace oox diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index c334d380dcf2..f722281a5375 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -28,7 +28,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A wrapper for a binary input stream that supports aligned read operations. @@ -81,7 +81,7 @@ private: sal_Int64 mnStrmSize; ///< Size of the wrapped stream data. }; -// ============================================================================ + /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -89,7 +89,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ typedef ::std::vector< OUString > AxArrayString; -// ============================================================================ + /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ @@ -247,7 +247,7 @@ private: bool mbValid; ///< True = stream still valid. }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index ba7a4866c50b..abb2fafbe645 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -16,7 +16,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A wrapper for a binary output stream that supports aligned write operations. @@ -75,7 +75,7 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; /** An array of string values as a property. */ typedef ::std::vector< OUString > AxStringArray; -// ============================================================================ + /** Export helper to write simple and complex ActiveX form control properties to a binary input stream. */ @@ -167,7 +167,7 @@ private: bool mb64BitPropFlags; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 90d48a51e2f7..15994434e67d 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -45,7 +45,7 @@ namespace oox { namespace oox { namespace ole { -// ============================================================================ + #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" @@ -54,7 +54,7 @@ namespace ole { const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; -// ---------------------------------------------------------------------------- + #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" @@ -141,7 +141,7 @@ const sal_Int32 AX_SCROLLBAR_NONE = 0x00; const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; -// ---------------------------------------------------------------------------- + /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType @@ -166,7 +166,7 @@ enum ApiControlType API_CONTROL_DIALOG // 17 }; -// ============================================================================ + /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode @@ -184,7 +184,7 @@ enum ApiDefaultStateMode API_DEFAULTSTATE_TRISTATE ///< Control supports tri-state, state is given as short. }; -// ---------------------------------------------------------------------------- + /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. @@ -344,7 +344,7 @@ private: bool mbDefaultColorBgr; }; -// ============================================================================ + /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase @@ -391,7 +391,7 @@ protected: typedef ::boost::shared_ptr< ControlModelBase > ControlModelRef; -// ============================================================================ + /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase @@ -435,7 +435,7 @@ private: bool mbComplexPart; ///< True = the COMCTL_COMPLEXDATA part exists. }; -// ============================================================================ + /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase @@ -458,7 +458,7 @@ private: sal_Int32 mnPosition; ///< Value of the spin button. }; -// ============================================================================ + /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase @@ -479,7 +479,7 @@ private: sal_uInt16 mnSmooth; ///< 0 = progress blocks, 1 = pixel resolution. }; -// ============================================================================ + /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase @@ -490,7 +490,7 @@ public: virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); }; -// ============================================================================ + /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase @@ -514,7 +514,7 @@ private: bool mbSupportsAlign; ///< True = UNO model supports Align property. }; -// ============================================================================ + /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel @@ -543,7 +543,7 @@ public: // direct access needed for legacy VML drawing controls bool mbFocusOnClick; ///< True = take focus on click. }; -// ============================================================================ + /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel @@ -571,7 +571,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase @@ -618,7 +618,7 @@ public: std::vector< ::rtl::OUString > maTabNames; // names for each tab }; -// ============================================================================ + /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel @@ -655,7 +655,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnVerticalAlign; ///< Vertical alignment (legacy VML drawing controls only). }; -// ============================================================================ + /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase @@ -669,7 +669,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase @@ -683,7 +683,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase @@ -700,7 +700,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase @@ -714,7 +714,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase @@ -728,7 +728,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase @@ -742,7 +742,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase @@ -756,7 +756,7 @@ public: virtual void exportCompObj( BinaryOutputStream& rOutStrm ); }; -// ============================================================================ + /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase @@ -785,7 +785,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase @@ -816,7 +816,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnDelay; ///< Repeat delay in milliseconds. }; -// ============================================================================ + typedef ::std::vector< OUString > AxClassTable; @@ -859,7 +859,7 @@ public: // direct access needed for legacy VML drawing controls typedef ::boost::shared_ptr< AxContainerModelBase > AxContainerModelRef; -// ============================================================================ + /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase @@ -893,7 +893,7 @@ public: sal_uInt32 mnTabStyle; }; -// ============================================================================ + /** Model for a Forms 2.0 user form. */ @@ -922,7 +922,7 @@ public: explicit HtmlTextBoxModel(); virtual bool importBinaryModel( BinaryInputStream& rInStrm ); }; -// ============================================================================ + /** A form control embedded in a document draw page. Contains a specific model structure according to the type of the control. */ @@ -968,7 +968,7 @@ private: OUString maName; ///< Name of the control. }; -// ---------------------------------------------------------------------------- + template< typename ModelType > inline ModelType& EmbeddedControl::createModel() @@ -988,7 +988,7 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) return *xModel; } -// ============================================================================ + /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm @@ -1021,7 +1021,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxFormIC; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 92173c1851b7..3139060f9030 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -28,7 +28,7 @@ namespace ole { class ControlModelBase; class EmbeddedControl; -// ============================================================================ + /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 @@ -46,7 +46,7 @@ private: sal_Int32 mnPropId; ///< Identifier of currently processed property. }; -// ============================================================================ + /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 @@ -64,7 +64,7 @@ private: EmbeddedControl& mrControl; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index ce1b0f6aaaf5..c8e764e997cc 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -28,7 +28,7 @@ namespace oox { namespace ole { -// ============================================================================ + const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 0b5dc4f03a3d..82afa4173112 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -55,13 +55,13 @@ typedef ::boost::shared_ptr< oox::BinaryXInputStream > BinaryXInputStreamRef; namespace ole { -// ============================================================================ + #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDHLINK "{79EAC9D0-BAF9-11CE-8C82-00AA004BA90B}" -// ============================================================================ + const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -88,7 +88,7 @@ struct StdFontInfo sal_uInt8 nFlags = 0 ); }; -// ============================================================================ + /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo @@ -99,7 +99,7 @@ struct StdHlinkInfo OUString maFrame; }; -// ============================================================================ + /** Static helper functions for OLE import/export. */ class OOX_DLLPUBLIC OleHelper @@ -197,7 +197,7 @@ public: }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index d869712067f2..a723949f539c 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -33,7 +33,7 @@ namespace oox { class PropertyMap; } namespace oox { namespace ole { -// ============================================================================ + /** Contains generic information about an OLE object. */ struct OleObjectInfo @@ -48,7 +48,7 @@ struct OleObjectInfo explicit OleObjectInfo(); }; -// ============================================================================ + /** Helper for OLE object handling. */ class OleObjectHelper @@ -69,7 +69,7 @@ private: sal_Int32 mnObjectId; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 78e4c4c442a6..22223aee2785 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace ole { -// ============================================================================ + /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase @@ -100,7 +100,7 @@ private: const OleStorage* mpParentStorage; ///< Parent OLE storage that contains this storage. }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index fa0ed5ebeda0..01612bdbd332 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -33,7 +33,7 @@ namespace oox { class StorageBase; } namespace oox { namespace ole { -// ============================================================================ + /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ @@ -94,7 +94,7 @@ protected: typedef ::boost::shared_ptr< VbaSiteModel > VbaSiteModelRef; -// ============================================================================ + /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -171,7 +171,7 @@ private: AxClassTable maClassTable; ///< Class identifiers for exotic embedded controls. }; -// ============================================================================ + class VbaUserForm : public VbaFormControl { @@ -196,7 +196,7 @@ private: ControlConverter maConverter; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index a593a176ba4b..3f9202f5b1cb 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -49,7 +49,7 @@ const sal_uInt16 VBA_ID_PROJECTMODULES = 0x000F; const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; -// ============================================================================ + /** Static helper functions for the VBA filters. */ class VbaHelper @@ -88,7 +88,7 @@ private: ~VbaHelper(); }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index c4c4f0c1aa51..c0adb5bda13f 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -26,7 +26,7 @@ namespace oox { namespace ole { -// ============================================================================ + /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream @@ -64,7 +64,7 @@ private: size_t mnChunkPos; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 01678bec5264..03d64f6ecd9e 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -38,7 +38,7 @@ namespace oox { namespace oox { namespace ole { -// ============================================================================ + class VbaModule { @@ -99,7 +99,7 @@ private: bool mbExecutable; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9c83c67f4eba..0bfd244d04d6 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -41,7 +41,7 @@ namespace oox { class GraphicHelper; } namespace oox { namespace ole { -// ============================================================================ + class OOX_DLLPUBLIC VbaFilterConfig { @@ -63,7 +63,7 @@ private: mxConfigAccess; }; -// ============================================================================ + /** Base class for objects that attach a amcro to a specific action. @@ -104,7 +104,7 @@ private: typedef ::boost::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; -// ============================================================================ + class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { @@ -205,7 +205,7 @@ private: VbaModuleMap maModulesByStrm; }; -// ============================================================================ + } // namespace ole } // namespace oox diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index e01ac84eff5d..7f5da0c39730 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -25,7 +25,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 6252ad558dcf..730a0e839042 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class QuickDiagrammingImport : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 3030c2465251..64131975bfd2 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class QuickDiagrammingLayout : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 4143461f4d52..308a7fb60e9b 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -31,7 +31,7 @@ namespace oox { namespace ppt { -// --------------------------------------------------------------------- + class PowerPointImport : public oox::core::XmlFilterBase { diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index ce23fbe600da..ed6e343ce92e 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -46,7 +46,7 @@ enum ShapeLocation Slide }; -// --------------------------------------------------------------------- + class TimeNode; class SlidePersist; diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index cf1d0fdd7fe4..46c89d658b80 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -26,7 +26,7 @@ namespace oox { -// ============================================================================ + /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap @@ -43,7 +43,7 @@ struct NamespaceMap /** Thread-save singleton of a map of all supported XML namespace URLs. */ struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index f8e1bbe97d45..3d0c8db6134c 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -26,7 +26,7 @@ namespace oox { -// ============================================================================ + /** A vector that contains all predefined property names used in the filters. */ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; @@ -34,7 +34,7 @@ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVecto /** Thread-save singleton of a vector of all supported property names. */ struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index bddc0ce6a34d..122d51e03494 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -27,7 +27,7 @@ namespace oox { -// ============================================================================ + class TokenMap { @@ -81,11 +81,11 @@ private: sal_Int32 mnAlphaTokens[26]; }; -// ============================================================================ + struct StaticTokenMap : public ::rtl::Static< TokenMap, StaticTokenMap > {}; -// ============================================================================ + } // namespace oox diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ae6f79e3375b..c6c53fd19409 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -47,7 +47,7 @@ namespace vml { class ShapeBase; struct ClientData; -// ============================================================================ + /** Enumerates different types of VML drawings. */ enum DrawingType @@ -57,7 +57,7 @@ enum DrawingType VMLDRAWING_POWERPOINT ///< PowerPoint: OLE objects are part of DrawingML. }; -// ============================================================================ + /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo @@ -88,7 +88,7 @@ struct OOX_DLLPUBLIC ControlInfo void setShapeId( sal_Int32 nShapeId ); }; -// ============================================================================ + /** Represents the collection of VML shapes for a complete draw page. */ class OOX_DLLPUBLIC Drawing @@ -203,7 +203,7 @@ private: const DrawingType meType; ///< Application type containing the drawing. }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index d896f1e92621..eb5bb5571567 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -28,7 +28,7 @@ namespace vml { class Drawing; -// ============================================================================ + class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 { @@ -50,7 +50,7 @@ private: Drawing& mrDrawing; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index c7d84ffe8ffc..070fb2a7e41f 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -37,12 +37,12 @@ namespace oox { namespace oox { namespace vml { -// ============================================================================ + typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; typedef ::std::pair< double, double > DoublePair; -// ============================================================================ + class OOX_DLLPUBLIC ConversionHelper { @@ -162,7 +162,7 @@ private: ~ConversionHelper(); }; -// ============================================================================ + /** The stroke arrow model structure contains all properties for an line end arrow. */ struct StrokeArrowModel @@ -174,7 +174,7 @@ struct StrokeArrowModel void assignUsed( const StrokeArrowModel& rSource ); }; -// ============================================================================ + /** The stroke model structure contains all shape border properties. */ struct StrokeModel @@ -198,7 +198,7 @@ struct StrokeModel const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + /** The fill model structure contains all shape fill properties. */ struct OOX_DLLPUBLIC FillModel @@ -224,7 +224,7 @@ struct OOX_DLLPUBLIC FillModel const GraphicHelper& rGraphicHelper ) const; }; -// ============================================================================ + /** The shadow model structure contains all shape shadow properties. */ struct OOX_DLLPUBLIC ShadowModel diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 55d8b1d2eefd..af94056156b9 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace vml { -// ============================================================================ + typedef ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream > InputStream_BASE; @@ -88,7 +88,7 @@ private: sal_Int32 mnBufferPos; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index e45c87d1139b..8e0183d9c445 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -40,7 +40,7 @@ class Drawing; struct ShapeParentAnchor; class ShapeContainer; -// ============================================================================ + const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_CHECKED = 1; @@ -52,7 +52,7 @@ const sal_Int32 VML_CLIENTDATA_NUMBER = 2; const sal_Int32 VML_CLIENTDATA_REFERENCE = 3; const sal_Int32 VML_CLIENTDATA_FORMULA = 4; -// ============================================================================ + /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel @@ -109,7 +109,7 @@ struct OOX_DLLPUBLIC ShapeTypeModel void assignUsed( const ShapeTypeModel& rSource ); }; -// ---------------------------------------------------------------------------- + /** A shape template contains all formatting properties of shapes and can serve as templates for several shapes in a drawing. */ @@ -148,7 +148,7 @@ protected: ShapeTypeModel maTypeModel; ///< The model structure containing shape type data. }; -// ============================================================================ + /** Excel specific shape client data (such as cell anchor). */ struct ClientData @@ -186,7 +186,7 @@ struct ClientData explicit ClientData(); }; -// ---------------------------------------------------------------------------- + struct ShapeModel { @@ -217,7 +217,7 @@ struct ShapeModel ClientData& createClientData(); }; -// ---------------------------------------------------------------------------- + /** A shape object that is part of a drawing. May inherit properties from a shape template. */ @@ -278,7 +278,7 @@ protected: ShapeModel maShapeModel; ///< The model structure containing shape data. }; -// ============================================================================ + /** A simple shape object based on a specific UNO shape service. */ class SimpleShape : public ShapeBase @@ -303,7 +303,7 @@ private: OUString maService; ///< Name of the UNO shape service. }; -// ============================================================================ + /** A rectangular shape object. */ class RectangleShape : public SimpleShape @@ -318,7 +318,7 @@ protected: const com::sun::star::awt::Rectangle& rShapeRect) const; }; -// ============================================================================ + /** An oval shape object. */ class EllipseShape : public SimpleShape @@ -327,7 +327,7 @@ public: explicit EllipseShape( Drawing& rDrawing ); }; -// ============================================================================ + /** A polygon shape object. */ class PolyLineShape : public SimpleShape @@ -371,7 +371,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A shape object with custom geometry. */ class CustomShape : public SimpleShape @@ -387,7 +387,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A complex shape object. This can be a picture shape, a custom shape, an OLE object, or an ActiveX form control. */ @@ -404,7 +404,7 @@ protected: const ::com::sun::star::awt::Rectangle& rShapeRect ) const; }; -// ============================================================================ + /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase @@ -440,7 +440,7 @@ private: ShapeContainerPtr mxChildren; ///< Shapes and templates that are part of this group. }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index f927ec83f599..cc8058595cee 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -36,7 +36,7 @@ class Drawing; class ShapeType; class ShapeBase; -// ============================================================================ + struct ShapeParentAnchor { @@ -44,7 +44,7 @@ struct ShapeParentAnchor ::com::sun::star::awt::Rectangle maCoordSys; }; -// ============================================================================ + /** Container that holds a list of shapes and shape templates. */ class ShapeContainer @@ -121,7 +121,7 @@ private: std::stack< size_t > markStack; ///< Recursion marks from pushMark()/popMark(). }; -// ---------------------------------------------------------------------------- + template< typename ShapeT > ShapeT& ShapeContainer::createShape() @@ -143,7 +143,7 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const return maShapes.findIf( rFunctor ).get(); } -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 1509fc9b4700..a4b6b6eb76ce 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -38,7 +38,7 @@ class RectangleShape; class ShapeContainer; -// ============================================================================ + class ShapeLayoutContext : public ::oox::core::ContextHandler2 { @@ -54,7 +54,7 @@ private: Drawing& mrDrawing; }; -// ============================================================================ + class ClientDataContext : public ::oox::core::ContextHandler2 { @@ -74,7 +74,7 @@ private: OUString maElementText; }; -// ============================================================================ + class ShapeContextBase : public ::oox::core::ContextHandler2 { @@ -90,7 +90,7 @@ protected: explicit ShapeContextBase( ::oox::core::ContextHandler2Helper& rParent ); }; -// ============================================================================ + class ShapeTypeContext : public ShapeContextBase { @@ -114,7 +114,7 @@ private: ShapeTypeModel& mrTypeModel; }; -// ============================================================================ + class ShapeContext : public ShapeTypeContext { @@ -148,7 +148,7 @@ private: ShapeModel& mrShapeModel; }; -// ============================================================================ + class GroupShapeContext : public ShapeContext { @@ -165,7 +165,7 @@ private: ShapeContainer& mrShapes; }; -// ============================================================================ + class RectangleShapeContext : public ShapeContext { @@ -178,7 +178,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index ecc04c097f26..3ff88d48804a 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -35,7 +35,7 @@ namespace vml { struct ShapeTypeModel; -// ============================================================================ + /// A text paragraph in a textbox. struct TextParagraphModel @@ -59,7 +59,7 @@ struct OOX_DLLPUBLIC TextFontModel explicit TextFontModel(); }; -// ============================================================================ + /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel @@ -71,7 +71,7 @@ struct TextPortionModel explicit TextPortionModel( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText ); }; -// ============================================================================ + /** The textbox contains all text contents and properties. */ class OOX_DLLPUBLIC TextBox @@ -102,7 +102,7 @@ private: PortionVector maPortions; }; -// ============================================================================ + } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index 740b816ecb82..b7d6d72323da 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -28,7 +28,7 @@ namespace oox { namespace vml { -// ============================================================================ + class TextPortionContext : public ::oox::core::ContextHandler2 { @@ -54,7 +54,7 @@ private: size_t mnInitialPortions; }; -// ============================================================================ + class TextBoxContext : public ::oox::core::ContextHandler2 { @@ -75,7 +75,7 @@ private: TextParagraphModel maParagraph; }; -// ============================================================================ + } // namespace vml } // namespace oox |