[ooo-build-commit] .: comphelper/inc comphelper/source l10ntools/source svl/inc svl/source svtools/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 08:00:12 PDT 2010
comphelper/inc/comphelper/TypeGeneration.hxx | 3
comphelper/source/property/TypeGeneration.cxx | 6 -
l10ntools/source/cfglex.l | 8 +
svl/inc/stylepool.hxx | 2
svl/source/items/stylepool.cxx | 89 ++++-----------
svtools/source/contnr/imivctl1.cxx | 14 --
svtools/source/contnr/svtreebx.cxx | 24 ----
svtools/source/graphic/grfmgr.cxx | 145 --------------------------
svtools/source/svhtml/parhtml.cxx | 5
9 files changed, 40 insertions(+), 256 deletions(-)
New commits:
commit 56e30dd7f910ee37b7f85b11859c975e0f8b7991
Author: David Hobley <davidh at sharpblue.org>
Date: Mon Oct 4 16:31:26 2010 +0200
More of OD style's comments removal
diff --git a/comphelper/inc/comphelper/TypeGeneration.hxx b/comphelper/inc/comphelper/TypeGeneration.hxx
index d365987..4499c29 100644
--- a/comphelper/inc/comphelper/TypeGeneration.hxx
+++ b/comphelper/inc/comphelper/TypeGeneration.hxx
@@ -109,9 +109,8 @@ namespace comphelper
CPPUTYPE_OUSTRINGS, //getCppuType( (Sequence<OUString>*)0 )
CPPUTYPE_REFCOMPONENT, //getCppuType( (Reference< lang::XComponent >*)0 )
- // --> OD 2004-08-09 #i28749#
+ // #i28749#
CPPUTYPE_TRANSFORMATIONINHORIL2R, //getCppuType( (drawing::HomogenMatrix3)* )
- // <--
CPPUTYPE_SEQNAMEDVALUE, //getCppuType( (Sequence<beans::NamedValue>*)0 )
CPPUTYPE_REFXGRAPHIC, //getCppuType( Reference< graphic::XGraphic >*)0)
CPPUTYPE_TABLEBORDERDISTANCES, //getCppuType( (table::TableBorderDistances*)0 )
diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx
index 6e6dc38..11978ad 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.cxx
@@ -129,9 +129,8 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/frame/XModel.hpp>
-// --> OD 2004-08-09 #i28749#
+// #i28749#
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-// <--
#include <com/sun/star/graphic/XGraphicProvider.hpp>
using ::rtl::OUString;
@@ -220,13 +219,12 @@ namespace comphelper
case CPPUTYPE_REFCONNECTION: pType = &::getCppuType( (Reference< sdbc::XConnection >*)0); break;
case CPPUTYPE_REFMODEL: pType = &::getCppuType( (Reference< frame::XModel >*)0); break;
case CPPUTYPE_REFCOMPONENT: pType = &::getCppuType( (Reference< lang::XComponent >*)0 ); break;
- // --> OD 2004-08-09 #i28749#
+ // #i28749#
case CPPUTYPE_TRANSFORMATIONINHORIL2R:
{
pType = &::getCppuType( (drawing::HomogenMatrix3*)0 );
}
break;
- // <--
case CPPUTYPE_SEQNAMEDVALUE: pType = &::getCppuType( (Sequence<beans::NamedValue>*)0 ); break;
case CPPUTYPE_REFXGRAPHIC: pType = &::getCppuType( (Reference< graphic::XGraphic >*)0); break;
case CPPUTYPE_TABLEBORDERDISTANCES: pType = &::getCppuType( (table::TableBorderDistances*)0 ); break;
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index 3fc3aa5..a6f6b36 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -30,6 +30,9 @@
#pragma warning(push, 1)
#endif
+int yycolumn = 1;
+#define YY_USER_ACTION yycolumn += yyleng;
+
/* external functions (C++ code, declared as extren "C" */
extern int WorkOnTokenSet( int, char* );
extern int InitCfgExport( char * , char *);
@@ -116,6 +119,7 @@ int bText=0;
}
.|\n {
+ yycolumn = 1;
if ( bText == 1 )
WorkOnTokenSet( CFG_TEXTCHAR, yytext );
else
@@ -138,7 +142,7 @@ void YYWarning( char *s )
{
/* write warning to stderr */
fprintf( stderr,
- "Warning: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
+ "Warning: \"%s\" in line %d, column %d: \"%s\"\n", s, yylineno, yycolumn, yytext );
}
/*****************************************************************************/
@@ -151,7 +155,7 @@ void yyerror ( char *s )
{
/* write error to stderr */
fprintf( stderr,
- "Error: \"%s\" in line %d: \"%s\"\n", s, yylineno, yytext );
+ "Error: \"%s\" in line %d, column %d: \"%s\"\n", s, yylineno, yycolumn, yytext );
SetError();
}
diff --git a/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index 99f72fd..935f6f3 100644
--- a/svl/inc/stylepool.hxx
+++ b/svl/inc/stylepool.hxx
@@ -42,9 +42,7 @@ private:
public:
typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
- // --> OD 2008-03-07 #i86923#
explicit StylePool( SfxItemSet* pIgnorableItems = 0 );
- // <--
/** Insert a SfxItemSet into the style pool.
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index fde27a7..27745fd 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -54,11 +54,10 @@ namespace {
std::vector< StylePool::SfxItemSet_Pointer_t > maItemSet;
const SfxPoolItem *mpItem; // my pool item
Node *mpUpper; // if I'm a child node that's my parent node
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
const bool mbIsItemIgnorable;
- // <--
public:
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
Node() // root node Ctor
: mChildren(),
maItemSet(),
@@ -73,36 +72,30 @@ namespace {
mpUpper( pParent ),
mbIsItemIgnorable( bIgnorable )
{}
- // <--
~Node();
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
bool hasItemSet( const bool bCheckUsage ) const;
- // <--
- // --> OD 2008-04-29 #i87808#
-// const StylePool::SfxItemSet_Pointer_t getItemSet() const { return aItemSet[aItemSet.size()-1]; }
+ // #i87808#
const StylePool::SfxItemSet_Pointer_t getItemSet() const
{
return maItemSet.back();
}
const StylePool::SfxItemSet_Pointer_t getUsedOrLastAddedItemSet() const;
- // <--
void setItemSet( const SfxItemSet& rSet ){ maItemSet.push_back( StylePool::SfxItemSet_Pointer_t( rSet.Clone() ) ); }
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
Node* findChildNode( const SfxPoolItem& rItem,
const bool bIsItemIgnorable = false );
Node* nextItemSet( Node* pLast,
const bool bSkipUnusedItemSet,
const bool bSkipIgnorable );
- // <--
const SfxPoolItem& getPoolItem() const { return *mpItem; }
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
bool hasIgnorableChildren( const bool bCheckUsage ) const;
const StylePool::SfxItemSet_Pointer_t getItemSetOfIgnorableChild(
const bool bSkipUnusedItemSets ) const;
- // <--
};
- // --> OD 2008-04-29 #i87808#
+ // #i87808#
const StylePool::SfxItemSet_Pointer_t Node::getUsedOrLastAddedItemSet() const
{
std::vector< StylePool::SfxItemSet_Pointer_t >::const_reverse_iterator aIter;
@@ -117,9 +110,8 @@ namespace {
return maItemSet.back();
}
- // <--
- // --> OD 2008-05-06 #i86923#
+ // #i86923#
bool Node::hasItemSet( const bool bCheckUsage ) const
{
bool bHasItemSet = false;
@@ -146,12 +138,10 @@ namespace {
}
return bHasItemSet;
}
- // <--
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
Node* Node::findChildNode( const SfxPoolItem& rItem,
const bool bIsItemIgnorable )
- // <--
{
Node* pNextNode = this;
std::vector<Node*>::iterator aIter = mChildren.begin();
@@ -162,9 +152,8 @@ namespace {
return *aIter;
++aIter;
}
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
pNextNode = new Node( rItem, pNextNode, bIsItemIgnorable );
- // <--
mChildren.push_back( pNextNode );
return pNextNode;
}
@@ -202,15 +191,14 @@ namespace {
Node *pNext = 0;
while( aIter != mChildren.end() )
{
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
if ( bSkipIgnorable && (*aIter)->mbIsItemIgnorable )
{
++aIter;
continue;
}
- // <--
pNext = *aIter;
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
if ( pNext->hasItemSet( bSkipUnusedItemSets ) )
{
return pNext;
@@ -221,7 +209,6 @@ namespace {
return pNext;
}
pNext = pNext->nextItemSet( 0, bSkipUnusedItemSets, bSkipIgnorable ); // 0 => downstairs only
- // <--
if( pNext )
return pNext;
++aIter;
@@ -229,14 +216,13 @@ namespace {
// Searching upstairs
if( pLast && mpUpper )
{
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
pNext = mpUpper->nextItemSet( this, bSkipUnusedItemSets, bSkipIgnorable );
- // <--
}
return pNext;
}
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
bool Node::hasIgnorableChildren( const bool bCheckUsage ) const
{
bool bHasIgnorableChildren( false );
@@ -289,7 +275,6 @@ namespace {
StylePool::SfxItemSet_Pointer_t pReturn;
return pReturn;
}
- // <--
Node::~Node()
{
@@ -310,7 +295,7 @@ namespace {
const bool mbSkipUnusedItemSets;
const bool mbSkipIgnorable;
public:
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
Iterator( std::map< const SfxItemSet*, Node >& rR,
const bool bSkipUnusedItemSets,
const bool bSkipIgnorable )
@@ -320,7 +305,6 @@ namespace {
mbSkipUnusedItemSets( bSkipUnusedItemSets ),
mbSkipIgnorable( bSkipIgnorable )
{}
- // <--
virtual StylePool::SfxItemSet_Pointer_t getNext();
virtual ::rtl::OUString getName();
};
@@ -334,31 +318,25 @@ namespace {
{
mpNode = &mpCurrNode->second;
++mpCurrNode;
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
if ( mpNode->hasItemSet( mbSkipUnusedItemSets ) )
{
- // --> OD 2008-04-30 #i87808#
-// return pNode->getItemSet();
+ // #i87808#
return mpNode->getUsedOrLastAddedItemSet();
- // <--
}
- // <--
}
- // --> OD 2008-03-11 #i86923#
+ // #i86923#
mpNode = mpNode->nextItemSet( mpNode, mbSkipUnusedItemSets, mbSkipIgnorable );
if ( mpNode && mpNode->hasItemSet( mbSkipUnusedItemSets ) )
{
- // --> OD 2008-04-30 #i87808#
-// return pNode->getItemSet();
+ // #i87808#
return mpNode->getUsedOrLastAddedItemSet();
- // <--
}
if ( mbSkipIgnorable &&
mpNode && mpNode->hasIgnorableChildren( mbSkipUnusedItemSets ) )
{
return mpNode->getItemSetOfIgnorableChild( mbSkipUnusedItemSets );
}
- // <--
}
return pReturn;
}
@@ -368,10 +346,7 @@ namespace {
::rtl::OUString aString;
if( mpNode && mpNode->hasItemSet( false ) )
{
- // --> OD 2008-04-30 #i87808#
-// aString = StylePool::nameOf( pNode->getItemSet() );
aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() );
- // <--
}
return aString;
}
@@ -396,11 +371,10 @@ class StylePoolImpl
private:
std::map< const SfxItemSet*, Node > maRoot;
sal_Int32 mnCount;
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
SfxItemSet* mpIgnorableItems;
- // <--
public:
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
explicit StylePoolImpl( SfxItemSet* pIgnorableItems = 0 )
: maRoot(),
mnCount(0),
@@ -418,14 +392,12 @@ public:
{
delete mpIgnorableItems;
}
- // <--
StylePool::SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet );
- // --> OD 2008-03-07 #i86923#
+ // #i86923#
IStylePoolIteratorAccess* createIterator( bool bSkipUnusedItemSets = false,
bool bSkipIgnorableItems = false );
- // <--
sal_Int32 getCount() const { return mnCount; }
};
@@ -437,8 +409,7 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
const SfxPoolItem* pItem = aIter.GetCurItem();
// Every SfxPoolItem in the SfxItemSet causes a step deeper into the tree,
// a complete empty SfxItemSet would stay at the root node.
- // --> OD 2008-03-07 #i86923#
- // insert ignorable items to the tree leaves.
+ // #i86923# insert ignorable items to the tree leaves.
std::auto_ptr<SfxItemSet> pFoundIgnorableItems;
if ( mpIgnorableItems )
{
@@ -469,7 +440,6 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
pItem = aIgnorableItemsIter.NextItem();
}
}
- // <--
// Every leaf node represents an inserted item set, but "non-leaf" nodes represents subsets
// of inserted itemsets.
// These nodes could have but does not need to have a shared_ptr to a item set.
@@ -505,37 +475,30 @@ StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet&
return pCurNode->getItemSet();
}
-// --> OD 2008-03-07 #i86923#
+// #i86923#
IStylePoolIteratorAccess* StylePoolImpl::createIterator( bool bSkipUnusedItemSets,
bool bSkipIgnorableItems )
{
return new Iterator( maRoot, bSkipUnusedItemSets, bSkipIgnorableItems );
}
-// <--
-
// Ctor, Dtor and redirected methods of class StylePool, nearly inline ;-)
-// --> OD 2008-03-07 #i86923#
+// #i86923#
StylePool::StylePool( SfxItemSet* pIgnorableItems )
: pImpl( new StylePoolImpl( pIgnorableItems ) )
{}
-// <--
StylePool::SfxItemSet_Pointer_t StylePool::insertItemSet( const SfxItemSet& rSet )
{ return pImpl->insertItemSet( rSet ); }
-// --> OD 2008-03-11 #i86923#
+// #i86923#
IStylePoolIteratorAccess* StylePool::createIterator( const bool bSkipUnusedItemSets,
const bool bSkipIgnorableItems )
{
return pImpl->createIterator( bSkipUnusedItemSets, bSkipIgnorableItems );
}
-// <--
sal_Int32 StylePool::getCount() const
{ return pImpl->getCount(); }
StylePool::~StylePool() { delete pImpl; }
-
-// End of class StylePool
-
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 1cf7fe8..b691088 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 ff88a20..3b797ee 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 f22694c..f0065a9 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 c71c1f5..4bb7c34 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;
}
More information about the ooo-build-commit
mailing list