summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorDavid Hobley <davidh@sharpblue.org>2010-10-04 16:31:26 +0200
committerC├ędric Bosdonnat <cedricbosdo@openoffice.org>2010-10-04 16:31:26 +0200
commit3f9bf0a9aeb91b1211a5659044ab1eb22da9be7c (patch)
treebb92f70d2dfd972eff58d70b81a08a5217e5f553 /svtools
parent44e3fb767feaad3eee464d7d8ae16ce708ec974c (diff)
More of OD style's comments removal
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/imivctl1.cxx14
-rw-r--r--svtools/source/contnr/svtreebx.cxx24
-rw-r--r--svtools/source/graphic/grfmgr.cxx145
-rw-r--r--svtools/source/svhtml/parhtml.cxx5
4 files changed, 5 insertions, 183 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index dd2ed992536e..2394ae619936 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -70,8 +70,6 @@ struct SvxIconChoiceCtrlEntry_Impl
static BOOL bEndScrollInvalidate = TRUE;
-// ----------------------------------------------------------------------------------------------
-
class IcnViewEdit_Impl : public MultiLineEdit
{
Link aCallBackHdl;
@@ -104,10 +102,6 @@ public:
BOOL IsGrabFocus() const { return bGrabFocus; }
};
-// ----------------------------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------------------------
-
SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pCurView,
WinBits nWinStyle ) :
aEntries( this ),
@@ -535,15 +529,13 @@ void SvxIconChoiceCtrl_Impl::EntrySelected( SvxIconChoiceCtrlEntry* pEntry, BOOL
}
if( pEntry == pCursor )
ShowCursor( TRUE );
- } // if( bUpdateMode )
+ }
- // --> OD 2009-05-27 #i101012#
- // emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
+ // #i101012# emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
if ( bSelect )
{
CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
}
- // <--
}
void SvxIconChoiceCtrl_Impl::ResetVirtSize()
@@ -4671,8 +4663,6 @@ BOOL SvxIconChoiceCtrl_Impl::HandleShortCutKey( const KeyEvent& rKEvt )
return bRet;
}
-// -----------------------------------------------------------------------
-
void SvxIconChoiceCtrl_Impl::CallEventListeners( ULONG nEvent, void* pData )
{
pView->CallImplEventListeners( nEvent, pData );
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index a8635c99d127..034b23fec05d 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -35,8 +35,6 @@
class TabBar;
-// #102891# -----------------------
-
#include <svtools/svlbox.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/svtreebx.hxx>
@@ -487,7 +485,6 @@ void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp,
GetModel()->InvalidateEntry( pEntry );
SetEntryHeight( pEntry );
Size aSize = aBmp.GetSizePixel();
- // #97680# ---------------
short nWidth = pImp->UpdateContextBmpWidthVector( pEntry, (short)aSize.Width() );
if( nWidth > nContextBmpWidthMax )
{
@@ -507,7 +504,6 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp,
GetModel()->InvalidateEntry( pEntry );
SetEntryHeight( pEntry );
Size aSize = aBmp.GetSizePixel();
- // #97680# -----------
short nWidth = pImp->UpdateContextBmpWidthVector( pEntry, (short)aSize.Width() );
if( nWidth > nContextBmpWidthMax )
{
@@ -599,9 +595,6 @@ void SvTreeListBox::CheckButtonHdl()
pImp->CallEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pCheckButtonData->GetActEntry() );
}
-// *********************************************************************
-// *********************************************************************
-
//
// TODO: Momentan werden die Daten so geklont, dass sie dem
// Standard-TreeView-Format entsprechen. Hier sollte eigentlich
@@ -649,10 +642,6 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
return pClone;
}
-// *********************************************************************
-// *********************************************************************
-
-
void SvTreeListBox::ShowExpandBitmapOnCursor( BOOL bYes )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -845,8 +834,6 @@ void SvTreeListBox::ModelHasCleared()
AdjustEntryHeight( GetDefaultCollapsedEntryBmp() );
SvLBox::ModelHasCleared();
-// if( IsUpdateMode() )
-// Invalidate();
}
void SvTreeListBox::ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL /* bShow */ )
@@ -1017,12 +1004,11 @@ BOOL SvTreeListBox::Expand( SvLBoxEntry* pParent )
GetModel()->InvalidateEntry( pParent ); // neu zeichnen
}
- // --> OD 2009-04-01 #i92103#
+ // #i92103#
if ( bExpanded )
{
pImp->CallEventListeners( VCLEVENT_ITEM_EXPANDED, pParent );
}
- // <--
return bExpanded;
}
@@ -1044,12 +1030,11 @@ BOOL SvTreeListBox::Collapse( SvLBoxEntry* pParent )
ExpandedHdl();
}
- // --> OD 2009-04-01 #i92103#
+ // #i92103#
if ( bCollapsed )
{
pImp->CallEventListeners( VCLEVENT_ITEM_COLLAPSED, pParent );
}
- // <--
return bCollapsed;
}
@@ -1413,13 +1398,10 @@ void SvTreeListBox::EditedText( const XubString& rStr )
((SvLBoxString*)pEdItem)->SetText( pEdEntry, rStr );
pModel->InvalidateEntry( pEdEntry );
}
- //if( GetSelectionMode() == SINGLE_SELECTION )
- //{
if( GetSelectionCount() == 0 )
Select( pEdEntry );
if( GetSelectionMode() == MULTIPLE_SELECTION && !GetCurEntry() )
SetCurEntry( pEdEntry );
- //}
}
}
@@ -1552,7 +1534,6 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
BOOL bHorSBar = pImp->HasHorScrollBar();
PreparePaint( pEntry );
- // #97680# ------------------
pImp->UpdateContextBmpWidthMax( pEntry );
if( nTreeFlags & TREEFLAG_RECALCTABS )
@@ -2312,7 +2293,6 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData )
SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight );
String aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
String aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
- // #102891# ----------------
pImp->UpdateIntlWrapper();
return pImp->pIntlWrapper->getCaseCollator()->compareString( aLeft, aRight );
}
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 221354cc6665..1b8eab96482a 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -44,27 +44,13 @@
#include <unotools/cacheoptions.hxx>
#include <svtools/grfmgr.hxx>
-// --> OD 2010-01-04 #i105243#
#include <vcl/pdfextoutdevdata.hxx>
-// <--
-
-// -----------
-// - Defines -
-// -----------
#define WATERMARK_LUM_OFFSET 50
#define WATERMARK_CON_OFFSET -70
-// -----------
-// - statics -
-// -----------
-
GraphicManager* GraphicObject::mpGlobalMgr = NULL;
-// ---------------------
-// - GrfDirectCacheObj -
-// ---------------------
-
struct GrfSimpleCacheObj
{
Graphic maGraphic;
@@ -74,14 +60,8 @@ struct GrfSimpleCacheObj
maGraphic( rGraphic ), maAttr( rAttr ) {}
};
-// -----------------
-// - GraphicObject -
-// -----------------
-
TYPEINIT1_AUTOFACTORY( GraphicObject, SvDataCopyStream );
-// -----------------------------------------------------------------------------
-
GraphicObject::GraphicObject( const GraphicManager* pMgr ) :
mpLink ( NULL ),
mpUserData ( NULL )
@@ -91,8 +71,6 @@ GraphicObject::GraphicObject( const GraphicManager* pMgr ) :
ImplSetGraphicManager( pMgr );
}
-// -----------------------------------------------------------------------------
-
GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr ) :
maGraphic ( rGraphic ),
mpLink ( NULL ),
@@ -103,8 +81,6 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMg
ImplSetGraphicManager( pMgr );
}
-// -----------------------------------------------------------------------------
-
GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, const GraphicManager* pMgr ) :
maGraphic ( rGraphic ),
mpLink ( rLink.Len() ? ( new String( rLink ) ) : NULL ),
@@ -115,8 +91,6 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, cons
ImplSetGraphicManager( pMgr );
}
-// -----------------------------------------------------------------------------
-
GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) :
SvDataCopyStream(),
maGraphic ( rGraphicObj.GetGraphic() ),
@@ -129,8 +103,6 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan
ImplSetGraphicManager( pMgr, NULL, &rGraphicObj );
}
-// -----------------------------------------------------------------------------
-
GraphicObject::GraphicObject( const ByteString& rUniqueID, const GraphicManager* pMgr ) :
mpLink ( NULL ),
mpUserData ( NULL )
@@ -146,8 +118,6 @@ GraphicObject::GraphicObject( const ByteString& rUniqueID, const GraphicManager*
ImplAssignGraphicData();
}
-// -----------------------------------------------------------------------------
-
GraphicObject::~GraphicObject()
{
if( mpMgr )
@@ -165,8 +135,6 @@ GraphicObject::~GraphicObject()
delete mpSimpleCache;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ImplConstruct()
{
mpMgr = NULL;
@@ -179,8 +147,6 @@ void GraphicObject::ImplConstruct()
mbIsInSwapOut = FALSE;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ImplAssignGraphicData()
{
maPrefSize = maGraphic.GetPrefSize();
@@ -201,8 +167,6 @@ void GraphicObject::ImplAssignGraphicData()
mbEPS = FALSE;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const ByteString* pID, const GraphicObject* pCopyObj )
{
if( !mpMgr || ( pMgr != mpMgr ) )
@@ -240,8 +204,6 @@ void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const Byt
}
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ImplAutoSwapIn()
{
if( IsSwappedOut() )
@@ -304,7 +266,6 @@ void GraphicObject::ImplAutoSwapIn()
}
}
-// -----------------------------------------------------------------------------
BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
PolyPolygon& rClipPolyPoly, BOOL& bRectClipRegion ) const
{
@@ -315,9 +276,6 @@ BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
Polygon aClipPoly( Rectangle( rPt, rSz ) );
const USHORT nRot10 = pAttr->GetRotation() % 3600;
const Point aOldOrigin( rPt );
- // --> OD 2005-09-30 #i54875# - It's not needed to get the graphic again.
-// const Graphic& rGraphic = GetGraphic();
- // <--
const MapMode aMap100( MAP_100TH_MM );
Size aSize100;
long nTotalWidth, nTotalHeight;
@@ -334,12 +292,6 @@ BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
rClipPolyPoly = aClipPoly;
- // --> OD 2005-09-30 #i54875# - directly access member <maGraphic> to
- // get <PrefSize> and <PrefMapMode>.
-// if( rGraphic.GetPrefMapMode() == MAP_PIXEL )
-// aSize100 = Application::GetDefaultDevice()->PixelToLogic( rGraphic.GetPrefSize(), aMap100 );
-// else
-// aSize100 = pOut->LogicToLogic( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode(), aMap100 );
if( maGraphic.GetPrefMapMode() == MAP_PIXEL )
aSize100 = Application::GetDefaultDevice()->PixelToLogic( maGraphic.GetPrefSize(), aMap100 );
else
@@ -386,8 +338,6 @@ BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz
return bRet;
}
-// -----------------------------------------------------------------------------
-
GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
{
if( &rGraphicObj != this )
@@ -413,8 +363,6 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj )
return *this;
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::operator==( const GraphicObject& rGraphicObj ) const
{
return( ( rGraphicObj.maGraphic == maGraphic ) &&
@@ -422,29 +370,21 @@ BOOL GraphicObject::operator==( const GraphicObject& rGraphicObj ) const
( rGraphicObj.GetLink() == GetLink() ) );
}
-// ------------------------------------------------------------------------
-
void GraphicObject::Load( SvStream& rIStm )
{
rIStm >> *this;
}
-// ------------------------------------------------------------------------
-
void GraphicObject::Save( SvStream& rOStm )
{
rOStm << *this;
}
-// ------------------------------------------------------------------------
-
void GraphicObject::Assign( const SvDataCopyStream& rCopyStream )
{
*this = (const GraphicObject& ) rCopyStream;
}
-// -----------------------------------------------------------------------------
-
ByteString GraphicObject::GetUniqueID() const
{
if ( !IsInSwapIn() && IsEPS() )
@@ -458,30 +398,22 @@ ByteString GraphicObject::GetUniqueID() const
return aRet;
}
-// -----------------------------------------------------------------------------
-
ULONG GraphicObject::GetChecksum() const
{
return( ( maGraphic.IsSupportedGraphic() && !maGraphic.IsSwapOut() ) ? maGraphic.GetChecksum() : 0 );
}
-// -----------------------------------------------------------------------------
-
SvStream* GraphicObject::GetSwapStream() const
{
return( HasSwapStreamHdl() ? (SvStream*) mpSwapStreamHdl->Call( (void*) this ) : GRFMGR_AUTOSWAPSTREAM_NONE );
}
-// -----------------------------------------------------------------------------
-
// !!! to be removed
ULONG GraphicObject::GetReleaseFromCache() const
{
return 0;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetAttr( const GraphicAttr& rAttr )
{
maAttr = rAttr;
@@ -490,23 +422,17 @@ void GraphicObject::SetAttr( const GraphicAttr& rAttr )
delete mpSimpleCache, mpSimpleCache = NULL;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetLink()
{
if( mpLink )
delete mpLink, mpLink = NULL;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetLink( const String& rLink )
{
delete mpLink, mpLink = new String( rLink );
}
-// -----------------------------------------------------------------------------
-
String GraphicObject::GetLink() const
{
if( mpLink )
@@ -515,23 +441,17 @@ String GraphicObject::GetLink() const
return String();
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetUserData()
{
if( mpUserData )
delete mpUserData, mpUserData = NULL;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetUserData( const String& rUserData )
{
delete mpUserData, mpUserData = new String( rUserData );
}
-// -----------------------------------------------------------------------------
-
String GraphicObject::GetUserData() const
{
if( mpUserData )
@@ -540,8 +460,6 @@ String GraphicObject::GetUserData() const
return String();
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetSwapStreamHdl()
{
if( mpSwapStreamHdl )
@@ -551,8 +469,6 @@ void GraphicObject::SetSwapStreamHdl()
}
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout )
{
delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl );
@@ -572,8 +488,6 @@ void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTime
delete mpSwapOutTimer, mpSwapOutTimer = NULL;
}
-// -----------------------------------------------------------------------------
-
Link GraphicObject::GetSwapStreamHdl() const
{
if( mpSwapStreamHdl )
@@ -582,22 +496,16 @@ Link GraphicObject::GetSwapStreamHdl() const
return Link();
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::FireSwapInRequest()
{
ImplAutoSwapIn();
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::FireSwapOutRequest()
{
ImplAutoSwapOutHdl( NULL );
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::GraphicManagerDestroyed()
{
// we're alive, but our manager doesn't live anymore ==> connect to default manager
@@ -605,15 +513,11 @@ void GraphicObject::GraphicManagerDestroyed()
ImplSetGraphicManager( NULL );
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetGraphicManager( const GraphicManager& rMgr )
{
ImplSetGraphicManager( &rMgr );
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, ULONG nFlags ) const
{
@@ -621,10 +525,6 @@ BOOL GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size&
if( nFlags & GRFMGR_DRAW_CACHED )
{
- // --> OD 2005-10-11 #i54875# - Consider cropped graphics.
- // Note: The graphic manager caches a cropped graphic with its
- // uncropped position and size.
-// bRet = mpMgr->IsInCache( pOut, rPt, rSz, *this, ( pAttr ? *pAttr : GetAttr() ) );
Point aPt( rPt );
Size aSz( rSz );
if ( pAttr->IsCropped() )
@@ -641,30 +541,22 @@ BOOL GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size&
return bRet;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ReleaseFromCache()
{
mpMgr->ReleaseFromCache( *this );
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetAnimationNotifyHdl( const Link& rLink )
{
maGraphic.SetAnimationNotifyHdl( rLink );
}
-// -----------------------------------------------------------------------------
-
List* GraphicObject::GetAnimationInfoList() const
{
return maGraphic.GetAnimationInfoList();
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, ULONG nFlags )
{
@@ -742,7 +634,7 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
return bRet;
}
-// --> OD 2010-01-04 #i105243#
+// #i105243#
BOOL GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
const Point& rPt, const Size& rSz,
const GraphicAttr* pGrfAttr,
@@ -802,9 +694,6 @@ BOOL GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
return bRet;
}
-// <--
-
-// -----------------------------------------------------------------------------
BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
const Size& rOffset, const GraphicAttr* pAttr, ULONG nFlags, int nTileCacheSize1D )
@@ -828,8 +717,6 @@ BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const
return ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D );
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz,
long nExtraData, const GraphicAttr* pAttr, ULONG /*nFlags*/,
OutputDevice* pFirstFrameOutDev )
@@ -888,16 +775,12 @@ BOOL GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const
return bRet;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::StopAnimation( OutputDevice* pOut, long nExtraData )
{
if( mpSimpleCache )
mpSimpleCache->maGraphic.StopAnimation( pOut, nExtraData );
}
-// -----------------------------------------------------------------------------
-
const Graphic& GraphicObject::GetGraphic() const
{
if( mbAutoSwapped )
@@ -906,8 +789,6 @@ const Graphic& GraphicObject::GetGraphic() const
return maGraphic;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj )
{
mpMgr->ImplUnregisterObj( *this );
@@ -927,16 +808,12 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC
mpSwapOutTimer->Start();
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetGraphic( const Graphic& rGraphic, const String& rLink )
{
SetGraphic( rGraphic );
mpLink = new String( rLink );
}
-// -----------------------------------------------------------------------------
-
Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMode& rDestMap, const GraphicAttr& rAttr ) const
{
// #104550# Extracted from svx/source/svdraw/svdograf.cxx
@@ -1121,8 +998,6 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo
return aTransGraphic;
}
-// -----------------------------------------------------------------------------
-
Graphic GraphicObject::GetTransformedGraphic( const GraphicAttr* pAttr ) const // TODO: Change to Impl
{
GetGraphic();
@@ -1173,8 +1048,6 @@ Graphic GraphicObject::GetTransformedGraphic( const GraphicAttr* pAttr ) const /
return aGraphic;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::ResetAnimationLoopCount()
{
if( IsAnimated() && !IsSwappedOut() )
@@ -1186,8 +1059,6 @@ void GraphicObject::ResetAnimationLoopCount()
}
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::SwapOut()
{
BOOL bRet = ( !mbAutoSwapped ? maGraphic.SwapOut() : FALSE );
@@ -1198,8 +1069,6 @@ BOOL GraphicObject::SwapOut()
return bRet;
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::SwapOut( SvStream* pOStm )
{
BOOL bRet = ( !mbAutoSwapped ? maGraphic.SwapOut( pOStm ) : FALSE );
@@ -1210,8 +1079,6 @@ BOOL GraphicObject::SwapOut( SvStream* pOStm )
return bRet;
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::SwapIn()
{
BOOL bRet;
@@ -1237,8 +1104,6 @@ BOOL GraphicObject::SwapIn()
return bRet;
}
-// -----------------------------------------------------------------------------
-
BOOL GraphicObject::SwapIn( SvStream* pIStm )
{
BOOL bRet;
@@ -1264,8 +1129,6 @@ BOOL GraphicObject::SwapIn( SvStream* pIStm )
return bRet;
}
-// -----------------------------------------------------------------------------
-
void GraphicObject::SetSwapState()
{
if( !IsSwappedOut() )
@@ -1277,8 +1140,6 @@ void GraphicObject::SetSwapState()
}
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG )
{
if( !IsSwappedOut() )
@@ -1312,8 +1173,6 @@ IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG )
return 0L;
}
-// ------------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj )
{
VersionCompat aCompat( rIStm, STREAM_READ );
@@ -1340,8 +1199,6 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj )
return rIStm;
}
-// ------------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 3c65997bedca..fafbb1f86445 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -444,9 +444,7 @@ int HTMLParser::FilterToken( int nToken )
#define HTML_ISALNUM( c ) ( HTML_ISALPHA(c) || HTML_ISDIGIT(c) )
#define HTML_ISSPACE( c ) ( ' ' == c || (c >= 0x09 && c <= 0x0d) )
#define HTML_ISPRINTABLE( c ) ( c >= 32 && c != 127)
-// --> OD 2006-07-26 #138464#
#define HTML_ISHEXDIGIT( c ) ( HTML_ISDIGIT(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f') )
-// <--
int HTMLParser::ScanText( const sal_Unicode cBreak )
{
@@ -473,8 +471,6 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
if( '#' == (nNextCh = GetNextChar()) )
{
nNextCh = GetNextChar();
- // --> OD 2006-07-26 #138464#
- // consider hexadecimal digits
const sal_Bool bIsHex( 'x' == nNextCh );
const sal_Bool bIsDecOrHex( bIsHex || HTML_ISDIGIT(nNextCh) );
if ( bIsDecOrHex )
@@ -520,7 +516,6 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
}
}
}
- // <--
else
nNextCh = 0U;
}