summaryrefslogtreecommitdiff
path: root/sw/source/core/graphic/ndgrf.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-02-22 14:24:52 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-22 14:25:33 +0000
commitfdb9d721c18fb3c3f81f7384ad544e72e969f448 (patch)
tree87337f4c493c58d1c72efa92f5307f5efd5b64d9 /sw/source/core/graphic/ndgrf.cxx
parent131cfef07ba1e941686bf71c4583b06e54e87434 (diff)
revert slew of debug code committed in error
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
-rw-r--r--sw/source/core/graphic/ndgrf.cxx33
1 files changed, 0 insertions, 33 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 907e1f009483..151d79528810 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,14 +63,6 @@
using namespace com::sun::star;
-static void dbg (SwGrfNode *pNode)
-{
- fprintf (stderr, "SwGrfNode created: '%s' 0x%lx\n",
- rtl::OUStringToOString(pNode->GetGrfObj().GetUserData(),
- RTL_TEXTENCODING_UTF8).getStr(),
- (long)pNode->GetGrf().GetChecksum());
-}
-
// --------------------
// SwGrfNode
// --------------------
@@ -91,7 +83,6 @@ SwGrfNode::SwGrfNode(
bGrafikArrived = sal_True;
ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
- dbg(this);
}
SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
@@ -109,7 +100,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
bFrameInPaint = bScaleImageMap = sal_False;
bGrafikArrived = sal_True;
- dbg(this);
}
// Konstruktor fuer den SW/G-Reader. Dieser ctor wird verwendet,
@@ -145,7 +135,6 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
((SwBaseLink*)&refLink)->Connect();
}
}
- dbg(this);
}
sal_Bool SwGrfNode::ReRead(
@@ -398,9 +387,6 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
const String aGraphicURL( aGrfObj.GetUserData() );
if( !GraphicFilter::GetGraphicFilter().ImportGraphic( aGraphic, aGraphicURL, rStrm ) )
{
- fprintf (stderr, "Very curious set User Data of '%s' vs 0x%lx\n",
- rtl::OUStringToOString(aGraphicURL, RTL_TEXTENCODING_UTF8).getStr(),
- aGraphic.GetChecksum());
aGrfObj.SetGraphic( aGraphic );
aGrfObj.SetUserData( aGraphicURL );
return sal_True;
@@ -514,13 +500,6 @@ short SwGrfNode::SwapOut()
if( !aGrfObj.SwapOut() )
return 0;
}
-
- if (HasStreamName() && aNewStrmName.Len() > 0 &&
- aNewStrmName != aGrfObj.GetUserData())
- {
- fprintf (stderr, "not [!] swapping out stream with potentially bogus new name\n");
- return 1;
- }
// Geschriebene Grafiken oder Links werden jetzt weggeschmissen
return (short) aGrfObj.SwapOut( NULL );
}
@@ -732,8 +711,6 @@ void SwGrfNode::DelStreamName()
{
if( HasStreamName() )
{
- fprintf (stderr, "FIXME: this method is -unutterably- broken - it takes no account of sharing images !\n\n\n");
-
// Dann die Grafik im Storage loeschen
uno::Reference < embed::XStorage > xDocStg = GetDoc()->GetDocStorage();
if( xDocStg.is() )
@@ -821,13 +798,6 @@ SvStream* SwGrfNode::_GetStreamForEmbedGrf(
}
}
- fprintf( stderr, "look for '%s' %d\n",
- rtl::OUStringToOString( _aStrmName, RTL_TEXTENCODING_UTF8 ).getStr(),
- _refPics->hasByName( _aStrmName ) );
-
- fprintf( stderr, "look for [200004AD0000475F000033B381B9C98F.svm] %d\n",
- _refPics->hasByName( rtl::OUString::createFromAscii("200004AD0000475F000033B381B9C98F.svm" ) ) );
-
// assure that graphic file exist in the storage.
if ( _refPics->hasByName( _aStrmName ) &&
_refPics->isStreamElement( _aStrmName ) )
@@ -857,9 +827,6 @@ void SwGrfNode::_GetStreamStorageNames( String& rStrmName,
if( !aUserData.Len() )
return;
- fprintf (stderr, "UserData '%s' NewStrmName '%s'\n",
- rtl::OUStringToOString(aUserData, RTL_TEXTENCODING_UTF8).getStr(),
- rtl::OUStringToOString(aNewStrmName, RTL_TEXTENCODING_UTF8).getStr());
if (aNewStrmName.Len()>0) {
aUserData=aNewStrmName;
}