Hi,
This patch remove some useless comments in msfilter.
Thanks
--
Arnaud Versini
From b30f33d40c17417d6be0db69aaf285668f7d91c6 Mon Sep 17 00:00:00 2001
From: Arnaud Versini <arnaud.vers...@gmail.com>
Date: Sun, 27 Feb 2011 16:41:34 +0100
Subject: [PATCH] Cleanup msfilter.
---
filter/source/msfilter/countryid.cxx | 10 --
filter/source/msfilter/escherex.cxx | 101 --------------------
filter/source/msfilter/eschesdo.cxx | 51 ----------
filter/source/msfilter/msfiltertracer.cxx | 4 -
filter/source/msfilter/msoleexp.cxx | 5 -
filter/source/msfilter/powerpoint/pptimporter.cxx | 20 +----
.../source/msfilter/powerpoint/pptimporteruno.cxx | 16 ---
filter/source/msfilter/powerpoint/ppttoxml.cxx | 9 --
filter/source/msfilter/powerpoint/ppttoxml.hxx | 4 -
filter/source/msfilter/svdfppt.cxx | 53 +---------
filter/source/msfilter/viscache.hxx | 6 -
11 files changed, 9 insertions(+), 270 deletions(-)
diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index df75753..6df59ae 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -261,8 +261,6 @@ static const CountryEntry pTable[] =
const CountryEntry * const pEnd = pTable + SAL_N_ELEMENTS( pTable );
-// ----------------------------------------------------------------------------
-
/** Predicate comparing a country ID with the member of a CountryEntry. */
struct CountryEntryPred_Country
{
@@ -275,8 +273,6 @@ struct CountryEntryPred_Country
{ return rCmp.meCountry == meCountry; }
};
-// ----------------------------------------------------------------------------
-
/** Predicate comparing a language type with the member of a CountryEntry.
Compares by primary language only, if the passed CountryEntry allows it
@@ -299,8 +295,6 @@ inline bool CountryEntryPred_Language::operator()( const CountryEntry& rCmp ) co
((meLanguage & 0x03FF) == (rCmp.meLanguage & 0x03FF));
}
-// ----------------------------------------------------------------------------
-
} // namespace
// Country ID <-> Language type conversion ====================================
@@ -336,10 +330,6 @@ LanguageType ConvertCountryToLanguage( CountryId eCountry )
return (pEntry != pEnd) ? pEntry->meLanguage : LANGUAGE_DONTKNOW;
}
-// ============================================================================
-
} // namespace svx
-// ============================================================================
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 68c6a74..e45dc88 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -99,8 +99,6 @@ using namespace ::rtl;
using namespace ::com::sun::star;
-// ---------------------------------------------------------------------------------------------
-
EscherExContainer::EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance ) :
rStrm ( rSt )
{
@@ -137,8 +135,6 @@ EscherExAtom::~EscherExAtom()
}
}
-// ---------------------------------------------------------------------------------------------
-
EscherExClientRecord_Base::~EscherExClientRecord_Base()
{
}
@@ -147,8 +143,6 @@ EscherExClientAnchor_Base::~EscherExClientAnchor_Base()
{
}
-// ---------------------------------------------------------------------------------------------
-
void EscherPropertyContainer::ImplInit()
{
nSortCount = 0;
@@ -1940,8 +1934,6 @@ sal_Bool EscherPropertyContainer::CreateShadowProperties(
return bHasShadow;
}
-// ---------------------------------------------------------------------------------------------
-
sal_Int32 GetValueForEnhancedCustomShapeParameter( const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, const std::vector< sal_Int32 >& rEquationOrder )
{
sal_Int32 nValue = 0;
@@ -3234,8 +3226,6 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
-// ---------------------------------------------------------------------------------------------
-
MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags, rtl::OUString& rShapeType )
{
MSO_SPT eShapeType = mso_sptNil;
@@ -3287,22 +3277,16 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
return GetCustomShapeType( rXShape, nMirrorFlags, aShapeType );
}
-// ---------------------------------------------------------------------------------------------
-
EscherPersistTable::EscherPersistTable()
{
}
-// ---------------------------------------------------------------------------------------------
-
EscherPersistTable::~EscherPersistTable()
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
delete (EscherPersistEntry*)pPtr;
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherPersistTable::PtIsID( UINT32 nID )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
@@ -3313,15 +3297,11 @@ BOOL EscherPersistTable::PtIsID( UINT32 nID )
return FALSE;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherPersistTable::PtInsert( UINT32 nID, UINT32 nOfs )
{
maPersistTable.Insert( new EscherPersistEntry( nID, nOfs ) );
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherPersistTable::PtDelete( UINT32 nID )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
@@ -3334,8 +3314,6 @@ UINT32 EscherPersistTable::PtDelete( UINT32 nID )
return 0;
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherPersistTable::PtGetOffsetByID( UINT32 nID )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
@@ -3346,8 +3324,6 @@ UINT32 EscherPersistTable::PtGetOffsetByID( UINT32 nID )
return 0;
};
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherPersistTable::PtReplace( UINT32 nID, UINT32 nOfs )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
@@ -3362,8 +3338,6 @@ UINT32 EscherPersistTable::PtReplace( UINT32 nID, UINT32 nOfs )
return 0;
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherPersistTable::PtReplaceOrInsert( UINT32 nID, UINT32 nOfs )
{
for ( void* pPtr = maPersistTable.First(); pPtr; pPtr = maPersistTable.Next() )
@@ -3417,8 +3391,6 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue(
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
-
::com::sun::star::beans::PropertyState EscherPropertyValueHelper::GetPropertyState(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
const String& rPropertyName )
@@ -3433,15 +3405,10 @@ sal_Bool EscherPropertyValueHelper::GetPropertyValue(
}
catch( ::com::sun::star::uno::Exception& )
{
- //...
}
return eRetValue;
}
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-
EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObject, const ByteString& rId,
const GraphicAttr* pGraphicAttr ) :
mnPictureOffset ( nPictureOffset ),
@@ -3510,8 +3477,6 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject
}
};
-// ---------------------------------------------------------------------------------------------
-
void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize )
{
sal_uInt32 nPictureOffset = ( bWritePictureOffset ) ? mnPictureOffset : 0;
@@ -3538,14 +3503,10 @@ void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffse
<< (sal_uInt32)0;
}
-// ---------------------------------------------------------------------------------------------
-
EscherBlibEntry::~EscherBlibEntry()
{
};
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) const
{
for ( int i = 0; i < 3; i++ )
@@ -3556,10 +3517,6 @@ BOOL EscherBlibEntry::operator==( const EscherBlibEntry& rEscherBlibEntry ) cons
return TRUE;
}
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-
EscherGraphicProvider::EscherGraphicProvider( sal_uInt32 nFlags ) :
mnFlags ( nFlags ),
mpBlibEntrys ( NULL ),
@@ -3909,10 +3866,6 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const ByteSt
return nBlibId;
}
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-
struct EscherConnectorRule
{
sal_uInt32 nRuleId;
@@ -4269,8 +4222,6 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm )
}
}
-// ---------------------------------------------------------------------------------------------
-
EscherExGlobal::EscherExGlobal( sal_uInt32 nGraphicProvFlags ) :
EscherGraphicProvider( nGraphicProvFlags ),
mpPicStrm( 0 ),
@@ -4395,10 +4346,6 @@ SvStream* EscherExGlobal::ImplQueryPictureStream()
return 0;
}
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-
EscherEx::EscherEx( const EscherExGlobalRef& rxGlobal, SvStream& rOutStrm ) :
mxGlobal ( rxGlobal ),
mpOutStrm ( &rOutStrm ),
@@ -4419,8 +4366,6 @@ EscherEx::~EscherEx()
{
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
{
if ( mxGlobal->HasDggContainer() )
@@ -4456,8 +4401,6 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
}
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::InsertAtCurrentPos( UINT32 nBytes, bool bExpandEndOfAtom )
{
UINT32 nSize, nType, nSource, nBufSize, nToCopy, nCurPos = mpOutStrm->Tell();
@@ -4517,8 +4460,6 @@ void EscherEx::InsertAtCurrentPos( UINT32 nBytes, bool bExpandEndOfAtom )
mpOutStrm->Seek( nCurPos );
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::SeekBehindRecHeader( UINT16 nRecType )
{
UINT32 nOldPos, nStreamEnd, nType, nSize;
@@ -4538,8 +4479,6 @@ BOOL EscherEx::SeekBehindRecHeader( UINT16 nRecType )
return FALSE;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::InsertPersistOffset( UINT32 nKey, UINT32 nOffset )
{
PtInsert( ESCHER_Persist_PrivateEntry | nKey, nOffset );
@@ -4555,8 +4494,6 @@ UINT32 EscherEx::GetPersistOffset( UINT32 nKey )
return PtGetOffsetByID( ESCHER_Persist_PrivateEntry | nKey );
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::DoSeek( UINT32 nKey )
{
UINT32 nPos = PtGetOffsetByID( nKey );
@@ -4571,15 +4508,11 @@ BOOL EscherEx::DoSeek( UINT32 nKey )
return TRUE;
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::SeekToPersistOffset( UINT32 nKey )
{
return DoSeek( ESCHER_Persist_PrivateEntry | nKey );
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::InsertAtPersistOffset( UINT32 nKey, UINT32 nValue )
{
UINT32 nOldPos = mpOutStrm->Tell();
@@ -4592,8 +4525,6 @@ BOOL EscherEx::InsertAtPersistOffset( UINT32 nKey, UINT32 nValue )
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
{
*mpOutStrm << (UINT16)( ( nRecInstance << 4 ) | 0xf ) << nEscherContainer << (UINT32)0;
@@ -4650,8 +4581,6 @@ void EscherEx::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
}
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::CloseContainer()
{
sal_uInt32 nSize, nPos = mpOutStrm->Tell();
@@ -4690,16 +4619,12 @@ void EscherEx::CloseContainer()
mpOutStrm->Seek( nPos );
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::BeginAtom()
{
mnCountOfs = mpOutStrm->Tell();
*mpOutStrm << (UINT32)0 << (UINT32)0; // record header wird spaeter geschrieben
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::EndAtom( UINT16 nRecType, int nRecVersion, int nRecInstance )
{
UINT32 nOldPos = mpOutStrm->Tell();
@@ -4709,15 +4634,11 @@ void EscherEx::EndAtom( UINT16 nRecType, int nRecVersion, int nRecInstance )
mpOutStrm->Seek( nOldPos );
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::AddAtom( UINT32 nAtomSize, UINT16 nRecType, int nRecVersion, int nRecInstance )
{
*mpOutStrm << (UINT16)( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) << nRecType << nAtomSize;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::AddChildAnchor( const Rectangle& rRect )
{
AddAtom( 16, ESCHER_ChildAnchor );
@@ -4727,8 +4648,6 @@ void EscherEx::AddChildAnchor( const Rectangle& rRect )
<< (sal_Int32)rRect.Bottom();
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::AddClientAnchor( const Rectangle& rRect )
{
AddAtom( 8, ESCHER_ClientAnchor );
@@ -4738,15 +4657,11 @@ void EscherEx::AddClientAnchor( const Rectangle& rRect )
<< (sal_Int16)( rRect.GetHeight() + rRect.Top() );
}
-// ---------------------------------------------------------------------------------------------
-
EscherExHostAppData* EscherEx::EnterAdditionalTextGroup()
{
return NULL;
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherEx::EnterGroup( const String& rShapeName, const Rectangle* pBoundRect )
{
Rectangle aRect;
@@ -4800,8 +4715,6 @@ UINT32 EscherEx::EnterGroup( const Rectangle* pBoundRect )
return EnterGroup( String::EmptyString(), pBoundRect );
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::SetGroupSnapRect( UINT32 nGroupLevel, const Rectangle& rRect )
{
BOOL bRetValue = FALSE;
@@ -4820,8 +4733,6 @@ BOOL EscherEx::SetGroupSnapRect( UINT32 nGroupLevel, const Rectangle& rRect )
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
-
BOOL EscherEx::SetGroupLogicRect( UINT32 nGroupLevel, const Rectangle& rRect )
{
BOOL bRetValue = FALSE;
@@ -4837,8 +4748,6 @@ BOOL EscherEx::SetGroupLogicRect( UINT32 nGroupLevel, const Rectangle& rRect )
return bRetValue;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::LeaveGroup()
{
--mnGroupLevel;
@@ -4847,8 +4756,6 @@ void EscherEx::LeaveGroup()
CloseContainer();
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::AddShape( UINT32 nShpInstance, UINT32 nFlags, UINT32 nShapeID )
{
AddAtom( 8, ESCHER_Sp, 2, nShpInstance );
@@ -4864,15 +4771,11 @@ void EscherEx::AddShape( UINT32 nShpInstance, UINT32 nFlags, UINT32 nShapeID )
*mpOutStrm << nShapeID << nFlags;
}
-// ---------------------------------------------------------------------------------------------
-
void EscherEx::Commit( EscherPropertyContainer& rProps, const Rectangle& )
{
rProps.Commit( GetStream() );
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherEx::GetColor( const UINT32 nSOColor, BOOL bSwap )
{
if ( bSwap )
@@ -4886,8 +4789,6 @@ UINT32 EscherEx::GetColor( const UINT32 nSOColor, BOOL bSwap )
return nSOColor & 0xffffff;
}
-// ---------------------------------------------------------------------------------------------
-
UINT32 EscherEx::GetColor( const Color& rSOColor, BOOL bSwap )
{
UINT32 nColor = ( rSOColor.GetRed() << 16 );
@@ -4900,6 +4801,4 @@ UINT32 EscherEx::GetColor( const Color& rSOColor, BOOL bSwap )
return nColor;
}
-// ---------------------------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 6c4b7d6..91465f5 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star::style;
#define EES_MAP_FRACTION 1440 // 1440 dpi
-// ===================================================================
-
ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
:
mpEscherEx ( &rEx ),
@@ -87,16 +85,11 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
}
-// -------------------------------------------------------------------
-
Point ImplEESdrWriter::ImplMapPoint( const Point& rPoint )
{
return OutputDevice::LogicToLogic( rPoint, maMapModeSrc, maMapModeDest );
}
-
-// -------------------------------------------------------------------
-
Size ImplEESdrWriter::ImplMapSize( const Size& rSize )
{
Size aRetSize( OutputDevice::LogicToLogic( rSize, maMapModeSrc, maMapModeDest ) );
@@ -108,8 +101,6 @@ Size ImplEESdrWriter::ImplMapSize( const Size& rSize )
return aRetSize;
}
-// -------------------------------------------------------------------
-
void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt )
{
INT32 nAngle = rObj.GetAngle();
@@ -781,8 +772,6 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
}
-// -------------------------------------------------------------------
-
UINT32 ImplEESdrWriter::ImplEnterAdditionalTextGroup( const Reference< XShape >& rShape,
const Rectangle* pBoundRect )
{
@@ -793,8 +782,6 @@ UINT32 ImplEESdrWriter::ImplEnterAdditionalTextGroup( const Reference< XShape >&
}
-// -------------------------------------------------------------------
-
BOOL ImplEESdrWriter::ImplInitPageValues()
{
mnIndices = 0;
@@ -805,9 +792,6 @@ BOOL ImplEESdrWriter::ImplInitPageValues()
return TRUE;
}
-
-// -------------------------------------------------------------------
-
void ImplEESdrWriter::ImplWritePage(
EscherSolverContainer& rSolverContainer,
ImplEESdrPageType ePageType, BOOL /* bBackGround */ )
@@ -838,8 +822,6 @@ void ImplEESdrWriter::ImplWritePage(
mnPagesWritten++;
}
-// ===================================================================
-
ImplEscherExSdr::ImplEscherExSdr( EscherEx& rEx )
:
ImplEESdrWriter( rEx ),
@@ -849,8 +831,6 @@ ImplEscherExSdr::ImplEscherExSdr( EscherEx& rEx )
}
-// -------------------------------------------------------------------
-
ImplEscherExSdr::~ImplEscherExSdr()
{
DBG_ASSERT( !mpSolverContainer, "ImplEscherExSdr::~ImplEscherExSdr: unwritten SolverContainer" );
@@ -858,8 +838,6 @@ ImplEscherExSdr::~ImplEscherExSdr()
}
-// -------------------------------------------------------------------
-
bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
{
do
@@ -890,8 +868,6 @@ bool ImplEscherExSdr::ImplInitPage( const SdrPage& rPage )
return false;
}
-// -------------------------------------------------------------------
-
bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
{
// eventually write SolverContainer of current page, deletes the Solver
@@ -911,8 +887,6 @@ bool ImplEscherExSdr::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
return true;
}
-// -------------------------------------------------------------------
-
void ImplEscherExSdr::ImplExitPage()
{
// close all groups before the solver container is written
@@ -924,8 +898,6 @@ void ImplEscherExSdr::ImplExitPage()
}
-// -------------------------------------------------------------------
-
void ImplEscherExSdr::ImplFlushSolverContainer()
{
if ( mpSolverContainer )
@@ -937,8 +909,6 @@ void ImplEscherExSdr::ImplFlushSolverContainer()
}
-// -------------------------------------------------------------------
-
void ImplEscherExSdr::ImplWriteCurrentPage()
{
DBG_ASSERT( mpSolverContainer, "ImplEscherExSdr::ImplWriteCurrentPage: no SolverContainer" );
@@ -947,8 +917,6 @@ void ImplEscherExSdr::ImplWriteCurrentPage()
}
-// -------------------------------------------------------------------
-
UINT32 ImplEscherExSdr::ImplWriteTheShape( ImplEESdrObject& rObj )
{
DBG_ASSERT( mpSolverContainer, "ImplEscherExSdr::ImplWriteShape: no SolverContainer" );
@@ -956,24 +924,18 @@ UINT32 ImplEscherExSdr::ImplWriteTheShape( ImplEESdrObject& rObj )
}
-// ===================================================================
-
void EscherEx::AddSdrPage( const SdrPage& rPage )
{
if ( mpImplEscherExSdr->ImplInitPage( rPage ) )
mpImplEscherExSdr->ImplWriteCurrentPage();
}
-// -------------------------------------------------------------------
-
void EscherEx::AddUnoShapes( const Reference< XShapes >& rxShapes )
{
if ( mpImplEscherExSdr->ImplInitUnoShapes( rxShapes ) )
mpImplEscherExSdr->ImplWriteCurrentPage();
}
-// -------------------------------------------------------------------
-
UINT32 EscherEx::AddSdrObject( const SdrObject& rObj )
{
ImplEESdrObject aObj( *mpImplEscherExSdr, rObj );
@@ -983,34 +945,25 @@ UINT32 EscherEx::AddSdrObject( const SdrObject& rObj )
}
-// -------------------------------------------------------------------
-
void EscherEx::EndSdrObjectPage()
{
mpImplEscherExSdr->ImplExitPage();
}
-// -------------------------------------------------------------------
-
EscherExHostAppData* EscherEx::StartShape( const Reference< XShape >& /* rShape */, const Rectangle* /*pChildAnchor*/ )
{
return NULL;
}
-// -------------------------------------------------------------------
-
void EscherEx::EndShape( UINT16 /* nShapeType */, UINT32 /* nShapeID */ )
{
}
-// -------------------------------------------------------------------
-
UINT32 EscherEx::QueryTextID( const Reference< XShape >&, UINT32 )
{
return 0;
}
-// -------------------------------------------------------------------
// add an dummy rectangle shape into the escher stream
UINT32 EscherEx::AddDummyShape()
{
@@ -1022,8 +975,6 @@ UINT32 EscherEx::AddDummyShape()
return nShapeID;
}
-// -------------------------------------------------------------------
-
// static
const SdrObject* EscherEx::GetSdrObject( const Reference< XShape >& rShape )
{
@@ -1039,8 +990,6 @@ const SdrObject* EscherEx::GetSdrObject( const Reference< XShape >& rShape )
}
-// -------------------------------------------------------------------
-
ImplEESdrObject::ImplEESdrObject( ImplEscherExSdr& rEx,
const SdrObject& rObj ) :
mnShapeId( 0 ),
diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index d2aea36..a66aca3 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -44,10 +44,6 @@
#include <unotools/ucbstreamhelper.hxx>
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::com::sun::star;
MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequence< beans::PropertyValue >* pConfigData ) :
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 92ba95d..5a5bd5c 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -279,12 +279,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
aSize.Height = 5000;
}
- //Rectangle aVisArea = xSfxIPObj->GetVisArea( ASPECT_CONTENT );
sal_Int32 pRect[4];
- //pRect[0] = aVisArea.Left();
- //pRect[1] = aVisArea.Right();
- //pRect[2] = aVisArea.Top();
- //pRect[3] = aVisArea.Bottom();
pRect[0] = 0;
pRect[1] = aSize.Width;
pRect[2] = 0;
diff --git a/filter/source/msfilter/powerpoint/pptimporter.cxx b/filter/source/msfilter/powerpoint/pptimporter.cxx
index 597608f..ab75bd8 100644
--- a/filter/source/msfilter/powerpoint/pptimporter.cxx
+++ b/filter/source/msfilter/powerpoint/pptimporter.cxx
@@ -38,10 +38,6 @@
#include <uno/mapping.hxx>
-// -----------------
-// - PptImporter -
-// -----------------
-
NMSP_RTL::OUString PptImporter_getImplementationName()
throw( NMSP_UNO::RuntimeException )
{
@@ -64,8 +60,6 @@ SEQ( NMSP_RTL::OUString ) SAL_CALL PptImporter_getSupportedServiceNames()
}
#undef SERVICE_NAME
-// -----------------------------------------------------------------------------
-
PptImporter::PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr ) :
xFact( rxMgr )
{
@@ -80,21 +74,15 @@ PptImporter::PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr )
}
}
-// -----------------------------------------------------------------------------
-
PptImporter::~PptImporter()
{
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL PptImporter::acquire() throw()
{
OWeakObject::acquire();
}
-// -----------------------------------------------------------------------------
-
void SAL_CALL PptImporter::release() throw()
{
OWeakObject::release();
@@ -116,15 +104,11 @@ sal_Bool SAL_CALL PptImporter::filter( const SEQ( NMSP_BEANS::PropertyValue )& a
xDataSource->setOutputStream( xOutStream );
aFilter.filter( aDescriptor, REF( NMSP_SAX::XDocumentHandler )( xWriter, NMSP_UNO::UNO_QUERY ) );
-// REF( NMSP_BEANS::XPropertySet ) xPropSet( xServiceFactory->createInstance( B2UCONST( "com.sun.star.beans.PropertySet" ) ) );
-// Any aAny;
-// aAny <<= (sal_Bool)sal_True;
-// xPropSet->setPropertyValue( B2UCONST( "UsePrettyPrinting" ), aAny );
-
#endif
return aFilter.filter( aDescriptor, xHdl );
}
+
void SAL_CALL PptImporter::cancel()
throw ( NMSP_UNO::RuntimeException )
{
@@ -150,11 +134,13 @@ NMSP_RTL::OUString SAL_CALL PptImporter::getImplementationName()
{
return PptImporter_getImplementationName();
}
+
sal_Bool SAL_CALL PptImporter::supportsService( const NMSP_RTL::OUString& rServiceName )
throw( NMSP_UNO::RuntimeException )
{
return PptImporter_supportsService( rServiceName );
}
+
SEQ( NMSP_RTL::OUString ) SAL_CALL PptImporter::getSupportedServiceNames()
throw ( NMSP_UNO::RuntimeException )
{
diff --git a/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
index 7aa6809..c654fda 100644
--- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx
+++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
@@ -34,28 +34,16 @@
#include <cppuhelper/factory.hxx>
#include <uno/mapping.hxx>
-// -------------------
-// - factory methods -
-// -------------------
-
static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_LANG::XMultiServiceFactory )& rxFact )
{
return REF( NMSP_UNO::XInterface )( *new PptImporter( rxFact ) );
}
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, void* pRegistryKey )
{
sal_Bool bRet = sal_False;
@@ -83,10 +71,6 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /* pServiceManager */, v
return bRet;
}
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
diff --git a/filter/source/msfilter/powerpoint/ppttoxml.cxx b/filter/source/msfilter/powerpoint/ppttoxml.cxx
index c8b6014..86cb1f9 100644
--- a/filter/source/msfilter/powerpoint/ppttoxml.cxx
+++ b/filter/source/msfilter/powerpoint/ppttoxml.cxx
@@ -52,14 +52,6 @@ sal_Bool PptToXml::filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor,
NMSP_RTL::OUString strTemp;
aDescriptor[ i ].Value >>= strTemp;
-/* we will open the document by url, so the stream is not needed
- if( aDescriptor[i].Name == B2UCONST( "InputStream" ) )
- {
- REF( NMSP_IO::XInputStream ) rInputStream;
- aDescriptor[ i].Value >>= rInputStream;
- }
- else
-*/
if ( aDescriptor[ i ].Name == B2UCONST( "URL" ) )
{
NMSP_RTL::OUString sURL;
@@ -73,7 +65,6 @@ sal_Bool PptToXml::filter( const SEQ( NMSP_BEANS::PropertyValue )& aDescriptor,
xDocStream->SetVersion( xStg->GetVersion() );
xDocStream->SetKey( xStg->GetKey() );
-// xHdl->unknown( PPT_DTD_STRING );
xHdl->startDocument();
diff --git a/filter/source/msfilter/powerpoint/ppttoxml.hxx b/filter/source/msfilter/powerpoint/ppttoxml.hxx
index 0c2b775..2e0b37d 100644
--- a/filter/source/msfilter/powerpoint/ppttoxml.hxx
+++ b/filter/source/msfilter/powerpoint/ppttoxml.hxx
@@ -31,10 +31,6 @@
#include "pptcom.hxx"
-// ------------
-// - PptToXml -
-// ------------
-
class PptToXml
{
REF( NMSP_SAX::XDocumentHandler ) xHdl;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 85ec53f..3211b73 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1293,8 +1293,6 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
return pRet;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void SdrEscherImport::CheckWingdings() const
{
OutputDevice* pDev = (OutputDevice*)Application::GetDefaultDevice();
@@ -1316,8 +1314,6 @@ void SdrEscherImport::CheckTimesNewRoman() const
((SdrEscherImport*)this)->bTimesNewRomanChecked = TRUE;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const String& rBaseURL ) :
SdrEscherImport ( rParam, rBaseURL ),
bOk ( rStCtrl.GetErrorCode() == SVSTREAM_OK ),
@@ -2752,7 +2748,6 @@ void ImportComment10( SvxMSDffManager& rMan, SvStream& rStCtrl, SdrPage* pPage,
// be sure not to import masterpages with this method
-// be sure not to import masterpages with this method
void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pMasterPersist )
{
UINT32 nMerk = rStCtrl.Tell();
@@ -3090,8 +3085,6 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
return pRet;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
HeaderFooterEntry::HeaderFooterEntry( const PptSlidePersistEntry* pMPE ) :
pMasterPersist ( pMPE ),
nAtom ( 0 )
@@ -3191,8 +3184,6 @@ sal_Unicode SdrPowerPointImport::PPTSubstitute( UINT16 /*nFont*/, sal_Unicode /*
return 0;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTBuGraEntry::PPTBuGraEntry( Graphic& rGraphic, UINT32 nInst ) :
nInstance ( nInst ),
aBuGra ( rGraphic ) {}
@@ -3404,8 +3395,6 @@ PPTExtParaProv::~PPTExtParaProv()
delete (PPTBuGraEntry*)pPtr;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTNumberFormatCreator::PPTNumberFormatCreator( PPTExtParaProv* pParaProv ) :
pExtParaProv ( pParaProv )
{
@@ -3736,8 +3725,6 @@ void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager,
rNumberFormat.SetFirstLineOffset( -nFirstLineOffset );
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTCharSheet::PPTCharSheet( UINT32 nInstance )
{
UINT32 nColor = PPT_COLSCHEME_TEXT_UND_ZEILEN;
@@ -4338,8 +4325,6 @@ PPTStyleSheet::~PPTStyleSheet()
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTParaPropSet::PPTParaPropSet() :
pParaSet( new ImplPPTParaPropSet )
{
@@ -4466,8 +4451,6 @@ void PPTCharPropSet::SetColor( sal_uInt32 nColor )
pCharSet->mnAttrSet |= 1 << PPT_CharAttr_FontColor;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTRuler::PPTRuler() :
nRefCount ( 1 ),
nFlags ( 0 ),
@@ -4586,8 +4569,6 @@ PPTTextRulerInterpreter::~PPTTextRulerInterpreter()
delete mpImplRuler;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTTextCharacterStyleAtomInterpreter::PPTTextCharacterStyleAtomInterpreter() :
nFlags1 ( 0 ),
nFlags2 ( 0 ),
@@ -4613,7 +4594,6 @@ PPTTextCharacterStyleAtomInterpreter::~PPTTextCharacterStyleAtomInterpreter()
{
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
PPTTextParagraphStyleAtomInterpreter::PPTTextParagraphStyleAtomInterpreter() :
bValid ( sal_False ),
bForbiddenRules ( sal_False ),
@@ -4690,8 +4670,6 @@ PPTTextParagraphStyleAtomInterpreter::~PPTTextParagraphStyleAtomInterpreter()
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
PPTTextSpecInfo::PPTTextSpecInfo( sal_uInt32 _nCharIdx ) :
nCharIdx ( _nCharIdx ),
nDontKnow ( 1 )
@@ -4776,8 +4754,6 @@ PPTTextSpecInfoAtomInterpreter::~PPTTextSpecInfoAtomInterpreter()
delete (PPTTextSpecInfo*)pPtr;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void StyleTextProp9::Read( SvStream& rIn )
{
rIn >> mnExtParagraphMask;
@@ -5266,8 +5242,6 @@ PPTStyleTextPropReader::~PPTStyleTextPropReader()
delete (PPTCharPropSet*)pTmp;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
struct FieldEntry
{
UINT32 nFieldType;
@@ -5670,8 +5644,6 @@ SvxFieldItem* PPTPortionObj::GetTextField()
return NULL;
}
-// -----------------------------------------------------------------------
-
PPTParagraphObj::PPTParagraphObj( const PPTStyleSheet& rStyleSheet, UINT32 nInstance, UINT16 nDepth ) :
PPTNumberFormatCreator ( NULL ),
mrStyleSheet ( rStyleSheet ),
@@ -6318,8 +6290,6 @@ void PPTFieldEntry::SetDateTime( UINT32 nVal )
}
}
-// -----------------------------------------------------------------------
-
PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport, PptSlidePersistEntry& rPersistEntry, DffObjData* pObjData ) :
mpImplTextObj ( new ImplPPTTextObj( rPersistEntry ) )
{
@@ -6351,9 +6321,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( pObjData->nSpFlags & SP_FHAVEMASTER )
mpImplTextObj->mnShapeMaster = rSdrPowerPointImport.GetPropertyValue( DFF_Prop_hspMaster, 0 );
}
- ////////////////
- // ClientData //
- ////////////////
+ // ClientData
if ( rSdrPowerPointImport.maShapeRecords.SeekToContent( rIn, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) )
{
UINT32 nOldPos = rIn.Tell();
@@ -6372,9 +6340,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
}
}
- ///////////////////
- // ClientTextBox //
- ///////////////////
+ // ClientTextBox
if ( rSdrPowerPointImport.maShapeRecords.SeekToContent( rIn, DFF_msofbtClientTextbox, SEEK_FROM_CURRENT_AND_RESTART ) )
{
DffRecordHeader aClientTextBoxHd( *rSdrPowerPointImport.maShapeRecords.Current() );
@@ -6382,12 +6348,10 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
// case of -1 -> ther is no atom of this kind
// else -> this is the fileofs where we can get it
- //////////////////////////////////////
- // checkout if this is a referenced //
- // textobj, if so the we will patch //
- // the ClientTextBoxHd for a //
- // equivalent one //
- //////////////////////////////////////
+ // checkout if this is a referenced
+ // textobj, if so the we will patch
+ // the ClientTextBoxHd for a
+ // equivalent one
DffRecordHeader aTextHd;
if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_OutlineTextRefAtom, aClientTextBoxHd.GetRecEndFilePos(), &aTextHd ) )
{
@@ -6591,10 +6555,8 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
}
#endif
}
- //
// now will search for possible textextensions such as date/time fields
// or ParaTabStops and append them on this textobj
- //
rIn.Seek( nFilePos );
List* pFieldList = NULL;
while ( rIn.Tell() < aClientTextBoxHd.GetRecEndFilePos() )
@@ -7554,7 +7516,4 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
return pRet;
}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 60f3004..616e3aa 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -30,12 +30,6 @@
#include <vcl/gdimtf.hxx>
#include <vcl/bitmap.hxx>
-/************************************************************************
-|* Impl_CacheElement
-|* Impl_Cache
-|*
-|* Beschreibung
-*************************************************************************/
class Impl_OlePres
{
ULONG nFormat;
--
1.7.4.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
