diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:52:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:52:37 +0000 |
| commit | 23613e1edf19f8e4649ab0d0489d617d31db9038 (patch) | |
| tree | e99b98030d38bcc4eff34e02f42b25d84114427e /sw/source/core/graphic/ndgrf.cxx | |
| parent | a9199a67dea010fda5a4605f7332f90a2e99d5e5 (diff) | |
INTEGRATION: CWS swwarnings (1.37.42); FILE MERGED
2007/08/24 08:16:21 tl 1.37.42.7: #i69287# warning-free code
2007/08/20 15:32:24 tl 1.37.42.6: RESYNC: (1.39-1.40); FILE MERGED
2007/05/29 11:27:40 os 1.37.42.5: RESYNC: (1.37-1.39); FILE MERGED
2007/04/11 07:02:50 tl 1.37.42.4: #i69287# warning-free code
2007/04/03 12:59:54 tl 1.37.42.3: #i69287# warning-free code
2007/03/09 08:37:46 ama 1.37.42.2: #i69287#: warning free code
2007/02/22 15:06:31 tl 1.37.42.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rw-r--r-- | sw/source/core/graphic/ndgrf.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index f0345a67053a..500541d10aaf 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ndgrf.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: obo $ $Date: 2007-07-18 13:33:02 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:52:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -147,16 +147,16 @@ using namespace com::sun::star; // SwGrfNode // -------------------- SwGrfNode::SwGrfNode( - const SwNodeIndex & rWhere, - const String& rGrfName, const String& rFltName, - const Graphic* pGraphic, - SwGrfFmtColl *pGrfColl, - SwAttrSet* pAutoAttr ) + const SwNodeIndex & rWhere, + const String& rGrfName, const String& rFltName, + const Graphic* pGraphic, + SwGrfFmtColl *pGrfColl, + SwAttrSet* pAutoAttr ) : + SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), // --> OD 2007-01-23 #i73788# - : mbLinkedInputStreamReady( false ), - mbIsStreamReadOnly( sal_False ), + mbLinkedInputStreamReady( false ), + mbIsStreamReadOnly( sal_False ) // <-- - SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = @@ -168,12 +168,12 @@ SwGrfNode::SwGrfNode( SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, - SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) + SwGrfFmtColl *pGrfColl, SwAttrSet* pAutoAttr ) : + SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), // --> OD 2007-01-23 #i73788# - : mbLinkedInputStreamReady( false ), - mbIsStreamReadOnly( sal_False ), + mbLinkedInputStreamReady( false ), + mbIsStreamReadOnly( sal_False ) // <-- - SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj = rGrfObj; aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); @@ -191,12 +191,12 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, const String& rGrfName, const String& rFltName, SwGrfFmtColl *pGrfColl, - SwAttrSet* pAutoAttr ) + SwAttrSet* pAutoAttr ) : + SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ), // --> OD 2007-01-23 #i73788# - : mbLinkedInputStreamReady( false ), - mbIsStreamReadOnly( sal_False ), + mbLinkedInputStreamReady( false ), + mbIsStreamReadOnly( sal_False ) // <-- - SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); @@ -428,7 +428,7 @@ SwGrfNode::~SwGrfNode() } -SwCntntNode *SwGrfNode::SplitNode( const SwPosition &rPos ) +SwCntntNode *SwGrfNode::SplitNode( const SwPosition & ) { return this; } @@ -882,7 +882,7 @@ uno::Reference< embed::XStorage > SwGrfNode::_GetDocSubstorageOrRoot( const Stri @author OD */ SvStream* SwGrfNode::_GetStreamForEmbedGrf( - const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _refPics, + const uno::Reference< embed::XStorage >& _refPics, String& _aStrmName ) const { SvStream* pStrm( 0L ); @@ -1144,9 +1144,9 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, { switch( rMirror.GetValue() ) { - case RES_DONT_MIRROR_GRF: nMirror = BMP_MIRROR_HORZ; break; - case RES_MIRROR_GRF_VERT: nMirror = BMP_MIRROR_NONE; break; - case RES_MIRROR_GRF_HOR: nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; + case RES_MIRROR_GRAPH_DONT: nMirror = BMP_MIRROR_HORZ; break; + case RES_MIRROR_GRAPH_VERT: nMirror = BMP_MIRROR_NONE; break; + case RES_MIRROR_GRAPH_HOR: nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; break; default: nMirror = BMP_MIRROR_VERT; break; } @@ -1154,10 +1154,10 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, else switch( rMirror.GetValue() ) { - case RES_MIRROR_GRF_BOTH: nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; + case RES_MIRROR_GRAPH_BOTH: nMirror = BMP_MIRROR_HORZ|BMP_MIRROR_VERT; break; - case RES_MIRROR_GRF_VERT: nMirror = BMP_MIRROR_HORZ; break; - case RES_MIRROR_GRF_HOR: nMirror = BMP_MIRROR_VERT; break; + case RES_MIRROR_GRAPH_VERT: nMirror = BMP_MIRROR_HORZ; break; + case RES_MIRROR_GRAPH_HOR: nMirror = BMP_MIRROR_VERT; break; } rGA.SetMirrorFlags( nMirror ); |