summaryrefslogtreecommitdiff
path: root/filter/source/flash
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /filter/source/flash
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter/source/flash')
-rw-r--r--filter/source/flash/impswfdialog.cxx8
-rw-r--r--filter/source/flash/swfdialog.cxx48
-rw-r--r--filter/source/flash/swfexporter.cxx22
-rw-r--r--filter/source/flash/swffilter.cxx12
-rw-r--r--filter/source/flash/swfwriter.cxx42
-rw-r--r--filter/source/flash/swfwriter1.cxx64
-rw-r--r--filter/source/flash/swfwriter2.cxx70
7 files changed, 133 insertions, 133 deletions
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 0bb623916f4d..eea9ab89c829 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -24,9 +24,9 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-// ----------------
+
// - ImpPDFDialog -
-// ----------------
+
ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) :
ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ),
@@ -60,13 +60,13 @@ ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterD
#endif
}
-// -----------------------------------------------------------------------------
+
ImpSWFDialog::~ImpSWFDialog()
{
}
-// -----------------------------------------------------------------------------
+
Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
{
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index b63604fac578..5a44f73d9046 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -38,13 +38,13 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::view;
using namespace ::com::sun::star::document;
-// -----------------------
+
// - PDFDialog functions -
-// -----------------------
+
#define SERVICE_NAME "com.sun.star.Impress.FlashExportDialog"
-// -----------------------------------------------------------------------------
+
OUString SWFDialog_getImplementationName ()
throw (RuntimeException)
@@ -52,7 +52,7 @@ OUString SWFDialog_getImplementationName ()
return OUString ( SERVICE_NAME );
}
-// -----------------------------------------------------------------------------
+
Sequence< sal_Int8 > SAL_CALL SWFDialog_getImplementationId()
throw(RuntimeException)
@@ -61,7 +61,7 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog_getImplementationId()
return aId.getImplementationId();
}
-// -----------------------------------------------------------------------------
+
Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
throw (RuntimeException)
@@ -72,7 +72,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
return aRet;
}
-// -----------------------------------------------------------------------------
+
Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
@@ -80,26 +80,26 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul
return (cppu::OWeakObject*) new SWFDialog( comphelper::getComponentContext(rSMgr) );
}
-// -----------------------------------------------------------------------------
+
#undef SERVICE_NAME
-// -------------
+
// - SWFDialog -
-// -------------
+
SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) :
OGenericUnoDialog( rxContext )
{
}
-// -----------------------------------------------------------------------------
+
SWFDialog::~SWFDialog()
{
}
-// -----------------------------------------------------------------------------
+
Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
throw (RuntimeException)
@@ -114,7 +114,7 @@ Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
return aReturn;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SWFDialog::acquire()
throw ()
@@ -122,7 +122,7 @@ void SAL_CALL SWFDialog::acquire()
OWeakObject::acquire();
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SWFDialog::release()
throw ()
@@ -130,7 +130,7 @@ void SAL_CALL SWFDialog::release()
OWeakObject::release();
}
-// -----------------------------------------------------------------------------
+
Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
throw(RuntimeException)
@@ -138,7 +138,7 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
return SWFDialog_getImplementationId();
}
-// -----------------------------------------------------------------------------
+
OUString SAL_CALL SWFDialog::getImplementationName()
throw (RuntimeException)
@@ -146,7 +146,7 @@ OUString SAL_CALL SWFDialog::getImplementationName()
return SWFDialog_getImplementationName();
}
-// -----------------------------------------------------------------------------
+
Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
throw (RuntimeException)
@@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
return SWFDialog_getSupportedServiceNames();
}
-// -----------------------------------------------------------------------------
+
Dialog* SWFDialog::createDialog( Window* pParent )
{
@@ -189,7 +189,7 @@ Dialog* SWFDialog::createDialog( Window* pParent )
return pRet;
}
-// -----------------------------------------------------------------------------
+
void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
{
@@ -199,7 +199,7 @@ void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
destroyDialog();
}
-// -----------------------------------------------------------------------------
+
Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
throw(RuntimeException)
@@ -208,13 +208,13 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
return xInfo;
}
-//-------------------------------------------------------------------------
+
::cppu::IPropertyArrayHelper& SWFDialog::getInfoHelper()
{
return *const_cast<SWFDialog*>(this)->getArrayHelper();
}
-//------------------------------------------------------------------------------
+
::cppu::IPropertyArrayHelper* SWFDialog::createArrayHelper() const
{
Sequence< Property > aProps;
@@ -222,7 +222,7 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
return new ::cppu::OPropertyArrayHelper( aProps );
}
-// -----------------------------------------------------------------------------
+
Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
throw ( RuntimeException )
@@ -244,7 +244,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
return maMediaDescriptor;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
@@ -261,7 +261,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL SWFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
throw(IllegalArgumentException, RuntimeException)
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index f67269787142..b9e7850a3bff 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -58,7 +58,7 @@ using com::sun::star::document::XFilter;
using com::sun::star::frame::XModel;
using com::sun::star::lang::XServiceInfo;
-// -----------------------------------------------------------------------------
+
PageInfo::PageInfo()
: meFadeEffect( FadeEffect_NONE )
@@ -73,7 +73,7 @@ PageInfo::PageInfo()
{
}
-// -----------------------------------------------------------------------------
+
PageInfo::~PageInfo()
{
@@ -86,7 +86,7 @@ PageInfo::~PageInfo()
}
#ifdef THEFUTURE
-// -----------------------------------------------------------------------------
+
void PageInfo::addShape( ShapeInfo* pShapeInfo )
{
@@ -94,7 +94,7 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo )
}
#endif
-// -----------------------------------------------------------------------------
+
FlashExporter::FlashExporter(const Reference< XComponentContext > &rxContext, sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG)
: mxContext(rxContext)
@@ -108,7 +108,7 @@ FlashExporter::FlashExporter(const Reference< XComponentContext > &rxContext, sa
{
}
-// -----------------------------------------------------------------------------
+
FlashExporter::~FlashExporter()
{
@@ -123,7 +123,7 @@ void FlashExporter::Flush()
maPagesMap.clear();
}
-// -----------------------------------------------------------------------------
+
const sal_uInt16 cBackgroundDepth = 2;
const sal_uInt16 cBackgroundObjectsDepth = 3;
@@ -381,7 +381,7 @@ sal_Bool FlashExporter::exportSound( Reference< XOutputStream > &xOutputStream,
}
#endif // defined AUGUSTUS
-// -----------------------------------------------------------------------------
+
sal_Int32 nPlaceDepth;
// AS: A Slide can have a private background or use its masterpage's background.
@@ -485,7 +485,7 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X
return nPage;
}
-// -----------------------------------------------------------------------------
+
/** export's the definition of the shapes inside this drawing page and adds the
shape infos to the current PageInfo */
@@ -495,7 +495,7 @@ void FlashExporter::exportDrawPageContents( Reference< XDrawPage >& xPage, bool
exportShapes(xShapes, bStream, bMaster);
}
-// -----------------------------------------------------------------------------
+
/** export's the definition of the shapes inside this XShapes container and adds the
shape infos to the current PageInfo */
@@ -528,7 +528,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b
}
}
-// -----------------------------------------------------------------------------
+
/** export this shape definition and adds it's info to the current PageInfo */
void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
@@ -641,7 +641,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
}
}
-// -----------------------------------------------------------------------------
+
bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground /* = false */, bool bExportAsJPEG /* = false */)
{
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 76f920c84ea9..55270544f393 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -130,7 +130,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput( ) throw (::com::sun::star::i
}
}
-// -----------------------------------------------------------------------------
+
class FlashExportFilter : public cppu::WeakImplHelper4
<
@@ -167,7 +167,7 @@ public:
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException);
};
-// -----------------------------------------------------------------------------
+
FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext)
: mxContext( rxContext )
@@ -175,7 +175,7 @@ FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxCon
}
-// -----------------------------------------------------------------------------
+
OUString exportBackground(FlashExporter &aFlashExporter, Reference< XDrawPage > xDrawPage, OUString sPath, sal_uInt32 nPage, const char* suffix)
{
@@ -425,14 +425,14 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >&
return aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator );
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL FlashExportFilter::cancel( )
throw (RuntimeException)
{
}
-// -----------------------------------------------------------------------------
+
// XExporter
void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
@@ -441,7 +441,7 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno:
mxDoc = xDoc;
}
-// -----------------------------------------------------------------------------
+
// XInitialization
void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ )
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index a6c3fbf511db..a94ee9b396fe 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -27,7 +27,7 @@ using namespace ::std;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
-// -----------------------------------------------------------------------------
+
static MapMode aTWIPSMode( MAP_TWIP );
static MapMode a100thmmMode( MAP_100TH_MM );
@@ -39,7 +39,7 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM )
return nX;
}
-// -----------------------------------------------------------------------------
+
Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode )
: mpClipPolyPolygon( NULL ),
@@ -98,7 +98,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
#endif
}
-// -----------------------------------------------------------------------------
+
Writer::~Writer()
{
@@ -107,7 +107,7 @@ Writer::~Writer()
delete mpTag;
}
-// -----------------------------------------------------------------------------
+
void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > &xOut )
{
@@ -138,7 +138,7 @@ void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream >
}
}
-// -----------------------------------------------------------------------------
+
void Writer::storeTo( Reference< XOutputStream > &xOutStream )
{
@@ -183,7 +183,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
ImplCopySvStreamToXOutputStream( *mpMovieStream, xOutStream );
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::startSprite()
{
@@ -193,7 +193,7 @@ sal_uInt16 Writer::startSprite()
return nShapeId;
}
-// -----------------------------------------------------------------------------
+
void Writer::endSprite()
{
@@ -215,7 +215,7 @@ void Writer::endSprite()
}
}
-// -----------------------------------------------------------------------------
+
void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClip, const char* pName )
{
@@ -252,7 +252,7 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int
}
#ifdef THEFUTURE
-// -----------------------------------------------------------------------------
+
void Writer::moveShape( sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y )
{
@@ -281,7 +281,7 @@ void Writer::moveShape( sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y )
}
#endif
-// -----------------------------------------------------------------------------
+
void Writer::removeShape( sal_uInt16 nDepth )
{
@@ -290,7 +290,7 @@ void Writer::removeShape( sal_uInt16 nDepth )
endTag();
}
-// -----------------------------------------------------------------------------
+
void Writer::startTag( sal_uInt8 nTagId )
{
@@ -299,7 +299,7 @@ void Writer::startTag( sal_uInt8 nTagId )
mpTag = new Tag( nTagId );
}
-// -----------------------------------------------------------------------------
+
void Writer::endTag()
{
@@ -318,14 +318,14 @@ void Writer::endTag()
}
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::createID()
{
return mnNextId++;
}
-// -----------------------------------------------------------------------------
+
void Writer::showFrame()
{
@@ -336,7 +336,7 @@ void Writer::showFrame()
mnFrames++;
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 y )
{
@@ -369,7 +369,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16
return nId;
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::defineShape( const Polygon& rPoly, const FillStyle& rFillStyle )
{
@@ -377,7 +377,7 @@ sal_uInt16 Writer::defineShape( const Polygon& rPoly, const FillStyle& rFillStyl
return defineShape( aPolyPoly, rFillStyle );
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& rFillStyle )
{
@@ -421,7 +421,7 @@ sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& r
return nShapeId;
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor )
{
@@ -594,7 +594,7 @@ sal_Bool Writer::streamSound( const char * filename )
#endif // AUGUSTUS
-// -----------------------------------------------------------------------------
+
void Writer::stop()
{
@@ -604,7 +604,7 @@ void Writer::stop()
endTag();
}
-// -----------------------------------------------------------------------------
+
void Writer::waitOnClick( sal_uInt16 nDepth )
{
@@ -614,7 +614,7 @@ void Writer::waitOnClick( sal_uInt16 nDepth )
removeShape( nDepth );
}
-// -----------------------------------------------------------------------------
+
/** inserts a doaction tag with an ActionGotoFrame */
void Writer::gotoFrame( sal_uInt16 nFrame )
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 0448fe447974..d27ce022fa1b 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -52,7 +52,7 @@ extern sal_uInt16 getMaxBitsSigned( sal_Int32 nValue );
static MapMode aTWIPSMode( MAP_TWIP );
static MapMode a100thmmMode( MAP_100TH_MM );
-// -----------------------------------------------------------------------------
+
Point Writer::map( const Point& rPoint ) const
{
@@ -68,7 +68,7 @@ Point Writer::map( const Point& rPoint ) const
return retPoint;
}
-// -----------------------------------------------------------------------------
+
Size Writer::map( const Size& rSize ) const
{
@@ -84,7 +84,7 @@ Size Writer::map( const Size& rSize ) const
return retSize;
}
-// -----------------------------------------------------------------------------
+
void Writer::map( PolyPolygon& rPolyPolygon ) const
{
@@ -105,7 +105,7 @@ void Writer::map( PolyPolygon& rPolyPolygon ) const
}
}
-// -----------------------------------------------------------------------------
+
sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
{
@@ -116,7 +116,7 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
return nTwips;
}
-// -----------------------------------------------------------------------------
+
/**
*/
@@ -173,7 +173,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
}
}
-// -----------------------------------------------------------------------------
+
/** exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1
*/
@@ -196,7 +196,7 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1
rBits.writeUB( 1, 1 ); // set FillStyle1 or LineStyle to 1
}
-// -----------------------------------------------------------------------------
+
/** exports a straight edge record
*/
@@ -230,7 +230,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int
}
}
-// -----------------------------------------------------------------------------
+
/** exports a curved edge record
*/
@@ -253,7 +253,7 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s
rBits.writeSB( anchor_dy, nBits ); // DeltaY
}
-// -----------------------------------------------------------------------------
+
/** exports a end shape record
*/
@@ -262,7 +262,7 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits )
rBits.writeUB( 0, 6 );
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
{
@@ -270,7 +270,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
Impl_writePolyPolygon( aPolyPoly, bFilled );
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
{
@@ -278,7 +278,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Co
Impl_writePolyPolygon( aPolyPoly, bFilled, rFillColor, rLineColor );
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
{
@@ -291,7 +291,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
Impl_writePolyPolygon(rPolyPoly, bFilled, aFillColor, aLineColor );
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
{
@@ -326,7 +326,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
}
}
-// -----------------------------------------------------------------------------
+
/** a gradient is a transition from one color to another, rendered inside a given polypolygon */
void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient )
@@ -361,14 +361,14 @@ void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient&
}
}
-// -----------------------------------------------------------------------------
+
void Writer::setClipping( const PolyPolygon* pClipPolyPolygon )
{
mpClipPolyPolygon = pClipPolyPolygon;
}
-// -----------------------------------------------------------------------------
+
// AS: Just comparing fonts straight up is too literal. There are some
// differences in font that actually require different glyphs to be defined,
@@ -384,7 +384,7 @@ bool compare_fonts_for_me(const Font& rFont1, const Font& rFont2)
rFont1.GetRelief() == rFont2.GetRelief();
}
-// -----------------------------------------------------------------------------
+
FlashFont& Writer::Impl_getFont( const Font& rFont )
{
@@ -405,7 +405,7 @@ FlashFont& Writer::Impl_getFont( const Font& rFont )
return *pFont;
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth )
{
@@ -724,7 +724,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
}
}
-// -----------------------------------------------------------------------------
+
// AS: Because JPEGs require the alpha channel provided separately (JPEG does not
// natively support alpha channel, but SWF lets you provide it separately), we
// extract the alpha channel into a separate array here.
@@ -792,7 +792,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga
}
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQualityLevel )
{
sal_uLong bmpChecksum = bmpSource.GetChecksum();
@@ -885,7 +885,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
return nBitmapId;
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& /* rSrcPt */, const Size& /* rSrcSz */, const Rectangle& rClipRect, bool bNeedToMapClipRect )
{
@@ -982,7 +982,7 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Si
}
}
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 height, sal_uInt8 *pCompressed, sal_uInt32 compressed_size )
{
@@ -998,7 +998,7 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h
endTag();
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size )
{
@@ -1135,7 +1135,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
}
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor )
{
@@ -1150,7 +1150,7 @@ void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color*
mpVDev->SetLineColor( aOldColor );
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY )
{
@@ -1166,7 +1166,7 @@ void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY )
}
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY )
{
@@ -1217,7 +1217,7 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke )
return true;
}
-// -----------------------------------------------------------------------------
+
/** writes the filling defined by SvtGraphicFill and returns true or it returns
false if it can't handle this filling.
@@ -1294,7 +1294,7 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
return true;
}
-// -----------------------------------------------------------------------------
+
/* CL: The idea was to export page fields as text fields that get theire
string from a variable set with actionscript by each page. This didn't
@@ -1343,7 +1343,7 @@ bool Writer::Impl_writePageField( Rectangle& rTextBounds )
}
#endif
-// -----------------------------------------------------------------------------
+
void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon)
{
@@ -1383,7 +1383,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
}
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
@@ -1862,7 +1862,7 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint,
}
-// -----------------------------------------------------------------------------
+
void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint,
const double P2x, const double P2y,
@@ -1878,7 +1878,7 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint,
rLastPoint = aAnchorPoint;
}
-// -----------------------------------------------------------------------------
+
/* Approximate given cubic bezier curve by quadratic bezier segments */
void Writer::Impl_quadBezierApprox( BitStream& rBits,
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 8bbc476e8922..131777dccf13 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -28,7 +28,7 @@ using namespace ::std;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
-// -----------------------------------------------------------------------------
+
sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue )
{
@@ -43,7 +43,7 @@ sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue )
return nBits;
}
-// -----------------------------------------------------------------------------
+
sal_uInt16 getMaxBitsSigned( sal_Int32 nValue )
{
@@ -53,7 +53,7 @@ sal_uInt16 getMaxBitsSigned( sal_Int32 nValue )
return getMaxBitsUnsigned( static_cast< sal_uInt32 >(nValue) ) + 1;
}
-// -----------------------------------------------------------------------------
+
BitStream::BitStream()
{
@@ -61,7 +61,7 @@ BitStream::BitStream()
mnCurrentByte = 0;
}
-// -----------------------------------------------------------------------------
+
void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits )
{
@@ -85,21 +85,21 @@ void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits )
}
}
-// -----------------------------------------------------------------------------
+
void BitStream::writeSB( sal_Int32 nValue, sal_uInt16 nBits )
{
writeUB( static_cast< sal_uInt32 >(nValue), nBits );
}
-// -----------------------------------------------------------------------------
+
void BitStream::writeFB( sal_uInt32 nValue, sal_uInt16 nBits )
{
writeUB( nValue, nBits );
}
-// -----------------------------------------------------------------------------
+
void BitStream::pad()
{
@@ -111,7 +111,7 @@ void BitStream::pad()
}
}
-// -----------------------------------------------------------------------------
+
void BitStream::writeTo( SvStream& out )
{
@@ -125,7 +125,7 @@ void BitStream::writeTo( SvStream& out )
}
}
-// -----------------------------------------------------------------------------
+
sal_uInt32 BitStream::getOffset() const
{
@@ -139,7 +139,7 @@ Tag::Tag( sal_uInt8 nTagId )
mnTagId = nTagId;
}
-// -----------------------------------------------------------------------------
+
void Tag::write( SvStream &out )
{
@@ -173,28 +173,28 @@ void Tag::write( SvStream &out )
out.Write( GetData(), nSz );
}
#if 0
-// -----------------------------------------------------------------------------
+
void Tag::addI32( sal_Int32 nValue )
{
addUI32( static_cast<sal_uInt32>( nValue ) );
}
#endif
-// -----------------------------------------------------------------------------
+
void Tag::addUI32( sal_uInt32 nValue )
{
WriteUInt32( nValue );
}
#if 0
-// -----------------------------------------------------------------------------
+
void Tag::addI16( sal_Int16 nValue )
{
addUI16( static_cast<sal_uInt16>( nValue ) );
}
#endif
-// -----------------------------------------------------------------------------
+
void Tag::addUI16( sal_uInt16 nValue )
{
@@ -202,21 +202,21 @@ void Tag::addUI16( sal_uInt16 nValue )
WriteUChar( (sal_uInt8)(nValue >> 8) );
}
-// -----------------------------------------------------------------------------
+
void Tag::addUI8( sal_uInt8 nValue )
{
WriteUChar( (sal_uInt8)nValue );
}
-// -----------------------------------------------------------------------------
+
void Tag::addBits( BitStream& rIn )
{
rIn.writeTo( *this );
}
-// -----------------------------------------------------------------------------
+
void Tag::addRGBA( const Color& rColor )
{
@@ -226,7 +226,7 @@ void Tag::addRGBA( const Color& rColor )
addUI8( 0xff - rColor.GetTransparency() );
}
-// -----------------------------------------------------------------------------
+
void Tag::addRGB( const Color& rColor )
{
@@ -235,14 +235,14 @@ void Tag::addRGB( const Color& rColor )
addUI8( rColor.GetBlue() );
}
-// -----------------------------------------------------------------------------
+
void Tag::addRect( const Rectangle& rRect )
{
writeRect( *this, rRect );
}
-// -----------------------------------------------------------------------------
+
void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
{
@@ -292,14 +292,14 @@ void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
aBits.writeTo( rOut );
}
-// -----------------------------------------------------------------------------
+
void Tag::addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
{
writeMatrix( *this, rMatrix );
}
-// -----------------------------------------------------------------------------
+
void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
{
@@ -341,7 +341,7 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix )
aBits.writeTo( rOut );
}
-// -----------------------------------------------------------------------------
+
void Tag::addString( const char* pString )
{
@@ -354,7 +354,7 @@ void Tag::addString( const char* pString )
addUI8( 0 );
}
-// -----------------------------------------------------------------------------
+
void Tag::addStream( SvStream& rIn )
{
@@ -368,7 +368,7 @@ Sprite::Sprite( sal_uInt16 nId )
{
}
-// -----------------------------------------------------------------------------
+
Sprite::~Sprite()
{
@@ -376,7 +376,7 @@ Sprite::~Sprite()
delete *i;
}
-// -----------------------------------------------------------------------------
+
void Sprite::write( SvStream& out )
{
@@ -396,7 +396,7 @@ void Sprite::write( SvStream& out )
aTag.write( out );
}
-// -----------------------------------------------------------------------------
+
void Sprite::addTag( Tag* pNewTag )
{
@@ -430,13 +430,13 @@ FlashFont::FlashFont( const Font& rFont, sal_uInt16 nId )
{
}
-// -----------------------------------------------------------------------------
+
FlashFont::~FlashFont()
{
}
-// -----------------------------------------------------------------------------
+
/** gets the glyph id for the given character. The glyphs are created on demand */
sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
@@ -496,7 +496,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
return mnNextIndex++;
}
-// -----------------------------------------------------------------------------
+
void FlashFont::write( SvStream& out )
{
@@ -525,7 +525,7 @@ FillStyle::FillStyle( const Color& rSolidColor )
{
}
-// -----------------------------------------------------------------------------
+
/** this c'tor creates a tiled or clipped bitmap fill style */
FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
@@ -535,7 +535,7 @@ FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DH
{
}
-// -----------------------------------------------------------------------------
+
FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient )
{
@@ -553,7 +553,7 @@ FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient )
}
}
-// -----------------------------------------------------------------------------
+
/** this c'tor creates a linear or radial gradient fill style */
FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient )
@@ -564,7 +564,7 @@ FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient )
{
}
-// -----------------------------------------------------------------------------
+
void FillStyle::addTo( Tag* pTag ) const
{
@@ -586,7 +586,7 @@ void FillStyle::addTo( Tag* pTag ) const
}
}
-// -----------------------------------------------------------------------------
+
struct GradRecord
{