diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-08 22:48:57 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-08 22:48:57 +0200 |
| commit | 398129e2410c6a43f459cb9089138b9fa0932252 (patch) | |
| tree | 567dd274ad77b03615fec5164d143d917e2352b6 | |
| parent | a27d2d7afd8c7b70a1548617fa6fcef02953a43a (diff) | |
| parent | 3f04560a2a180c00a5a3f99b222eea86af7d2fba (diff) | |
Merge branch 'master' of ssh://pmladek@git.freedesktop.org/git/libreoffice/libs-gui
54 files changed, 171 insertions, 221 deletions
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx index 41d5bfb4f32f..f9944b7db5d3 100644 --- a/dtrans/source/test/test_dtrans.cxx +++ b/dtrans/source/test/test_dtrans.cxx @@ -54,10 +54,6 @@ #include <stdio.h> #include <string.h> -//#include <memory> - -//#include <process.h> - //------------------------------------------------------------------------ // my defines //------------------------------------------------------------------------ diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx index 2ed1b1b956bb..fd85ffa804a5 100644 --- a/dtrans/test/win32/dnd/atlwindow.cxx +++ b/dtrans/test/win32/dnd/atlwindow.cxx @@ -40,7 +40,6 @@ #include "atlwindow.hxx" #include "targetlistener.hxx" #include "sourcelistener.hxx" -//#include "transferable.hxx" #include <map> #include <winbase.h> diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx index e1a96598da62..77dae4f9e076 100644 --- a/dtrans/test/win32/dnd/dndTest.cxx +++ b/dtrans/test/win32/dnd/dndTest.cxx @@ -50,10 +50,8 @@ CComModule _Module; #include <com/sun/star/lang/XComponent.hpp> #include <rtl/process.h> #include <cppuhelper/servicefactory.hxx> -//#include "transferable.hxx" #include "sourcelistener.hxx" - #include "atlwindow.hxx" BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx index a9509f497ab1..f7d891799122 100644 --- a/dtrans/test/win32/dnd/transferable.hxx +++ b/dtrans/test/win32/dnd/transferable.hxx @@ -27,17 +27,6 @@ #ifndef _TRANSFERABLE_HXX_ #define _TRANSFERABLE_HXX_ -//_________________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________________ - - -//#include "..\ImplHelper.hxx" - -//_________________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________________ - #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> diff --git a/l10ntools/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx index 9c59083bf038..8b23f03e0caa 100644 --- a/l10ntools/source/help/compilehelp.hxx +++ b/l10ntools/source/help/compilehelp.hxx @@ -37,8 +37,6 @@ #endif #define HELPLINKER_DLLPRIVATE SAL_DLLPRIVATE - -//#include <helplinkerdllapi.h> #include <rtl/ustring.hxx> enum HelpProcessingErrorClass diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 15cb1e311002..1f433a7f98c1 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -43,7 +43,6 @@ #include "rtl/strbuf.hxx" #ifdef WNT #include <direct.h> -//#include <WinBase.h> #include "tools/prewin.h" #include <windows.h> #include "tools/postwin.h" diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index aaf6cf84b359..a35eced63b3f 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -29,7 +29,6 @@ #define _SAX_ATTRLISTIMPL_HXX #include "sal/config.h" -//#include "sax/saxdllapi.h" #include <cppuhelper/implbase2.hxx> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 1a4cc9278e1e..d37367eb05df 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -25,9 +25,6 @@ * ************************************************************************/ -//#include <stdlib.h> -//#include <sal/alloca.h> - #include <boost/scoped_ptr.hpp> #include <osl/diagnose.h> diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index d0cc27b94b96..e54ab508ae62 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -223,7 +223,7 @@ class SVL_DLLPUBLIC SfxMiniRecordWriter protected: SvStream* _pStream; // <SvStream>, in dem der Record liegt UINT32 _nStartPos; // Start-Position des Gesamt-Records im Stream - FASTBOOL _bHeaderOk; /* TRUE, wenn der Header schon geschrieben ist; + bool _bHeaderOk; /* TRUE, wenn der Header schon geschrieben ist; bei DBG_UTIL wird SFX_BOOL_DONTCARE ver- wendet, um die Gr"o\se von Fix-Sized-Records zu pr"ufen. */ @@ -241,7 +241,7 @@ public: inline void Reset(); - UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); + UINT32 Close( bool bSeekToEndOfRec = true ); private: // not implementend, not allowed @@ -281,7 +281,7 @@ class SVL_DLLPUBLIC SfxMiniRecordReader protected: SvStream* _pStream; // <SvStream>, aus dem gelesen wird UINT32 _nEofRec; // Position direkt hinter dem Record - FASTBOOL _bSkipped; // TRUE: der Record wurde explizit geskippt + bool _bSkipped; // TRUE: der Record wurde explizit geskippt BYTE _nPreTag; // aus dem Header gelesenes Pre-Tag // Drei-Phasen-Ctor f"ur Subklassen @@ -292,7 +292,7 @@ protected: _bSkipped = FALSE; _nPreTag = nTag; } - inline FASTBOOL SetHeader_Impl( UINT32 nHeader ); + inline bool SetHeader_Impl( UINT32 nHeader ); // als ung"ultig markieren und zur"uck-seeken void SetInvalid_Impl( UINT32 nRecordStartPos ) @@ -309,7 +309,7 @@ public: inline ~SfxMiniRecordReader(); inline BYTE GetTag() const; - inline FASTBOOL IsValid() const; + inline bool IsValid() const; inline SvStream& operator*() const; @@ -374,7 +374,7 @@ public: inline void Reset(); - UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); + UINT32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -420,8 +420,8 @@ protected: SfxMiniRecordReader::Construct_Impl( pStream, SFX_REC_PRETAG_EXT ); } - FASTBOOL FindHeader_Impl( UINT16 nTypes, UINT16 nTag ); - FASTBOOL ReadHeader_Impl( USHORT nTypes ); + bool FindHeader_Impl( UINT16 nTypes, UINT16 nTag ); + bool ReadHeader_Impl( USHORT nTypes ); public: SfxSingleRecordReader( SvStream *pStream ); @@ -430,7 +430,7 @@ public: inline UINT16 GetTag() const; inline BYTE GetVersion() const; - inline FASTBOOL HasVersion( USHORT nVersion ) const; + inline bool HasVersion( USHORT nVersion ) const; }; //------------------------------------------------------------------------ @@ -505,7 +505,7 @@ public: inline void Reset(); - UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); + UINT32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -576,7 +576,7 @@ public: void NewContent(); - virtual UINT32 Close( FASTBOOL bSeekToEndOfRec = TRUE ); + virtual UINT32 Close( bool bSeekToEndOfRec = true ); }; //------------------------------------------------------------------------ @@ -676,17 +676,17 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader UINT16 _nContentTag; // Art-Kennung des aktuellen Contents BYTE _nContentVer; // Versions-Kennung des akt. Contents - FASTBOOL ReadHeader_Impl(); + bool ReadHeader_Impl(); public: SfxMultiRecordReader( SvStream *pStream ); SfxMultiRecordReader( SvStream *pStream, UINT16 nTag ); ~SfxMultiRecordReader(); - FASTBOOL GetContent(); + bool GetContent(); inline UINT16 GetContentTag(); inline BYTE GetContentVersion() const; - inline FASTBOOL HasContentVersion( USHORT nVersion ) const; + inline bool HasContentVersion( USHORT nVersion ) const; inline UINT32 ContentCount() const; }; @@ -835,7 +835,7 @@ inline BYTE SfxMiniRecordReader::GetTag() const //------------------------------------------------------------------------- -inline FASTBOOL SfxMiniRecordReader::IsValid() const +inline bool SfxMiniRecordReader::IsValid() const /* [Beschreibung] @@ -865,9 +865,9 @@ inline SvStream& SfxMiniRecordReader::operator*() const //========================================================================= -inline UINT32 SfxSingleRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) +inline UINT32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) -// siehe <SfxMiniRecordWriter::Close(FASTBOOL)> +// siehe <SfxMiniRecordWriter::Close(bool)> { UINT32 nRet = 0; @@ -931,7 +931,7 @@ inline BYTE SfxSingleRecordReader::GetVersion() const //------------------------------------------------------------------------- -inline FASTBOOL SfxSingleRecordReader::HasVersion( USHORT nVersion ) const +inline bool SfxSingleRecordReader::HasVersion( USHORT nVersion ) const /* [Beschreibung] @@ -1054,7 +1054,7 @@ inline BYTE SfxMultiRecordReader::GetContentVersion() const //------------------------------------------------------------------------- -inline FASTBOOL SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const +inline bool SfxMultiRecordReader::HasContentVersion( USHORT nVersion ) const /* [Beschreibung] diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index cbc6b7c4dd11..ec9c59cdc456 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -121,7 +121,7 @@ class SVL_DLLPUBLIC SfxItemPool SfxItemPool* pSecondary; SfxItemPool* pMaster; USHORT* _pPoolRanges; - FASTBOOL bPersistentRefCounts; + bool bPersistentRefCounts; private: // ObjectUser section @@ -140,15 +140,15 @@ private: inline USHORT GetIndex_Impl(USHORT nWhich) const; inline USHORT GetSize_Impl() const { return nEnd - nStart + 1; } - SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); - SVL_DLLPRIVATE FASTBOOL IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const; + SVL_DLLPRIVATE SvStream& Load1_Impl( SvStream &rStream ); + SVL_DLLPRIVATE bool IsItemFlag_Impl( USHORT nWhich, USHORT nFlag ) const; public: // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges void FillItemIdRanges_Impl( USHORT*& pWhichRanges ) const; const USHORT* GetFrozenIdRanges() const { return _pPoolRanges; } - FASTBOOL IsVer2_Impl() const; + bool IsVer2_Impl() const; #endif //--------------------------------------------------------------------- @@ -170,7 +170,7 @@ public: #ifndef TF_POOLABLE USHORT *pSlotIds = 0, #endif - FASTBOOL bLoadRefCounts = TRUE ); + bool bLoadRefCounts = true ); protected: virtual ~SfxItemPool(); public: @@ -202,11 +202,11 @@ public: virtual const SfxPoolItem& GetDefaultItem( USHORT nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, - FASTBOOL bDirect = FALSE, + bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - FASTBOOL StoreItem( SvStream &rStream, + bool StoreItem( SvStream &rStream, const SfxPoolItem &rItem, - FASTBOOL bDirect = FALSE ) const; + bool bDirect = false ) const; USHORT GetSurrogate(const SfxPoolItem *) const; const SfxPoolItem * GetItem(USHORT nWhich, USHORT nSurrogate) const; @@ -214,7 +214,7 @@ public: const SfxPoolItem* LoadSurrogate(SvStream& rStream, USHORT &rWhich, USHORT nSlotId, const SfxItemPool* pRefPool = 0 ); - FASTBOOL StoreSurrogate(SvStream& rStream, + bool StoreSurrogate(SvStream& rStream, const SfxPoolItem *pItem ) const; virtual SvStream & Load(SvStream &); @@ -225,11 +225,11 @@ public: USHORT GetFirstWhich() const { return nStart; } USHORT GetLastWhich() const { return nEnd; } - FASTBOOL IsInRange( USHORT nWhich ) const { + bool IsInRange( USHORT nWhich ) const { return nWhich >= nStart && nWhich <= nEnd; } - FASTBOOL IsInVersionsRange( USHORT nWhich ) const; - FASTBOOL IsInStoringRange( USHORT nWhich ) const; + bool IsInVersionsRange( USHORT nWhich ) const; + bool IsInStoringRange( USHORT nWhich ) const; void SetStoringRange( USHORT nFrom, USHORT nTo ); void SetSecondaryPool( SfxItemPool *pPool ); SfxItemPool* GetSecondaryPool() const { @@ -242,8 +242,8 @@ public: void Delete(); #ifdef TF_POOLABLE - FASTBOOL IsItemFlag( USHORT nWhich, USHORT nFlag ) const; - FASTBOOL IsItemFlag( const SfxPoolItem &rItem, USHORT nFlag ) const + bool IsItemFlag( USHORT nWhich, USHORT nFlag ) const; + bool IsItemFlag( const SfxPoolItem &rItem, USHORT nFlag ) const { return IsItemFlag( rItem.Which(), nFlag ); } void SetItemInfos( const SfxItemInfo *pInfos ) { pItemInfos = pInfos; } @@ -266,7 +266,7 @@ public: { return _nFileFormatVersion; } void SetFileFormatVersion( USHORT nFileFormatVersion ); USHORT GetLoadingVersion() const; - FASTBOOL IsCurrentVersionLoading() const; + bool IsCurrentVersionLoading() const; static int IsWhich(USHORT nId) { return nId && nId <= SFX_WHICH_MAX; } diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx index 30c4cc411fad..8d2abd0f8dbc 100644 --- a/svl/inc/svl/itemset.hxx +++ b/svl/inc/svl/itemset.hxx @@ -168,9 +168,9 @@ public: void MergeRange( USHORT nFrom, USHORT nTo ); const SfxItemSet* GetParent() const { return _pParent; } - virtual SvStream & Load( SvStream &, FASTBOOL bDirect = FALSE, + virtual SvStream & Load( SvStream &, bool bDirect = false, const SfxItemPool *pRefPool = 0 ); - virtual SvStream & Store( SvStream &, FASTBOOL bDirect = FALSE ) const; + virtual SvStream & Store( SvStream &, bool bDirect = false ) const; virtual int operator==(const SfxItemSet &) const; }; diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx index 5e7e792b61e7..98669ef02160 100644 --- a/svl/inc/svl/metitem.hxx +++ b/svl/inc/svl/metitem.hxx @@ -44,8 +44,8 @@ public: ~SfxMetricItem() { DBG_DTOR(SfxMetricItem, 0); } - virtual int ScaleMetrics( long lMult, long lDiv ); - virtual int HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ); + virtual bool HasMetrics() const; }; diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 78b6e909ed6c..31a8b4aa221d 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -228,8 +228,8 @@ public: const IntlWrapper * pIntlWrapper = 0 ) const; virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual int ScaleMetrics( long lMult, long lDiv ); - virtual int HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ); + virtual bool HasMetrics() const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 0d1b06be5d11..1f0d2cf14d5e 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -74,7 +74,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 ); UINT32 SfxMiniRecordWriter::Close ( - FASTBOOL bSeekToEndOfRec /* TRUE (default) + bool bSeekToEndOfRec /* TRUE (default) Der Stream wird an das Ende des Records positioniert. @@ -260,7 +260,7 @@ USHORT SfxMiniRecordReader::ScanRecordType //------------------------------------------------------------------------- -FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) +bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) /* [Beschreibung] @@ -272,7 +272,7 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) */ { - FASTBOOL bRet = TRUE; + bool bRet = true; // Record-Ende und Pre-Tag aus dem Header ermitteln _nEofRec = _pStream->Tell() + SFX_REC_OFS(nHeader); @@ -282,7 +282,7 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader ) if ( _nPreTag == SFX_REC_PRETAG_EOR ) { _pStream->SetError( ERRCODE_IO_WRONGFORMAT ); - bRet = FALSE; + bRet = true; } return bRet; } @@ -487,7 +487,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter //========================================================================= -inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) +inline bool SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) /* [Beschreibung] @@ -498,13 +498,13 @@ inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes ) */ { - FASTBOOL bRet; + bool bRet; // Basisklassen-Header einlesen UINT32 nHeader=0; *_pStream >> nHeader; if ( !SetHeader_Impl( nHeader ) ) - bRet = FALSE; + bRet = false; else { // eigenen Header einlesen @@ -561,7 +561,7 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, USHORT nTag ) //------------------------------------------------------------------------- -FASTBOOL SfxSingleRecordReader::FindHeader_Impl +bool SfxSingleRecordReader::FindHeader_Impl ( UINT16 nTypes, // arithm. Veroderung erlaubter Record-Typen UINT16 nTag // zu findende Record-Art-Kennung @@ -674,7 +674,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter //------------------------------------------------------------------------ -UINT32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) +UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) // siehe <SfxMiniRecordWriter> @@ -799,7 +799,7 @@ void SfxMultiVarRecordWriter::NewContent() //------------------------------------------------------------------------- -UINT32 SfxMultiVarRecordWriter::Close( FASTBOOL bSeekToEndOfRec ) +UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) // siehe <SfxMiniRecordWriter> @@ -872,7 +872,7 @@ void SfxMultiMixRecordWriter::NewContent //========================================================================= -FASTBOOL SfxMultiRecordReader::ReadHeader_Impl() +bool SfxMultiRecordReader::ReadHeader_Impl() /* [Beschreibung] @@ -963,7 +963,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader() //------------------------------------------------------------------------- -FASTBOOL SfxMultiRecordReader::GetContent() +bool SfxMultiRecordReader::GetContent() /* [Beschreibung] diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 70122a5b1998..aa16d3abdf2b 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -80,8 +80,8 @@ struct SfxItemPool_Impl USHORT nStoringStart, nStoringEnd; // zu speichernder Range BYTE nMajorVer, nMinorVer; // Pool selbst SfxMapUnit eDefMetric; - FASTBOOL bInSetItem; - FASTBOOL bStreaming; // in Load() bzw. Store() + bool bInSetItem; + bool bStreaming; // in Load() bzw. Store() SfxItemPool_Impl( USHORT nStart, USHORT nEnd ) : ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1]) diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 4729b5e1afd8..b76c9fede5d2 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -239,20 +239,20 @@ SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem): //============================================================================ // virtual -int SfxMetricItem::ScaleMetrics(long nMult, long nDiv) +bool SfxMetricItem::ScaleMetrics(long nMult, long nDiv) { BigInt aTheValue(GetValue()); aTheValue *= nMult; aTheValue += nDiv / 2; aTheValue /= nDiv; SetValue(aTheValue); - return 1; + return true; } //============================================================================ // virtual -int SfxMetricItem::HasMetrics() const +bool SfxMetricItem::HasMetrics() const { - return 1; + return true; } diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 5c5f106a1c36..3c721f0aa4d4 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -82,7 +82,7 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( USHORT nWhich ) const // ----------------------------------------------------------------------- -inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const +inline bool SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const { USHORT nItemFlag = pItemInfos[nPos]._nFlags; return nFlag == (nItemFlag & nFlag); @@ -90,7 +90,7 @@ inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const // ----------------------------------------------------------------------- -FASTBOOL SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const +bool SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const { for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pSecondary ) { @@ -126,7 +126,7 @@ SfxItemPool::SfxItemPool #ifndef TF_POOLABLE USHORT* pSlotIdArray, /* Zuordnung von Slot-Ids zu Which-Ids */ #endif - FASTBOOL bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ + bool bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */ ) /* [Beschreibung] @@ -187,7 +187,7 @@ SfxItemPool::SfxItemPool pImp->nInitRefCount = 1; pImp->nVerStart = nStart; pImp->nVerEnd = nEnd; - pImp->bInSetItem = FALSE; + pImp->bInSetItem = false; pImp->nStoringStart = nStartWhich; pImp->nStoringEnd = nEndWhich; @@ -246,7 +246,7 @@ SfxItemPool::SfxItemPool pImp->nInitRefCount = 1; pImp->nVerStart = rPool.pImp->nVerStart; pImp->nVerEnd = rPool.pImp->nVerEnd; - pImp->bInSetItem = FALSE; + pImp->bInSetItem = false; pImp->nStoringStart = nStart; pImp->nStoringEnd = nEnd; diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index a79e5195187a..5bb968fb46b0 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1501,7 +1501,7 @@ USHORT SfxItemSet::GetWhichByPos( USHORT nPos ) const SvStream &SfxItemSet::Store ( SvStream& rStream, // Zielstream f"ur normale Items - FASTBOOL bDirect // TRUE: Items direkt speicher, FALSE: Surrogate + bool bDirect // TRUE: Items direkt speicher, FALSE: Surrogate ) const /* [Beschreibung] @@ -1568,7 +1568,7 @@ SvStream &SfxItemSet::Load ( SvStream& rStream, // Stream, aus dem geladen werden soll - FASTBOOL bDirect, /* TRUE + bool bDirect, /* TRUE Items werden direkt aus dem Stream gelesen, nicht "uber Surrogate diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 6aeb64d76d1a..513ab49fe348 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -202,8 +202,10 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const SfxMultiMixRecordWriter aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS, 0 ); // erst Atomaren-Items und dann die Sets schreiben (wichtig beim Laden) - for ( pImp->bInSetItem = FALSE; pImp->bInSetItem <= TRUE && !rStream.GetError(); ++pImp->bInSetItem ) + for (int ft = 0 ; ft < 2 && !rStream.GetError(); ft++) { + pImp->bInSetItem = ft != 0; + SfxPoolItemArray_Impl **pArr = pImp->ppPoolItems; SfxPoolItem **ppDefItem = ppStaticDefaults; const USHORT nSize = GetSize_Impl(); @@ -274,7 +276,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const } } - pImp->bInSetItem = FALSE; + pImp->bInSetItem = false; } // die gesetzten Defaults speichern (Pool-Defaults) @@ -625,7 +627,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) } // Items laden - FASTBOOL bSecondaryLoaded = FALSE; + bool bSecondaryLoaded = false; long nSecondaryEnd = 0; { SfxMultiRecordReader aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS); @@ -664,7 +666,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // Sekund"arpool einlesen pSecondary->Load( rStream ); - bSecondaryLoaded = TRUE; + bSecondaryLoaded = true; nSecondaryEnd = rStream.Tell(); // zur"uck zu unseren eigenen Items @@ -817,7 +819,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) // Items laden rStream.Seek( nStartPos ); CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ITEMS ); - FASTBOOL bSecondaryLoaded = FALSE; + bool bSecondaryLoaded = false; long nSecondaryEnd = 0; USHORT nWhich, nSlot; while ( rStream >> nWhich, nWhich ) @@ -866,7 +868,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) // Sekund"arpool einlesen pSecondary->Load1_Impl( rStream ); - bSecondaryLoaded = TRUE; + bSecondaryLoaded = true; nSecondaryEnd = rStream.Tell(); // zur"uck zu unseren eigenen Items @@ -1090,7 +1092,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate // auf jeden Fall aufgel"ost werden. if ( !pRefPool ) pRefPool = this; - FASTBOOL bResolvable = pRefPool->GetName().Len() > 0; + bool bResolvable = pRefPool->GetName().Len() > 0; if ( !bResolvable ) { // Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId @@ -1153,7 +1155,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate //------------------------------------------------------------------------- -FASTBOOL SfxItemPool::StoreSurrogate +bool SfxItemPool::StoreSurrogate ( SvStream& rStream, const SfxPoolItem* pItem @@ -1166,7 +1168,7 @@ FASTBOOL SfxItemPool::StoreSurrogate [R"uckgabewert] - FASTBOOL TRUE + bool TRUE es wurde ein echtes Surrogat gespeichert, auch SFX_ITEMS_NULL bei 'pItem==0', SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT @@ -1181,7 +1183,7 @@ FASTBOOL SfxItemPool::StoreSurrogate { if ( pItem ) { - FASTBOOL bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); + bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE); rStream << ( bRealSurrogate ? GetSurrogate( pItem ) : (UINT16) SFX_ITEMS_DIRECT ); @@ -1227,7 +1229,7 @@ USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const // ----------------------------------------------------------------------- -FASTBOOL SfxItemPool::IsInStoringRange( USHORT nWhich ) const +bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const { return nWhich >= pImp->nStoringStart && nWhich <= pImp->nStoringEnd; @@ -1444,14 +1446,14 @@ USHORT SfxItemPool::GetNewWhich // ----------------------------------------------------------------------- -FASTBOOL SfxItemPool::IsInVersionsRange( USHORT nWhich ) const +bool SfxItemPool::IsInVersionsRange( USHORT nWhich ) const { return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd; } // ----------------------------------------------------------------------- -FASTBOOL SfxItemPool::IsCurrentVersionLoading() const +bool SfxItemPool::IsCurrentVersionLoading() const /* [Beschreibung] @@ -1542,7 +1544,7 @@ USHORT SfxItemPool::GetLoadingVersion() const //------------------------------------------------------------------------- -FASTBOOL SfxItemPool::IsVer2_Impl() const +bool SfxItemPool::IsVer2_Impl() const { return pMaster->pImp->nMajorVer >= 2; } @@ -1550,8 +1552,8 @@ FASTBOOL SfxItemPool::IsVer2_Impl() const //------------------------------------------------------------------------- -FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, - FASTBOOL bDirect ) const +bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, + bool bDirect ) const /* [Beschreibung] @@ -1576,7 +1578,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, [Querverweise] - <SfxItemPool::LoadItem(SvStream&,FASTBOOL)const> + <SfxItemPool::LoadItem(SvStream&,bool)const> */ { @@ -1616,7 +1618,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem, //------------------------------------------------------------------------- -const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect, +const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, const SfxItemPool *pRefPool ) // pRefPool==-1 => nicht putten! @@ -1649,7 +1651,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect, } // wird eine andere Version geladen? - FASTBOOL bCurVersion = pRefPool->IsCurrentVersionLoading(); + bool bCurVersion = pRefPool->IsCurrentVersionLoading(); if ( !bCurVersion ) // Which-Id auf neue Version mappen nWhich = pRefPool->GetNewWhich( nWhich ); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 325c99c40ce0..2544bd7b2b97 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -477,15 +477,15 @@ SfxItemHandle::~SfxItemHandle() } // ------------------------------------------------------------------------ -int SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ ) +bool SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ ) { - return 0; + return false; } // ------------------------------------------------------------------------ -int SfxPoolItem::HasMetrics() const +bool SfxPoolItem::HasMetrics() const { - return 0; + return false; } // ----------------------------------------------------------------------- diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 7343a0a9c0e6..ecaf708674df 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -30,7 +30,6 @@ #ifndef GCC #endif -// #include <math.h> #include <tools/debug.hxx> #include <unotools/charclass.hxx> #include <i18npool/mslangid.hxx> diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 97f06171a4fc..b91997a814a8 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -30,7 +30,6 @@ #include <stdio.h> #include <ctype.h> #include <float.h> -// #include <math.h> #include <errno.h> #include <stdlib.h> #include <tools/debug.hxx> diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx index c885bdb83de1..f4a816117a40 100644 --- a/svtools/inc/svtools/chartprettypainter.hxx +++ b/svtools/inc/svtools/chartprettypainter.hxx @@ -30,7 +30,6 @@ #include "svtools/svtdllapi.h" -//#include <svtools/embedhlp.hxx> #include <vcl/outdev.hxx> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svtools/inc/svtools/langhelp.hxx b/svtools/inc/svtools/langhelp.hxx index 038941828aa0..d91c03e4c395 100644 --- a/svtools/inc/svtools/langhelp.hxx +++ b/svtools/inc/svtools/langhelp.hxx @@ -1,27 +1,27 @@ -/************************************************************************* +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * - * Copyright 2010 Novell, Inc. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * OpenOffice.org - a multi-platform office productivity suite + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * This file is part of OpenOffice.org. + * The Initial Developer of the Original Code is + * Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * or later, as published by the Free Software Foundation. + * Contributor(s): Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ #ifndef _SVTOOLS_LANGHELP_HXX_ #define _SVTOOLS_LANGHELP_HXX_ diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx index a302b40d9d4b..93267a2c0287 100644 --- a/svtools/inc/svtools/parhtml.hxx +++ b/svtools/inc/svtools/parhtml.hxx @@ -256,7 +256,7 @@ public: // Mit Ausnahme des Falls, dass SwitchToUCS2==FALSE und // SVPAR_CS_DONTKNOW uebergeben wird muss der String mit zwei(!) // 0-Bytes an einer geraden(!) Position terminiert sein. - static FASTBOOL IsHTMLFormat( const sal_Char* pHeader, + static bool IsHTMLFormat( const sal_Char* pHeader, BOOL bSwitchToUCS2 = FALSE, rtl_TextEncoding eEnc=RTL_TEXTENCODING_DONTKNOW ); diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 86157c991cd5..d2e79ea74ef8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -129,21 +129,21 @@ public: String aRealRowCount; // zur Anzeige im VScrollBar RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode - FASTBOOL bInPaint; // TRUE while in Paint - FASTBOOL bInCommand; // TRUE while in Command - FASTBOOL bNoScrollBack; // nur vorwaerts scrollen - FASTBOOL bNoHScroll; // kein horizontaler Scrollbar - FASTBOOL bNoVScroll; // no vertical scrollbar - FASTBOOL bAutoHScroll; // autohide horizontaler Scrollbar - FASTBOOL bAutoVScroll; // autohide horizontaler Scrollbar - FASTBOOL bUpdateMode; // nicht SV-UpdateMode wegen Invalidate() - FASTBOOL bAutoSizeLastCol;// last column always fills up window - FASTBOOL bResizeOnPaint; // outstanding resize-event - FASTBOOL bUpdateOnUnlock; // Update() while locked - FASTBOOL bInUpdateScrollbars; // Rekursionsschutz - FASTBOOL bHadRecursion; // Rekursion war aufgetreten - FASTBOOL bOwnDataChangedHdl; // dont change colors in DataChanged - FASTBOOL bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently + bool bInPaint; // TRUE while in Paint + bool bInCommand; // TRUE while in Command + bool bNoScrollBack; // nur vorwaerts scrollen + bool bNoHScroll; // kein horizontaler Scrollbar + bool bNoVScroll; // no vertical scrollbar + bool bAutoHScroll; // autohide horizontaler Scrollbar + bool bAutoVScroll; // autohide horizontaler Scrollbar + bool bUpdateMode; // nicht SV-UpdateMode wegen Invalidate() + bool bAutoSizeLastCol; // last column always fills up window + bool bResizeOnPaint; // outstanding resize-event + bool bUpdateOnUnlock; // Update() while locked + bool bInUpdateScrollbars; // Rekursionsschutz + bool bHadRecursion; // Rekursion war aufgetreten + bool bOwnDataChangedHdl; // dont change colors in DataChanged + bool bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently USHORT nUpdateLock; // lock count, dont call Control::Update()! short nCursorHidden; // new conuter for DoHide/ShowCursor @@ -181,7 +181,7 @@ public: const String& GetRealRowCount() const { return aRealRowCount; } void SetUpdateMode( BOOL bMode ); - FASTBOOL GetUpdateMode() const { return bUpdateMode; } + bool GetUpdateMode() const { return bUpdateMode; } void EnterUpdateLock() { ++nUpdateLock; } void LeaveUpdateLock(); void Update(); diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx index 3b081ce2f520..ed05272d4f6f 100644 --- a/svtools/source/dialogs/property.cxx +++ b/svtools/source/dialogs/property.cxx @@ -32,15 +32,8 @@ #ifndef GCC #endif -//------------------------------------------------------------------ - -//#include "Svitems.hxx" - #include "property.hxx" -/* -#include "property.hrc" -#include "Scresid.hxx" -*/ + #define FRAME_OFFSET 4 diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index e175380244b3..faafc4a98d12 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -39,10 +39,6 @@ #include "sgvspln.hxx" #include <unotools/ucbstreamhelper.hxx> -//#if OSL_DEBUG_LEVEL > 1 -//#include "Debug.c" -//#endif - #define SWAPPOINT(p) { \ p.x=SWAPSHORT(p.x); \ p.y=SWAPSHORT(p.y); } diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 4a0be80b55be..ab131b4c1233 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -34,7 +34,6 @@ #include "sgffilt.hxx" #include "sgfbram.hxx" #include "sgvmain.hxx" -// #include "Debug.c" extern SgfFontLst* pSgfFonts; diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index bd5ab933ebc8..1fa433199b2b 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -32,7 +32,6 @@ #include <sysdep.hxx> #endif #include <string.h> -// #include <math.h> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <vcl/wrkwin.hxx> diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index cbda7f861273..6de51e023a26 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -1,27 +1,27 @@ -/************************************************************************* +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ * - * Copyright 2010 Novell, Inc. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * OpenOffice.org - a multi-platform office productivity suite + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * This file is part of OpenOffice.org. + * The Initial Developer of the Original Code is + * Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * or later, as published by the Free Software Foundation. + * Contributor(s): Thorsten Behrens <tbehrens@novell.com> * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index d1ff94572a99..f04648bbb03a 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -28,12 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -// include --------------------------------------------------------------- - #include <tools/shl.hxx> #include <tools/debug.hxx> -//#include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/DirectionProperty.hpp> #include <i18npool/lang.h> diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx index 3a235afcc61b..9e2195c02738 100644 --- a/svtools/source/plugapp/commtest.cxx +++ b/svtools/source/plugapp/commtest.cxx @@ -35,7 +35,6 @@ #include <tools/simplecm.hxx> #include "communi.hxx" #include "brooker.hxx" -//#include <tools/bcst.hxx> #include "commtest.hrc" diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index d11ee4208e80..a83921c58154 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1904,9 +1904,9 @@ int HTMLParser::FilterListing( int nToken ) return nToken; } -FASTBOOL HTMLParser::IsHTMLFormat( const sal_Char* pHeader, - BOOL bSwitchToUCS2, - rtl_TextEncoding eEnc ) +bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader, + BOOL bSwitchToUCS2, + rtl_TextEncoding eEnc ) { // Einer der folgenden regulaeren Ausdrucke muss sich auf den String // anwenden lassen, damit das Dok ein HTML-Dokument ist. diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 336830804a6f..0229374fcf49 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -37,7 +37,6 @@ #include <vcl/image.hxx> -//#include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index 62753a36136d..7a3f10c3a347 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -35,7 +35,6 @@ #include <cppuhelper/weak.hxx> #include <vos/mutex.hxx> -// #include <com/sun/star/awt/XTextConstraints.hpp> #include <com/sun/star/awt/XUnitConversion.hpp> class OutputDevice; diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx index 8b8c8bfc795c..fae9358bb1f4 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx @@ -29,7 +29,6 @@ #include "precompiled_toolkit.hxx" #include <com/sun/star/awt/grid/XGridColumnModel.hpp> #include <com/sun/star/awt/grid/XGridColumn.hpp> -//#include <com/sun/star/awt/grid/GridColumnEvent.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index 9b8df60521ae..71a9020932ac 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -26,7 +26,6 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -//#include "precompiled_toolkit.hxx" #include "precompiled_toolkit.hxx" #include <toolkit/helper/listenermultiplexer.hxx> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx index 9047e914a76d..c8acb125e993 100644 --- a/toolkit/workben/controls.cxx +++ b/toolkit/workben/controls.cxx @@ -43,7 +43,6 @@ #include <unoctrl.hxx> -// #include <unoctrl2.hxx> #include <svtools/unoiface.hxx> // InitExtToolkit diff --git a/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx index c5e54ba0ad47..08ead519933a 100644 --- a/tools/source/fsys/os2.hxx +++ b/tools/source/fsys/os2.hxx @@ -71,7 +71,6 @@ inline BOOL DRIVE_EXISTS( char c ) } #include <time.h> -//#include <datetime.hxx> inline Time MsDos2Time( FTIME* aTime ) { diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 6a3dcd2b7d28..114a920277fb 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -29,9 +29,6 @@ #include "precompiled_unotools.hxx" #include <i18npool/mslangid.hxx> #include <tools/debug.hxx> -#ifndef _INTN_HXX //autogen -//#include <tools/intn.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/SearchFlags.hdl> #include <com/sun/star/i18n/TransliterationModules.hpp> diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index 1fdd340c698e..9e0a23961e58 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -33,8 +33,6 @@ #include "keyboardfocuslistener.hxx" #include "aquavcltypes.h" -// #include <com/sun/star/accessibility/XAccessibleContext.hpp> - class AquaA11yFocusListener : public KeyboardFocusListener, public salhelper::ReferenceObject @@ -59,4 +57,4 @@ public: virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); }; -#endif // _AQUA11YFOCUSLISTENER_HXX_
\ No newline at end of file +#endif // _AQUA11YFOCUSLISTENER_HXX_ diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx index af1392ed4d4b..5f9794c11538 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/vcl/graphite_cache.hxx @@ -36,7 +36,6 @@ #define GRCACHE_REUSE_VECTORS 1 -//#include <rope> #include <hash_map> class TextSourceAdaptor; diff --git a/vcl/os2/inc/sallang.hxx b/vcl/os2/inc/sallang.hxx index 00caecd90eee..0c465a7acd65 100644 --- a/vcl/os2/inc/sallang.hxx +++ b/vcl/os2/inc/sallang.hxx @@ -28,7 +28,6 @@ #ifndef _SALLANG_HXX #define _SALLANG_HXX -//#include <tools/lang.hxx> #include <i18npool/mslangid.hxx> // -------------------- diff --git a/vcl/os2/source/app/salinfo.cxx b/vcl/os2/source/app/salinfo.cxx index e48aacd4c521..47c9b8b6297d 100644 --- a/vcl/os2/source/app/salinfo.cxx +++ b/vcl/os2/source/app/salinfo.cxx @@ -40,10 +40,6 @@ #include <rtl/ustrbuf.hxx> #include "vcl/window.hxx" -#ifndef _SV_SALGTYPE_HXX -//#include <salgtype.hxx> -#endif - #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer class Os2SalSystem : public SalSystem diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e503172eb2c6..71d063bed39d 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -140,7 +140,6 @@ namespace } -// #include <usr/refl.hxx> class Reflection; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index e0efb37c9444..748d4fae0b63 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -// #include <math.h> #include <limits.h> #include <tools/time.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ae226a595fac..469c6661d366 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -32,9 +32,6 @@ #include <vcl/salwtype.hxx> #include <vcl/salframe.hxx> #include <tools/debug.hxx> -#ifndef _INTN_HXX -//#include <tools/intn.hxx> -#endif #include <vcl/i18nhelp.hxx> #include <vcl/unohelp.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index c0399145b07c..fdc05745eeda 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -34,9 +34,6 @@ #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> -// #include <functional> -// #include <hash_map> - #include <stdio.h> #include <string.h> diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 4f32025e0d96..4cb54761892e 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -146,6 +146,8 @@ void KDEXLib::Init() Display* pDisp = QX11Info::display(); SalKDEDisplay *pSalDisplay = new SalKDEDisplay(pDisp); + m_pApplication->disp = pSalDisplay; + pInputMethod->CreateMethod( pDisp ); pInputMethod->AddConnectionWatch( pDisp, (void*)this ); pSalDisplay->SetInputMethod( pInputMethod ); diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx index ccd0b8463750..2cfb071e96ae 100644 --- a/vcl/unx/kde4/VCLKDEApplication.cxx +++ b/vcl/unx/kde4/VCLKDEApplication.cxx @@ -36,4 +36,17 @@ VCLKDEApplication::VCLKDEApplication() : KApplication() { + disp = 0; } + +bool VCLKDEApplication::x11EventFilter(XEvent* event) +{ + //if we have a display and the display consumes the event + //do not process the event in qt + if (disp && disp->Dispatch(event) > 0) + { + return true; + } + + return false; +}
\ No newline at end of file diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx index 838d43356e2b..2edfddd69a9c 100644 --- a/vcl/unx/kde4/VCLKDEApplication.hxx +++ b/vcl/unx/kde4/VCLKDEApplication.hxx @@ -46,4 +46,8 @@ class VCLKDEApplication : public KApplication VCLKDEApplication(); virtual void commitData(QSessionManager&) {}; -}; + + virtual bool x11EventFilter(XEvent* event); + + SalKDEDisplay* disp; +};
\ No newline at end of file diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx index 8d24e4098df4..b5afb8363fca 100644 --- a/vcl/unx/source/gdi/xrender_peer.cxx +++ b/vcl/unx/source/gdi/xrender_peer.cxx @@ -31,7 +31,7 @@ #include <stdio.h> #include <rtl/ustring.hxx> #include <osl/module.h> -//#include <osl/thread.h> + using namespace rtl; #include <xrender_peer.hxx> diff --git a/vos/source/socket.cxx b/vos/source/socket.cxx index c32faf17a4a5..0b222eb7034f 100644 --- a/vos/source/socket.cxx +++ b/vos/source/socket.cxx @@ -31,7 +31,6 @@ #include <osl/time.h> #include <vos/socket.hxx> #include <vos/diagnose.hxx> -//#include <osl/tools.h> using namespace vos; |