summaryrefslogtreecommitdiff
path: root/oox/source/vml
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/vml')
-rw-r--r--oox/source/vml/vmldrawing.cxx12
-rw-r--r--oox/source/vml/vmldrawingfragment.cxx6
-rw-r--r--oox/source/vml/vmlformatting.cxx16
-rw-r--r--oox/source/vml/vmlinputstream.cxx10
-rw-r--r--oox/source/vml/vmlshape.cxx34
-rw-r--r--oox/source/vml/vmlshapecontainer.cxx8
-rw-r--r--oox/source/vml/vmlshapecontext.cxx21
-rw-r--r--oox/source/vml/vmltextboxcontext.cxx8
8 files changed, 0 insertions, 115 deletions
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index d80155f8b3d4..97634ef86019 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -37,8 +37,6 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
@@ -49,8 +47,6 @@ using namespace ::com::sun::star::uno;
using ::oox::core::XmlFilterBase;
-
-
namespace {
/** Returns the textual representation of a numeric VML shape identifier. */
@@ -70,8 +66,6 @@ sal_Int32 lclGetShapeId( const OUString& rShapeId )
} // namespace
-
-
OleObjectInfo::OleObjectInfo( bool bDmlShape ) :
mbAutoLoad( false ),
mbDmlShape( bDmlShape )
@@ -83,8 +77,6 @@ void OleObjectInfo::setShapeId( sal_Int32 nShapeId )
maShapeId = lclGetShapeId( nShapeId );
}
-
-
ControlInfo::ControlInfo()
{
}
@@ -94,8 +86,6 @@ void ControlInfo::setShapeId( sal_Int32 nShapeId )
maShapeId = lclGetShapeId( nShapeId );
}
-
-
Drawing::Drawing( XmlFilterBase& rFilter, const Reference< XDrawPage >& rxDrawPage, DrawingType eType ) :
mrFilter( rFilter ),
mxDrawPage( rxDrawPage ),
@@ -290,8 +280,6 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/,
{
}
-
-
} // namespace vml
} // namespave oox
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index b8646a335383..4ba82addae71 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -27,14 +27,10 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
using namespace ::oox::core;
-
-
DrawingFragment::DrawingFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, Drawing& rDrawing ) :
FragmentHandler2( rFilter, rFragmentPath, false ), // do not trim whitespace, has been preprocessed by the input stream
mrDrawing( rDrawing )
@@ -79,8 +75,6 @@ void DrawingFragment::finalizeImport()
mrDrawing.finalizeFragmentImport();
}
-
-
} // namespace vml
} // namespace oox
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 86b303e94fb3..83f4c2955952 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -35,8 +35,6 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::geometry;
@@ -50,8 +48,6 @@ using ::com::sun::star::drawing::PolygonFlags;
using ::com::sun::star::drawing::PolygonFlags_NORMAL;
using ::com::sun::star::drawing::PolygonFlags_CONTROL;
-
-
namespace {
bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& rValue )
@@ -64,8 +60,6 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
} // namespace
-
-
bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
const OUString& rValue, sal_Unicode cSep )
{
@@ -497,8 +491,6 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
}
}
-
-
namespace {
sal_Int64 lclGetEmu( const GraphicHelper& rGraphicHelper, const OptValue< OUString >& roValue, sal_Int64 nDefValue )
@@ -620,8 +612,6 @@ sal_Int32 lclGetDmlLineJoint( const OptValue< sal_Int32 >& roJoinStyle )
} // namespace
-
-
void StrokeArrowModel::assignUsed( const StrokeArrowModel& rSource )
{
moArrowType.assignIfUsed( rSource.moArrowType );
@@ -629,8 +619,6 @@ void StrokeArrowModel::assignUsed( const StrokeArrowModel& rSource )
moArrowLength.assignIfUsed( rSource.moArrowLength );
}
-
-
void StrokeModel::assignUsed( const StrokeModel& rSource )
{
moStroked.assignIfUsed( rSource.moStroked );
@@ -671,8 +659,6 @@ void StrokeModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper
aLineProps.pushToPropMap( rPropMap, rGraphicHelper );
}
-
-
void FillModel::assignUsed( const FillModel& rSource )
{
moFilled.assignIfUsed( rSource.moFilled );
@@ -809,8 +795,6 @@ void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper&
aFillProps.pushToPropMap( rPropMap, rGraphicHelper );
}
-
-
ShadowModel::ShadowModel()
: mbHasShadow(false)
{
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index f373bad0c0d1..28ef7bb2cf6f 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -29,13 +29,9 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
-
-
namespace {
inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar )
@@ -77,8 +73,6 @@ inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, co
rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) );
}
-
-
void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
{
/* Map attribute names to char-pointer of all attributes. This map is used
@@ -255,8 +249,6 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
} // namespace
-
-
InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) :
// use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters
mxTextStrm( TextInputStream::createXTextInputStream( rxContext, rxInStrm, RTL_TEXTENCODING_ISO_8859_1 ) ),
@@ -386,8 +378,6 @@ OString InputStream::readToElementEnd() throw (IOException, RuntimeException)
return aText;
}
-
-
} // namespace vml
} // namespave oox
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d7783d806cb0..879b462c9c14 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star::text;
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::graphic;
@@ -78,15 +76,11 @@ using namespace ::com::sun::star::io;
using ::oox::core::XmlFilterBase;
-
-
namespace {
const sal_Int32 VML_SHAPETYPE_PICTUREFRAME = 75;
const sal_Int32 VML_SHAPETYPE_HOSTCONTROL = 201;
-
-
awt::Point lclGetAbsPoint( const awt::Point& rRelPoint, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys )
{
double fWidthRatio = static_cast< double >( rShapeRect.Width ) / rCoordSys.Width;
@@ -111,8 +105,6 @@ awt::Rectangle lclGetAbsRect( const awt::Rectangle& rRelRect, const awt::Rectang
} // namespace
-
-
ShapeTypeModel::ShapeTypeModel():
mbAutoHeight( false ),
mbVisible( true )
@@ -132,8 +124,6 @@ void ShapeTypeModel::assignUsed( const ShapeTypeModel& rSource )
moGraphicTitle.assignIfUsed( rSource.moGraphicTitle );
}
-
-
ShapeType::ShapeType( Drawing& rDrawing ) :
mrDrawing( rDrawing )
{
@@ -210,8 +200,6 @@ awt::Rectangle ShapeType::getRelRectangle() const
nWidth, nHeight );
}
-
-
ClientData::ClientData() :
mnObjType( XML_TOKEN_INVALID ),
mnTextHAlign( XML_Left ),
@@ -239,8 +227,6 @@ ClientData::ClientData() :
{
}
-
-
ShapeModel::ShapeModel()
{
}
@@ -261,8 +247,6 @@ ClientData& ShapeModel::createClientData()
return *mxClientData;
}
-
-
ShapeBase::ShapeBase( Drawing& rDrawing ) :
ShapeType( rDrawing )
{
@@ -452,8 +436,6 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con
PropertySet( rxShape ).setProperties( aPropMap );
}
-
-
SimpleShape::SimpleShape( Drawing& rDrawing, const OUString& rService ) :
ShapeBase( rDrawing ),
maService( rService )
@@ -739,8 +721,6 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >
return xShape;
}
-
-
RectangleShape::RectangleShape( Drawing& rDrawing ) :
SimpleShape( rDrawing, "com.sun.star.drawing.RectangleShape" )
{
@@ -773,15 +753,11 @@ Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>&
return xShape;
}
-
-
EllipseShape::EllipseShape( Drawing& rDrawing ) :
SimpleShape( rDrawing, "com.sun.star.drawing.EllipseShape" )
{
}
-
-
PolyLineShape::PolyLineShape( Drawing& rDrawing ) :
SimpleShape( rDrawing, "com.sun.star.drawing.PolyLineShape" )
{
@@ -837,8 +813,6 @@ awt::Rectangle LineShape::getRelRectangle() const
return aShapeRect;
}
-
-
BezierShape::BezierShape(Drawing& rDrawing)
: SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape")
{
@@ -939,8 +913,6 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
return xShape;
}
-
-
CustomShape::CustomShape( Drawing& rDrawing ) :
SimpleShape( rDrawing, "com.sun.star.drawing.CustomShape" )
{
@@ -964,8 +936,6 @@ Reference< XShape > CustomShape::implConvertAndInsert( const Reference< XShapes
return xShape;
}
-
-
ComplexShape::ComplexShape( Drawing& rDrawing ) :
CustomShape( rDrawing )
{
@@ -1056,8 +1026,6 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
return CustomShape::implConvertAndInsert( rxShapes, rShapeRect );
}
-
-
GroupShape::GroupShape( Drawing& rDrawing ) :
ShapeBase( rDrawing ),
mxChildren( new ShapeContainer( rDrawing ) )
@@ -1138,8 +1106,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
return xGroupShape;
}
-
-
} // namespace vml
} // namespace oox
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 74f7c23061ac..76daf625eeac 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -25,14 +25,10 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::uno;
-
-
namespace {
template< typename ShapeType >
@@ -52,8 +48,6 @@ void lclMapShapesById( RefMap< OUString, ShapeType >& orMap, const RefVector< Sh
} // namespace
-
-
ShapeContainer::ShapeContainer( Drawing& rDrawing ) :
mrDrawing( rDrawing )
{
@@ -135,8 +129,6 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con
(*aIt)->convertAndInsert( rxShapes, pParentAnchor );
}
-
-
} // namespace vml
} // namespace oox
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 146940e03041..0471573db09d 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -28,16 +28,12 @@
namespace oox {
namespace vml {
-
-
using namespace ::com::sun::star;
using ::oox::core::ContextHandler2;
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
namespace {
/** Returns the boolean value from the specified VML attribute (if present).
@@ -134,15 +130,12 @@ bool lclDecodeVmlxBool( const OUString& rValue, bool bDefaultForEmpty )
} // namespace
-
-
ShapeLayoutContext::ShapeLayoutContext( ContextHandler2Helper& rParent, Drawing& rDrawing ) :
ContextHandler2( rParent ),
mrDrawing( rDrawing )
{
}
-
ContextHandlerRef ShapeLayoutContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{
switch( nElement )
@@ -163,8 +156,6 @@ ContextHandlerRef ShapeLayoutContext::onCreateContext( sal_Int32 nElement, const
return 0;
}
-
-
ClientDataContext::ClientDataContext( ContextHandler2Helper& rParent,
ClientData& rClientData, const AttributeList& rAttribs ) :
ContextHandler2( rParent ),
@@ -225,8 +216,6 @@ void ClientDataContext::onEndElement()
}
}
-
-
ShapeContextBase::ShapeContextBase( ContextHandler2Helper& rParent ) :
ContextHandler2( rParent )
{
@@ -271,8 +260,6 @@ ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& r
return 0;
}
-
-
ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& rShapeType, const AttributeList& rAttribs ) :
ShapeContextBase( rParent ),
mrTypeModel( rShapeType.getTypeModel() )
@@ -429,8 +416,6 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
}
}
-
-
ShapeContext::ShapeContext( ContextHandler2Helper& rParent, ShapeBase& rShape, const AttributeList& rAttribs ) :
ShapeTypeContext( rParent, rShape, rAttribs ),
mrShape( rShape ),
@@ -521,9 +506,6 @@ void ShapeContext::setVmlPath( const OUString& rPath )
mrShapeModel.maVmlPath = rPath;
}
-
-
-
GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, GroupShape& rShape, const AttributeList& rAttribs ) :
ShapeContext( rParent, rShape, rAttribs ),
mrShapes( rShape.getChildren() )
@@ -538,8 +520,6 @@ ContextHandlerRef GroupShapeContext::onCreateContext( sal_Int32 nElement, const
return xContext.get() ? xContext : ShapeContext::onCreateContext( nElement, rAttribs );
}
-
-
RectangleShapeContext::RectangleShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, RectangleShape& rShape ) :
ShapeContext( rParent, rShape, rAttribs )
{
@@ -551,7 +531,6 @@ ContextHandlerRef RectangleShapeContext::onCreateContext( sal_Int32 nElement, co
return ShapeContext::onCreateContext( nElement, rAttribs );
}
-
} // namespace vml
} // namespace oox
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index ab3c11afb732..7442e9eea3f6 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -25,14 +25,10 @@
namespace oox {
namespace vml {
-
-
using ::oox::core::ContextHandler2;
using ::oox::core::ContextHandler2Helper;
using ::oox::core::ContextHandlerRef;
-
-
TextPortionContext::TextPortionContext( ContextHandler2Helper& rParent,
TextBox& rTextBox, TextParagraphModel& rParagraph, const TextFontModel& rParentFont,
sal_Int32 nElement, const AttributeList& rAttribs ) :
@@ -170,8 +166,6 @@ void TextPortionContext::onEndElement()
mrTextBox.appendPortion( maParagraph, maFont, OUString( ' ' ) );
}
-
-
TextBoxContext::TextBoxContext( ContextHandler2Helper& rParent, TextBox& rTextBox, const AttributeList& rAttribs,
const GraphicHelper& graphicHelper ) :
ContextHandler2( rParent ),
@@ -275,8 +269,6 @@ void TextBoxContext::onEndElement()
}
}
-
-
} // namespace vml
} // namespace oox
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-10 18:52:00 +0000