Skip to content

C
core
Kaydet (Commit) 3f9bf0a9 authored tarafından David Hobley's avatar David Hobley Kaydeden (comit) Cédric Bosdonnat
Dosyalara gözat
Seçenekler

More of OD style's comments removal

üst 44e3fb76
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 112 deletions
comphelper/inc/comphelper/TypeGeneration.hxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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 )
......
comphelper/source/property/TypeGeneration.cxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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;
......
l10ntools/source/cfglex.l
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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();
}
......
svl/inc/stylepool.hxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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.
......
svl/source/items/stylepool.cxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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
svtools/source/contnr/imivctl1.cxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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 );
......
svtools/source/contnr/svtreebx.cxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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 );
}
......
svtools/source/svhtml/parhtml.cxx
Dosyayı görüntüle @ 3f9bf0a9
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment