avmedia/source/gstreamer/gstplayer.cxx | 4 - basic/source/comp/exprnode.cxx | 5 - basic/source/comp/exprtree.cxx | 18 ----- basic/source/inc/expr.hxx | 3 solenv/bin/mkdocs.sh | 2 svtools/inc/svtools/headbar.hxx | 9 -- svtools/source/control/headbar.cxx | 75 ---------------------- vcl/inc/vcl/gdimtf.hxx | 7 -- vcl/inc/vcl/graphictools.hxx | 89 -------------------------- vcl/source/gdi/gdimtf.cxx | 96 ---------------------------- vcl/source/gdi/graphictools.cxx | 110 --------------------------------- 11 files changed, 4 insertions(+), 414 deletions(-)
New commits: commit 6c3cfe6059c31c980d123f413a69d536887c336d Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 21:27:42 2012 -0500 Generate docs for basic diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 77e7562..1112b0f 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -23,7 +23,7 @@ DOXYGEN_PROJECT_PREFIX="LibreOffice" . ./Env.Host.sh # get list of modules in build order - bah, blows RAM & disk, static list below -INPUT_PROJECTS="o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui chart2 dbaccess sd starmath sc sw" +INPUT_PROJECTS="o3tl basegfx basebmp basic comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter cui chart2 dbaccess sd starmath sc sw" # output directory for generated documentation BASE_OUTPUT="$1" commit a3b6842cc91fee88b9a6fd48008d1c7e53d67108 Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 14:28:27 2012 -0500 cppcheck: cstyleCast diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 14cdbb5..0e73177 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -112,7 +112,7 @@ Player::~Player() static gboolean gst_pipeline_bus_callback( GstBus *, GstMessage *message, gpointer data ) { - Player* pPlayer = (Player *) data; + Player* pPlayer = static_cast<Player*>(data); pPlayer->processMessage( message ); @@ -121,7 +121,7 @@ static gboolean gst_pipeline_bus_callback( GstBus *, GstMessage *message, gpoint static GstBusSyncReply gst_pipeline_bus_sync_handler( GstBus *, GstMessage * message, gpointer data ) { - Player* pPlayer = (Player *) data; + Player* pPlayer = static_cast<Player*>(data); return pPlayer->processSyncMessage( message ); } commit 743e627bcfc9c87d806109fe6f3f4e2817b73dda Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 14:26:01 2012 -0500 Remove unused code diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index 5161620..c027f6a 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -153,50 +153,6 @@ public: // mutators /// Set path to stroke void setPath ( const Polygon& ); - /** Set the polygon that is put at the start of the line - - The polygon has to be in a special normalized position, and - already scaled to the desired size: the center of the stroked - path will meet the given polygon at (0,0) from negative y - values. Thus, an arrow would have its baseline on the x axis, - going upwards to positive y values. Furthermore, the polygon - also has to be scaled appropriately: the width of the joining - stroke is defined to be SvtGraphicStroke::normalizedArrowWidth - (0x10000), i.e. ranging from x=-0x8000 to x=0x8000. If your - arrow does have this width, it will fit every stroke with - every stroke width exactly. - */ - void setStartArrow ( const PolyPolygon& ); - /** Set the polygon that is put at the end of the line - - The polygon has to be in a special normalized position, and - already scaled to the desired size: the center of the stroked - path will meet the given polygon at (0,0) from negative y - values. Thus, an arrow would have its baseline on the x axis, - going upwards to positive y values. Furthermore, the polygon - also has to be scaled appropriately: the width of the joining - stroke is defined to be SvtGraphicStroke::normalizedArrowWidth - (0x10000), i.e. ranging from x=-0x8000 to x=0x8000. If your - arrow does have this width, it will fit every stroke with - every stroke width exactly. - */ - void setEndArrow ( const PolyPolygon& ); - /** Set stroke transparency - - @param fTrans - The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) - */ - void setTransparency ( double fTrans ); - /// Set width of the stroke - void setStrokeWidth ( double ); - /// Set the style in which open stroke ends are drawn - void setCapType ( CapType ); - /// Set the style in which the stroke segments are joined - void setJoinType ( JoinType ); - /// Set the maximum length of mitered joins - void setMiterLimit ( double ); - /// Set the array of "on" and "off" lengths for stroke dashing - void setDashArray ( const DashArray& ); private: // friends @@ -359,21 +315,9 @@ public: @return true, if texture is tiled, false, if output only once. */ bool isTiling () const; - /// Get type of hatch used - HatchType getHatchType () const; - /// Get color used for drawing the hatch - Color getHatchColor () const; /// Get type of gradient used GradientType getGradientType () const; - /// Get start color of the gradient - Color getGradient1stColor () const; - /// Get end color of the gradient - Color getGradient2ndColor () const; - /** Get the numbers of steps to render the gradient. - - @return the step count. gradientStepsInfinite means infinitely many. - */ - int getGradientStepCount() const; + /** Get the texture graphic used The Graphic object returned is used to fill the geometry, if @@ -386,37 +330,6 @@ public: // mutators /// Set path to fill void setPath ( const PolyPolygon& rPath ); - /// Set color used for solid fills - void setFillColor ( Color aFillColor ); - /** Set stroke transparency - - @param fTransparency - The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) - */ - void setTransparency ( double fTransparency ); - /// Set fill rule used - void setFillRule ( FillRule aFillRule ); - /** Set fill type used - - Currently, only one of the fill types can be used - simultaneously. If you specify e.g. FillRule::fillGradient, - hatching, texture and solid fill color are ignored. - */ - void setFillType ( FillType aFillType ); - /// Set transformation applied to hatch, gradient or texture during fill - void setTransform ( const Transform& pTransform ); - /** Set state of texture tiling - - @param bTiling - If set to true, texture is tiled, if set to false, texture is output only once. - */ - void setTiling ( bool bTiling = true ); - /// Set type of hatch used - void setHatchType ( HatchType aHatchType ); - /// Set color used for drawing the hatch - void setHatchColor ( Color aHatchColor ); - /// Set the texture graphic used - void setGraphic ( const Graphic& rGraphic ); private: // friends diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 8a72c0b..3f6a0ec 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -262,46 +262,6 @@ void SvtGraphicStroke::setPath( const Polygon& rPoly ) maPath = rPoly; } -void SvtGraphicStroke::setStartArrow( const PolyPolygon& rPoly ) -{ - maStartArrow = rPoly; -} - -void SvtGraphicStroke::setEndArrow( const PolyPolygon& rPoly ) -{ - maEndArrow = rPoly; -} - -void SvtGraphicStroke::setTransparency( double fTrans ) -{ - mfTransparency = fTrans; -} - -void SvtGraphicStroke::setStrokeWidth( double fWidth ) -{ - mfStrokeWidth = fWidth; -} - -void SvtGraphicStroke::setCapType( CapType eType ) -{ - maCapType = eType; -} - -void SvtGraphicStroke::setJoinType( JoinType eType ) -{ - maJoinType = eType; -} - -void SvtGraphicStroke::setMiterLimit( double fMiterLimit ) -{ - mfMiterLimit = fMiterLimit; -} - -void SvtGraphicStroke::setDashArray( const DashArray& rDashArray ) -{ - maDashArray = rDashArray; -} - SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); @@ -442,36 +402,11 @@ bool SvtGraphicFill::isTiling() const return mbTiling; } -SvtGraphicFill::HatchType SvtGraphicFill::getHatchType() const -{ - return maHatchType; -} - -Color SvtGraphicFill::getHatchColor() const -{ - return maHatchColor; -} - SvtGraphicFill::GradientType SvtGraphicFill::getGradientType() const { return maGradientType; } -Color SvtGraphicFill::getGradient1stColor() const -{ - return maGradient1stColor; -} - -Color SvtGraphicFill::getGradient2ndColor() const -{ - return maGradient2ndColor; -} - -int SvtGraphicFill::getGradientStepCount() const -{ - return maGradientStepCount; -} - void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const { rGraphic = maFillGraphic; @@ -482,51 +417,6 @@ void SvtGraphicFill::setPath( const PolyPolygon& rPath ) maPath = rPath; } -void SvtGraphicFill::setFillColor( Color aFillColor ) -{ - maFillColor = aFillColor; -} - -void SvtGraphicFill::setTransparency( double fTransparency ) -{ - mfTransparency = fTransparency; -} - -void SvtGraphicFill::setFillRule( FillRule aFillRule ) -{ - maFillRule = aFillRule; -} - -void SvtGraphicFill::setFillType( FillType aFillType ) -{ - maFillType = aFillType; -} - -void SvtGraphicFill::setTransform( const Transform& rTransform ) -{ - maFillTransform = rTransform; -} - -void SvtGraphicFill::setTiling( bool bTiling ) -{ - mbTiling = bTiling; -} - -void SvtGraphicFill::setHatchType( HatchType aHatchType ) -{ - maHatchType = aHatchType; -} - -void SvtGraphicFill::setHatchColor( Color aHatchColor ) -{ - maHatchColor = aHatchColor; -} - -void SvtGraphicFill::setGraphic( const Graphic& rGraphic ) -{ - maFillGraphic = rGraphic; -} - SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); commit 809438ad92ab5709fcea022e0f403bb941c2f1b3 Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 13:59:34 2012 -0500 Remove unused code diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 2c0db87..d4d0fa5 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -65,15 +65,6 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t ) pExpr->Optimize(); } -SbiExpression::SbiExpression( SbiParser* p, const String& r ) -{ - pParser = p; - pNext = NULL; - bError = bByVal = bBased = bBracket = sal_False; - eCurExpr = SbOPERAND; - pExpr = new SbiExprNode( pParser, r ); -} - SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprList* pPar ) { pParser = p; @@ -83,15 +74,6 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef& r, SbiExprList* pPa pExpr = new SbiExprNode( pParser, r, SbxVARIANT, pPar ); } -SbiExpression::SbiExpression( SbiParser* p, SbiToken t ) -{ - pParser = p; - pNext = NULL; - bError = bByVal = bBased = bBracket = sal_False; - eCurExpr = SbOPERAND; - pExpr = new SbiExprNode( pParser, NULL, t, NULL ); -} - SbiExpression::~SbiExpression() { delete pExpr; diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 143be79..c6a656c 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -199,10 +199,8 @@ protected: public: SbiExpression( SbiParser*, SbiExprType = SbSTDEXPR, SbiExprMode eMode = EXPRMODE_STANDARD, const KeywordSymbolInfo* pKeywordSymbolInfo = NULL ); // parsing Ctor - SbiExpression( SbiParser*, const String& ); SbiExpression( SbiParser*, double, SbxDataType = SbxDOUBLE ); SbiExpression( SbiParser*, const SbiSymDef&, SbiExprList* = NULL ); - SbiExpression( SbiParser*, SbiToken ); // special expr with special tokens ~SbiExpression(); String& GetName() { return aArgName; } void SetBased() { bBased = sal_True; } commit e0cf30f54a8c5e962fc4aa213f47819598ec22e9 Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 11:43:30 2012 -0500 Remove unused code diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index db12fc2..2fd1af6 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -195,11 +195,6 @@ sal_Bool SbiExprNode::IsNumber() return sal_Bool( eNodeType == SbxNUMVAL ); } -sal_Bool SbiExprNode::IsString() -{ - return sal_Bool( eNodeType == SbxSTRVAL ); -} - sal_Bool SbiExprNode::IsVariable() { return sal_Bool( eNodeType == SbxVARVAL ); diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index 0a7d4aa..143be79 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -122,7 +122,6 @@ class SbiExprNode { // operators (and operands) sal_Bool IsNew() { return sal_Bool( eNodeType == SbxNEW ); } sal_Bool IsNumber(); - sal_Bool IsString(); sal_Bool IsLvalue(); // sal_True, if usable as Lvalue void GenElement( SbiOpcode ); void BaseInit( SbiParser* p ); // help function for Ctor, from 17.12.95 commit 66291199a301c695c234b6d57708b5199ae22a30 Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 11:41:38 2012 -0500 Remove unused code diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index a44bc8b..dd94a17 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -319,16 +319,9 @@ public: virtual void Select(); virtual void DoubleClick(); - void InsertItem( sal_uInt16 nItemId, const Image& rImage, - long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - sal_uInt16 nPos = HEADERBAR_APPEND ); void InsertItem( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, sal_uInt16 nPos = HEADERBAR_APPEND ); - void InsertItem( sal_uInt16 nItemId, - const Image& rImage, const XubString& rText, - long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, - sal_uInt16 nPos = HEADERBAR_APPEND ); void RemoveItem( sal_uInt16 nItemId ); void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos ); void Clear(); @@ -357,9 +350,7 @@ public: void SetItemText( sal_uInt16 nItemId, const XubString& rText ); XubString GetItemText( sal_uInt16 nItemId ) const; - void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); XubString GetHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( sal_uInt16 nItemId, const rtl::OString& nHelpId ); rtl::OString GetHelpId( sal_uInt16 nItemId ) const; Size CalcWindowSizePixel() const; diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 08f2d3c..22fb7a3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1216,33 +1216,6 @@ void HeaderBar::DoubleClick() // ----------------------------------------------------------------------- -void HeaderBar::InsertItem( sal_uInt16 nItemId, const Image& rImage, - long nSize, HeaderBarItemBits nBits, sal_uInt16 nPos ) -{ - DBG_ASSERT( nItemId, "HeaderBar::InsertItem(): ItemId == 0" ); - DBG_ASSERT( GetItemPos( nItemId ) == HEADERBAR_ITEM_NOTFOUND, - "HeaderBar::InsertItem(): ItemId already exists" ); - - // Item anlegen und in die Liste einfuegen - ImplHeadItem* pItem = new ImplHeadItem; - pItem->mnId = nItemId; - pItem->mnBits = nBits; - pItem->mnSize = nSize; - pItem->maImage = rImage; - if ( nPos < mpItemList->size() ) { - ImplHeadItemList::iterator it = mpItemList->begin(); - ::std::advance( it, nPos ); - mpItemList->insert( it, pItem ); - } else { - mpItemList->push_back( pItem ); - } - - // Ausgabe updaten - ImplUpdate( nPos, sal_True ); -} - -// ----------------------------------------------------------------------- - void HeaderBar::InsertItem( sal_uInt16 nItemId, const XubString& rText, long nSize, HeaderBarItemBits nBits, sal_uInt16 nPos ) { @@ -1270,36 +1243,6 @@ void HeaderBar::InsertItem( sal_uInt16 nItemId, const XubString& rText, // ----------------------------------------------------------------------- -void HeaderBar::InsertItem( sal_uInt16 nItemId, - const Image& rImage, const XubString& rText, - long nSize, HeaderBarItemBits nBits, - sal_uInt16 nPos ) -{ - DBG_ASSERT( nItemId, "HeaderBar::InsertItem(): ItemId == 0" ); - DBG_ASSERT( GetItemPos( nItemId ) == HEADERBAR_ITEM_NOTFOUND, - "HeaderBar::InsertItem(): ItemId already exists" ); - - // Item anlegen und in die Liste einfuegen - ImplHeadItem* pItem = new ImplHeadItem; - pItem->mnId = nItemId; - pItem->mnBits = nBits; - pItem->mnSize = nSize; - pItem->maImage = rImage; - pItem->maText = rText; - if ( nPos < mpItemList->size() ) { - ImplHeadItemList::iterator it = mpItemList->begin(); - ::std::advance( it, nPos ); - mpItemList->insert( it, pItem ); - } else { - mpItemList->push_back( pItem ); - } - - // Ausgabe updaten - ImplUpdate( nPos, sal_True ); -} - -// ----------------------------------------------------------------------- - void HeaderBar::RemoveItem( sal_uInt16 nItemId ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1492,15 +1435,6 @@ XubString HeaderBar::GetItemText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void HeaderBar::SetHelpText( sal_uInt16 nItemId, const XubString& rText ) -{ - sal_uInt16 nPos = GetItemPos( nItemId ); - if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - (*mpItemList)[ nPos ]->maHelpText = rText; -} - -// ----------------------------------------------------------------------- - XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1522,15 +1456,6 @@ XubString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void HeaderBar::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ) -{ - sal_uInt16 nPos = GetItemPos( nItemId ); - if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - (*mpItemList)[ nPos ]->maHelpId = rHelpId; -} - -// ----------------------------------------------------------------------- - rtl::OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); commit 677fe9e4a886c04debb74a4fbe8b255e630d5665 Author: August Sodora <aug...@gmail.com> Date: Fri Jan 6 11:35:29 2012 -0500 Remove unused code diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 6c682bd..95d8069 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -161,7 +161,6 @@ public: sal_Bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); - sal_Bool IsEqual( const GDIMetaFile& rMtf ) const; sal_Bool Mirror( sal_uLong nMirrorFlags ); void Move( long nX, long nY ); // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) @@ -186,7 +185,6 @@ public: ); void Convert( MtfConversion eConversion ); - void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, sal_uLong nColorCount, sal_uLong* pTols = NULL ); @@ -206,10 +204,7 @@ public: void Stop(); void WindStart(); - void WindEnd(); - void Wind( size_t nAction ); void WindPrev(); - void WindNext(); size_t GetActionSize() const; @@ -224,8 +219,6 @@ public: MetaAction* GetCurAction() const { return GetAction( nCurrentActionElement ); } MetaAction* ReplaceAction( MetaAction* pAction, size_t nAction ); - sal_Bool SaveStatus(); - const Size& GetPrefSize() const { return aPrefSize; } void SetPrefSize( const Size& rSize ) { aPrefSize = rSize; } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index c906241..38d66ed 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -292,34 +292,6 @@ sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const // ------------------------------------------------------------------------ -sal_Bool GDIMetaFile::IsEqual( const GDIMetaFile& rMtf ) const -{ - const size_t nObjCount = aList.size(); - sal_Bool bRet = sal_False; - - if( this == &rMtf ) - bRet = sal_True; - else if( rMtf.GetActionSize() == nObjCount && - rMtf.GetPrefSize() == aPrefSize && - rMtf.GetPrefMapMode() == aPrefMapMode ) - { - bRet = sal_True; - - for( size_t n = 0; n < nObjCount; n++ ) - { - if( !aList[ n ]->IsEqual( *(rMtf.GetAction( n )) ) ) - { - bRet = sal_False; - break; - } - } - } - - return bRet; -} - -// ------------------------------------------------------------------------ - void GDIMetaFile::Clear() { if( bRecord ) @@ -735,22 +707,6 @@ void GDIMetaFile::WindStart() // ------------------------------------------------------------------------ -void GDIMetaFile::WindEnd() -{ - if( !bRecord ) - nCurrentActionElement = aList.empty() ? 0 : (aList.size() - 1); -} - -// ------------------------------------------------------------------------ - -void GDIMetaFile::Wind( size_t nActionPos ) -{ - if( !bRecord ) - nCurrentActionElement = nActionPos < aList.size() ? nActionPos : nCurrentActionElement; -} - -// ------------------------------------------------------------------------ - void GDIMetaFile::WindPrev() { if( !bRecord ) @@ -760,15 +716,6 @@ void GDIMetaFile::WindPrev() // ------------------------------------------------------------------------ -void GDIMetaFile::WindNext() -{ - if( !bRecord ) - if ( nCurrentActionElement + 1 < aList.size() ) - ++nCurrentActionElement; -} - -// ------------------------------------------------------------------------ - void GDIMetaFile::AddAction( MetaAction* pAction ) { aList.push_back( pAction ); @@ -829,42 +776,6 @@ void GDIMetaFile::RemoveAction( size_t nPos ) // ------------------------------------------------------------------------ -sal_Bool GDIMetaFile::SaveStatus() -{ - if ( bRecord ) - { - if ( bPause ) - Linker( pOutDev, sal_True ); - - AddAction( new MetaLineColorAction( pOutDev->GetLineColor(), - pOutDev->IsLineColor() ) ); - AddAction( new MetaFillColorAction( pOutDev->GetFillColor(), - pOutDev->IsFillColor() ) ); - AddAction( new MetaFontAction( pOutDev->GetFont() ) ); - AddAction( new MetaTextColorAction( pOutDev->GetTextColor() ) ); - AddAction( new MetaTextFillColorAction( pOutDev->GetTextFillColor(), - pOutDev->IsTextFillColor() ) ); - AddAction( new MetaTextLineColorAction( pOutDev->GetTextLineColor(), - pOutDev->IsTextLineColor() ) ); - AddAction( new MetaOverlineColorAction( pOutDev->GetOverlineColor(), - pOutDev->IsOverlineColor() ) ); - AddAction( new MetaTextAlignAction( pOutDev->GetTextAlign() ) ); - AddAction( new MetaRasterOpAction( pOutDev->GetRasterOp() ) ); - AddAction( new MetaMapModeAction( pOutDev->GetMapMode() ) ); - AddAction( new MetaClipRegionAction( pOutDev->GetClipRegion(), - pOutDev->IsClipRegion() ) ); - - if ( bPause ) - Linker( pOutDev, sal_False ); - - return sal_True; - } - else - return sal_False; -} - -// ------------------------------------------------------------------------ - sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) { const Size aOldPrefSize( GetPrefSize() ); @@ -2491,13 +2402,6 @@ void GDIMetaFile::Convert( MtfConversion eConversion ) // ------------------------------------------------------------------------ -void GDIMetaFile::ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) -{ - ReplaceColors( &rSearchColor, &rReplaceColor, 1, &nTol ); -} - -// ------------------------------------------------------------------------ - void GDIMetaFile::ReplaceColors( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, sal_uLong* pTols ) { ImplColReplaceParam aColParam; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits