diff options
Diffstat (limited to 'filter')
68 files changed, 751 insertions, 828 deletions
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 8f91437fce30..e82634fb25c2 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -131,7 +131,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, css::uno::TypeClass aTypeClass = aT1.getTypeClass(); switch(aTypeClass) { - //--------------------------------------- + case css::uno::TypeClass_BOOLEAN : case css::uno::TypeClass_BYTE : case css::uno::TypeClass_SHORT : @@ -148,7 +148,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, return bIs; } - //--------------------------------------- + case css::uno::TypeClass_STRING : { OUString v1; @@ -166,7 +166,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, } break; - //--------------------------------------- + case css::uno::TypeClass_ANY : { css::uno::Any v1; @@ -184,7 +184,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, } break; - //--------------------------------------- + case css::uno::TypeClass_STRUCT : { css::beans::PropertyValue p1; @@ -221,7 +221,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, } break; - //--------------------------------------- + case css::uno::TypeClass_SEQUENCE : { css::uno::Sequence< OUString > uno_s1; diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index d9715a1ee68c..8e53aef0c9f0 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -88,7 +88,7 @@ void SAL_CALL ConfigFlush::refresh() } } -//----------------------------------------------- + void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) throw(css::uno::RuntimeException) { @@ -98,7 +98,7 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut xListener); } -//----------------------------------------------- + void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) throw(css::uno::RuntimeException) { @@ -108,13 +108,13 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css: xListener); } -//----------------------------------------------- + OUString ConfigFlush::impl_getImplementationName() { return OUString("com.sun.star.comp.filter.config.ConfigFlush"); } -//----------------------------------------------- + css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() { css::uno::Sequence< OUString > lServiceNames(1); @@ -122,7 +122,7 @@ css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() return lServiceNames; } -//----------------------------------------------- + css::uno::Reference< css::uno::XInterface > ConfigFlush::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) { ConfigFlush* pNew = new ConfigFlush(xSMGR); diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 0d150332c0a0..04cc0ab6b632 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -189,7 +189,7 @@ void FilterCache::load(EFillState eRequired, // Otherwise load the missing items. - // ------------------------------------------ + // a) load some const values from configration. // These values are needed there for loading // config items ... @@ -216,7 +216,7 @@ void FilterCache::load(EFillState eRequired, /* LateInitListener* pLateInit = */ new LateInitListener(comphelper::getProcessComponentContext()); } - // ------------------------------------------ + // b) If the required fill state was not reached // but std values was already loaded ... // we must load some further missing items. @@ -452,7 +452,7 @@ void FilterCache::setItem( EItemType eType , impl_addItem2FlushList(eType, sItem); } -//----------------------------------------------- + void FilterCache::refreshItem( EItemType eType, const OUString& sItem) throw(css::uno::Exception) @@ -1346,7 +1346,7 @@ void FilterCache::impl_load(EFillState eRequiredState) // Attention: Detect services are part of the standard set! // So there is no need to handle it separately. - // ------------------------------------------ + // a) The standard set of config value is needed. if ( ((eRequiredState & E_CONTAINS_STANDARD) == E_CONTAINS_STANDARD) && @@ -1363,7 +1363,7 @@ void FilterCache::impl_load(EFillState eRequiredState) } } - // ------------------------------------------ + // b) We need all type information ... if ( ((eRequiredState & E_CONTAINS_TYPES) == E_CONTAINS_TYPES) && @@ -1380,7 +1380,7 @@ void FilterCache::impl_load(EFillState eRequiredState) } } - // ------------------------------------------ + // c) We need all filter information ... if ( ((eRequiredState & E_CONTAINS_FILTERS) == E_CONTAINS_FILTERS) && @@ -1397,7 +1397,7 @@ void FilterCache::impl_load(EFillState eRequiredState) } } - // ------------------------------------------ + // c) We need all frame loader information ... if ( ((eRequiredState & E_CONTAINS_FRAMELOADERS) == E_CONTAINS_FRAMELOADERS) && @@ -1414,7 +1414,7 @@ void FilterCache::impl_load(EFillState eRequiredState) } } - // ------------------------------------------ + // d) We need all content handler information ... if ( ((eRequiredState & E_CONTAINS_CONTENTHANDLERS) == E_CONTAINS_CONTENTHANDLERS) && @@ -1680,7 +1680,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: aItem[PROPNAME_NAME] = css::uno::makeAny(sItem); switch(eType) { - //--------------------------------------- + case E_TYPE : { // read standard properties of a type @@ -1709,7 +1709,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: } break; - //--------------------------------------- + case E_FILTER : { // read standard properties of a filter @@ -1749,7 +1749,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: } break; - //--------------------------------------- + case E_FRAMELOADER : case E_CONTENTHANDLER : { @@ -1850,7 +1850,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName CacheItem::const_iterator pIt; switch(eType) { - //--------------------------------------- + case E_TYPE : { pIt = aItem.find(PROPNAME_PREFERREDFILTER); @@ -1881,7 +1881,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName } break; - //--------------------------------------- + case E_FILTER : { pIt = aItem.find(PROPNAME_TYPE); @@ -1930,7 +1930,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName } break; - //--------------------------------------- + case E_FRAMELOADER : case E_CONTENTHANDLER : { 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 { diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 946968e177b4..df402c7b385a 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -27,9 +27,9 @@ #include <vcl/FilterConfigItem.hxx> #include "giflzwc.hxx" -// ------------- + // - GIFWriter - -// ------------- + class GIFWriter { @@ -81,7 +81,7 @@ GIFWriter::GIFWriter(SvStream &rStream) { } -// ------------------------------------------------------------------------ + sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { @@ -170,7 +170,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC return bStatus; } -// ------------------------------------------------------------------------ + void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, sal_Bool bExtended, long nTimer, Disposal eDisposal ) @@ -200,7 +200,7 @@ void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteAnimation( const Animation& rAnimation ) { @@ -225,7 +225,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation ) } } -// ------------------------------------------------------------------------ + void GIFWriter::MayCallback( sal_uLong nPercent ) { @@ -240,7 +240,7 @@ void GIFWriter::MayCallback( sal_uLong nPercent ) } } -// ------------------------------------------------------------------------ + sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx ) { @@ -274,7 +274,7 @@ sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx ) return bStatus; } -// ------------------------------------------------------------------------ + void GIFWriter::DestroyAccess() { @@ -282,7 +282,7 @@ void GIFWriter::DestroyAccess() m_pAcc = NULL; } -// ------------------------------------------------------------------------ + void GIFWriter::WriteSignature( sal_Bool bGIF89a ) { @@ -295,7 +295,7 @@ void GIFWriter::WriteSignature( sal_Bool bGIF89a ) } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteGlobalHeader( const Size& rSize ) { @@ -325,7 +325,7 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize ) } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteLoopExtension( const Animation& rAnimation ) { @@ -358,7 +358,7 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation ) } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteLogSizeExtension( const Size& rSize100 ) { @@ -377,7 +377,7 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 ) } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal ) { @@ -409,7 +409,7 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal ) } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteLocalHeader() { @@ -441,7 +441,7 @@ void GIFWriter::WriteLocalHeader() } } -// ------------------------------------------------------------------------ + void GIFWriter::WritePalette() { @@ -468,7 +468,7 @@ void GIFWriter::WritePalette() } } -// ------------------------------------------------------------------------ + void GIFWriter::WriteAccess() { @@ -543,7 +543,7 @@ void GIFWriter::WriteAccess() delete[] pBuffer; } -// ------------------------------------------------------------------------ + void GIFWriter::WriteTerminator() { @@ -556,7 +556,7 @@ void GIFWriter::WriteTerminator() } } -// ------------------------------------------------------------------------ + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from @@ -573,7 +573,7 @@ GraphicExport( SvStream& rStream, Graphic& rGraphic, return aWriter.WriteGIF(rGraphic, pConfigItem); } -// ------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx index 081c8e1bd710..c686a6dfe91e 100644 --- a/filter/source/graphicfilter/egif/giflzwc.cxx +++ b/filter/source/graphicfilter/egif/giflzwc.cxx @@ -21,9 +21,9 @@ #include <tools/stream.hxx> #include "giflzwc.hxx" -// ---------------------------- + // - GIFImageDataOutputStream - -// ---------------------------- + class GIFImageDataOutputStream { @@ -46,7 +46,7 @@ public: inline void WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ); }; -// ------------------------------------------------------------------------ + inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes() { @@ -61,7 +61,7 @@ inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes() } } -// ------------------------------------------------------------------------ + inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { @@ -72,7 +72,7 @@ inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nC nBitsBufSize = nBitsBufSize + nCodeLen; } -// ------------------------------------------------------------------------ + GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 nLZWDataSize ) : rStream(rGIF) @@ -84,7 +84,7 @@ GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 n rStream.WriteUChar( nLZWDataSize ); } -// ------------------------------------------------------------------------ + GIFImageDataOutputStream::~GIFImageDataOutputStream() @@ -96,7 +96,7 @@ GIFImageDataOutputStream::~GIFImageDataOutputStream() delete[] pBlockBuf; } -// ------------------------------------------------------------------------ + void GIFImageDataOutputStream::FlushBlockBuf() { @@ -108,9 +108,9 @@ void GIFImageDataOutputStream::FlushBlockBuf() } } -// ------------------- + // - GIFLZWCTreeNode - -// ------------------- + struct GIFLZWCTreeNode { @@ -121,9 +121,9 @@ struct GIFLZWCTreeNode sal_uInt16 nValue; // the pixel value }; -// -------------------- + // - GIFLZWCompressor - -// -------------------- + GIFLZWCompressor::GIFLZWCompressor() : pIDOS(NULL), pTable(NULL), pPrefix(NULL), nDataSize(0), nClearCode(0), @@ -131,14 +131,14 @@ GIFLZWCompressor::GIFLZWCompressor() { } -// ------------------------------------------------------------------------ + GIFLZWCompressor::~GIFLZWCompressor() { if (pIDOS!=NULL) EndCompression(); } -// ------------------------------------------------------------------------ + void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize ) { @@ -170,7 +170,7 @@ void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize ) } } -// ------------------------------------------------------------------------ + void GIFLZWCompressor::Compress( HPBYTE pSrc, sal_uLong nSize ) { @@ -230,7 +230,7 @@ void GIFLZWCompressor::Compress( HPBYTE pSrc, sal_uLong nSize ) } } -// ------------------------------------------------------------------------ + void GIFLZWCompressor::EndCompression() { diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index a7c9ef8d8edb..425416ec82dd 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -822,9 +822,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) WriteFieldIntroducer(0,DscGrfObjMagic,0,0); - //------------------------------------------------------------------------------ + // The following is the OS2 original documentation and the associated implementation - //------------------------------------------------------------------------------ + // Parameters (all required and in this order) diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index f71ed0cad0d9..f77a0d67384a 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -62,13 +62,13 @@ PBMWriter::PBMWriter(SvStream &rPBM) { } -// ------------------------------------------------------------------------ + PBMWriter::~PBMWriter() { } -// ------------------------------------------------------------------------ + sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { @@ -110,7 +110,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool PBMWriter::ImplWriteHeader() { @@ -132,7 +132,7 @@ sal_Bool PBMWriter::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ + void PBMWriter::ImplWriteBody() { @@ -174,7 +174,7 @@ void PBMWriter::ImplWriteBody() } } -// ------------------------------------------------------------------------ + // A decimal number in ascii format is written in the stream. void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) @@ -183,11 +183,11 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) m_rOStm.WriteCharPtr( aNum.getStr() ); } -// ------------------------------------------------------------------------ -// --------------------- + + // - exported function - -// --------------------- + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from @@ -204,7 +204,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon return aPBMWriter.WritePBM( rGraphic, pFilterConfigItem ); } -// ------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 3a61cf0b0dfe..5c151be2ab3b 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -62,13 +62,13 @@ PGMWriter::PGMWriter(SvStream &rStream) { } -// ------------------------------------------------------------------------ + PGMWriter::~PGMWriter() { } -// ------------------------------------------------------------------------ + sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { @@ -111,7 +111,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool PGMWriter::ImplWriteHeader() { @@ -137,7 +137,7 @@ sal_Bool PGMWriter::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ + void PGMWriter::ImplWriteBody() { @@ -199,7 +199,7 @@ void PGMWriter::ImplWriteBody() } } -// ------------------------------------------------------------------------ + // write a decimal number in ascii format into the stream void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) { @@ -207,11 +207,11 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) m_rOStm.WriteCharPtr( aNum.getStr() ); } -// ------------------------------------------------------------------------ -// --------------------- + + // - exported function - -// --------------------- + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from @@ -228,7 +228,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon return aPGMWriter.WritePGM( rGraphic, pFilterConfigItem ); } -// ------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 5a6e8df4aece..a2413829e4e3 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -38,8 +38,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -//============================== PictWriter =================================== - +// PictWriter struct PictWriterAttrStackMember { struct PictWriterAttrStackMember * pSucc; Color aLineColor; @@ -172,9 +171,7 @@ public: }; -//========================== Methods of PictWriter ========================== - - +// Methods of PictWriter void PictWriter::MayCallback() { if ( xStatusIndicator.is() ) @@ -235,8 +232,7 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) for (np=1; np<nCount; np++) { aPoly2=rPolyPoly.GetObject(np); - //-----------------The following code merges aPoly1 and aPoly2 to aPoly1----------------- - + // The following code merges aPoly1 and aPoly2 to aPoly1 nSize1=aPoly1.GetSize(); nSize2=aPoly2.GetSize(); @@ -277,9 +273,6 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) for (i2=0; i2<=nBestIdx2; i2++) aPoly3.SetPoint(aPoly2.GetPoint(i2),i3++); aPoly1=aPoly3; - - //----------------------------------------------------------------------------------- - } return aPoly1; } @@ -1150,13 +1143,12 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // allocate memory for a row: pPix = new sal_uInt8[ nSrcRowBytes ]; - // Position der Map-Daten in Ziel merken: + // remember position of the map-data in the target: nDstMapPos=pPict->Tell(); // loop trough rows: for ( ny = 0; ny < nHeight; ny++ ) { - // read line ny of source into the buffer: switch ( nBitsPerPixel ) { @@ -1600,7 +1592,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_CHORD_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" ); } break; @@ -1775,7 +1767,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_TEXTRECT_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" ); } break; @@ -1858,7 +1850,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_MASKSCALE_ACTION: case META_MASKSCALEPART_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" ); } break; @@ -1888,13 +1880,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_WALLPAPER_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" ); } break; case META_CLIPREGION_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" ); } break; @@ -1907,13 +1899,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_ISECTREGIONCLIPREGION_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" ); } break; case META_MOVECLIPREGION_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" ); } break; @@ -1959,7 +1951,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) case META_TEXTALIGN_ACTION: { -// OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" ); + // OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" ); } break; @@ -2262,7 +2254,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea return bStatus; } -//================== GraphicExport - the exported Function ================ +// GraphicExport - the exported Function // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 0af3cb8dabe4..fcb75e9bfecb 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -62,13 +62,13 @@ PPMWriter::PPMWriter(SvStream &rStrm) { } -// ------------------------------------------------------------------------ + PPMWriter::~PPMWriter() { } -// ------------------------------------------------------------------------ + sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ) { @@ -111,7 +111,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool PPMWriter::ImplWriteHeader() { @@ -137,7 +137,7 @@ sal_Bool PPMWriter::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ + void PPMWriter::ImplWriteBody() { @@ -207,7 +207,7 @@ void PPMWriter::ImplWriteBody() } } -// ------------------------------------------------------------------------ + // a decimal number in ASCII format is being written into the stream void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) @@ -216,11 +216,11 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) m_rOStm.WriteCharPtr( aNum.getStr() ); } -// ------------------------------------------------------------------------ -// --------------------- + + // - exported function - -// --------------------- + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from @@ -236,7 +236,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem ); } -// ------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 14731e1c46bc..18e3c9b8d7eb 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -242,7 +242,7 @@ public: //========================== Methoden von PSWriter ========================== -//--------------------------------------------------------------------------------- + PSWriter::PSWriter() : mbStatus(sal_False) @@ -305,7 +305,7 @@ PSWriter::~PSWriter() delete pAMTF; } -//--------------------------------------------------------------------------------- + sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem ) { @@ -501,7 +501,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi return mbStatus; } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteProlog( const Graphic* pPreview ) { @@ -638,7 +638,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) ImplWriteLine( "/tm matrix currentmatrix def" ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteEpilog() { @@ -652,9 +652,9 @@ void PSWriter::ImplWriteEpilog() ImplWriteLine( "%%EOF" ); } -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- + + + void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { @@ -1463,7 +1463,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) -//--------------------------------------------------------------------------------- + inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) { @@ -1471,7 +1471,7 @@ inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode ) ImplWriteDouble( rPoint.Y(), nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) { @@ -1480,7 +1480,7 @@ void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) { @@ -1489,7 +1489,7 @@ void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode ) { @@ -1500,7 +1500,7 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3 ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode ) { @@ -1510,7 +1510,7 @@ void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMo ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) { @@ -1520,7 +1520,7 @@ void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplRect( const Rectangle & rRect ) { @@ -1545,7 +1545,7 @@ void PSWriter::ImplRect( const Rectangle & rRect ) mnCursorPos = 0; } -//--------------------------------------------------------------------------------- + void PSWriter::ImplRectFill( const Rectangle & rRect ) { @@ -1565,7 +1565,7 @@ void PSWriter::ImplRectFill( const Rectangle & rRect ) ImplExecMode( PS_RET ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplAddPath( const Polygon & rPolygon ) { @@ -1590,7 +1590,7 @@ void PSWriter::ImplAddPath( const Polygon & rPolygon ) } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly ) { @@ -1608,7 +1608,7 @@ void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly ) ImplWriteLine( "eoclip newpath" ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { @@ -1619,7 +1619,7 @@ void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& ImplWriteActions( aTmpMtf, rVDev ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutline ) { @@ -1656,7 +1656,7 @@ void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutlin } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplPolyLine( const Polygon & rPoly ) { @@ -1694,7 +1694,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly ) } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplSetClipRegion( Region& rClipRegion ) { @@ -1757,7 +1757,7 @@ void PSWriter::ImplSetClipRegion( Region& rClipRegion ) } } -//--------------------------------------------------------------------------------- + // possible gfx formats: // // level 1: grayscale 8 bit @@ -2088,7 +2088,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteCharacter( sal_Char nChar ) { @@ -2102,7 +2102,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar ) ImplWriteByte( (sal_uInt8)nChar, PS_NONE ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch ) { @@ -2134,7 +2134,7 @@ void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, co } } -// ------------------------------------------------------------------------ + void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ) { @@ -2195,7 +2195,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sa } } -// ------------------------------------------------------------------------ + void PSWriter::ImplSetAttrForText( const Point& rPoint ) { @@ -2238,7 +2238,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) { @@ -2262,9 +2262,9 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) ImplWriteLine( " f" ); } -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- + + + void PSWriter::ImplClosePathDraw( sal_uLong nMode ) { @@ -2280,7 +2280,7 @@ void PSWriter::ImplPathDraw() ImplExecMode( PS_RET ); } -//--------------------------------------------------------------------------------- + inline void PSWriter::ImplWriteLineColor( sal_uLong nMode ) { @@ -2315,7 +2315,7 @@ inline void PSWriter::ImplWriteTextFillColor( sal_uLong nMode ) } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteColor( sal_uLong nMode ) { @@ -2336,7 +2336,7 @@ void PSWriter::ImplWriteColor( sal_uLong nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + double PSWriter::ImplGetScaling( const MapMode& rMapMode ) { @@ -2384,7 +2384,7 @@ double PSWriter::ImplGetScaling( const MapMode& rMapMode ) return nMul; } -//--------------------------------------------------------------------------------- + void PSWriter::ImplGetMapMode( const MapMode& rMapMode ) { @@ -2396,7 +2396,7 @@ void PSWriter::ImplGetMapMode( const MapMode& rMapMode ) ImplScale( fScaleX, fScaleY ); } -//--------------------------------------------------------------------------------- + inline void PSWriter::ImplExecMode( sal_uLong nMode ) { @@ -2421,7 +2421,7 @@ inline void PSWriter::ImplExecMode( sal_uLong nMode ) } } -//--------------------------------------------------------------------------------- + inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) { @@ -2434,7 +2434,7 @@ inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, SvtGraphicStroke::CapType eLCap, @@ -2479,7 +2479,7 @@ void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit, } } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) { @@ -2529,7 +2529,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) ImplWriteLineInfo( fLWidth, fMiterLimit, aCapType, aJoinType, l_aDashArray ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { @@ -2539,7 +2539,7 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) ImplExecMode(nMode); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) { @@ -2583,7 +2583,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + // writes the number to stream: nNumber / ( 10^nCount ) @@ -2625,7 +2625,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) { @@ -2634,7 +2634,7 @@ void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) { @@ -2651,7 +2651,7 @@ void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) ImplExecMode( nMode ); } -//--------------------------------------------------------------------------------- + // writes the sal_uInt8 nNumb as a Number from 0.000 up to 1.000 @@ -2661,7 +2661,7 @@ void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode ) } -// ------------------------------------------------------------------------ + inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { @@ -2677,7 +2677,7 @@ inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) ImplWriteHexByte( (sal_uInt8)( dwShift >> 24 ) ); } -// ------------------------------------------------------------------------ + void PSWriter::StartCompression() { @@ -2703,7 +2703,7 @@ void PSWriter::StartCompression() WriteBits( nClearCode, nCodeSize ); } -// ------------------------------------------------------------------------ + void PSWriter::Compress( sal_uInt8 nCompThis ) { @@ -2757,7 +2757,7 @@ void PSWriter::Compress( sal_uInt8 nCompThis ) } } -// ------------------------------------------------------------------------ + void PSWriter::EndCompression() { @@ -2768,7 +2768,7 @@ void PSWriter::EndCompression() delete[] pTable; } -// ------------------------------------------------------------------------ + sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize ) { @@ -2787,7 +2787,7 @@ sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_ return NULL; } -// ------------------------------------------------------------------------ + sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ) { diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 46cc4fbcecaf..fe18cadbe89d 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -65,13 +65,13 @@ RASWriter::RASWriter(SvStream &rStream) { } -// ------------------------------------------------------------------------ + RASWriter::~RASWriter() { } -// ------------------------------------------------------------------------ + void RASWriter::ImplCallback( sal_uLong nYPos ) { @@ -132,7 +132,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool RASWriter::ImplWriteHeader() { @@ -164,7 +164,7 @@ sal_Bool RASWriter::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ + void RASWriter::ImplWritePalette() { @@ -175,7 +175,7 @@ void RASWriter::ImplWritePalette() for ( i = 0; i < mnColors; m_rOStm.WriteUChar( mpAcc->GetPaletteColor( i++ ).GetBlue() ) ) ; } -// ------------------------------------------------------------------------ + void RASWriter::ImplWriteBody() { @@ -230,7 +230,7 @@ void RASWriter::ImplWriteBody() ImplPutByte( mnRepVal + 1 ); // end of RLE decoding } -// ------------------------------------------------------------------------ + void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) { @@ -263,11 +263,11 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) } } -// ------------------------------------------------------------------------ -// --------------------- + + // - exported function - -// --------------------- + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index aff5ce3733f6..e32b5a915a3f 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -42,9 +42,9 @@ #define ResolutionUnit 296 #define ColorMap 320 -// ------------- + // - TIFFWriter - -// ------------- + struct TIFFLZWCTreeNode { @@ -113,7 +113,7 @@ public: sal_Bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem ); }; -// ------------------------------------------------------------------------ + TIFFWriter::TIFFWriter(SvStream &rStream) : m_rOStm(rStream) @@ -129,13 +129,13 @@ TIFFWriter::TIFFWriter(SvStream &rStream) { } -// ------------------------------------------------------------------------ + TIFFWriter::~TIFFWriter() { } -// ------------------------------------------------------------------------ + sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem) { @@ -228,7 +228,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt return mbStatus; } -// ------------------------------------------------------------------------ + void TIFFWriter::ImplCallback( sal_uInt32 nPercent ) { @@ -244,7 +244,7 @@ void TIFFWriter::ImplCallback( sal_uInt32 nPercent ) } -// ------------------------------------------------------------------------ + sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage ) { @@ -319,7 +319,7 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage ) return mbStatus; } -// ------------------------------------------------------------------------ + void TIFFWriter::ImplWritePalette() { @@ -346,7 +346,7 @@ void TIFFWriter::ImplWritePalette() } } -// ------------------------------------------------------------------------ + sal_Bool TIFFWriter::ImplWriteBody() { @@ -454,7 +454,7 @@ sal_Bool TIFFWriter::ImplWriteBody() return mbStatus; } -// ------------------------------------------------------------------------ + void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit ) { @@ -466,7 +466,7 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti m_rOStm.WriteUInt32( nResolutionUnit ); } -// ------------------------------------------------------------------------ + void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt32 nNumberOfItems, sal_uInt32 nValue) { @@ -480,7 +480,7 @@ void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt m_rOStm.WriteUInt32( nValue ); } -// ------------------------------------------------------------------------ + inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) { @@ -498,7 +498,7 @@ inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) } } -// ------------------------------------------------------------------------ + void TIFFWriter::StartCompression() { @@ -525,7 +525,7 @@ void TIFFWriter::StartCompression() WriteBits( nClearCode, nCodeSize ); } -// ------------------------------------------------------------------------ + void TIFFWriter::Compress( sal_uInt8 nCompThis ) { @@ -579,7 +579,7 @@ void TIFFWriter::Compress( sal_uInt8 nCompThis ) } } -// ------------------------------------------------------------------------ + void TIFFWriter::EndCompression() { @@ -590,7 +590,7 @@ void TIFFWriter::EndCompression() delete[] pTable; } -// ------------------------------------------------------------------------ + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index df650d1ef40f..3affd3586aad 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -63,13 +63,13 @@ XPMWriter::XPMWriter(SvStream& rOStm) { } -// ------------------------------------------------------------------------ + XPMWriter::~XPMWriter() { } -// ------------------------------------------------------------------------ + void XPMWriter::ImplCallback( sal_uInt16 nPercent ) { @@ -141,7 +141,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool XPMWriter::ImplWriteHeader() { @@ -163,7 +163,7 @@ sal_Bool XPMWriter::ImplWriteHeader() return mbStatus; } -// ------------------------------------------------------------------------ + void XPMWriter::ImplWritePalette() { @@ -186,7 +186,7 @@ void XPMWriter::ImplWritePalette() } } -// ------------------------------------------------------------------------ + void XPMWriter::ImplWriteBody() { @@ -202,7 +202,7 @@ void XPMWriter::ImplWriteBody() } } -// ------------------------------------------------------------------------ + // write a decimal number in ascii format into the stream void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) @@ -211,7 +211,7 @@ void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) m_rOStm.WriteCharPtr( aNum.getStr() ); } -// ------------------------------------------------------------------------ + void XPMWriter::ImplWritePixel( sal_uLong nCol ) const { @@ -225,7 +225,7 @@ void XPMWriter::ImplWritePixel( sal_uLong nCol ) const m_rOStm.WriteUChar( (sal_uInt8)( nCol + 'A' ) ); } -// ------------------------------------------------------------------------ + // write a color value in hex format into the stream void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) { @@ -245,7 +245,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) } } -// ------------------------------------------------------------------------ + // this needs to be kept in sync with // ImpFilterLibCacheEntry::GetImportFunction() from diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 274a912e4f1d..d4aaf10ec30f 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; -// --------------------------------------------------------------- + CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) : CGMOutAct ( rCGM ), @@ -76,7 +76,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod } }; -// --------------------------------------------------------------- + sal_Bool CGMImpressOutAct::ImplInitPage() { @@ -92,7 +92,7 @@ sal_Bool CGMImpressOutAct::ImplInitPage() return bStatRet; } -// --------------------------------------------------------------- + sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) { @@ -107,7 +107,7 @@ sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) return sal_False; } -// --------------------------------------------------------------- + void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrientation ) { @@ -120,7 +120,7 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien maXPropSet->setPropertyValue( "RotateAngle", aAny ); } -// --------------------------------------------------------------- + void CGMImpressOutAct::ImplSetLineBundle() { @@ -178,7 +178,7 @@ void CGMImpressOutAct::ImplSetLineBundle() } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::ImplSetFillBundle() { @@ -345,7 +345,7 @@ void CGMImpressOutAct::ImplSetFillBundle() } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty ) { @@ -389,7 +389,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty rProperty->setPropertyValue( "FontDescriptor", aAny ); }; -// --------------------------------------------------------------- + void CGMImpressOutAct::InsertPage() { @@ -403,7 +403,7 @@ void CGMImpressOutAct::InsertPage() mnCurrentPage++; }; -// --------------------------------------------------------------- + void CGMImpressOutAct::BeginGroup() { @@ -415,7 +415,7 @@ void CGMImpressOutAct::BeginGroup() mnGroupActCount = mpCGM->mnActCount; }; -// --------------------------------------------------------------- + void CGMImpressOutAct::EndGroup() { @@ -448,7 +448,7 @@ void CGMImpressOutAct::EndGroup() } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::EndGrouping() { @@ -458,7 +458,7 @@ void CGMImpressOutAct::EndGrouping() } } -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect ) { @@ -474,7 +474,7 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect ) } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation ) { @@ -501,7 +501,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation, sal_uInt32 nType, double& fStartAngle, double& fEndAngle ) @@ -574,7 +574,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc ) { @@ -615,7 +615,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc ) } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawPolygon( Polygon& rPoly ) { @@ -648,7 +648,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly ) }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly ) { @@ -680,7 +680,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly ) } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon ) { @@ -715,7 +715,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon ) } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon ) { @@ -760,7 +760,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon ) } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, char* pString, sal_uInt32 /*nSize*/, FinalFlag eFlag ) { @@ -909,7 +909,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha } }; -// --------------------------------------------------------------- + void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFlag /*eFlag*/ ) { @@ -947,14 +947,14 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla } } -// --------------------------------------------------------------- + // nCount != 0 -> Append Text sal_uInt32 CGMImpressOutAct::DrawText( TextEntry* /*pTextEntry*/, NodeFrameSet& /*rNodeFrameSet*/, sal_uInt32 /*nObjCount*/ ) { return 0; } -// --------------------------------------------------------------- + void CGMImpressOutAct::DrawChart() { diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx index f9242c784877..a5ca20b34d06 100644 --- a/filter/source/graphicfilter/icgm/bitmap.cxx +++ b/filter/source/graphicfilter/icgm/bitmap.cxx @@ -20,7 +20,7 @@ #include "main.hxx" -// --------------------------------------------------------------- + CGMBitmap::CGMBitmap( CGM& rCGM ) : mpCGM ( &rCGM ), @@ -29,14 +29,14 @@ CGMBitmap::CGMBitmap( CGM& rCGM ) : ImplGetBitmap( *pCGMBitmapDescriptor ); }; -// --------------------------------------------------------------- + CGMBitmap::~CGMBitmap() { delete pCGMBitmapDescriptor; } -// --------------------------------------------------------------- + void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) { @@ -220,7 +220,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc ) } } -// --------------------------------------------------------------- + void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) { @@ -233,7 +233,7 @@ void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc ) } } -// --------------------------------------------------------------- + sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) { @@ -325,7 +325,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc ) return rDesc.mbStatus; } -// --------------------------------------------------------------- + void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest ) { @@ -358,7 +358,7 @@ void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& r rDest.mndy += rSource.mndy; }; -// --------------------------------------------------------------- + CGMBitmap* CGMBitmap::GetNext() { @@ -391,7 +391,7 @@ CGMBitmap* CGMBitmap::GetNext() return NULL; } -// --------------------------------------------------------------- + CGMBitmapDescriptor* CGMBitmap::GetBitmap() { diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx index c4dc6e929607..2b22bc40361c 100644 --- a/filter/source/graphicfilter/icgm/bundles.cxx +++ b/filter/source/graphicfilter/icgm/bundles.cxx @@ -29,7 +29,7 @@ Bundle& Bundle::operator=( Bundle& rSource ) return *this; }; -// --------------------------------------------------------------- + void Bundle::SetColor( sal_uInt32 nColor ) { @@ -41,7 +41,7 @@ sal_uInt32 Bundle::GetColor() const return mnColor; } -// --------------------------------------------------------------- + LineBundle& LineBundle::operator=( LineBundle& rSource ) { @@ -86,7 +86,7 @@ FillBundle& FillBundle::operator=( FillBundle& rSource ) return *this; }; -// --------------------------------------------------------------- + FontEntry::FontEntry() : pFontName ( NULL ), @@ -102,7 +102,7 @@ FontEntry::~FontEntry() delete pCharSetValue; } -// --------------------------------------------------------------- + CGMFList::CGMFList() : nFontNameCount ( 0 ), @@ -117,7 +117,7 @@ CGMFList::~CGMFList() ImplDeleteList(); } -// --------------------------------------------------------------- + CGMFList& CGMFList::operator=( CGMFList& rSource ) { @@ -148,7 +148,7 @@ CGMFList& CGMFList::operator=( CGMFList& rSource ) return *this; } -// --------------------------------------------------------------- + FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) { @@ -158,7 +158,7 @@ FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex ) return ( nInd < aFontEntryList.size() ) ? aFontEntryList[ nInd ] : NULL; } -// --------------------------------------------------------------- + static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8* pDest, sal_uInt32 nComp, sal_uInt32 nSize ) { @@ -238,7 +238,7 @@ void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize ) delete[] pBuf; } -//-------------------------------------------------------------------------- + void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_uInt32 nSize ) { @@ -260,7 +260,7 @@ void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_ memcpy( pFontEntry->pCharSetValue, pSource , nSize ); } -// --------------------------------------------------------------- + void CGMFList::ImplDeleteList() { diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index b2055b35ed42..08e81ad258d7 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -31,8 +31,6 @@ using namespace ::com::sun::star; -// --------------------------------------------------------------- - void CGM::ImplCGMInit() { mbIsFinished = mbPicture = mbMetaFile = mbPictureBody = sal_False; @@ -49,8 +47,6 @@ void CGM::ImplCGMInit() pElement = new CGMElements( *this ); } -// --------------------------------------------------------------- - #ifdef CGM_EXPORT_IMPRESS CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) : @@ -64,8 +60,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) : } #endif -// --------------------------------------------------------------- - CGM::~CGM() { @@ -91,15 +85,11 @@ CGM::~CGM() delete [] mpBuf; }; -// --------------------------------------------------------------- - sal_uInt32 CGM::GetBackGroundColor() { return ( pElement ) ? pElement->aColorTable[ 0 ] : 0; } -// --------------------------------------------------------------- - sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ ) { sal_uInt8* pSource = mpSource + mnParaSize; @@ -107,15 +97,11 @@ sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ ) return ( pSource[ 0 ] << 8 ) + pSource[ 1 ]; }; -// --------------------------------------------------------------- - sal_uInt8 CGM::ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision ) { return (sal_uInt8)( nSource >> ( ( nPrecision - 1 ) << 3 ) ); }; -// --------------------------------------------------------------- - long CGM::ImplGetI( sal_uInt32 nPrecision ) { sal_uInt8* pSource = mpSource + mnParaSize; @@ -146,8 +132,6 @@ long CGM::ImplGetI( sal_uInt32 nPrecision ) } } -// --------------------------------------------------------------- - sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision ) { sal_uInt8* pSource = mpSource + mnParaSize; @@ -174,8 +158,6 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision ) } } -// --------------------------------------------------------------- - void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest ) { for ( int i = 0; i < 4; i++ ) @@ -184,8 +166,6 @@ void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest ) } } -// --------------------------------------------------------------- - void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest ) { for ( int i = 0; i < 8; i++ ) @@ -194,8 +174,6 @@ void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest ) } } -// --------------------------------------------------------------- - double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize ) { void* pPtr; @@ -265,8 +243,6 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize ) return nRetValue; } -// --------------------------------------------------------------- - sal_uInt32 CGM::ImplGetPointSize() { if ( pElement->eVDCType == VDC_INTEGER ) @@ -275,36 +251,26 @@ sal_uInt32 CGM::ImplGetPointSize() return pElement->nVDCRealSize << 1; } -// --------------------------------------------------------------- - inline double CGM::ImplGetIX() { return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCXadd ) * mnVDCXmul ); } -// --------------------------------------------------------------- - inline double CGM::ImplGetFX() { return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCXadd ) * mnVDCXmul ); } -// --------------------------------------------------------------- - inline double CGM::ImplGetIY() { return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCYadd ) * mnVDCYmul ); } -// --------------------------------------------------------------- - inline double CGM::ImplGetFY() { return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCYadd ) * mnVDCYmul ); } -// --------------------------------------------------------------- - void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap ) { if ( pElement->eVDCType == VDC_INTEGER ) @@ -321,8 +287,6 @@ void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap ) ImplMapPoint( rFloatPoint ); } -// --------------------------------------------------------------- - void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap ) { if ( pElement->eVDCType == VDC_INTEGER ) @@ -349,8 +313,6 @@ void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap ) } } -// --------------------------------------------------------------- - void CGM::ImplGetRectangleNS( FloatRect& rFloatRect ) { if ( pElement->eVDCType == VDC_INTEGER ) @@ -369,8 +331,6 @@ void CGM::ImplGetRectangleNS( FloatRect& rFloatRect ) } } -// --------------------------------------------------------------- - sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect ) { // the background color is always a direct color @@ -408,8 +368,6 @@ sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect ) return nTmp; } -// --------------------------------------------------------------- - // call this function each time after the mapmode settings has been changed void CGM::ImplSetMapMode() { @@ -453,8 +411,6 @@ void CGM::ImplSetMapMode() } } -// --------------------------------------------------------------- - void CGM::ImplMapDouble( double& nNumb ) { if ( pElement->eDeviceViewPortMap == DVPM_FORCED ) @@ -470,7 +426,7 @@ void CGM::ImplMapDouble( double& nNumb ) case DVPM_METRIC : { -// nNumb *= ( 100 * pElement->nDeviceViewPortScale ); + // nNumb *= ( 100 * pElement->nDeviceViewPortScale ); nNumb *= ( mnXFraction + mnYFraction ) / 2; if ( pElement->nDeviceViewPortScale < 0 ) nNumb = -nNumb; @@ -495,8 +451,6 @@ void CGM::ImplMapDouble( double& nNumb ) } } -// --------------------------------------------------------------- - void CGM::ImplMapX( double& nNumb ) { if ( pElement->eDeviceViewPortMap == DVPM_FORCED ) @@ -512,7 +466,7 @@ void CGM::ImplMapX( double& nNumb ) case DVPM_METRIC : { -// nNumb *= ( 100 * pElement->nDeviceViewPortScale ); + // nNumb *= ( 100 * pElement->nDeviceViewPortScale ); nNumb *= mnXFraction; if ( pElement->nDeviceViewPortScale < 0 ) nNumb = -nNumb; @@ -537,9 +491,6 @@ void CGM::ImplMapX( double& nNumb ) } } - -// --------------------------------------------------------------- - void CGM::ImplMapY( double& nNumb ) { if ( pElement->eDeviceViewPortMap == DVPM_FORCED ) @@ -555,7 +506,7 @@ void CGM::ImplMapY( double& nNumb ) case DVPM_METRIC : { -// nNumb *= ( 100 * pElement->nDeviceViewPortScale ); + // nNumb *= ( 100 * pElement->nDeviceViewPortScale ); nNumb *= mnYFraction; if ( pElement->nDeviceViewPortScale < 0 ) nNumb = -nNumb; @@ -580,9 +531,6 @@ void CGM::ImplMapY( double& nNumb ) } } - -// --------------------------------------------------------------- - // convert a point to the current VC mapmode (1/100TH mm) void CGM::ImplMapPoint( FloatPoint& rFloatPoint ) { @@ -628,8 +576,6 @@ void CGM::ImplMapPoint( FloatPoint& rFloatPoint ) } } -// --------------------------------------------------------------- - void CGM::ImplDoClass() { #ifdef CGM_USER_BREAKPOINT @@ -662,8 +608,6 @@ void CGM::ImplDoClass() mnActCount++; }; -// --------------------------------------------------------------- - void CGM::ImplDefaultReplacement() { if ( !maDefRepList.empty() ) @@ -709,8 +653,6 @@ void CGM::ImplDefaultReplacement() } } -// --------------------------------------------------------------- - sal_Bool CGM::Write( SvStream& rIStm ) { if ( !mpBuf ) @@ -748,20 +690,13 @@ sal_Bool CGM::Write( SvStream& rIStm ) return mbStatus; }; -// --------------------------------------------------------------- - SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ ) { return rOStm; }; -// --------------------------------------------------------------- - - - -//================== GraphicImport - the exported function ================ - +// GraphicImport - the exported function extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar ) { diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index d66ca3441883..6d6f653f0e84 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -21,7 +21,7 @@ #include <main.hxx> #include <chart.hxx> -// --------------------------------------------------------------- + CGMChart::CGMChart( CGM& rCGM ) : mpCGM ( &rCGM ) @@ -35,7 +35,7 @@ CGMChart::CGMChart( CGM& rCGM ) : } }; -// --------------------------------------------------------------- + CGMChart::~CGMChart() { @@ -47,7 +47,7 @@ CGMChart::~CGMChart() } }; -// --------------------------------------------------------------- + void CGMChart::DeleteTextEntry( TextEntry* pTextEntry ) { @@ -73,22 +73,22 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry ) } }; -// --------------------------------------------------------------- + void CGMChart::InsertTextEntry( TextEntry* pTextEntry ) { maTextEntryList.push_back( pTextEntry ); }; -// --------------------------------------------------------------- -// --------------------------------------------------------------- + + void CGMChart::ResetAnnotation() { mDataNode[ 0 ].nZoneEnum = 0; } -// --------------------------------------------------------------- + sal_Bool CGMChart::IsAnnotation() { diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index fa65008815f9..3ef40972609d 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -20,7 +20,7 @@ #include <main.hxx> #include <outact.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass0() { diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index de354d52c581..f9082953dd56 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -20,7 +20,7 @@ #include <main.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass1() { diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx index 2c9e430323a9..3012eeec3571 100644 --- a/filter/source/graphicfilter/icgm/class2.cxx +++ b/filter/source/graphicfilter/icgm/class2.cxx @@ -20,7 +20,7 @@ #include <main.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass2() { diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 98f1254acd06..56f96d7eff5f 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -21,7 +21,7 @@ #include <main.hxx> #include <outact.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass3() { diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 71ccf320abba..0f99aff1b704 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -39,7 +39,7 @@ double CGM::ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint ) return fOrientation; } -// --------------------------------------------------------------- + void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) { @@ -49,7 +49,7 @@ void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ) rEndAngle = nTemp; } -// --------------------------------------------------------------- + void CGM::ImplGetVector( double* pVector ) { @@ -73,7 +73,7 @@ void CGM::ImplGetVector( double* pVector ) pVector[ 3 ] *= mnVDCYmul; } -// --------------------------------------------------------------- + sal_Bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rAngle ) { FloatPoint aPoint1, aPoint2; diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index eb537886fbb6..43705f4c7e08 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -23,7 +23,7 @@ #include <outact.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass5() { diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx index 304ba32952ff..60141c488ef1 100644 --- a/filter/source/graphicfilter/icgm/class7.cxx +++ b/filter/source/graphicfilter/icgm/class7.cxx @@ -22,7 +22,7 @@ #include <chart.hxx> #include <outact.hxx> -// --------------------------------------------------------------- + void CGM::ImplDoClass7() { diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx index 9fb36078a2bf..8d8c03872d13 100644 --- a/filter/source/graphicfilter/icgm/classx.cxx +++ b/filter/source/graphicfilter/icgm/classx.cxx @@ -21,7 +21,7 @@ #include <main.hxx> #include <outact.hxx> -// --------------------------------------------------------------- + #define ImplSetUnderlineMode() \ \ @@ -36,7 +36,7 @@ } \ pElement->nUnderlineColor = ImplGetBitmapColor(); -// --------------------------------------------------------------- + void CGM::ImplDoClass6() { @@ -197,7 +197,7 @@ void CGM::ImplDoClass6() } }; -// --------------------------------------------------------------- + void CGM::ImplDoClass8() { @@ -216,7 +216,7 @@ void CGM::ImplDoClass8() } }; -// --------------------------------------------------------------- + void CGM::ImplDoClass9() { @@ -236,7 +236,7 @@ void CGM::ImplDoClass9() } }; -// --------------------------------------------------------------- + void CGM::ImplDoClass15() { @@ -249,6 +249,6 @@ void CGM::ImplDoClass15() } }; -// --------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index dcd5479ecc40..0f4104005e58 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -20,7 +20,7 @@ #include "elements.hxx" -// --------------------------------------------------------------- + CGMElements::CGMElements( CGM& rCGM ) : @@ -29,7 +29,7 @@ CGMElements::CGMElements( CGM& rCGM ) : Init(); }; -// --------------------------------------------------------------- + CGMElements::~CGMElements() { @@ -40,7 +40,7 @@ CGMElements::~CGMElements() DeleteAllBundles( aFillList ); } -// --------------------------------------------------------------- + CGMElements& CGMElements::operator=( CGMElements& rSource ) { @@ -139,7 +139,7 @@ CGMElements& CGMElements::operator=( CGMElements& rSource ) return (*this); } -// --------------------------------------------------------------- + void CGMElements::Init() { @@ -283,7 +283,7 @@ void CGMElements::Init() bSegmentCount = sal_False; } -// --------------------------------------------------------------- + void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, long nAngle ) { @@ -293,7 +293,7 @@ void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, l rEntry.HatchAngle = nAngle; } -// --------------------------------------------------------------- + void CGMElements::DeleteAllBundles( BundleList& rList ) { @@ -304,7 +304,7 @@ void CGMElements::DeleteAllBundles( BundleList& rList ) }; -// --------------------------------------------------------------- + void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) { @@ -318,7 +318,7 @@ void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest ) } }; -// --------------------------------------------------------------- + Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBundle ) { @@ -329,7 +329,7 @@ Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBu return pBundle; } -// --------------------------------------------------------------- + Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) { @@ -341,7 +341,7 @@ Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex ) return NULL; } -// --------------------------------------------------------------- + Bundle* CGMElements::InsertBundle( BundleList& rList, Bundle& rBundle ) { diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx index fe1d09ffd46b..798b2f2ce0bd 100644 --- a/filter/source/graphicfilter/icgm/outact.cxx +++ b/filter/source/graphicfilter/icgm/outact.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -// --------------------------------------------------------------- + CGMOutAct::CGMOutAct( CGM& rCGM ) { @@ -38,7 +38,7 @@ CGMOutAct::CGMOutAct( CGM& rCGM ) mpGradient = NULL; }; -// --------------------------------------------------------------- + CGMOutAct::~CGMOutAct() { @@ -50,7 +50,7 @@ CGMOutAct::~CGMOutAct() delete mpGradient; }; -// --------------------------------------------------------------- + void CGMOutAct::BeginFigure() { @@ -61,7 +61,7 @@ void CGMOutAct::BeginFigure() mnIndex = 0; } -// --------------------------------------------------------------- + void CGMOutAct::CloseRegion() { @@ -73,7 +73,7 @@ void CGMOutAct::CloseRegion() } } -// --------------------------------------------------------------- + void CGMOutAct::NewRegion() { @@ -85,7 +85,7 @@ void CGMOutAct::NewRegion() mnIndex = 0; } -// --------------------------------------------------------------- + void CGMOutAct::EndFigure() { @@ -96,7 +96,7 @@ void CGMOutAct::EndFigure() mnIndex = 0; } -// --------------------------------------------------------------- + void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse ) { @@ -123,7 +123,7 @@ void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse ) } } -// --------------------------------------------------------------- + void CGMOutAct::SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 /*nType*/ ) { @@ -133,7 +133,7 @@ void CGMOutAct::SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 /*nT mpGradient->YOffset = ( (sal_uInt16)nVertOfs & 0x7f ); } -// --------------------------------------------------------------- + void CGMOutAct::SetGradientAngle( long nAngle ) { @@ -142,7 +142,7 @@ void CGMOutAct::SetGradientAngle( long nAngle ) mpGradient->Angle = sal::static_int_cast< sal_Int16 >(nAngle); } -// --------------------------------------------------------------- + void CGMOutAct::SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorTo ) { @@ -152,7 +152,7 @@ void CGMOutAct::SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorT mpGradient->EndColor = nColorTo; } -// --------------------------------------------------------------- + void CGMOutAct::SetGradientStyle( sal_uInt32 nStyle, double /*fRatio*/ ) { diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx index bb52fe42aebe..eb100bdc6773 100644 --- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx @@ -22,9 +22,9 @@ #include <dxfblkrd.hxx> -//---------------------------------------------------------------------------- + //---------------- DXFBlock -------------------------------------------------- -//---------------------------------------------------------------------------- + DXFBlock::DXFBlock() @@ -65,9 +65,9 @@ void DXFBlock::Read(DXFGroupReader & rDGR) } -//---------------------------------------------------------------------------- + //---------------- DXFBlocks ------------------------------------------------- -//---------------------------------------------------------------------------- + DXFBlocks::DXFBlocks() diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index 43fccca97fa2..506ffa277656 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -24,7 +24,7 @@ #include <tools/stream.hxx> #include "dxfgrprd.hxx" -// ---------------------------------------------------------------------------- + // we use an own ReadLine function, because Stream::ReadLine stops if // a 0-sign occurs; this functions converts 0-signs to blanks and reads @@ -87,7 +87,7 @@ OString DXFReadLine(SvStream& rIStm) return aBuf.makeStringAndClear(); } -// ------------------ + DXFGroupReader::DXFGroupReader(SvStream & rIStream, sal_uInt16 nminpercent, sal_uInt16 nmaxpercent ) : rIS(rIStream) diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index a5f8b1455af2..fee898d34b40 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -67,7 +67,7 @@ static sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLo return NULL; } -//-------------------------------------------------------------------------- + // SecurityCount is the buffersize of the buffer in which we will parse for a number static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount ) { @@ -106,7 +106,7 @@ static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount ) return nRetValue; } -//-------------------------------------------------------------------------- + static int ImplGetLen( sal_uInt8* pBuf, int nMax ) { diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 02b4db2701d6..3f56bfff7cd2 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -162,13 +162,13 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem ) return bStatus; } -// ------------------------------------------------------------------------------------------- + void PCDReader::MayCallback(sal_uLong /*nPercent*/) { } -// ------------------------------------------------------------------------------------------- + void PCDReader::CheckPCDImagePacFile() { @@ -181,7 +181,7 @@ void PCDReader::CheckPCDImagePacFile() bStatus = sal_False; } -// ------------------------------------------------------------------------------------------- + void PCDReader::ReadOrientation() { @@ -192,7 +192,7 @@ void PCDReader::ReadOrientation() nOrientation &= 0x03; } -// ------------------------------------------------------------------------------------------- + void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) { diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 9cb8cf877fed..27cf0bfa7503 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -249,7 +249,7 @@ public: }; -//------------------------------------------------------------------------------------------------ + #define SETBYTE \ switch ( nPixelSize ) \ @@ -290,7 +290,7 @@ public: break; \ } -//------------------------------------------------------------------------------------------------ + #define BITMAPERROR \ { \ diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index 33219a75927e..7848463fb00e 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -102,7 +102,7 @@ PSDReader::~PSDReader() delete mpFileHeader; } -// ------------------------------------------------------------------------ + sal_Bool PSDReader::ReadPSD(Graphic & rGraphic ) { @@ -166,7 +166,7 @@ sal_Bool PSDReader::ReadPSD(Graphic & rGraphic ) return mbStatus; } -// ------------------------------------------------------------------------ + sal_Bool PSDReader::ImplReadHeader() { @@ -331,7 +331,7 @@ sal_Bool PSDReader::ImplReadHeader() return sal_True; } -// ------------------------------------------------------------------------ + sal_Bool PSDReader::ImplReadBody() { diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index dcaaf4ce06f8..101aab41a758 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -78,7 +78,7 @@ RASReader::~RASReader() { } -//---------------------------------------------------------------------------- + sal_Bool RASReader::ReadRAS(Graphic & rGraphic) { @@ -169,7 +169,7 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic) return mbStatus; } -//---------------------------------------------------------------------------- + sal_Bool RASReader::ImplReadHeader() { @@ -207,7 +207,7 @@ sal_Bool RASReader::ImplReadHeader() return mbStatus; } -//---------------------------------------------------------------------------- + sal_Bool RASReader::ImplReadBody() { @@ -302,7 +302,7 @@ sal_Bool RASReader::ImplReadBody() return mbStatus; } -//---------------------------------------------------------------------------- + sal_uInt8 RASReader::ImplGetByte() { diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index f9b338119f59..b03ca79e6277 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -130,7 +130,7 @@ TGAReader::~TGAReader() delete mpFileFooter; } -// ------------------------------------------------------------------------------------------- + sal_Bool TGAReader::ReadTGA(Graphic & rGraphic) { @@ -170,7 +170,7 @@ sal_Bool TGAReader::ReadTGA(Graphic & rGraphic) return mbStatus; } -// ------------------------------------------------------------------------------------------- + sal_Bool TGAReader::ImplReadHeader() { @@ -276,7 +276,7 @@ sal_Bool TGAReader::ImplReadHeader() return mbStatus; } -// ------------------------------------------------------------------------------------------- + sal_Bool TGAReader::ImplReadBody() { @@ -711,7 +711,7 @@ sal_Bool TGAReader::ImplReadBody() return mbStatus; } -// ------------------------------------------------------------------------------------------- + sal_Bool TGAReader::ImplReadPalette() { diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 8deea2c16589..cd156a7fca05 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -138,7 +138,7 @@ void TIFFReader::MayCallback( sal_uLong /*nPercent*/ ) { } -// --------------------------------------------------------------------------------- + sal_uLong TIFFReader::DataTypeSize() { @@ -172,7 +172,7 @@ sal_uLong TIFFReader::DataTypeSize() return nSize; } -// --------------------------------------------------------------------------------- + sal_uLong TIFFReader::ReadIntData() { @@ -235,7 +235,7 @@ sal_uLong TIFFReader::ReadIntData() return nUINT32a; } -// --------------------------------------------------------------------------------- + double TIFFReader::ReadDoubleData() { @@ -255,7 +255,7 @@ double TIFFReader::ReadDoubleData() return nd; } -// --------------------------------------------------------------------------------- + void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) { @@ -481,7 +481,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen) bStatus = sal_False; } -// --------------------------------------------------------------------------------- + sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent ) { @@ -717,7 +717,7 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u return nRes; } -// --------------------------------------------------------------------------------- + sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) { @@ -1024,7 +1024,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY ) return sal_True; } -// --------------------------------------------------------------------------------- + void TIFFReader::MakePalCol( void ) { @@ -1075,7 +1075,7 @@ void TIFFReader::MakePalCol( void ) } } -// --------------------------------------------------------------------------------- + void TIFFReader::ReadHeader() { @@ -1105,7 +1105,7 @@ bool TIFFReader::HasAlphaChannel() const ); } -// --------------------------------------------------------------------------------- + sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) { diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx index 28b57b332e5b..832d4b2886da 100644 --- a/filter/source/msfilter/countryid.cxx +++ b/filter/source/msfilter/countryid.cxx @@ -22,7 +22,7 @@ #include <algorithm> #include <sal/macros.h> -// ---------------------------------------------------------------------------- + namespace msfilter { @@ -30,7 +30,7 @@ namespace msfilter { namespace { -// ---------------------------------------------------------------------------- + /** Table entry for Windows country ID <-> language type conversion. @@ -57,7 +57,7 @@ struct CountryEntry bool mbUseSubLang; /// false = Primary only, true = Primary and sub language. }; -// ---------------------------------------------------------------------------- + /** Table for Windows country ID <-> language type conversion. diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index a6423fce2fdc..b507ed68bef8 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -435,10 +435,10 @@ void EscherPropertyContainer::CreateGradientProperties( sal_uInt32 nFillFocus = 0; sal_uInt32 nFillLR = 0; sal_uInt32 nFillTB = 0; - sal_uInt32 nFirstColor = 0;//like the control var nChgColors in import logic + sal_uInt32 nFirstColor = 0;// like the control var nChgColors in import logic bool bWriteFillTo = false; - //Transparency gradient: Means the third setting in transparency page is set + // Transparency gradient: Means the third setting in transparency page is set if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) ) { @@ -452,7 +452,7 @@ void EscherPropertyContainer::CreateGradientProperties( ::com::sun::star::drawing::FillStyle eFS; if ( ! ( aAnyTemp >>= eFS ) ) eFS = ::com::sun::star::drawing::FillStyle_SOLID; - //solid and transparency + // solid and transparency if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID) { if ( EscherPropertyValueHelper::GetPropertyValue( @@ -462,7 +462,7 @@ void EscherPropertyContainer::CreateGradientProperties( pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False ); } } - //gradient and transparency. + // gradient and transparency. else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT ) { if ( EscherPropertyValueHelper::GetPropertyValue( @@ -472,7 +472,7 @@ void EscherPropertyContainer::CreateGradientProperties( } } - //Not transparency gradient + // Not transparency gradient else if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillGradient" ), sal_False ) ) { @@ -490,7 +490,7 @@ void EscherPropertyContainer::CreateGradientProperties( nAngle = pGradient->Angle; while ( nAngle > 0 ) nAngle -= 3600; while ( nAngle <= -3600 ) nAngle += 3600; - //Value of the real number = Integral + (Fractional / 65536.0) + // Value of the real number = Integral + (Fractional / 65536.0) nAngle = ( nAngle * 0x10000) / 10; nFillFocus = (pGradient->Style == ::com::sun::star::awt::GradientStyle_LINEAR) ? @@ -506,7 +506,7 @@ void EscherPropertyContainer::CreateGradientProperties( case ::com::sun::star::awt::GradientStyle_SQUARE : case ::com::sun::star::awt::GradientStyle_RECT : { - //according to the import logic and rect type fill** value + // according to the import logic and rect type fill** value nFillLR = (pGradient->XOffset * 0x10000) / 100; nFillTB = (pGradient->YOffset * 0x10000) / 100; if ( ((nFillLR > 0) && (nFillLR < 0x10000)) || ((nFillTB > 0) && (nFillTB < 0x10000)) ) @@ -528,7 +528,7 @@ void EscherPropertyContainer::CreateGradientProperties( AddOpt( ESCHER_Prop_fillFocus, nFillFocus ); if ( bWriteFillTo ) { - //according to rect type fillTo** value + // according to rect type fillTo** value if(nFillLR) { AddOpt( ESCHER_Prop_fillToLeft, nFillLR ); @@ -541,7 +541,7 @@ void EscherPropertyContainer::CreateGradientProperties( } } - //Transparency gradient + // Transparency gradient if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) ) { @@ -566,7 +566,7 @@ void EscherPropertyContainer::CreateFillProperties( if ( pObj ) { SfxItemSet aAttr( pObj->GetMergedItemSet() ); - //tranparency with gradient. Means the third setting in transparency page is set + // tranparency with gradient. Means the third setting in transparency page is set sal_Bool bTransparentGradient = ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && ( (const XFillFloatTransparenceItem&) aAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled(); CreateFillProperties( rXPropSet, bEdge, bTransparentGradient ); @@ -880,9 +880,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, if ( !aApiName.isEmpty() ) { - /* todo: - calculate the best option for ArrowLength and ArrowWidth - */ + // TODO: calculate the best option for ArrowLength and ArrowWidth if ( aApiName == "Arrow concave" ) reLineEnd = ESCHER_LineArrowStealthEnd; else if ( aApiName == "Square 45" ) @@ -1610,7 +1608,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties( if ( nErrCode == ERRCODE_NONE ) { - // no. + // no aGraphicObject = aGraphic; aUniqueId = aGraphicObject.GetUniqueID(); } @@ -2195,9 +2193,8 @@ sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) } return nRet; } -/* - Adjust value decide the position which connector should turn a corner -*/ + +// Adjust value decide the position which connector should turn a corner sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex ) { sal_uInt16 k = rPoly.GetSize(); @@ -2212,7 +2209,7 @@ sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex aEnd.X() = aStart.X() +4; sal_Bool bVertical = ( rPoly[1].X()-aStart.X() ) == 0 ; - //vertical and horizon alternate + // vertical and horizon alternate if ( nIndex%2 == 1 ) bVertical = !bVertical; aPt = rPoly[ nIndex + 1]; @@ -2306,7 +2303,7 @@ sal_Bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle ) // Set angle properties nAngle *= 655; nAngle += 0x8000; - nAngle &=~0xffff; // nAngle auf volle Gradzahl runden + nAngle &=~0xffff; // round nAngle to whole number of degrees return sal_True; } return sal_False; @@ -2348,7 +2345,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties( rShapeFlags = SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT | SHAPEFLAG_CONNECTOR; rGeoRect = ::com::sun::star::awt::Rectangle( aStartPoint.X, aStartPoint.Y, ( aEndPoint.X - aStartPoint.X ) + 1, ( aEndPoint.Y - aStartPoint.Y ) + 1 ); - //set standard's FLIP in below code + // set standard's FLIP in below code if ( eCt != ::com::sun::star::drawing::ConnectorType_STANDARD) { if ( rGeoRect.Height < 0 ) // justify @@ -2646,7 +2643,7 @@ sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShap sal_Bool bIsDefaultObject = sal_False; switch(eShapeType) { - //if the custom shape is not default shape of ppt, return sal_Fasle; + // if the custom shape is not default shape of ppt, return sal_Fasle; case mso_sptTearDrop: return bIsDefaultObject; @@ -3562,7 +3559,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT nTextPathFlags &=~0x20; } } - //export gTextAlign attr + // export gTextAlign attr if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "TextHorizontalAdjust", sal_True ) ) { MSO_GeoTextAlign gTextAlign = mso_alignTextCenter; @@ -3598,7 +3595,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT AddOpt(DFF_Prop_gtextAlign,gTextAlign); } } - if((nTextPathFlags & 0x4000) != 0) //Is Font work + if((nTextPathFlags & 0x4000) != 0) // Is Font work { OutlinerParaObject* pOutlinerParaObject = pCustoShape->GetOutlinerParaObject(); if ( pOutlinerParaObject && pOutlinerParaObject->IsVertical() ) @@ -3917,7 +3914,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi return GetCustomShapeType( rXShape, nMirrorFlags, aShapeType ); } -//Implement for form control export +// Implement for form control export sal_Bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape) { SdrObject* pShape = GetSdrObjectFromXShape( rXShape ); @@ -4581,7 +4578,7 @@ sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const Polygon& rPoly, cons return nClosest; }; -// --------------------------------------------------------------------------------------------- + // for rectangles for ellipses for polygons // // nRule = 0 ->Top 0 ->Top nRule = Index auf ein (Poly)Polygon Punkt @@ -5022,11 +5019,11 @@ SvStream* EscherExGlobal::ImplQueryPictureStream() return 0; } -/// Implementation of an empty stream that silently succeeds, but does nothing. -/// -/// In fact, this is a hack. The right solution is to abstract EscherEx to be -/// able to work without SvStream; but at the moment it is better to live with -/// this I guess. +// /Implementation of an empty stream that silently succeeds, but does nothing. +// / +// /In fact, this is a hack. The right solution is to abstract EscherEx to be +// /able to work without SvStream; but at the moment it is better to live with +// /this I guess. class SvNullStream : public SvStream { protected: diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8340f844b700..68cfc3a79da2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2837,9 +2837,9 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_ } } -//--------------------------------------------------------------------------- + //- Record Manager ---------------------------------------------------------- -//--------------------------------------------------------------------------- + DffRecordList::DffRecordList( DffRecordList* pList ) : nCount ( 0 ), @@ -3029,9 +3029,9 @@ DffRecordHeader* DffRecordManager::GetRecordHeader( sal_uInt16 nRecId, DffSeekTo return pHd; } -//--------------------------------------------------------------------------- + // private methods -//--------------------------------------------------------------------------- + bool CompareSvxMSDffShapeInfoById::operator() ( ::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs, @@ -5436,9 +5436,9 @@ void SvxMSDffManager::RemoveFromShapeOrder( SdrObject* pObject ) const -//--------------------------------------------------------------------------- + // exported class: Public Methods -//--------------------------------------------------------------------------- + SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, const OUString& rBaseURL, diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index abd50efed0dc..8035c862e6c3 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -20,8 +20,8 @@ namespace util { rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Locale &rLocale) { - //Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks - //in last-ditch broken-file-format cases to guess the right 8bit encodings + // Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks + // in last-ditch broken-file-format cases to guess the right 8bit encodings const OUString &rLanguage = rLocale.Language; if (rLanguage == "cs" || rLanguage == "hu" || rLanguage == "pl") return RTL_TEXTENCODING_MS_1250; @@ -358,7 +358,7 @@ sal_Int32 PaperSizeConv::getMSPaperSizeIndex( const com::sun::star::awt::Size& r { sal_Int32 nCurDeltaHeight = std::abs( pItem->mnHeight - rSize.Height ); sal_Int32 nCurDeltaWidth = std::abs( pItem->mnWidth - rSize.Width ); - if ( pItem == spPaperSizeTable ) // initialise delta with first item + if ( pItem == spPaperSizeTable ) // initialize delta with first item { nDeltaWidth = nCurDeltaWidth; nDeltaHeight = nCurDeltaHeight; @@ -412,10 +412,9 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData ) , nNext( 0 ) , nSavPtr( 0 ) { + /* - erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem - Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl - (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird + First look for an opening bracket or a space or a quatation mark or a backslash, so that the field (i.e. INCLUDEPICTURE or EINFUEGENGRAFIK or...) gets oread over */ const sal_Int32 nLen = aData.getLength(); @@ -461,7 +460,7 @@ bool WW8ReadFieldParams::GoToTokenParam() return false; } -// ret: -2: NOT a '\' parameter but normal Text +// ret: -2: NOT a '\' parameter but normal text sal_Int32 WW8ReadFieldParams::SkipToNextToken() { if ( nNext<0 || nNext>=aData.getLength() ) @@ -476,7 +475,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() if (nFnd+1<aData.getLength() && aData[nFnd+1]!='\\' && aData[nFnd]=='\\') { const sal_Int32 nRet = aData[++nFnd]; - nNext = ++nFnd; // und dahinter setzen + nNext = ++nFnd; // and set after return nRet; } @@ -487,22 +486,22 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken() return -2; } -// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette -// bis zum Blank oder naechsten "\" oder zum schliessenden Anfuehrungszeichen -// oder zum String-Ende von pStr. +// FindNextPara searches the next backslash parameter or the next string +// until the next blank or "\" or closing quatation mark +// or the end of the string of pStr. // -// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0 +// Output ppNext (if ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0 // -// Returnwert: 0 falls String-Ende erreicht, +// Return value: 0 if end of string reached, // ansonsten Anfang des Paramters bzw. der Zeichenkette // sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) { const sal_Int32 nLen = aData.getLength(); - sal_Int32 n = nStart<0 ? nFnd : nStart; // Anfang - sal_Int32 n2; // Ende + sal_Int32 n = nStart<0 ? nFnd : nStart; // start + sal_Int32 n2; // end - nNext = -1; // Default fuer nicht gefunden + nNext = -1; // if not found -> Default while ( n<nLen && aData[n]==' ' ) ++n; @@ -519,36 +518,36 @@ sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart) return -1; } - // Anfuehrungszeichen vor Para? + // quotation marks before paragraph? if ( aData[n]=='"' || aData[n]==0x201c || aData[n]==132 || aData[n]==0x14 ) { - n++; // Anfuehrungszeichen ueberlesen - n2 = n; // ab hier nach Ende suchen + n++; // read over quatation marks + n2 = n; // search for the end from here on while( (nLen > n2) && (aData[n2] != '"') && (aData[n2] != 0x201d) && (aData[n2] != 147) && (aData[n2] != 0x15) ) - n2++; // Ende d. Paras suchen + n2++; // search for the end of the paragraph } - else // keine Anfuehrungszeichen + else // no quotation mark { - n2 = n; // ab hier nach Ende suchen - while ( n2<nLen && aData[n2]!=' ' ) // Ende d. Paras suchen + n2 = n; // search for the end from here on + while ( n2<nLen && aData[n2]!=' ' ) // search for the end of the paragraph { if ( aData[n2]=='\\' ) { if ( n2+1<nLen && aData[n2+1]=='\\' ) - n2 += 2; // Doppel-Backslash -> OK + n2 += 2; // double backslash -> OK else { if( n2 > n ) n2--; - break; // einfach-Backslash -> Ende + break; // single backslash -> end } } else - n2++; // kein Backslash -> OK + n2++; // no backslash -> OK } } if( nLen > n2 ) @@ -622,8 +621,8 @@ EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam) OUString sPart = rReadParam.GetResult(); sal_Int32 nBegin = sPart.indexOf('('); - //Word disallows brackets in this field, which - //aids figuring out the case of an end of )) vs ) + // Word disallows brackets in this field, which + // aids figuring out the case of an end of )) vs ) sal_Int32 nEnd = sPart.indexOf(')'); if (nBegin != -1 && nEnd != -1) diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index a98e170c9d1d..189f7e226508 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -49,9 +49,9 @@ PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMg { } -// ---------------- + // - ImpPDFDialog - -// ---------------- + using namespace ::com::sun::star; @@ -59,7 +59,7 @@ using namespace ::com::sun::star; // tabbed PDF dialog implementation // please note: the default used here are the same as per specification, // they should be the same in PDFFilter::implExport and in PDFExport::PDFExport -// ----------------------------------------------------------------------------- + ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rxDoc) : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui", @@ -314,7 +314,7 @@ IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl) return 0; } -// ----------------------------------------------------------------------------- + ImpPDFTabDialog::~ImpPDFTabDialog() { //delete the pages, needed because otherwise the child tab pages @@ -331,7 +331,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog() RemoveTabPage(mnSigningPageId); } -// ----------------------------------------------------------------------------- + void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) { @@ -361,7 +361,7 @@ void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId, } } -// ----------------------------------------------------------------------------- + short ImpPDFTabDialog::Ok( ) { //here the whole mechanism of the base class is not used @@ -369,7 +369,7 @@ short ImpPDFTabDialog::Ok( ) return RET_OK; } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() { // updating the FilterData sequence and storing FilterData to configuration @@ -511,7 +511,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() return aRet; } -// ----------------------------------------------------------------------------- + ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", rCoreSet) , mbTaggedPDFUserSelection(false) @@ -553,12 +553,12 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rC get(mpEdWatermark, "watermarkentry"); } -// ----------------------------------------------------------------------------- + ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage() { } -// ----------------------------------------------------------------------------- + void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { mpaParent = paParent; @@ -652,7 +652,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ToggleAddStreamHdl(NULL); } -// ----------------------------------------------------------------------------- + void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { // updating the FilterData sequence and storing FilterData to configuration @@ -705,14 +705,14 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->mbAllowDuplicateFieldNames = mpCbAllowDuplicateFieldNames->IsChecked(); } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabGeneralPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl) { mpEdPages->Enable( mpRbRange->IsChecked() ); @@ -721,21 +721,21 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl) return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl) { mpFormsFrame->Enable(mpCbExportFormFields->IsChecked()); return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl) { mpQualityFrame->Enable(mpRbJPEGCompression->IsChecked()); return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl) { mpCoReduceImageResolution->Enable( mpCbReduceImageResolution->IsChecked() ); @@ -753,7 +753,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl) return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl) { if( mpCbAddStream->IsVisible() ) @@ -776,7 +776,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl) return 0; } -// ----------------------------------------------------------------------------- + IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) { //set the security page status (and its controls as well) @@ -851,19 +851,19 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& rCor mpRbMagnZoom->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbMagnHdl ) ); } -// ----------------------------------------------------------------------------- + ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage() { } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabOpnFtrPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabOpnFtrPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { paParent->mnInitialView = 0; @@ -898,7 +898,7 @@ void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : sal_False; } -// ----------------------------------------------------------------------------- + void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { mbUseCTLFont = paParent->mbUseCTLFont; @@ -985,7 +985,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) //////////////////////////////////////////////////////// // The Viewer preferences tab page -// ----------------------------------------------------------------------------- + ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", rCoreSet ) @@ -1007,25 +1007,25 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, m_pRbVisibleBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) ); } -// ----------------------------------------------------------------------------- + ImpPDFTabViewerPage::~ImpPDFTabViewerPage() { } -// ----------------------------------------------------------------------------- + IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, ) { m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() ); return 0; } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabViewerPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabViewerPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { paParent->mbHideViewerMenubar = m_pCbHideViewerMenubar->IsChecked(); @@ -1040,7 +1040,7 @@ void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) -1 : static_cast<sal_Int32>(m_pNumBookmarkLevels->GetValue()); } -// ----------------------------------------------------------------------------- + void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { m_pCbHideViewerMenubar->Check( paParent->mbHideViewerMenubar ); @@ -1105,19 +1105,19 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet mpPbSetPwd->SetClickHdl( LINK( this, ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl ) ); } -// ----------------------------------------------------------------------------- + ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage() { } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabSecurityPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabSecurityPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { // please note that in PDF/A-1a mode even if this are copied back, @@ -1152,7 +1152,7 @@ void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -// ----------------------------------------------------------------------------- + void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { switch( paParent->mnPrint ) @@ -1293,7 +1293,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls() //////////////////////////////////////////////////////// // This tab page is under control of the PDF/A-1a checkbox: // implement a method to do it. -// ----------------------------------------------------------------------------- + void ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity ) { if( bEnableSecurity ) @@ -1309,7 +1309,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity //////////////////////////////////////////////////////// // The link preferences tab page (relative and other stuff) -// ----------------------------------------------------------------------------- + ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",rCoreSet ), @@ -1326,19 +1326,19 @@ ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, get(m_pRbOpnLnksBrowser ,"openinternet"); } -// ----------------------------------------------------------------------------- + ImpPDFTabLinksPage::~ImpPDFTabLinksPage() { } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabLinksPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabLinksPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { paParent->mbExportRelativeFsysLinks = m_pCbExportRelativeFsysLinks->IsChecked(); @@ -1367,7 +1367,7 @@ void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->mbExportBmkToPDFDestination = m_pCbExprtBmkrToNmDst->IsChecked(); } -// ----------------------------------------------------------------------------- + void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { m_pCbOOoToPDFTargets->Check( paParent->mbConvertOOoTargets ); @@ -1402,7 +1402,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) ImplPDFALinkControl(!pGeneralPage->mpCbPDFA1b->IsChecked()); } -// ----------------------------------------------------------------------------- + // called from general tab, with PDFA/1 selection status // retrieves/store the status of Launch action selection void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch ) @@ -1428,7 +1428,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch ) } } -// ----------------------------------------------------------------------------- + // reset the memory of Launch action present // when PDF/A-1 was requested IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl) @@ -1439,7 +1439,7 @@ IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl) return 0; } -// ----------------------------------------------------------------------------- + // reset the memory of a launch action present // when PDF/A-1 was requested IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl) @@ -1555,7 +1555,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) //////////////////////////////////////////////////////// // The digital signatures tab page -// ----------------------------------------------------------------------------- + ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", rCoreSet) , maSignCertificate() @@ -1573,7 +1573,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rC mpPbSignCertClear->SetClickHdl( LINK( this, ImpPDFTabSigningPage, ClickmaPbSignCertClear ) ); } -// ----------------------------------------------------------------------------- + ImpPDFTabSigningPage::~ImpPDFTabSigningPage() { } @@ -1613,14 +1613,14 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) return 0; } -// ----------------------------------------------------------------------------- + SfxTabPage* ImpPDFTabSigningPage::Create( Window* pParent, const SfxItemSet& rAttrSet) { return ( new ImpPDFTabSigningPage( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------------- + void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) { paParent->mbSignPDF = maSignCertificate.is(); @@ -1632,7 +1632,7 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -// ----------------------------------------------------------------------------- + void ImpPDFTabSigningPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) { diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index 361748dd52fa..cbead17dc2ce 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; -// ----------------------- + // - PDFDialog functions - -// ----------------------- + #define SERVICE_NAME "com.sun.star.document.PDFDialog" -// ----------------------------------------------------------------------------- + OUString PDFDialog_getImplementationName () throw (RuntimeException) @@ -46,7 +46,7 @@ OUString PDFDialog_getImplementationName () return OUString ( "com.sun.star.comp.PDF.PDFDialog" ); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() throw(RuntimeException) @@ -55,7 +55,7 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() return aId.getImplementationId(); } -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException) @@ -66,7 +66,7 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() return aRet; } -// ----------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception ) @@ -74,26 +74,26 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul return (cppu::OWeakObject*) new PDFDialog( comphelper::getComponentContext(rSMgr) ); } -// ----------------------------------------------------------------------------- + #undef SERVICE_NAME -// ------------- + // - PDFDialog - -// ------------- + PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext ) : PDFDialog_Base( rxContext ) { } -// ----------------------------------------------------------------------------- + PDFDialog::~PDFDialog() { } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() throw(RuntimeException) @@ -101,7 +101,7 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId() return PDFDialog_getImplementationId(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL PDFDialog::getImplementationName() throw (RuntimeException) @@ -109,7 +109,7 @@ OUString SAL_CALL PDFDialog::getImplementationName() return PDFDialog_getImplementationName(); } -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() throw (RuntimeException) @@ -117,7 +117,7 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() return PDFDialog_getSupportedServiceNames(); } -// ----------------------------------------------------------------------------- + Dialog* PDFDialog::createDialog( Window* pParent ) { @@ -132,7 +132,7 @@ Dialog* PDFDialog::createDialog( Window* pParent ) return pRet; } -// ----------------------------------------------------------------------------- + void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) { @@ -141,7 +141,7 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) destroyDialog(); } -// ----------------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() throw(RuntimeException) @@ -150,13 +150,13 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() return xInfo; } -//------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& PDFDialog::getInfoHelper() { return *const_cast<PDFDialog*>(this)->getArrayHelper(); } -//------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* PDFDialog::createArrayHelper() const { Sequence< Property > aProps; @@ -164,7 +164,7 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper( aProps ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() throw ( RuntimeException ) @@ -186,7 +186,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues() return maMediaDescriptor; } -// ----------------------------------------------------------------------------- + void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) @@ -203,7 +203,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr } } -// ----------------------------------------------------------------------------- + void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException) diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 1105b17b9dd5..5b1994bb9af8 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -84,9 +84,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::view; using namespace ::com::sun::star::graphic; -// ------------- + // - PDFExport - -// ------------- + PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc, const Reference< task::XStatusIndicator >& rxStatusIndicator, @@ -148,13 +148,13 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc, { } -// ----------------------------------------------------------------------------- + PDFExport::~PDFExport() { } -// ----------------------------------------------------------------------------- + sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com::sun::star::view::XRenderable >& rRenderable, @@ -999,7 +999,7 @@ void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors ) } } -// ----------------------------------------------------------------------------- + sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf ) { @@ -1041,7 +1041,7 @@ sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFEx return bRet; } -// ----------------------------------------------------------------------------- + void PDFExport::ImplWriteWatermark( PDFWriter& rWriter, const Size& rPageSize ) { diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index b8406900d242..5814b42a5bd3 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -129,7 +129,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) return bRet; } -// ----------------------------------------------------------------------------- + class FocusWindowWaitCursor { Window* m_pFocusWindow; @@ -172,13 +172,13 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto return bRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc ) throw (IllegalArgumentException, RuntimeException) @@ -186,7 +186,7 @@ void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc mxSrcDoc = xDoc; } -// ----------------------------------------------------------------------------- + void SAL_CALL PDFFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& ) throw (Exception, RuntimeException) @@ -212,7 +212,7 @@ Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMul return (cppu::OWeakObject*) new PDFFilter( comphelper::getComponentContext(rSMgr) ); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL PDFFilter::getImplementationName() throw (RuntimeException) @@ -220,7 +220,7 @@ OUString SAL_CALL PDFFilter::getImplementationName() return PDFFilter_getImplementationName(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName ) throw (RuntimeException) @@ -228,7 +228,7 @@ sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName ) return cppu::supportsService( this, rServiceName ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames( ) throw (RuntimeException) { diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index fdb2e5655cb6..a0bbaaa85dfa 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -54,20 +54,20 @@ using com::sun::star::beans::XPropertySet; using com::sun::star::presentation::XPresentationPage; using com::sun::star::task::XStatusIndicator; -// ----------------------------------------------------------------------------- + PlaceWareExporter::PlaceWareExporter(const Reference< XComponentContext > & rxContext) : mxContext( rxContext ) { } -// ----------------------------------------------------------------------------- + PlaceWareExporter::~PlaceWareExporter() { } -// ----------------------------------------------------------------------------- + class PageEntry { private: @@ -399,7 +399,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < return bRet; } -// ----------------------------------------------------------------------------- + PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage ) { diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 61309708f3dc..2a82b1fdee89 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -37,7 +37,7 @@ using ::com::sun::star::task::XStatusIndicator; namespace pwp { -// ----------------------------------------------------------------------------- + class PlaceWareExportFilter : public cppu::WeakImplHelper4 < @@ -69,14 +69,14 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); }; -// ----------------------------------------------------------------------------- + PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext > &rxContext) : mxContext( rxContext ) { } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (RuntimeException) @@ -116,14 +116,14 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se return aExporter.doExport( mxDoc, xOutputStream, sURL, xInteractionHandler, xStatusIndicator ); } -// ----------------------------------------------------------------------------- + void SAL_CALL PlaceWareExportFilter::cancel( ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + // XExporter void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) @@ -132,7 +132,7 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star:: mxDoc = xDoc; } -// ----------------------------------------------------------------------------- + // XInitialization void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ ) @@ -180,7 +180,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::supportsService( const OUString& rServi return PlaceWareExportFilter_getSupportedServiceNames(); } -// ----------------------------------------------------------------------------- + } diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index c438cf5d6f00..1da05e4020a9 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -31,9 +31,9 @@ inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal ) return( nVal << 1 ); } -// ---------------- + // - ImpSVGDialog - -// ---------------- + ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent ), @@ -91,13 +91,13 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterD maBTHelp.Show(); } -// ----------------------------------------------------------------------------- + ImpSVGDialog::~ImpSVGDialog() { } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > ImpSVGDialog::GetFilterData() { @@ -108,7 +108,7 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData() return( maConfigItem.GetFilterData() ); } -// ----------------------------------------------------------------------------- + IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox*, pBox ) { diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 7a5afb9f17d3..9ae45d865d20 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -42,9 +42,9 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; using namespace ::com::sun::star::document; -// ----------------------- + // - SVGDialog functions - -// ----------------------- + OUString SVGDialog_getImplementationName () throw (RuntimeException) @@ -52,7 +52,7 @@ OUString SVGDialog_getImplementationName () return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME ); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId() throw(RuntimeException) @@ -62,7 +62,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId() return( aId.getImplementationId() ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() throw (RuntimeException) @@ -74,7 +74,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames() return aRet; } -// ----------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ) @@ -82,22 +82,22 @@ Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMul return( static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ) ); } -// ------------- + // - SVGDialog - -// ------------- + SVGDialog::SVGDialog( const Reference< XComponentContext > &rxContext ) : OGenericUnoDialog( rxContext ) { } -// ----------------------------------------------------------------------------- + SVGDialog::~SVGDialog() { } -// ----------------------------------------------------------------------------- + Any SAL_CALL SVGDialog::queryInterface( const Type& rType ) throw (RuntimeException) @@ -113,7 +113,7 @@ Any SAL_CALL SVGDialog::queryInterface( const Type& rType ) return( aReturn ); } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGDialog::acquire() throw () @@ -121,7 +121,7 @@ void SAL_CALL SVGDialog::acquire() OWeakObject::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGDialog::release() throw () @@ -129,7 +129,7 @@ void SAL_CALL SVGDialog::release() OWeakObject::release(); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() throw(RuntimeException) @@ -137,7 +137,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId() return SVGDialog_getImplementationId(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SVGDialog::getImplementationName() throw (RuntimeException) @@ -145,7 +145,7 @@ OUString SAL_CALL SVGDialog::getImplementationName() return SVGDialog_getImplementationName(); } -// ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() throw (RuntimeException) @@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() return SVGDialog_getSupportedServiceNames(); } -// ----------------------------------------------------------------------------- + Dialog* SVGDialog::createDialog( Window* pParent ) { @@ -162,7 +162,7 @@ Dialog* SVGDialog::createDialog( Window* pParent ) NULL ); } -// ----------------------------------------------------------------------------- + void SVGDialog::executedDialog( sal_Int16 nExecutionResult ) { @@ -172,7 +172,7 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult ) destroyDialog(); } -// ----------------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() throw(RuntimeException) @@ -180,13 +180,13 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) ); } -//------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SVGDialog::getInfoHelper() { return( *const_cast< SVGDialog *>(this)->getArrayHelper() ); } -//------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper* SVGDialog::createArrayHelper() const { Sequence< Property > aProps; @@ -196,7 +196,7 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper( aProps ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues() throw ( RuntimeException ) @@ -220,7 +220,7 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues() return( maMediaDescriptor ); } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) @@ -237,7 +237,7 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr } } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 121e3aa1041c..bbb413d61f6f 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; -// ------------------------------- + // - ooo elements and attributes - -// ------------------------------- + #define NSPREFIX "ooo:" @@ -311,9 +311,9 @@ sal_Bool operator==( const TextField & aLhsTextField, const TextField & aRhsText -// ------------- + // - SVGExport - -// ------------- + SVGExport::SVGExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -360,7 +360,7 @@ SVGExport::SVGExport( } -// ----------------------------------------------------------------------------- + SVGExport::~SVGExport() { @@ -368,16 +368,16 @@ SVGExport::~SVGExport() } -// ------------------------ + // - ObjectRepresentation - -// ------------------------ + ObjectRepresentation::ObjectRepresentation() : mpMtf( NULL ) { } -// ----------------------------------------------------------------------------- + ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObject, const GDIMetaFile& rMtf ) : @@ -386,7 +386,7 @@ ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObj { } -// ----------------------------------------------------------------------------- + ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresentation ) : mxObject( rPresentation.mxObject ), @@ -394,14 +394,14 @@ ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresent { } -// ----------------------------------------------------------------------------- + ObjectRepresentation::~ObjectRepresentation() { delete mpMtf; } -// ----------------------------------------------------------------------------- + ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentation& rPresentation ) { @@ -414,7 +414,7 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio return *this; } -// ----------------------------------------------------------------------------- + sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const { @@ -422,7 +422,7 @@ sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresenta ( *mpMtf == *rPresentation.mpMtf ) ); } -// ----------------------------------------------------------------------------- + sal_uLong GetBitmapChecksum( const MetaAction* pAction ) { @@ -452,7 +452,7 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction ) } return nChecksum; } -// ----------------------------------------------------------------------------- + void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) { @@ -481,7 +481,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) } -// ----------------------------------------------------------------------------- + size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const { @@ -497,7 +497,7 @@ size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const } } -// ----------------------------------------------------------------------------- + bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1, const ObjectRepresentation& rObjRep2 ) const @@ -518,9 +518,9 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1, } -// ------------- + // - SVGFilter - -// ------------- + sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) @@ -631,7 +631,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) return bRet; } -// ----------------------------------------------------------------------------- + Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm ) { @@ -646,7 +646,7 @@ Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference return xSaxWriter; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implLookForFirstVisiblePage() { @@ -677,7 +677,7 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage() return ( mnVisiblePage != -1 ); } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportDocument() { OUString aAttr; @@ -820,7 +820,7 @@ sal_Bool SVGFilter::implExportDocument() } -//------------------------------------------------------------------------------ + // Append aField to aFieldSet if it is not already present in the set // and create the field id sFieldId // @@ -853,7 +853,7 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet, return sFieldId; } -//------------------------------------------------------------------------------ + sal_Bool SVGFilter::implGenerateMetaData() { @@ -1072,7 +1072,7 @@ sal_Bool SVGFilter::implGenerateMetaData() return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportAnimations() { @@ -1138,7 +1138,7 @@ sal_Bool SVGFilter::implExportAnimations() return bRet; } -// ----------------------------------------------------------------------------- + void SVGFilter::implExportTextShapeIndex() { @@ -1164,7 +1164,7 @@ void SVGFilter::implExportTextShapeIndex() } } -// ----------------------------------------------------------------------------- + void SVGFilter::implEmbedBulletGlyphs() { @@ -1191,7 +1191,7 @@ void SVGFilter::implEmbedBulletGlyphs() implEmbedBulletGlyph( 8211, sPathData ); } -// ----------------------------------------------------------------------------- + void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData ) { @@ -1210,7 +1210,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat } -// ----------------------------------------------------------------------------- + /** SVGFilter::implExportTextEmbeddedBitmaps * We export bitmaps embedded into text shapes, such as those used by list @@ -1281,7 +1281,7 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps() return sal_True; } -// ----------------------------------------------------------------------------- + #define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \ xExtDocHandler->unknown( OUString::createFromAscii( aFragment ## n ) ); @@ -1303,7 +1303,7 @@ sal_Bool SVGFilter::implGenerateScript() return sal_True; } -// ----------------------------------------------------------------------------- + Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, @@ -1317,7 +1317,7 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName, return result; } -// ----------------------------------------------------------------------------- + /* SVGFilter::implGetPagePropSet * @@ -1382,7 +1382,7 @@ sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage ) } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & rxPages, sal_Int32 nFirstPage, sal_Int32 nLastPage ) @@ -1415,7 +1415,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages, sal_Int32 nFirstPage, sal_Int32 nLastPage ) @@ -1467,7 +1467,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportPage( const OUString & sPageId, const Reference< XDrawPage > & rxPage, const Reference< XShapes > & xShapes, @@ -1570,7 +1570,7 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId, } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, sal_Bool bMaster ) @@ -1589,7 +1589,7 @@ sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes, return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, sal_Bool bMaster ) @@ -1763,7 +1763,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape, return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implCreateObjects() { @@ -1819,7 +1819,7 @@ sal_Bool SVGFilter::implCreateObjects() return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes ) { @@ -1837,7 +1837,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape ) { @@ -1955,7 +1955,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r return bRet; } -// ----------------------------------------------------------------------------- + sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage ) { @@ -1983,7 +1983,7 @@ sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage return sal_True; } -// ----------------------------------------------------------------------------- + OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape ) { @@ -2014,7 +2014,7 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape ) return aRet; } -// ----------------------------------------------------------------------------- + void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) { @@ -2022,14 +2022,14 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) (mpSVGExport->getInterfaceToIdentifierMapper()).registerReference( rxIf ); } -// ----------------------------------------------------------------------------- + const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } -// ----------------------------------------------------------------------------- + OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf ) { @@ -2042,7 +2042,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf ) return aRet; } -// ----------------------------------------------------------------------------- + IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) { @@ -2282,7 +2282,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) return ( bFieldProcessed ? 0 : maOldFieldHdl.Call( pInfo ) ); } -// ----------------------------------------------------------------------------- + void SVGExport::writeMtf( const GDIMetaFile& rMtf ) { diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 6b030a2c8df6..e8e7df608e8a 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -47,9 +47,9 @@ using namespace ::com::sun::star; -// ------------- + // - SVGFilter - -// ------------- + SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) : mxContext( rxCtx ), @@ -66,7 +66,7 @@ SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) : { } -// ----------------------------------------------------------------------------- + SVGFilter::~SVGFilter() { @@ -77,7 +77,7 @@ SVGFilter::~SVGFilter() DBG_ASSERT( mpObjects == NULL, "mpObjects not destroyed" ); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) @@ -242,13 +242,13 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto return bRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException) { } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc ) throw (IllegalArgumentException, RuntimeException) @@ -256,7 +256,7 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc mxSrcDoc = xDoc; } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException) @@ -264,7 +264,7 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc mxDstDoc = xDoc; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) { @@ -305,7 +305,7 @@ OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) return OUString(); } -// ----------------------------------------------------------------------------- + #define SVG_FILTER_IMPL_NAME "com.sun.star.comp.Draw.SVGFilter" #define SVG_WRITER_IMPL_NAME "com.sun.star.comp.Draw.SVGWriter" diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 6dd28be6fcca..86f401ffd4d2 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -30,9 +30,9 @@ static const sal_Int32 nFontEM = 2048; -// ----------------- + // - SVGFontExport - -// ----------------- + SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) : mrExport( rExport ), @@ -41,13 +41,13 @@ SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRep { } -// ----------------------------------------------------------------------------- + SVGFontExport::~SVGFontExport() { } -// ----------------------------------------------------------------------------- + SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont ) { @@ -74,7 +74,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont ) return( maGlyphTree[ aFontName.getToken( 0, ';', nNextTokenPos ) ][ eWeight ][ eItalic ] ); } -// ----------------------------------------------------------------------------- + void SVGFontExport::implCollectGlyphs() { @@ -172,7 +172,7 @@ void SVGFontExport::implCollectGlyphs() } } -// ----------------------------------------------------------------------------- + void SVGFontExport::implEmbedFont( const Font& rFont ) { @@ -254,7 +254,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) } } -// ----------------------------------------------------------------------------- + void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ) { @@ -289,7 +289,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr } } -// ----------------------------------------------------------------------------- + void SVGFontExport::EmbedFonts() { @@ -327,7 +327,7 @@ void SVGFontExport::EmbedFonts() } } -// ----------------------------------------------------------------------------- + OUString SVGFontExport::GetMappedFontName( const OUString& rFontName ) const { diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index a252d1267caa..6b3f04da56e5 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3611,9 +3611,9 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm, mpVDev->Pop(); } -// ------------- + // - SVGWriter - -// ------------- + SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentContext >& rxCtx ) : mxContext(rxCtx) @@ -3622,13 +3622,13 @@ SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentCont args[0]>>=maFilterData; } -// ----------------------------------------------------------------------------- + SVGWriter::~SVGWriter() { } -// ----------------------------------------------------------------------------- + void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler, const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException ) diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx index 9ac5829c2511..447939864823 100644 --- a/filter/source/svg/test/parsertest.cxx +++ b/filter/source/svg/test/parsertest.cxx @@ -194,7 +194,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestParser, "test svg parser fragments"); diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index d3115ca5cd2f..3f42cbda43f0 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -32,7 +32,7 @@ using namespace ::osl; //================================================================== //= OOutputStreamWrapper //================================================================== -//------------------------------------------------------------------------------ + void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { sal_uInt64 nWritten = 0; @@ -43,12 +43,12 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 } } -//------------------------------------------------------------------ + void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { } -//------------------------------------------------------------------ + void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { } diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 9884cf7706e5..31c1816894fa 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -111,7 +111,7 @@ private: XMLFilterSettingsDialog* mpDialog; }; -//------------------------------------------------------------------------- + namespace { @@ -133,13 +133,13 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::R xDesktop->addTerminateListener( xListener ); } -//------------------------------------------------------------------------- + XMLFilterDialogComponent::~XMLFilterDialogComponent() { } -//------------------------------------------------------------------------- + // XInterface Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException) @@ -147,7 +147,7 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw return OComponentHelper::queryInterface( aType ); } -//------------------------------------------------------------------------- + Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException) { @@ -174,21 +174,21 @@ Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) th return OComponentHelper::queryAggregation( rType ); } -//------------------------------------------------------------------------- + void SAL_CALL XMLFilterDialogComponent::acquire() throw () { OComponentHelper::acquire(); } -//------------------------------------------------------------------------- + void SAL_CALL XMLFilterDialogComponent::release() throw () { OComponentHelper::release(); } -//------------------------------------------------------------------------- + OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException ) { @@ -220,7 +220,7 @@ Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( voi return rID.getImplementationId(); } -//------------------------------------------------------------------------- + namespace { @@ -281,7 +281,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing() } } -//------------------------------------------------------------------------- + // XTerminateListener void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException) @@ -303,7 +303,7 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* mpDialog->Close(); } -//------------------------------------------------------------------------- + void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException) { @@ -315,12 +315,12 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source { } -//------------------------------------------------------------------------- + void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException) { } -//------------------------------------------------------------------------- + sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) { ::SolarMutexGuard aGuard; @@ -349,7 +349,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) return 0; } -//------------------------------------------------------------------------- + void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { const Any* pArguments = aArguments.getConstArray(); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 869f98104938..3f1d2d198682 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -102,7 +102,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent, } } -// ----------------------------------------------------------------------- + IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton ) { @@ -141,7 +141,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl) { @@ -149,7 +149,7 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl) { @@ -162,7 +162,7 @@ bool XMLFilterSettingsDialog::isClosable() return m_bIsClosable; } -// ----------------------------------------------------------------------- + short XMLFilterSettingsDialog::Execute() { @@ -175,7 +175,7 @@ short XMLFilterSettingsDialog::Execute() return ModelessDialog::Execute(); } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::updateStates() { @@ -209,7 +209,7 @@ void XMLFilterSettingsDialog::updateStates() m_pPBSave->Enable( bHasSelection ); } -// ----------------------------------------------------------------------- + /** is called when the user clicks on the "New" button */ void XMLFilterSettingsDialog::onNew() @@ -238,7 +238,7 @@ void XMLFilterSettingsDialog::onNew() } } -// ----------------------------------------------------------------------- + /** is called when the user clicks on the "Edit" Button */ void XMLFilterSettingsDialog::onEdit() @@ -265,7 +265,7 @@ void XMLFilterSettingsDialog::onEdit() } } -// ----------------------------------------------------------------------- + /** helper to create a sequence of strings from an extensions strings "ext1;ext2;ext3" will become { "ext1", "ext2", "ext3" } */ @@ -318,7 +318,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension return aExtensions; } -// ----------------------------------------------------------------------- + /** checks if the given name is unique inside the filter factory. If not, numbers are added until the returned name is unique */ @@ -339,7 +339,7 @@ OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilte return aFilterName; } -// ----------------------------------------------------------------------- + /** checks if the given name is unique inside the type detection. If not, numbers are added until the returned name is unique */ @@ -420,7 +420,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn return aInterfaceName; } -// ----------------------------------------------------------------------- + /** inserts a new filter into the ui and configuration if pOldInfo is NULL. If pOldInfo is not null, the old filter will be replaced with the new settings */ @@ -765,7 +765,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi return bOk; } -// ----------------------------------------------------------------------- + /** is called when the user clicks the "Test" button */ void XMLFilterSettingsDialog::onTest() @@ -781,7 +781,7 @@ void XMLFilterSettingsDialog::onTest() } } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::onDelete() { @@ -873,7 +873,7 @@ void XMLFilterSettingsDialog::onDelete() updateStates(); } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::onSave() { @@ -929,7 +929,7 @@ void XMLFilterSettingsDialog::onSave() } } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::onOpen() { @@ -995,7 +995,7 @@ void XMLFilterSettingsDialog::onOpen() } } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::onClose() { @@ -1026,7 +1026,7 @@ bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) return nRet; } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::disposeFilterList() { @@ -1040,7 +1040,7 @@ void XMLFilterSettingsDialog::disposeFilterList() m_pFilterListBox->Clear(); } -// ----------------------------------------------------------------------- + void XMLFilterSettingsDialog::initFilterList() { @@ -1222,9 +1222,9 @@ void XMLFilterSettingsDialog::initFilterList() m_pFilterListBox->Select( pEntry ); } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + application_info_impl::application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ) : maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ), @@ -1234,7 +1234,7 @@ application_info_impl::application_info_impl( const sal_Char * pDocumentService, { } -// ----------------------------------------------------------------------- + std::vector< application_info_impl* >& getApplicationInfos() { @@ -1303,7 +1303,7 @@ std::vector< application_info_impl* >& getApplicationInfos() return aInfos; } -// ----------------------------------------------------------------------- + const application_info_impl* getApplicationInfo( const OUString& rServiceName ) { @@ -1320,7 +1320,7 @@ const application_info_impl* getApplicationInfo( const OUString& rServiceName ) return NULL; } -// ----------------------------------------------------------------------- + OUString getApplicationUIName( const OUString& rServiceName ) { @@ -1424,7 +1424,7 @@ XMLFilterListBox::XMLFilterListBox(SvxPathControl* pParent) m_pHeaderBar->Show(); } -// ----------------------------------------------------------------------- + void XMLFilterListBox::Paint( const Rectangle& rRect ) { @@ -1443,7 +1443,7 @@ IMPL_LINK( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTabListBox*, /* pList */ ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) { @@ -1474,7 +1474,7 @@ IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) return 1; } -// ----------------------------------------------------------------------- + /** adds a new filter info entry to the ui filter list */ void XMLFilterListBox::addFilterEntry( const filter_info_impl* pInfo ) @@ -1483,7 +1483,7 @@ void XMLFilterListBox::addFilterEntry( const filter_info_impl* pInfo ) InsertEntryToColumn( aEntryStr, LIST_APPEND, 0xffff, (void*)pInfo ); } -// ----------------------------------------------------------------------- + void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo ) { @@ -1501,7 +1501,7 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo ) } } -// ----------------------------------------------------------------------- + OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const { @@ -1535,9 +1535,9 @@ OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const return aEntryStr; } -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + filter_info_impl::filter_info_impl() : maFlags(0x00080040), @@ -1548,7 +1548,7 @@ filter_info_impl::filter_info_impl() { } -// ----------------------------------------------------------------------- + filter_info_impl::filter_info_impl( const filter_info_impl& rInfo ) : maFilterName( rInfo.maFilterName ), @@ -1572,7 +1572,7 @@ filter_info_impl::filter_info_impl( const filter_info_impl& rInfo ) : { } -// ----------------------------------------------------------------------- + bool filter_info_impl::operator==( const filter_info_impl& r ) const { @@ -1594,7 +1594,7 @@ bool filter_info_impl::operator==( const filter_info_impl& r ) const mbNeedsXSLT2 == r.mbNeedsXSLT2; } -// ----------------------------------------------------------------------- + Sequence< OUString > filter_info_impl::getFilterUserData() const { @@ -1612,7 +1612,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const } -// ----------------------------------------------------------------------- + OUString string_encode( const OUString & rText ) { @@ -1632,21 +1632,21 @@ OUString string_encode( const OUString & rText ) return Uri::encode( rText, aCharClass, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8 ); } -// ----------------------------------------------------------------------- + OUString string_decode( const OUString & rText ) { return Uri::decode( rText, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } -// ----------------------------------------------------------------------- + bool isFileURL( const OUString & rURL ) { return rURL.startsWith("file:"); } -// ----------------------------------------------------------------------- + bool copyStreams( Reference< XInputStream > xIS, Reference< XOutputStream > xOS ) { @@ -1685,7 +1685,7 @@ bool copyStreams( Reference< XInputStream > xIS, Reference< XOutputStream > xOS return false; } -// ----------------------------------------------------------------------- + bool createDirectory( OUString& rURL ) { diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index f8690520d24f..78da78bde5ad 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -71,7 +71,7 @@ XMLFilterTabDialog::XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr, ActivatePageHdl(m_pTabCtrl); } -// ----------------------------------------------------------------------- + XMLFilterTabDialog::~XMLFilterTabDialog() { @@ -80,7 +80,7 @@ XMLFilterTabDialog::~XMLFilterTabDialog() delete mpNewInfo; } -// ----------------------------------------------------------------------- + bool XMLFilterTabDialog::onOk() { @@ -271,14 +271,14 @@ bool XMLFilterTabDialog::onOk() } } -// ----------------------------------------------------------------------- + filter_info_impl* XMLFilterTabDialog::getNewFilterInfo() const { return mpNewInfo; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) { @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) { @@ -299,7 +299,7 @@ IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, /* pTabCtrl */ ) { diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 1edc2d682654..0577d505643f 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -273,7 +273,7 @@ void XMLFilterTestDialog::initDialog() m_pExport->Enable(bExport); m_pFTExportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maExportXSLT ) ); - // --- + m_pImport->Enable(bImport); m_pFTImportTemplate->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty()); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index ff9aca316e62..355b9f0fe7b5 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -545,9 +545,9 @@ namespace XSLT } - // -------------------------------------- + // Component management - // -------------------------------------- + #define FILTER_SERVICE_NAME "com.sun.star.documentconversion.XSLTFilter" #define FILTER_IMPL_NAME "com.sun.star.comp.documentconversion.XSLTFilter" #define TRANSFORMER_SERVICE_NAME "com.sun.star.xml.xslt.XSLTTransformer" |