[Libreoffice-commits] .: l10ntools/inc l10ntools/source padmin/source rsc/inc rsc/source sot/source svl/inc svl/source svtools/inc svtools/source toolkit/inc toolkit/source tools/bootstrp tools/inc tools/source vcl/inc vcl/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Feb 19 08:29:19 PST 2011
l10ntools/inc/cfgmerge.hxx | 1
l10ntools/inc/export.hxx | 1
l10ntools/inc/tagtest.hxx | 3
l10ntools/inc/xmlparse.hxx | 1
l10ntools/source/gsicheck.cxx | 1
padmin/source/progress.cxx | 3
rsc/inc/rsclst.hxx | 1
rsc/inc/rsctools.hxx | 1
rsc/source/parser/rsclex.cxx | 15 ++--
rsc/source/parser/rscyacc.cxx | 3
rsc/source/tools/rscdef.cxx | 1
sot/source/base/filelist.cxx | 1
sot/source/sdstor/ucbstorage.cxx | 1
svl/inc/svl/slstitm.hxx | 2
svl/inc/svl/svdde.hxx | 2
svl/source/svdde/ddeimp.hxx | 13 ---
svtools/inc/ctrltool.hxx | 6 -
svtools/inc/svtools/treelist.hxx | 2
svtools/inc/taskbar.hxx | 1
svtools/source/control/headbar.cxx | 1
svtools/source/control/taskbar.cxx | 3
svtools/source/control/taskbox.cxx | 1
svtools/source/control/taskmisc.cxx | 3
svtools/source/control/taskstat.cxx | 1
svtools/source/control/valueimp.hxx | 1
svtools/source/control/valueset.cxx | 1
svtools/source/edit/textdat2.hxx | 3
svtools/source/edit/textdoc.hxx | 3
svtools/source/graphic/grfcache.hxx | 41 +++++------
toolkit/inc/pch/precompiled_toolkit.hxx | 3
toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx | 1
toolkit/source/controls/dialogcontrol.cxx | 1
toolkit/source/controls/unocontrolcontainer.cxx | 1
tools/bootstrp/rscdep.cxx | 1
tools/inc/bootstrp/mkcreate.hxx | 1
tools/inc/bootstrp/sstring.hxx | 1
tools/inc/tools/geninfo.hxx | 1
tools/inc/tools/globname.hxx | 2
tools/inc/tools/inetmime.hxx | 2
tools/inc/tools/inetmsg.hxx | 3
tools/inc/tools/multisel.hxx | 3
tools/inc/tools/ownlist.hxx | 2
tools/source/fsys/comdep.cxx | 3
tools/source/fsys/dirent.cxx | 4 -
tools/source/fsys/os2.cxx | 1
tools/source/fsys/tdir.cxx | 1
tools/source/fsys/unx.cxx | 1
tools/source/fsys/wntmsc.cxx | 1
vcl/inc/vcl/gdimtf.hxx | 18 ++---
vcl/inc/vcl/outfont.hxx | 5 -
vcl/source/window/menu.cxx | 1
vcl/source/window/toolbox.cxx | 59 ++++++++---------
vcl/source/window/toolbox2.cxx | 1
53 files changed, 93 insertions(+), 141 deletions(-)
New commits:
commit 052d00a6e356a1731abef629e4be84319e60eeae
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Feb 19 08:29:03 2011 -0800
Some more #include <tools/list.hxx> cleanup
I basically removed them for everywhere and then added back in only the
ones required to get it to build.
I did a "make distclean" on Mac and it worked.
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index eaf4fc5..d68984e 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -30,7 +30,6 @@
#define _CFG_MERGE_HXX
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <boost/unordered_map.hpp>
#include <vector>
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 654d3c2..93c4c71 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -35,7 +35,6 @@
#endif
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <tools/stream.hxx>
#include <tools/fsys.hxx>
#include <osl/file.hxx>
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index ae4f916..2c0bf6a 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -30,7 +30,6 @@
#define _TAGTEST_HXX_
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <boost/unordered_map.hpp>
#include <vector>
@@ -242,7 +241,7 @@ public:
maList.clear();
}
- void insert( TokenInfo p, size_t nIndex = LIST_APPEND )
+ void insert( TokenInfo p, size_t nIndex = size_t(-1) )
{
if ( nIndex < maList.size() ) {
TokenListImpl::iterator it = maList.begin();
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 7adcc4c..6c8e85b 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -34,7 +34,6 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include "tools/string.hxx"
-#include "tools/list.hxx"
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include "tools/stream.hxx"
#include "tools/isofallback.hxx"
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index eb50168..d6f7e0a 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -31,7 +31,6 @@
#include <stdio.h>
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
-#include <tools/list.hxx>
// local includes
#include "tagtest.hxx"
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 7c6bea8..8d191d8 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,6 @@
#include <stdio.h>
#include <tools/string.hxx>
#include <tools/stream.hxx>
-#include <tools/list.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <progress.hxx>
diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index 97ad5c5..c6af57b 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.hxx
@@ -29,7 +29,6 @@
#ifndef _RSCLST_HXX
#define _RSCLST_HXX
-#include <tools/list.hxx>
#include <rscall.h>
class REResourceList;
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 55b5ead..b941189 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -36,7 +36,6 @@ class RscPtrPtr;
#endif
#include <stdio.h>
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <vector>
/******************* T y p e s *******************************************/
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index f1e0938..fbea2e3 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -49,6 +49,7 @@
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
+#include <tools/list.hxx>
using namespace rtl;
@@ -216,11 +217,11 @@ int MakeToken( YYSTYPE * pTokenVal ){
if( InvalidAtom != nHashId )
{
KEY_STRUCT aKey;
-
+
// Suche nach dem Schluesselwort
if( pTC->aNmTb.Get( nHashId, &aKey ) )
{
-
+
// Schluesselwort gefunden
switch( aKey.nTyp )
{
@@ -242,7 +243,7 @@ int MakeToken( YYSTYPE * pTokenVal ){
default:
pTokenVal->value = aKey.yylval;
};
-
+
return( aKey.nTyp );
}
else
@@ -253,14 +254,14 @@ int MakeToken( YYSTYPE * pTokenVal ){
}
else{ // Symbol
RscDefine * pDef;
-
+
pDef = pTC->aFileTab.FindDef( aBuf.getStr() );
if( pDef ){
pTokenVal->defineele = pDef;
-
+
return( RSCDEFINE );
}
-
+
pTokenVal->string = const_cast<char*>(pStringContainer->putString( aBuf.getStr() ));
return( SYMBOL );
}
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index dad6601..61b17b0 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -33,6 +33,7 @@
#include <string.h>
#include <tools/rc.h>
+#include <tools/list.hxx>
#include <rscerror.h>
#include <rsctools.hxx>
#include <rscclass.hxx>
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 0eb7849..fa43192 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -32,6 +32,7 @@
// Programmuebergreifende Includes.
#include <rscdef.hxx>
+#include <tools/list.hxx>
/****************** C o d e **********************************************/
/****************** R s c I d ********************************************/
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index b1691e5..65be91d 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sot.hxx"
-#include <tools/list.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <tools/rtti.hxx>
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index f1143e8..9dd4af0 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -60,7 +60,6 @@
#include <unotools/streamwrap.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/localfilehelper.hxx>
-#include <tools/list.hxx>
#include <tools/urlobj.hxx>
#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index a58bf95..aaec612 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index d5832e0..b7b300f 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index dd54802..15b12c0 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,17 +47,8 @@
#include <postwin.h>
#include "ddewrap.hxx"
-/*
-extern "C"
-{
-#define BOOL WIN_BOOL
-#define BYTE WIN_BYTE
-#undef BOOL
-#undef BYTE
-};
-*/
-
#endif
+
#include <tools/string.hxx>
#include <tools/list.hxx>
#include <tools/shl.hxx>
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx
index ee85ae1..6c7e207 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/ctrltool.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,9 +30,9 @@
#define _CTRLTOOL_HXX
#include "svtools/svtdllapi.h"
+#include <tools/list.hxx>
#include <sal/types.h>
-#include <tools/list.hxx>
#include <vcl/metric.hxx>
class ImplFontListNameInfo;
@@ -185,7 +185,7 @@ public:
~FontList();
FontList* Clone() const;
-
+
OutputDevice* GetDevice() const { return mpDev; }
OutputDevice* GetDevice2() const { return mpDev2; }
XubString GetFontMapText( const FontInfo& rInfo ) const;
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 3b308dc..cbabb2c 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index 3c80ab0..129ccf7 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.hxx
@@ -31,7 +31,6 @@
#include "svtools/svtdllapi.h"
#include <tools/time.hxx>
-#include <tools/list.hxx>
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/status.hxx>
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 78c5ad0..ed8201a 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -32,7 +32,6 @@
#define _SV_HEADBAR_CXX
#include <svtools/headbar.hxx>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index 6995ce4..fa85c77 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#define _TASKBAR_CXX
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <vcl/floatwin.hxx>
diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx
index 30bc76d..21cf187 100644
--- a/svtools/source/control/taskbox.cxx
+++ b/svtools/source/control/taskbox.cxx
@@ -31,7 +31,6 @@
#define _TASKBAR_CXX
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <vcl/image.hxx>
#include <vcl/help.hxx>
diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index f293ffe..04a26b0 100644
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#define _TASKBAR_CXX
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <vcl/help.hxx>
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index c3f8d4d..03c5199 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -31,7 +31,6 @@
#define _TASKBAR_CXX
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <tools/date.hxx>
#include <vcl/image.hxx>
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index 20e600f..24b37aa 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <osl/mutex.hxx>
-#include <tools/list.hxx>
#include <tools/color.hxx>
#include <tools/string.hxx>
#include <vcl/image.hxx>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 680c951..2057658 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <vcl/decoview.hxx>
#include <vcl/svapp.hxx>
diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx
index 414d435..97675fb 100644
--- a/svtools/source/edit/textdat2.hxx
+++ b/svtools/source/edit/textdat2.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#define _TEXTDAT2_HXX
#include <svl/svarray.hxx>
-#include <tools/list.hxx>
#include <vcl/seleng.hxx>
#include <vcl/virdev.hxx>
#include <vcl/cursor.hxx>
diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index f816487..28154df 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,7 +35,6 @@
#include <tools/debug.hxx>
#include <tools/string.hxx>
-#include <tools/list.hxx>
typedef TextCharAttrib* TextCharAttribPtr;
SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0, 4 )
diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index ecf2cf1..a36b887 100644
--- a/svtools/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,6 @@
#ifndef _GRFCACHE_HXX
#define _GRFCACHE_HXX
-#include <tools/list.hxx>
#include <vcl/graph.hxx>
#include <vcl/timer.hxx>
#include <svtools/grfmgr.hxx>
@@ -58,17 +57,17 @@ private:
DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer );
-
-public:
-
+
+public:
+
GraphicCache( GraphicManager& rMgr,
- ULONG nDisplayCacheSize = 10000000UL,
+ ULONG nDisplayCacheSize = 10000000UL,
ULONG nMaxObjDisplayCacheSize = 2400000UL );
~GraphicCache();
-
-public:
-
- void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute,
+
+public:
+
+ void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute,
const ByteString* pID, const GraphicObject* pCopyObj );
void ReleaseGraphicObject( const GraphicObject& rObj );
@@ -77,33 +76,33 @@ public:
void GraphicObjectWasSwappedIn( const GraphicObject& rObj );
ByteString GetUniqueID( const GraphicObject& rObj ) const;
-
-public:
-
+
+public:
+
void SetMaxDisplayCacheSize( ULONG nNewCacheSize );
ULONG GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; };
-
+
void SetMaxObjDisplayCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE );
ULONG GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; }
-
+
ULONG GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; }
ULONG GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); }
void SetCacheTimeout( ULONG nTimeoutSeconds );
ULONG GetCacheTimeout() const { return mnReleaseTimeoutSeconds; }
-
+
void ClearDisplayCache();
- BOOL IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ BOOL IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
- BOOL IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ BOOL IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr ) const;
- BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr,
const BitmapEx& rBmpEx );
- BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr,
const GDIMetaFile& rMtf );
- BOOL DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+ BOOL DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicObject& rObj, const GraphicAttr& rAttr );
};
diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx
index 93d2c90..2a078fe 100644
--- a/toolkit/inc/pch/precompiled_toolkit.hxx
+++ b/toolkit/inc/pch/precompiled_toolkit.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -303,7 +303,6 @@
#include "tools/diagnose_ex.h"
#include "tools/gen.hxx"
#include "tools/link.hxx"
-#include "tools/list.hxx"
#include "tools/poly.hxx"
#include "tools/simplerm.hxx"
#include "tools/solar.h"
diff --git a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
index 162e9dd..40f6a29 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
@@ -41,7 +41,6 @@
#include <toolkit/helper/servicenames.hxx>
#include <osl/mutex.hxx>
-#include <tools/list.hxx>
#include <tools/gen.hxx>
#include <vector>
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index a0c47b1..9a604f4 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -49,7 +49,6 @@
#include <com/sun/star/awt/WindowAttribute.hpp>
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <tools/list.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index a7e13f8..0b88470 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -44,7 +44,6 @@
#include <comphelper/sequence.hxx>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 6635df8..163d928 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -40,7 +40,6 @@
#include "sal/main.h"
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx
index 48f8122..31cbfde 100644
--- a/tools/inc/bootstrp/mkcreate.hxx
+++ b/tools/inc/bootstrp/mkcreate.hxx
@@ -32,7 +32,6 @@
#include <tools/string.hxx>
#include "bootstrp/sstring.hxx"
-#include <tools/list.hxx>
#include "bootstrp/prj.hxx"
class SvStream;
diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx
index 10c42e5..2e8b9bc 100644
--- a/tools/inc/bootstrp/sstring.hxx
+++ b/tools/inc/bootstrp/sstring.hxx
@@ -30,7 +30,6 @@
#define _SSTRING_HXX
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <vector>
#define NOT_THERE LIST_ENTRY_NOTFOUND
diff --git a/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx
index 2b2ee68..c3d6034 100644
--- a/tools/inc/tools/geninfo.hxx
+++ b/tools/inc/tools/geninfo.hxx
@@ -31,7 +31,6 @@
#include "tools/toolsdllapi.h"
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <vector>
// forwards
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index 950b529..97fbce5 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 7ca43f0..51c6263 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index 24705ab..63af811 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,7 +34,6 @@
#include <rtl/textenc.h>
#include <tools/inetmime.hxx>
-#include <tools/list.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index ec3e5e4..09b7ad7 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -30,7 +30,6 @@
#include "tools/toolsdllapi.h"
#include <tools/gen.hxx>
-#include <tools/list.hxx>
#include <tools/string.hxx>
#include <vector>
@@ -40,7 +39,7 @@
typedef ::std::vector< Range* > ImpSelList;
-#define SFX_ENDOFSELECTION CONTAINER_ENTRY_NOTFOUND
+#define SFX_ENDOFSELECTION ULONG_MAX
//------------------------------------------------------------------
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
index 59d2a8a..bab5213 100644
--- a/tools/inc/tools/ownlist.hxx
+++ b/tools/inc/tools/ownlist.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/tools/source/fsys/comdep.cxx b/tools/source/fsys/comdep.cxx
index 2278e8d..1904e39 100644
--- a/tools/source/fsys/comdep.cxx
+++ b/tools/source/fsys/comdep.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#include "comdep.hxx"
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <tools/fsys.hxx>
DBG_NAMEEX( DirEntry )
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index b11c6cc..35cd762 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx"
-
#if !defined UNX
#include <io.h>
#include <process.h>
@@ -47,7 +46,6 @@
#include <stdio.h>
#include <string.h>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include "comdep.hxx"
#include <tools/fsys.hxx>
#define _TOOLS_HXX
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index 0bcf7d9..025351e 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.cxx
@@ -36,7 +36,6 @@
#include <malloc.h>
#endif
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <tools/bigint.hxx>
#include <tools/fsys.hxx>
#include "comdep.hxx"
diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index 5851310..6597008 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.cxx
@@ -35,7 +35,6 @@
#include <cstdarg>
#include <limits.h>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include "comdep.hxx"
#include <tools/fsys.hxx>
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index e488c84..a188722 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -59,7 +59,6 @@ struct mnttab
#endif
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <tools/fsys.hxx>
#include "comdep.hxx"
#include <rtl/instance.hxx>
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 2c9eae2..1b2d892 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -42,7 +42,6 @@
#include "wntmsc.hxx"
#include <tools/errinf.hxx>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
#include <tools/wldcrd.hxx>
#include <tools/fsys.hxx>
#include <tools/bigint.hxx>
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 4bf3d46..ad7acb6 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,8 +31,8 @@
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
-#include <tools/list.hxx>
#include <tools/link.hxx>
+#include <tools/list.hxx>
#include <tools/string.hxx>
#include <vcl/mapmod.hxx>
@@ -121,16 +121,16 @@ private:
SAL_DLLPRIVATE static Color ImplColReplaceFnc( const Color& rColor, const void* pColParam );
SAL_DLLPRIVATE static BitmapEx ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBmpParam );
- SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam,
+ SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam,
BmpExchangeFnc pFncBmp, const void* pBmpParam );
- SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt,
+ SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
+ SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE PolyPolygon ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt,
+ SAL_DLLPRIVATE PolyPolygon ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt,
const Size& rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf,
+ SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf,
const OutputDevice& rMapDev,
const PolyPolygon& rPolyPoly,
const Gradient& rGrad );
@@ -174,11 +174,11 @@ public:
Rectangle GetBoundRect( OutputDevice& i_rReference );
void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0,
- short nChannelRPercent = 0, short nChannelGPercent = 0,
+ short nChannelRPercent = 0, short nChannelGPercent = 0,
short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE );
void Convert( MtfConversion eConversion );
void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 );
- void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors,
+ void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors,
ULONG nColorCount, ULONG* pTols = NULL );
GDIMetaFile GetMonochromeMtf( const Color& rCol ) const;
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index 6e9a44a..17492c1 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,6 @@
#define _SV_OUTFONT_HXX
#include <tools/string.hxx>
-#include <tools/list.hxx>
#include <i18npool/lang.h>
#include <tools/gen.hxx>
#include <tools/solar.h>
@@ -273,7 +272,7 @@ public:
void ImplInitAboveTextLineSize();
public: // TODO: hide members behind accessor methods
- // font instance attributes from the font request
+ // font instance attributes from the font request
long mnWidth; // Reference Width
short mnOrientation; // Rotation in 1/10 degrees
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 892d175..6fe3ccc 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -31,7 +31,6 @@
#include "svsys.h"
#include "vcl/salinst.hxx"
-#include "tools/list.hxx"
#include "tools/debug.hxx"
#include "tools/diagnose_ex.h"
#include "vcl/svdata.hxx"
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index ecd6505..1f8465c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,6 @@
#include <svsys.h>
#include <rtl/logfile.hxx>
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <tools/rc.h>
@@ -230,11 +229,11 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
ToolBoxItemBits nBits( pItem->mnBits & 0x300 );
if ( nBits & TIB_TEXTICON ) // item has custom setting
{
- tmpButtonType = BUTTON_SYMBOLTEXT;
+ tmpButtonType = BUTTON_SYMBOLTEXT;
if ( nBits == TIB_TEXT_ONLY )
- tmpButtonType = BUTTON_TEXT;
+ tmpButtonType = BUTTON_TEXT;
else if ( nBits == TIB_ICON_ONLY )
- tmpButtonType = BUTTON_SYMBOL;
+ tmpButtonType = BUTTON_SYMBOL;
}
return tmpButtonType;
}
@@ -317,7 +316,7 @@ static void ImplCheckUpdate( ToolBox *pThis )
// which would result in erasing the background only and not painting any items
// this must not be done when we're already in Paint()
- // this is only required for transparent toolbars (see ImplDrawTransparentBackground() )
+ // this is only required for transparent toolbars (see ImplDrawTransparentBackground() )
if( !pThis->IsBackground() && pThis->HasPaintEvent() && !pThis->IsInPaint() )
pThis->Update();
}
@@ -341,7 +340,7 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis )
Rectangle aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
ControlState nState = CTRL_STATE_ENABLED;
- bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ,
+ bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_VERT : PART_THUMB_HORZ,
aCtrlRegion, nState, aToolbarValue, rtl::OUString() );
}
@@ -555,7 +554,7 @@ BOOL ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & )
Rectangle aCtrlRegion( aPt, pThis->GetOutputSizePixel() );
ControlState nState = CTRL_STATE_ENABLED;
- return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
+ return pThis->DrawNativeControl( CTRL_TOOLBAR, pThis->mbHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
aCtrlRegion, nState, ImplControlValue(), rtl::OUString() );
}
@@ -567,7 +566,7 @@ void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegi
pThis->mpData->mbIsPaintLocked = true;
// send an invalidate to the first opaque parent and invalidate the whole hierarchy from there (noclipchildren)
- pThis->Invalidate( rRegion, INVALIDATE_UPDATE|INVALIDATE_NOCLIPCHILDREN );
+ pThis->Invalidate( rRegion, INVALIDATE_UPDATE|INVALIDATE_NOCLIPCHILDREN );
pThis->mpData->mbIsPaintLocked = bOldPaintLock;
}
@@ -581,7 +580,7 @@ void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion,
else
{
// use different color in popupmode
- pThis->DrawWallpaper( rRegion.GetBoundRect(),
+ pThis->DrawWallpaper( rRegion.GetBoundRect(),
Wallpaper( pThis->GetSettings().GetStyleSettings().GetFaceGradientColor() ) );
}
}
@@ -643,7 +642,7 @@ void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, BOOL bHighlight
// the background of non NWF buttons is painted in a constant color
// to have the same highlight color (transparency in DrawSelectionBackground())
// items with open popups will also painted using a constant color
- if( !pThis->mpData->mbNativeButtons &&
+ if( !pThis->mpData->mbNativeButtons &&
(bHighlight || ! (((Window*) pThis)->GetStyle() & WB_3DLOOK ) ) )
{
if( (((Window*) pThis)->GetStyle() & WB_3DLOOK ) )
@@ -1043,12 +1042,12 @@ USHORT ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
nLineHeight += TB_LINESPACING;
nToolSize += TB_LINESPACING;
}
-
+
// #i91917# always report at least one line
long nLines = nToolSize/nLineHeight;
if( nLines < 1 )
nLines = 1;
-
+
return static_cast<USHORT>(nLines);
}
@@ -1724,7 +1723,7 @@ void ToolBox::ImplLoadRes( const ResId& rResId )
ResMgr* pMgr = rResId.GetResMgr();
if( ! pMgr )
return;
-
+
DockingWindow::ImplLoadRes( rResId );
ULONG nObjMask;
@@ -1936,7 +1935,7 @@ BOOL ToolBox::ImplCalcItem()
mpData->mnMenuButtonWidth = TB_MENUBUTTON_SIZE;
}
}
-
+
// also calculate the area for comboboxes, drop down list boxes and spinfields
// as these are often inserted into toolboxes; set mnWinHeight to the
// greater of those values to prevent toolbar flickering (#i103385#)
@@ -1976,10 +1975,10 @@ BOOL ToolBox::ImplCalcItem()
if( aRect.GetHeight() > mnWinHeight )
mnWinHeight = aRect.GetHeight();
}
- }
-
+ }
+
if ( ! mpData->m_aItems.empty() )
- {
+ {
std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin();
while ( it != mpData->m_aItems.end() )
{
@@ -1999,7 +1998,7 @@ BOOL ToolBox::ImplCalcItem()
bText = FALSE;
else
bText = TRUE;
- ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting
+ ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting
if ( bImage || bText )
{
@@ -2090,7 +2089,7 @@ BOOL ToolBox::ImplCalcItem()
{
// add borders
ImplAddButtonBorder( it->maItemSize.Width(), it->maItemSize.Height(), mnOutStyle, mpData->mbNativeButtons );
-
+
if( it->meType == TOOLBOXITEM_BUTTON )
{
if( it->maItemSize.Width() < nMinWidth )
@@ -3469,7 +3468,7 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, USHORT highl
aControlValue.setTristateVal( bChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
- bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
+ bNativeOk = pThis->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
rRect, nState, aControlValue, rtl::OUString() );
}
@@ -3659,7 +3658,7 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
// determine what has to be drawn on the button: image, text or both
BOOL bImage;
BOOL bText;
- ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting
+ ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting
pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText );
// compute output values
@@ -3711,7 +3710,7 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
nImageOffX += (nBtnWidth-aImageSize.Width())/2;
nImageOffY += (nBtnHeight-aImageSize.Height())/2;
}
- if ( bHighlight || (pItem->meState == STATE_CHECK) )
+ if ( bHighlight || (pItem->meState == STATE_CHECK) )
{
if( bHasOpenPopup )
ImplDrawFloatwinBorder( pItem );
@@ -3949,7 +3948,7 @@ void ToolBox::ImplFloatControl( BOOL bStart, FloatingWindow* pFloatWindow )
// draw current item with highlight and keep old state
BOOL bWasKeyboardActivate = mpData->mbDropDownByKeyboard;
-
+
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
ImplDrawItem( mnCurPos, bWasKeyboardActivate ? 2 : 0 );
Deactivate();
@@ -3988,7 +3987,7 @@ void ToolBox::ShowLine( BOOL bNext )
mnCurLine = mnCurLine - delta;
else
mnCurLine = 1;
- }
+ }
}
else
{
@@ -4086,7 +4085,7 @@ BOOL ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, BOOL bCancel )
{
mpData->maDropdownTimer.Stop();
}
-
+
if ( mbDrag || mbSelection )
{
// Hier die MouseDaten setzen, wenn Selection-Modus, da dann kein
@@ -4779,7 +4778,7 @@ void ToolBox::Move()
// -----------------------------------------------------------------------
void ToolBox::Resize()
-{
+{
Size aSize = GetOutputSizePixel();
// #i31422# some WindowManagers send (0,0) sizes when
// switching virtual desktops - ignore this and avoid reformatting
@@ -4916,7 +4915,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
{
String aCommand = GetItemCommand( nItemId );
ULONG nHelpId = GetHelpId( nItemId );
-
+
if ( aCommand.Len() || nHelpId )
{
// Wenn eine Hilfe existiert, dann ausloesen
@@ -5414,7 +5413,7 @@ Size ToolBox::CalcWindowSizePixel( USHORT nCalcLines, WindowAlign eAlign ) const
USHORT ToolBox::ImplCountLineBreaks( const ToolBox *pThis )
{
USHORT nLines = 0;
-
+
std::vector< ImplToolItem >::const_iterator it = ((ToolBox*)pThis)->mpData->m_aItems.begin();
while ( it != ((ToolBox*)pThis)->mpData->m_aItems.end() )
{
@@ -5429,7 +5428,7 @@ Size ToolBox::CalcPopupWindowSizePixel() const
{
// count number of breaks and calc corresponding floating window size
USHORT nLines = ImplCountLineBreaks( this );
-
+
if( nLines )
++nLines; // add the first line
else
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ebceb02..acaca04 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -28,7 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include <tools/list.hxx>
#include <tools/debug.hxx>
#include <tools/rc.h>
More information about the Libreoffice-commits
mailing list