summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-06-06 18:46:01 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-06-06 23:05:59 +0900
commitf0c7544df93e3847c4f96934d1d76be3e8d3af85 (patch)
treec05c56fbc4a69e178dedc718e6ff39be938c0ce9 /filter
parent4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22 (diff)
nuke dead code
Change-Id: I0ea47ee535ba0e903bae0de227acd311ca96aa03
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/cacheitem.cxx20
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx18
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx19
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx75
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx8
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx11
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx8
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx8
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx11
-rw-r--r--filter/source/placeware/zip.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfilterjar.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx18
12 files changed, 0 insertions, 208 deletions
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 88153a092ada..c6790d574af6 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -335,26 +335,6 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
}
}
break;
-/*
- case css::uno::TypeClass_CHAR :
- case css::uno::TypeClass_VOID :
- case css::uno::TypeClass_TYPE :
- case css::uno::TypeClass_ENUM :
- case css::uno::TypeClass_TYPEDEF :
- case css::uno::TypeClass_UNION :
- case css::uno::TypeClass_EXCEPTION :
- case css::uno::TypeClass_ARRAY :
- case css::uno::TypeClass_INTERFACE :
- case css::uno::TypeClass_SERVICE :
- case css::uno::TypeClass_MODULE :
- case css::uno::TypeClass_INTERFACE_METHOD :
- case css::uno::TypeClass_INTERFACE_ATTRIBUTE :
- case css::uno::TypeClass_UNKNOWN :
- case css::uno::TypeClass_PROPERTY :
- case css::uno::TypeClass_CONSTANT :
- case css::uno::TypeClass_CONSTANTS :
- case css::uno::TypeClass_SINGLETON :
-*/
default: break;
}
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 1e09df3ac435..090ce6f56d9f 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -80,15 +80,6 @@ void CacheUpdateListener::startListening()
css::uno::Reference< css::util::XChangesListener > xThis(static_cast< css::util::XChangesListener* >(this), css::uno::UNO_QUERY_THROW);
xNotifier->addChangesListener(xThis);
-
-/*
- css::uno::Reference< css::container::XContainer > xNotifier(xConfigAccess, css::uno::UNO_QUERY);
- if (!xNotifier.is())
- return;
-
- css::uno::Reference< css::container::XContainerListener > xThis(static_cast< css::container::XContainerListener* >(this), css::uno::UNO_QUERY);
- xNotifier->addContainerListener(xThis);
-*/
}
@@ -106,15 +97,6 @@ void CacheUpdateListener::stopListening()
css::uno::Reference< css::util::XChangesListener > xThis(static_cast< css::util::XChangesListener* >(this), css::uno::UNO_QUERY);
xNotifier->removeChangesListener(xThis);
-
-/*
- css::uno::Reference< css::container::XContainer > xNotifier(xConfigAccess, css::uno::UNO_QUERY);
- if (!xNotifier.is())
- return;
-
- css::uno::Reference< css::container::XContainerListener > xThis(static_cast< css::container::XContainerListener* >(this), css::uno::UNO_QUERY);
- xNotifier->removeContainerListener(xThis);
-*/
}
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 1b6158589072..9db541c784dd 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2306,25 +2306,6 @@ GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterC
if (rGraphic.GetType()==GRAPHIC_GDIMETAFILE)
{
GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
-
-/*
- MapMode aMap72( MAP_INCH );
- Fraction aDPIFrac( 1, 72 );
- Size aOldSize = aScaledMtf.GetPrefSize();
-
- aMap72.SetScaleX( aDPIFrac );
- aMap72.SetScaleY( aDPIFrac );
-
- Size aNewSize = OutputDevice::LogicToLogic( aOldSize,
- aScaledMtf.GetPrefMapMode(),
- aMap72 );
-
- aScaledMtf.Scale( Fraction( aNewSize.Width(), aOldSize.Width() ),
- Fraction( aNewSize.Height(), aOldSize.Height() ) );
- aScaledMtf.SetPrefMapMode( aMap72 );
- aScaledMtf.SetPrefSize( aNewSize );
-*/
-
return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
}
else
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 5fd735a40620..d05abb4e5389 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -87,8 +87,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
aDXFLineInfo.eStyle = LINE_DASH;
for (i=0; i < (pLT->nDashCount); i++) {
x = pLT->fDash[i] * pDXF->getGlobalLineTypeScale();
-// ####
- // x = (sal_Int32) rTransform.TransLineWidth( pLT->fDash[i] * pDXF->getGlobalLineTypeScale() );
if ( x >= 0.0 ) {
if ( aDXFLineInfo.nDotCount == 0 ) {
aDXFLineInfo.nDotCount ++;
@@ -120,16 +118,6 @@ DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
}
}
-#if 0
- if (aDXFLineInfo.DashCount > 0 && aDXFLineInfo.DashLen == 0.0)
- aDXFLineInfo.DashLen ( 1 );
- if (aDXFLineInfo.DotCount > 0 && aDXFLineInfo.DotLen() == 0.0)
- aDXFLineInfo.SetDotLen( 1 );
- if (aDXFLineInfo.GetDashCount > 0 || aDXFLineInfo.GetDotCount > 0)
- if (aDXFLineInfo.GetDistance() == 0)
- aDXFLineInfo.SetDistance( 1 );
-#endif
-
return aDXFLineInfo;
}
@@ -243,19 +231,6 @@ void DXF2GDIMetaFile::DrawLineEntity(const DXFLineEntity & rE, const DXFTransfor
LineInfo aLineInfo;
aLineInfo = rTransform.Transform(aDXFLineInfo);
-#if 0
- printf("%f\n", rTransform.TransLineWidth(1000.0));
-
- // LINE_NONE = 0, LINE_SOLID = 1, LINE_DASH = 2, LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
- aLineInfo.SetStyle( LINE_DASH );
- aLineInfo.SetWidth( 300 );
- aLineInfo.SetDashCount( 2 );
- aLineInfo.SetDashLen( 100 );
- aLineInfo.SetDotCount( 1 );
- aLineInfo.SetDotLen( 0 );
- aLineInfo.SetDistance( 500 );
-#endif
-
pVirDev->DrawLine(aP0,aP1,aLineInfo);
if (rE.fThickness!=0) {
Point aP2,aP3;
@@ -591,8 +566,6 @@ void DXF2GDIMetaFile::DrawLWPolyLineEntity(const DXFLWPolyLineEntity & rE, const
pVirDev->DrawPolygon( aPoly );
else
pVirDev->DrawPolyLine( aPoly );
- // ####
- //pVirDev->DrawPolyLine( aPoly, aDXFLineInfo );
}
}
}
@@ -636,46 +609,6 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
}
break;
case 2 :
- {
-/*
- double frx,fry,fA1,fdA,fAng;
- sal_uInt16 nPoints,i;
- DXFVector aC;
- Point aPS,aPE;
- fA1=((DXFEdgeTypeCircularArc*)pEdge)->fStartAngle;
- fdA=((DXFEdgeTypeCircularArc*)pEdge)->fEndAngle - fA1;
- while ( fdA >= 360.0 )
- fdA -= 360.0;
- while ( fdA <= 0 )
- fdA += 360.0;
- rTransform.Transform(((DXFEdgeTypeCircularArc*)pEdge)->aCenter, aC);
- if ( fdA > 5.0 && rTransform.TransCircleToEllipse(((DXFEdgeTypeCircularArc*)pEdge)->fRadius,frx,fry ) == sal_True )
- {
- DXFVector aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
- aVS*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
- aVS+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
- DXFVector aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
- aVE*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
- aVE+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
- if ( rTransform.Mirror() == sal_True )
- {
- rTransform.Transform(aVS,aPS);
- rTransform.Transform(aVE,aPE);
- }
- else
- {
- rTransform.Transform(aVS,aPE);
- rTransform.Transform(aVE,aPS);
- }
- pVirDev->DrawArc(
- Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
- (long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)),
- aPS,aPE
- );
- }
-*/
- }
- break;
case 3 :
case 4 :
break;
@@ -900,14 +833,10 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
fScale = 0; // -Wall added this...
}
else {
-// if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
if (fWidth>fHeight)
fScale=10000.0/fWidth;
else
fScale=10000.0/fHeight;
-// }
-// else
-// fScale=1.0;
aTransform=DXFTransform(fScale,-fScale,fScale,
DXFVector(-pDXF->aBoundingBox.fMinX*fScale,
pDXF->aBoundingBox.fMaxY*fScale,
@@ -920,14 +849,10 @@ sal_Bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile &
else {
fHeight=pVPort->fHeight;
fWidth=fHeight*pVPort->fAspectRatio;
-// if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
if (fWidth>fHeight)
fScale=10000.0/fWidth;
else
fScale=10000.0/fHeight;
-// }
-// else
-// fScale=1.0;
aTransform=DXFTransform(
DXFTransform(pVPort->aDirection,pVPort->aTarget),
DXFTransform(
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index c9e433cce28b..be8d38ac7c19 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -421,14 +421,6 @@ public:
sal_Bool OS2METReader::Callback(sal_uInt16 /*nPercent*/)
{
-/*
- if (pCallback!=NULL) {
- if (((*pCallback)(pCallerData,nPercent))==sal_True) {
- pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
- return sal_True;
- }
- }
-*/
return sal_False;
}
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 8d4070e9b0f6..3a0388e55c05 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -175,17 +175,6 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
void PCDReader::MayCallback(sal_uLong /*nPercent*/)
{
-/*
- if ( nPercent >= nLastPercent + 3 )
- {
- nLastPercent=nPercent;
- if ( pCallback != NULL && nPercent <= 100 && bStatus == sal_True )
- {
- if ( ( (*pCallback)( pCallerData, (sal_uInt16)nPercent ) ) == sal_True )
- bStatus = sal_False;
- }
- }
-*/
}
// -------------------------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index d5507736aa48..0fd6d164eab5 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -83,14 +83,6 @@ PCXReader::~PCXReader()
sal_Bool PCXReader::Callback( sal_uInt16 /*nPercent*/ )
{
-/*
- if (pCallback!=NULL) {
- if (((*pCallback)(pCallerData,nPercent))==sal_True) {
- nStatus = sal_False;
- return sal_True;
- }
- }
-*/
return sal_False;
}
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index aa00e589c165..879300be59d5 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -359,14 +359,6 @@ void PictReader::SetFillColor( const Color& rColor )
sal_Bool PictReader::Callback(sal_uInt16 /*nPercent*/)
{
-/*
- if (pCallback!=NULL) {
- if (((*pCallback)(pCallerData,nPercent))==sal_True) {
- pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
- return sal_True;
- }
- }
-*/
return sal_False;
}
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 22738fc26169..bcfc757493d3 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -151,17 +151,6 @@ public:
void TIFFReader::MayCallback( sal_uLong /*nPercent*/ )
{
-/*
- if ( nPercent >= nLastPercent + 3 )
- {
- nLastPercent=nPercent;
- if ( pCallback != NULL && nPercent <= 100 && bStatus == sal_True )
- {
- if (((*pCallback)(pCallerData,(sal_uInt16)nPercent)) == sal_True )
- bStatus = sal_False;
- }
- }
-*/
}
// ---------------------------------------------------------------------------------
diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx
index 549bfcaafb8c..be5dfac79bc7 100644
--- a/filter/source/placeware/zip.cxx
+++ b/filter/source/placeware/zip.cxx
@@ -26,10 +26,6 @@
*
************************************************************************/
-
-/*
-#include <tools/datetime.hxx>
-*/
#include <osl/diagnose.h>
#include <rtl/crc.h>
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index b5a7139e99e0..f497fc7e6822 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -135,14 +135,6 @@ static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleSe
}
}
-/*
-static void addFile( Reference< XInterface > xRootFolder, Reference< XSingleServiceFactory > xFactory, const OUString& rSourceFile, const OUString& rName ) throw( Exception )
-{
- Reference< XInputStream > xInput( new utl::OSeekableInputStreamWrapper( new SvFileStream(rSourceFile, STREAM_READ ), true ) );
- _addFile( xRootFolder, xFactory, xInput, rName );
-}
-*/
-
void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference< XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( Exception )
{
if( !rSourceFile.isEmpty() &&
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 558ac0d94e82..252c4194bf84 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -613,10 +613,6 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
aValues[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) );
aValues[0].Value <<= pFilterEntry->maInterfaceName;
-/*
- aValues[i ].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
- aValues[i++].Value <<= pFilterEntry->maDocType;
-*/
aValues[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ClipboardFormat" ) );
OUString aDocType;
if( !pFilterEntry->maDocType.match( sDocTypePrefix ) )
@@ -1190,12 +1186,6 @@ void XMLFilterSettingsDialog::initFilterList()
for( nValue2 = 0; nValue2 < nValueCount2; nValue2++, pValues2++ )
{
-/*
- if ( pValues2->Name == "MediaType" )
- {
- pValues2->Value >>= pTempFilter->maDocType;
- } else
-*/
if ( pValues2->Name == "ClipboardFormat" )
{
OUString aDocType;
@@ -1653,14 +1643,6 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
Sequence< OUString > aUserData(8);
aUserData[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) );
- /*
- const application_info_impl* pInfo = getApplicationInfo( maDocumentService );
- if( pInfo )
- {
- aUserData[2] = pInfo->maXMLImporter;
- aUserData[3] = pInfo->maXMLExporter;
- }
- */
aUserData[1] = maXSLTTransformerImpl;
aUserData[2] = maImportService;
aUserData[3] = maExportService;