[Libreoffice-commits] .: binfilter/bf_svx binfilter/bf_sw filter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 9 10:09:18 PST 2011
binfilter/bf_svx/source/xoutdev/svx_xout1.cxx | 29 ----------
binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx | 55 -------------------
filter/source/msfilter/svdfppt.cxx | 66 -----------------------
3 files changed, 150 deletions(-)
New commits:
commit b11af06846a14371059adcdab654492550b12823
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:06:38 2011 +0100
Remove DBG_EXTRACTOLEOBJECTS, JOEDEBUG and JOEENV
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xout1.cxx b/binfilter/bf_svx/source/xoutdev/svx_xout1.cxx
index df85e7b..9700818 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xout1.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xout1.cxx
@@ -32,8 +32,6 @@
#include "xoutx.hxx"
-#ifdef JOEDEBUG
-#endif
namespace binfilter {
#define GLOBALOVERFLOW
@@ -51,35 +49,8 @@ namespace binfilter {
/*N*/ Point aDelta(rOfs);
/*N*/ Fraction aFact1(1,1);
/*N*/ aDelta-=aOfs;
-/*N*/ #ifdef neeJOEDEBUG
-/*N*/ DebWrite("XOutputDevice::SetOffset(");
-/*N*/ DebOut(rOfs);
-/*N*/ DebWrite("Alter Offset: ");
-/*N*/ DebOut(aOfs);
-/*N*/ DebWrite("Alter Origin: ");
-/*N*/ DebOut(pOut->GetMapMode().GetOrigin());
-/*N*/ DebWrite("Delta: ");
-/*N*/ DebOut(aDelta);
-/*N*/ #endif
-//#ifdef JOEDEBUG
-//// pOut->SetMapMode(MapMode(MAP_RELATIVE,Point(-aOfs.X(),-aOfs.Y()),aFact1,aFact1));
-//// pOut->SetMapMode(MapMode(MAP_RELATIVE,rOfs,aFact1,aFact1));
/*N*/ pOut->SetMapMode(MapMode(MAP_RELATIVE,aDelta,aFact1,aFact1));
-//#else
-// MapMode aMap(pOut->GetMapMode());
-// Point aOrg(aMap.GetOrigin());
-// aOrg.X()+=aDelta.X();
-// aOrg.Y()+=aDelta.Y();
-// aMap.SetOrigin(aOrg);
-// pOut->SetMapMode(aMap);
-//#endif
/*N*/ aOfs=rOfs;
-/*N*/ #ifdef neeJOEDEBUG
-/*N*/ DebWrite("Neuer Offset: ");
-/*N*/ DebOut(aOfs);
-/*N*/ DebWrite("Neuer Origin: ");
-/*N*/ DebOut(pOut->GetMapMode().GetOrigin());
-/*N*/ #endif
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
index 2caabc6..ae52f27 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wgraf.cxx
@@ -491,55 +491,6 @@ short SwW4WGraf::ReadW4WGrafBMap( long, long, long ) // Mastersoft internal F
// W4W Vectorimport von Joe (BEGIN) ///////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef JOEDEBUG
-
-
-void ShowW4WGrafRec(USHORT nRecID)
-{
- static USHORT nLnCnt=0;
- switch (nRecID) {
- case W4WRG_Ignore: ShowMsg("Dummy "); break;
- case W4WRG_RecdID: ShowMsg("OrgFileTp "); break;
- case W4WRG_DefPal: ShowMsg("Def_Pal Û"); break;
- case W4WRG_DefPen: ShowMsg("Def_Pen "); break;
- case W4WRG_DefBrs: ShowMsg("Def_Brs "); break;
- case W4WRG_DefMrk: ShowMsg("Def_Mark Û"); break;
- case W4WRG_MoveTo: ShowMsg("Move_To "); break;
- case W4WRG_LineTo: ShowMsg("Line_To "); break;
- case W4WRG_FloodF: ShowMsg("FloodfillÛ"); break;
- case W4WRG_SetFil: ShowMsg("Set_Fill Û"); break;
- case W4WRG_DrMark: ShowMsg("Drw_Mark Û"); break;
- case W4WRG_DrMrkP: ShowMsg("Drw_MarkAÛ"); break;
- case W4WRG_DrRect: ShowMsg("Drw_Rect "); break;
- case W4WRG_DrPLin: ShowMsg("Drw_PLine "); break;
- case W4WRG_DrPoly: ShowMsg("Drw_Poly "); break;
- case W4WRG_DrwArc: ShowMsg("Drw_Arc Û"); break;
- case W4WRG_DrwPie: ShowMsg("Drw_Pie Û"); break;
- case W4WRG_DrCirc: ShowMsg("Drw_Circ Û"); break;
- case W4WRG_DrBMap: ShowMsg("Drw_BMap Û"); break;
- case W4WRG_Scalng: ShowMsg("Set_ScaleÛ"); break;
- case W4WRG_Rotate: ShowMsg("Set_Rota Û"); break;
- case W4WRG_DefFnt: ShowMsg("Def_Font Û"); break;
- case W4WRG_DrText: ShowMsg("Drw_Text Û"); break;
- case W4WRG_BckCol: ShowMsg("Set_BCol Û"); break;
- case W4WRG_StGrup: ShowMsg("Start_Grp "); break;
- case W4WRG_EoGrup: ShowMsg("End_Grp "); break;
- case W4WRG_DrChrd: ShowMsg("Drw_ChordÛ"); break;
- case W4WRG_DefP16: ShowMsg("Def_Pal16Û"); break;
- case W4WRG_DefGCv: ShowMsg("Def_PalGrÛ"); break;
- case W4WRG_DefFHd: ShowMsg("Def_FHeadÛ"); break;
- case W4WRG_EoFile: ShowMsg("EOFÞÜÝÞßÝ \n"); break;
- }
- nLnCnt++;
- if (nLnCnt>=23*8) {
- nLnCnt=0;
- WaitKey();
- }
-}
-
-#endif
-
-
BOOL SwW4WGraf::CheckW4WVector() // enth„lt die W4W-Grafik Vektordaten ? (Joe)
{
long nFPosMerk = rInp.Tell();
@@ -620,13 +571,7 @@ int SwW4WGraf::GetNextVectRec(OutputDevice& rOut)
nRecID = GetHexUShort();
nVarSize = GetVarSize();
-#ifdef JOEDEBUG
-// ShowW4WGrafRec(nRecID);
-#endif
-
switch (nRecID) {
-// case W4WRG_DefPal: nRet=ReadPalette(nVarSize); break;
-// case W4WRG_DrBMap: nRet=ReadBitmap(nVarSize); break;
case W4WRG_RecdID: {
/* INT16 nId= */ GetHexUShort();
/* INT16 nRes= */GetHexUShort();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index a2dfee1..85ec53f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -70,15 +70,6 @@
#include <editeng/unoprnms.hxx>
#include <editeng/editids.hrc>
-#if defined(JOEENV) && defined(JOEDEBUG)
-#include "impinccv.h" // etwas Testkram
-#endif
-
-#if defined(DBG_EXTRACTOLEOBJECTS) || defined(DBG_EXTRACTFONTMETRICS)
-#include <tools/urlobj.hxx>
-#include <unotools/localfilehelper.hxx>
-#endif
-
#define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue()
#include <editeng/adjitem.hxx>
#include <editeng/escpitem.hxx>
@@ -2183,63 +2174,6 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
if ( mbTracing && !pFont->bAvailable )
mpTracer->Trace( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sd1000" )), pFont->aName );
-#ifdef DBG_EXTRACTFONTMETRICS
-
- SvxFont aTmpFont( aFont );
-
- if ( !pVDev )
- pVDev = new VirtualDevice;
- aTmpFont.SetPhysFont( pVDev );
- FontMetric aMetric( pVDev->GetFontMetric() );
- sal_uInt16 nTxtHeight = (sal_uInt16)aMetric.GetAscent() + (sal_uInt16)aMetric.GetDescent();
-
- String aFileURLStr;
- if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( Application::GetAppFileName(), aFileURLStr ) )
- {
- INetURLObject aURL( aFileURLStr );
- aURL.SetName( String( RTL_CONSTASCII_STRINGPARAM( "dbgfontmetrics.txt" ) ) );
-
- SvStream* pDbgOut = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
- if( pDbgOut )
- {
- pDbgOut->Seek( STREAM_SEEK_TO_END );
-
- Printer* pPrinter = NULL;
- if ( pSdrModel->GetRefDevice() && pSdrModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER )
- pPrinter = (Printer*)pSdrModel->GetRefDevice();
- if ( pPrinter )
- {
- Font aOldFont( pPrinter->GetFont() );
- aFont.SetKerning( TRUE );
- pPrinter->SetFont( aFont );
- aMetric = pPrinter->GetFontMetric();
- pPrinter->SetFont( aOldFont );
- }
-
- if ( ( pPrinter == NULL ) || ( aMetric.GetIntLeading() == 0 ) )
- {
- VirtualDevice aVirDev( 1 );
- aVirDev.SetFont( aFont );
- aMetric = aVirDev.GetFontMetric();
- }
- ByteString aFontName( aFont.GetName(), RTL_TEXTENCODING_UTF8 );
- ByteString aHeight( ByteString::CreateFromInt32( aMetric.GetLineHeight() ) );
- ByteString aAscent( ByteString::CreateFromInt32( aMetric.GetAscent() ) );
- ByteString aDescent( ByteString::CreateFromInt32( aMetric.GetDescent() ) );
- ByteString aLeading( ByteString::CreateFromInt32( aMetric.GetIntLeading() ) );
- ByteString aPhysHeight( ByteString::CreateFromInt32( nTxtHeight ) );
-
- *pDbgOut << (sal_uInt8)0xa
- << "FontName : " << aFontName.GetBuffer() << (sal_uInt8)0xa
- << " Height: " << aHeight.GetBuffer() << (sal_uInt8)0xa
- << " Ascent: " << aAscent.GetBuffer() << (sal_uInt8)0xa
- << " Descent:" << aDescent.GetBuffer() << (sal_uInt8)0xa
- << " Leading:" << aLeading.GetBuffer() << (sal_uInt8)0xa
- << "PhysHeight :" << aPhysHeight.GetBuffer()<< (sal_uInt8)0xa;
- }
- delete pDbgOut;
- }
-#endif
// following block is necessary, because our old PowerPoint export did not set the
// correct charset
if ( pFont->aName.EqualsIgnoreCaseAscii( "Wingdings" ) ||
More information about the Libreoffice-commits
mailing list