summaryrefslogtreecommitdiff
path: root/include/oox/vml
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 19:06:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-01 09:51:32 -0600
commit8792ec7b2129650777b7b4bfacaa7c13d923279b (patch)
treef181e37b61533b460397cc68625fd21f46bb6393 /include/oox/vml
parentdff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff)
Remove visual noise from include
Conflicts: include/framework/preventduplicateinteraction.hxx include/sfx2/sfxbasecontroller.hxx include/sfx2/sfxbasemodel.hxx include/toolkit/awt/vclxtabpagemodel.hxx include/vcl/field.hxx include/vcl/settings.hxx Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2 Reviewed-on: https://gerrit.libreoffice.org/8272 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/oox/vml')
-rw-r--r--include/oox/vml/vmldrawing.hxx8
-rw-r--r--include/oox/vml/vmldrawingfragment.hxx4
-rw-r--r--include/oox/vml/vmlformatting.hxx12
-rw-r--r--include/oox/vml/vmlinputstream.hxx4
-rw-r--r--include/oox/vml/vmlshape.hxx28
-rw-r--r--include/oox/vml/vmlshapecontainer.hxx8
-rw-r--r--include/oox/vml/vmlshapecontext.hxx16
-rw-r--r--include/oox/vml/vmltextbox.hxx8
-rw-r--r--include/oox/vml/vmltextboxcontext.hxx6
9 files changed, 47 insertions, 47 deletions
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