mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove visual noise from vcl

Browse Source 
Conflicts:
	vcl/source/app/settings.cxx
	vcl/source/window/dockmgr.cxx
	vcl/source/window/dockwin.cxx
	vcl/source/window/floatwin.cxx
	vcl/source/window/toolbox2.cxx

Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341
Reviewed-on: https://gerrit.libreoffice.org/8339
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms 2014-02-25 22:51:59 +01:00 committed by Caolán McNamara
parent 0fb3bdc5d3
commit d9f0af83b7
206 changed files with 1246 additions and 1280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/generic/app/geninst.cxx
View File

@ -27,9 +27,9 @@
#include "generic/geninst.h"
//
// SalYieldMutex
//
SalYieldMutex::SalYieldMutex()

4
vcl/generic/fontmanager/fontconfig.cxx
View File

@ -168,7 +168,7 @@ namespace
//See fdo#30729 for where an old opensymbol installed system-wide can
//clobber the new opensymbol installed locally
//
//See if this font is a duplicate with equal attributes which has already been
//inserted, or if it an older version of an inserted fonts. Depends on FcFontSet
//on being sorted with SortFont
@ -568,7 +568,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int,
//remove font, reuse index
//we want to remove unusable fonts here, in case there is a usable font
//which duplicates the properties of the unusable one
//
//not removing the unusable font will risk the usable font being rejected
//as a duplicate by isPreviouslyDuplicateOrObsoleted
lcl_FcFontSetRemove(pFSet, i--);

6
vcl/generic/fontmanager/fontsubst.cxx
View File

@ -34,9 +34,9 @@
#include <unotools/fontdefs.hxx>
#include <list>
// ===========================================================================
// platform specific font substitution hooks
// ===========================================================================
struct FontSelectPatternAttributesHash
{
@ -262,7 +262,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
return bHaveSubstitute;
}
// ===========================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

18
vcl/generic/glyphs/gcach_ftyp.cxx
View File

@ -112,9 +112,9 @@ static int nDefaultPrioEmbedded = 2;
static int nDefaultPrioAutoHint = 1;
static int nDefaultPrioAntiAlias = 1;
// =======================================================================
// FreetypeManager
// =======================================================================
FtFontFile::FtFontFile( const OString& rNativeFileName )
: maNativeFileName( rNativeFileName ),
@ -227,7 +227,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
}
#endif
// =======================================================================
FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic)
@ -379,7 +379,7 @@ void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList )
pFontList->Add( pFD );
}
// =======================================================================
FreetypeManager::FreetypeManager()
: mnMaxFontId( 0 )
@ -483,7 +483,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
return pNew;
}
// =======================================================================
ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA )
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
@ -501,9 +501,9 @@ ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) co
return pEntry;
}
// =======================================================================
// ServerFont
// =======================================================================
ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI )
: maGlyphList( 0),
@ -1729,7 +1729,7 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
{
const sal_uLong nScriptTag = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang
const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 );
pScriptHeader += 6; //###
pScriptHeader += 6;
if( (nScriptTag != nRequestedScript) && (nRequestedScript != 0) )
continue;
@ -1945,6 +1945,6 @@ GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const
}
#endif
// =======================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

10
vcl/generic/glyphs/gcach_ftyp.hxx
View File

@ -27,7 +27,7 @@
class GraphiteFaceWrapper;
#endif
// -----------------------------------------------------------------------
// FtFontFile has the responsibility that a font file is only mapped once.
// (#86621#) the old directly ft-managed solution caused it to be mapped
@ -55,7 +55,7 @@ private:
int mnLangBoost;
};
// -----------------------------------------------------------------------
// FtFontInfo corresponds to an unscaled font face
class FtFontInfo
@ -132,7 +132,7 @@ inline void FtFontInfo::CacheGlyphIndex( sal_UCS4 cChar, int nIndex ) const
(*mpGlyph2Char)[ nIndex ] = cChar;
}
// -----------------------------------------------------------------------
class FreetypeManager
{
@ -154,7 +154,7 @@ private:
sal_IntPtr mnMaxFontId;
};
// -----------------------------------------------------------------------
class ImplFTSFontData : public PhysicalFontFace
{
@ -174,7 +174,7 @@ public:
static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( IFTSFONT_MAGIC ); }
};
// -----------------------------------------------------------------------
#endif // INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX

10
vcl/generic/glyphs/gcach_layout.cxx
View File

@ -38,9 +38,9 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <comphelper/processfactory.hxx>
// =======================================================================
// layout implementation for ServerFont
// =======================================================================
ServerFontLayout::ServerFontLayout( ServerFont& rFont )
: mrServerFont( rFont )
@ -115,7 +115,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos
rArgs.NeedFallback(nGraphemeStartPos, nGraphemeEndPos, bRightToLeft);
}
// =======================================================================
std::ostream &operator <<(std::ostream& s, ServerFont* pFont)
{
@ -553,7 +553,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
return true;
}
// =======================================================================
ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
{
@ -564,6 +564,6 @@ ServerFontLayoutEngine* ServerFont::GetLayoutEngine()
return mpLayoutEngine;
}
// =======================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
vcl/generic/glyphs/graphite_serverfont.cxx
View File

@ -18,7 +18,7 @@
*/
// Header files
//
// Platform
#include <i18nlangtag/languagetag.hxx>
@ -41,9 +41,9 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId)
return .0f;
}
//
// An implementation of the GraphiteLayout interface to enable Graphite enabled fonts to be used.
//
GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont& rServerFont) throw()
: ServerFontLayout(rServerFont),

2
vcl/generic/glyphs/scrptrun.cxx
View File

@ -166,7 +166,7 @@ UBool ScriptRun::next()
int32_t pairIndex = getPairIndex(ch);
// Paired character handling:
//
// if it's an open character, push it onto the stack.
// if it's a close character, find the matching open on the
// stack, and use that script code. Any non-matching open

6
vcl/generic/print/genpspgraphics.cxx
View File

@ -348,7 +348,7 @@ bool GenPspGraphics::setClipRegion( const Region& i_rClip )
m_pPrinterGfx->EndSetClipRegion();
//m_pPrinterGfx->BeginSetClipRegion( i_rClip.GetRectCount() );
//
//ImplRegionInfo aInfo;
//long nX, nY, nW, nH;
//bool bRegionRect = i_rClip.ImplGetFirstRect(aInfo, nX, nY, nW, nH );
@ -562,7 +562,7 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert)
OSL_FAIL("Warning: PrinterGfx::Invert() not implemented");
}
//==========================================================================
class ImplPspFontData : public PhysicalFontFace
{
@ -593,7 +593,7 @@ ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) co
return pEntry;
}
//==========================================================================
class PspFontLayout : public GenericSalLayout
{

4
vcl/headless/svpgdi.cxx
View File

@ -60,7 +60,7 @@ rDevice
#endif
}
// ===========================================================================
#ifndef IOS
bool SvpSalGraphics::drawAlphaBitmap( const SalTwoRect&, const SalBitmap& /*rSourceBitmap*/, const SalBitmap& /*rAlphaBitmap*/ )
@ -284,7 +284,7 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox &aRange, SvpSalGraphi
// particularly galling if we render only to a small,
// well defined rectangular area inside one of these clip
// rectangles.
//
// ensureClipFor() or ensureClip() need to be called before
// real rendering. FIXME: we should prolly push this down to
// bitmapdevice instead.

12
vcl/inc/controldata.hxx
View File

@ -22,14 +22,14 @@
#include <vcl/controllayout.hxx>
//........................................................................
namespace vcl
{
//........................................................................
//====================================================================
//= ImplControlData
//====================================================================
struct ImplControlData
{
mutable ControlLayoutData* mpLayoutData;
@ -47,9 +47,9 @@ namespace vcl
}
};
//........................................................................
} // namespace vcl
//........................................................................
#endif // INCLUDED_VCL_INC_CONTROLDATA_HXX

6
vcl/inc/dndevdis.hxx
View File

@ -98,9 +98,9 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException);
};
//==================================================================================================
//
//==================================================================================================
#endif

6
vcl/inc/dndlcon.hxx
View File

@ -109,9 +109,9 @@ public:
};
//==================================================================================================
//
//==================================================================================================
#endif

20
vcl/inc/generic/glyphcache.hxx
View File

@ -62,7 +62,7 @@ namespace vcl
struct FontCapabilities;
}
// =======================================================================
class VCL_DLLPUBLIC GlyphCache
{
@ -110,7 +110,7 @@ private:
class FreetypeManager* mpFtManager;
};
// =======================================================================
class GlyphMetric
{
@ -136,7 +136,7 @@ private:
Size maSize;
};
// -----------------------------------------------------------------------
// the glyph specific data needed by a GlyphCachePeer is usually trivial,
// not attaching it to the corresponding GlyphData would be overkill;
@ -150,7 +150,7 @@ struct ExtGlyphData
ExtGlyphData() : meInfo(0), mpData(NULL) {}
};
// -----------------------------------------------------------------------
class GlyphData
{
@ -179,7 +179,7 @@ private:
mutable long mnLruValue;
};
// =======================================================================
class FtFontInfo;
@ -283,7 +283,7 @@ private:
ServerFontLayoutEngine* mpLayoutEngine;
};
// =======================================================================
// a class for cache entries for physical font instances that are based on serverfonts
class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry
@ -300,7 +300,7 @@ public:
void HandleFontOptions();
};
// =======================================================================
class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout
{
@ -323,7 +323,7 @@ public:
ServerFont& GetServerFont() const { return mrServerFont; }
};
// =======================================================================
class ServerFontLayoutEngine
{
@ -332,7 +332,7 @@ public:
virtual bool layout(ServerFontLayout&, ImplLayoutArgs&) = 0;
};
// =======================================================================
class GlyphCachePeer
{
@ -349,7 +349,7 @@ protected:
sal_Int32 mnBytesUsed;
};
// =======================================================================
class VCL_DLLPUBLIC RawBitmap
{

2
vcl/inc/graphite_layout.hxx
View File

@ -80,7 +80,7 @@ private:
// This class uses the SIL Graphite engine to provide complex text layout services to the VCL
// @author tse
//
class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout
{
public:

2
vcl/inc/graphite_serverfont.hxx
View File

@ -42,7 +42,7 @@ private:
// This class implments the server font specific parts.
// @author tse
//
class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout
{
private:

4
vcl/inc/helpwin.hxx
View File

@ -23,9 +23,9 @@
#include <vcl/floatwin.hxx>
#include <vcl/timer.hxx>
// ------------------
// - HelpTextWindow -
// ------------------
class HelpTextWindow : public FloatingWindow
{

26
vcl/inc/image.h
View File

@ -24,9 +24,9 @@
#include <boost/unordered_map.hpp>
// ----------------
// - ImplImageBmp -
// ----------------
class ImplImageBmp
{
@ -56,15 +56,15 @@ private: // prevent assignment and copy construction
void operator=( const ImplImageBmp& );
};
// --------------
// - ImageTypes -
// --------------
enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE };
// -----------------
// - ImplImageList -
// -----------------
struct ImageAryData
{
@ -84,7 +84,7 @@ struct ImageAryData
ImageAryData& operator=( const ImageAryData& rData );
};
// ------------------------------------------------------------------------------
struct ImplImageList
{
@ -107,9 +107,9 @@ struct ImplImageList
void RemoveImage( sal_uInt16 nPos );
};
// --------------------
// - ImplImageRefData -
// --------------------
struct ImplImageRefData
{
@ -122,9 +122,9 @@ struct ImplImageRefData
bool IsEqual( const ImplImageRefData& rData );
};
// ----------------
// - ImpImageData -
// ----------------
struct ImplImageData
{
@ -137,9 +137,9 @@ struct ImplImageData
bool IsEqual( const ImplImageData& rData );
};
// -------------
// - ImplImage -
// -------------
struct ImplImage
{

16
vcl/inc/impfont.hxx
View File

@ -29,9 +29,9 @@
#include <vcl/fntstyle.hxx>
#include <outfont.hxx>
// ------------
// - Impl_Font -
// ------------
typedef sal_uInt32 FontRefCount;
@ -86,9 +86,9 @@ private:
friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& );
};
// ------------------
// - ImplFontMetric -
// ------------------
class ImplFontMetric
{
@ -127,9 +127,9 @@ public:
bool operator==( const ImplFontMetric& ) const;
};
// ------------------
// - ImplFontOptions -
// ------------------
class ImplFontOptions
{
@ -163,9 +163,9 @@ public:
{ return NULL; }
};
// -------------------
// - ImplFontCharMap -
// -------------------
class CmapResult;

8
vcl/inc/impgraph.hxx
View File

@ -27,9 +27,9 @@
#include <vcl/graph.h>
#include <vcl/svgdata.hxx>
// ---------------
// - ImpSwapInfo -
// ---------------
struct ImpSwapInfo
{
@ -37,9 +37,9 @@ struct ImpSwapInfo
Size maPrefSize;
};
// --------------
// - ImpGraphic -
// --------------
class OutputDevice;
class GfxLink;

26
vcl/inc/impoct.hxx
View File

@ -22,9 +22,9 @@
#include "octree.hxx"
// ----------------
// - ImpErrorQuad -
// ----------------
class ImpErrorQuad
{
@ -59,7 +59,7 @@ public:
inline BitmapColor ImplGetColor();
};
// ------------------------------------------------------------------------
inline void ImpErrorQuad::operator=( const BitmapColor& rColor )
{
@ -68,7 +68,7 @@ inline void ImpErrorQuad::operator=( const BitmapColor& rColor )
nBlue = (long) rColor.GetBlue() << 5L;
}
// ------------------------------------------------------------------------
inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor )
{
@ -79,7 +79,7 @@ inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor )
return *this;
}
// ------------------------------------------------------------------------
inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad )
{
@ -88,7 +88,7 @@ inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue >> 4L );
}
// ------------------------------------------------------------------------
inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad )
{
@ -97,7 +97,7 @@ inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue * 3L >> 4L );
}
// ------------------------------------------------------------------------
inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad )
{
@ -106,7 +106,7 @@ inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue * 5L >> 4L );
}
// ------------------------------------------------------------------------
inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
{
@ -115,7 +115,7 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
nBlue += ( rErrQuad.nBlue *7L >> 4L );
}
// ------------------------------------------------------------------------
inline BitmapColor ImpErrorQuad::ImplGetColor()
{
@ -124,9 +124,9 @@ inline BitmapColor ImpErrorQuad::ImplGetColor()
(sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) );
}
// -------------
// - NodeCache -
// -------------
class ImpNodeCache
{
@ -141,7 +141,7 @@ public:
inline void ImplReleaseNode( OctreeNode* pNode );
};
// ------------------------------------------------------------------------
inline OctreeNode* ImpNodeCache::ImplGetFreeNode()
{
@ -160,7 +160,7 @@ inline OctreeNode* ImpNodeCache::ImplGetFreeNode()
return pNode;
}
// ------------------------------------------------------------------------
inline void ImpNodeCache::ImplReleaseNode( OctreeNode* pNode )
{

4
vcl/inc/osx/a11yfocustracker.hxx
View File

@ -34,9 +34,9 @@ class Window;
class ToolBox;
class DocumentFocusListener;
// ------------------------
// - AquaA11yFocusTracker -
// ------------------------
class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker>
{

4
vcl/inc/osx/a11ylistener.hxx
View File

@ -28,9 +28,9 @@
#include <set>
#include <com/sun/star/awt/Rectangle.hpp>
// -------------------------
// - AquaA11yEventListener -
// -------------------------
class AquaA11yEventListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >

4
vcl/inc/osx/keyboardfocuslistener.hxx
View File

@ -24,9 +24,9 @@
#include <rtl/ref.hxx>
// -------------------------
// - KeyboardFocusListener -
// -------------------------
class KeyboardFocusListener : public rtl::IReference
{

4
vcl/inc/osx/salframe.h
View File

@ -45,9 +45,9 @@ class AquaBlinker;
typedef struct SalFrame::SalPointerState SalPointerState;
// ----------------
// - AquaSalFrame -
// ----------------
class AquaSalFrame : public SalFrame
{

4
vcl/inc/osx/salobj.h
View File

@ -27,9 +27,9 @@ class AquaSalFrame;
class AquaSalObject;
// -----------------
// - SalObjectData -
// -----------------
struct SalObjectData
{

8
vcl/inc/osx/salprn.h
View File

@ -27,9 +27,9 @@
#include <boost/shared_array.hpp>
// ---------------------
// - AquaSalInfoPrinter -
// ---------------------
class AquaSalGraphics;
@ -116,9 +116,9 @@ class AquaSalInfoPrinter : public SalInfoPrinter
AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
};
// -----------------
// - AquaSalPrinter -
// -----------------
class AquaSalPrinter : public SalPrinter
{

4
vcl/inc/osx/salsys.h
View File

@ -24,9 +24,9 @@
#include <list>
// -----------------
// - SalSystemData -
// -----------------
class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
{

24
vcl/inc/outfont.hxx
View File

@ -45,9 +45,9 @@ class Size;
namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}}
// ----------------------
// - ImplFontAttributes -
// ----------------------
// device independent font properties
class ImplFontAttributes
@ -86,9 +86,9 @@ private:
bool mbSymbolFlag;
};
// -------------------------
// - ImplDevFontAttributes -
// -------------------------
// device dependent font properties
class ImplDevFontAttributes : public ImplFontAttributes
@ -110,9 +110,9 @@ public: // TODO: hide members behind accessor methods
bool mbEmbeddable; // true: the font can be embedded
};
// ----------------
// - PhysicalFontFace -
// ----------------
// TODO: no more direct access to members
// TODO: add reference counting
// TODO: get rid of height/width for scalable fonts
@ -202,9 +202,9 @@ public: // TODO: change to private
void copyAttributes(const FontSelectPatternAttributes &rAttributes);
};
// -------------------
// - ImplDevFontList -
// -------------------
// TODO: merge with ImplFontCache
// TODO: rename to LogicalFontManager
@ -267,9 +267,9 @@ private:
mutable int mnFallbackCount;
};
// -----------------------
// - ImplFontMetricData -
// -----------------------
class ImplFontMetricData : public ImplFontAttributes
{
@ -325,9 +325,9 @@ public: // TODO: hide members behind accessor methods
long mnDStrikeoutOffset2; // Offset of double strike-out to baseline
};
// -----------------
// - ImplFontEntry -
// ------------------
// TODO: rename ImplFontEntry to LogicalFontInstance
// TODO: allow sharing of metrics for related fonts

4
vcl/inc/quartz/salbmp.h
View File

@ -36,9 +36,9 @@
#include "salvd.hxx"
#include "salbmp.hxx"
// --------------
// - SalBitmap -
// --------------
struct BitmapBuffer;
class BitmapPalette;

8
vcl/inc/quartz/salgdi.h
View File

@ -121,10 +121,10 @@ private:
CFMutableDictionaryRef GetStyleDict( void ) const { return mpStyleDict; }
};
// ------------------
// - SystemFontList -
// TODO: move into cross-platform headers
// ------------------
class SystemFontList
{
public:
@ -147,9 +147,9 @@ private:
#ifdef MACOSX
// -------------------
// - AquaSalGraphics -
// -------------------
class AquaSalGraphics : public SalGraphics
{
friend class CTLayout;

4
vcl/inc/regionband.hxx
View File

@ -26,7 +26,7 @@
const char* ImplDbgTestRegionBand(const void*);
#endif
//////////////////////////////////////////////////////////////////////////////
class RegionBand
{
@ -80,5 +80,5 @@ public:
#endif // INCLUDED_VCL_INC_REGIONBAND_HXX
//////////////////////////////////////////////////////////////////////////////
//eof

4
vcl/inc/salgdi.hxx
View File

@ -53,9 +53,9 @@ namespace basegfx {
class B2DPolyPolygon;
}
// ---------------------
// - SalGraphics-Codes -
// ---------------------
#define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004)
#define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000)

4
vcl/inc/salobj.hxx
View File

@ -27,9 +27,9 @@
struct SystemEnvData;
// -------------------
// - SalObject-Types -
// -------------------
#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001)
#define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002)

12
vcl/inc/salptype.hxx
View File

@ -22,9 +22,9 @@
#include <tools/solar.h>
// --------------------
// - SalJobSetupFlags -
// --------------------
#define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001)
#define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002)
@ -35,16 +35,16 @@
SAL_JOBSET_PAPERSIZE |\
SAL_JOBSET_DUPLEXMODE)
// -------------------
// - SalPrinterError -
// -------------------
#define SAL_PRINTER_ERROR_GENERALERROR 1
#define SAL_PRINTER_ERROR_ABORT 2
// -------------------
// - SalPrinterProcs -
// -------------------
class SalPrinter;
typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter );

24
vcl/inc/salwtype.hxx
View File

@ -31,9 +31,9 @@ class Window;
class FontSelectPattern;
// ------------
// - SalEvent -
// ------------
#define SALEVENT_MOUSEMOVE ((sal_uInt16)1)
#define SALEVENT_MOUSELEAVE ((sal_uInt16)2)
@ -234,32 +234,32 @@ struct SalQueryCharPositionEvent
long mnCursorBoundHeight; // The cursor bounds corresponding to the character specified by mnCharPos - Height
};
// ------------------
// - SalFrame-Types -
// ------------------
typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame,
sal_uInt16 nEvent, const void* pEvent );
// --------------------
// - SalObject-Events -
// --------------------
#define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1)
#define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2)
#define SALOBJ_EVENT_TOTOP ((sal_uInt16)3)
#define SALOBJ_EVENT_COUNT ((sal_uInt16)4)
// ------------------
// - SalObject-Types -
// ------------------
typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject,
sal_uInt16 nEvent, const void* pEvent );
// -----------------
// - SalFrameState -
// -----------------
struct SalFrameState
{
@ -275,9 +275,9 @@ struct SalFrameState
sal_uLong mnState;
};
// -------------------
// - SalInputContext -
// -------------------
// Have to match DEFINEs in inputctx.hxx, as these are not converted
#define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001)

2
vcl/inc/unx/gtk/gtkframe.hxx
View File

@ -75,7 +75,7 @@ class GtkSalFrame : public SalFrame
struct IMHandler
{
//--------------------------------------------------------
// Not all GTK Input Methods swallow key release
// events. Since they swallow the key press events and we
// are left with the key release events, we need to

12
vcl/inc/unx/salbmp.h
View File

@ -34,9 +34,9 @@ class SalGraphics;
class ImplSalDDB;
class ImplSalBitmapCache;
// -------------
// - SalBitmap -
// -------------
class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap
{
@ -149,9 +149,9 @@ public:
virtual bool GetSystemData( BitmapSystemData& rData );
};
// --------------
// - ImplSalDDB -
// --------------
class ImplSalDDB
{
@ -219,9 +219,9 @@ public:
) const;
};
// ----------------------
// - ImplSalBitmapCache -
// ----------------------
struct ImplBmpObj;

2
vcl/inc/unx/saldisp.hxx
View File

@ -62,7 +62,7 @@ namespace vcl_sal { class WMAdaptor; }
#define PROPERTY_DEFAULT 0x00000FCB
// ------------------------------------------------------------------------
// server vendor
typedef enum {

6
vcl/inc/win/salbmp.h
View File

@ -25,9 +25,9 @@
#include <salbmp.hxx>
#include <boost/shared_ptr.hpp>
// --------------
// - SalBitmap -
// --------------
struct BitmapBuffer;
class BitmapColor;
@ -48,7 +48,7 @@ private:
// the buffered evtl. used Gdiplus::Bitmap instance. It is managed by
// GdiPlusBuffer. To make this safe, it is only handed out as shared
// pointer; the GdiPlusBuffer may delete the local instance.
//
// mpAssociatedAlpha holds the last WinSalBitmap used to construct an
// evtl. buffered GdiPlusBmp. This is needed since the GdiPlusBmp is a single
// instance and remembered only on the content-WinSalBitmap, not on the

4
vcl/inc/win/salframe.h
View File

@ -25,9 +25,9 @@
class WinSalGraphics;
// ----------------
// - WinSalFrame -
// ----------------
class WinSalFrame : public SalFrame
{

4
vcl/inc/win/salobj.h
View File

@ -22,9 +22,9 @@
#include <salobj.hxx>
// -----------------
// - SalObjectData -
// -----------------
class WinSalObject : public SalObject
{

12
vcl/inc/win/salprn.h
View File

@ -22,9 +22,9 @@
#include <salprn.hxx>
// -----------------
// - SalDriverData -
// -----------------
// WNT3
#define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433)
@ -40,9 +40,9 @@ struct SalDriverData
#pragma pack()
// ---------------------
// - WinSalInfoPrinter -
// ---------------------
class WinSalGraphics;
@ -75,9 +75,9 @@ public:
virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData );
};
// -----------------
// - WinSalPrinter -
// -----------------
class WinSalPrinter : public SalPrinter
{

4
vcl/inc/win/salvd.h
View File

@ -24,9 +24,9 @@
class WinSalGraphics;
// -----------------
// - SalVirDevData -
// -----------------
class WinSalVirtualDevice : public SalVirtualDevice
{

20
vcl/inc/win/wincomp.hxx
View File

@ -22,9 +22,9 @@
#include <string.h>
// ----------
// - Strict -
// ----------
// Anpassungen fuer TypeChecking
@ -173,9 +173,9 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
return (HINSTANCE)GetWindowLongPtr( hWnd, GWLP_HINSTANCE );
}
// ------------------------
// - ZMouse Erweiterungen -
// ------------------------
#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG"
@ -204,18 +204,18 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
#endif
// -----------------------------
// - SystemAgent Erweiterungen -
// -----------------------------
#define ENABLE_AGENT 1
#define DISABLE_AGENT 2
#define GET_AGENT_STATUS 3
typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
// ---------------------
// - 5.0-Erweiterungen -
// ---------------------
#ifndef COLOR_GRADIENTACTIVECAPTION
#define COLOR_GRADIENTACTIVECAPTION 27
@ -238,10 +238,10 @@ typedef int (APIENTRY* SysAgt_Enable_PROC)( int );
#define CS_DROPSHADOW 0x00020000
#endif
// -------------------------------------------------------
// MT 12/03: From winuser.h, only needed in salframe.cxx
// Better change salframe.cxx to include winuser.h
// -------------------------------------------------------
#define WS_EX_LAYERED 0x00080000

14
vcl/osx/DataFlavorMapping.cxx
View File

@ -147,7 +147,7 @@ namespace // private
} // namespace private
//###########################
/* A base class for other data provider.
*/
@ -185,7 +185,7 @@ DataProviderBaseImpl::~DataProviderBaseImpl()
}
}
//#################################
class UniDataProvider : public DataProviderBaseImpl
{
@ -238,7 +238,7 @@ Any UniDataProvider::getOOoData()
return oOOData;
}
//###########################
class ByteSequenceDataProvider : public DataProviderBaseImpl
{
@ -292,7 +292,7 @@ Any ByteSequenceDataProvider::getOOoData()
}
//###########################
class HTMLFormatDataProvider : public DataProviderBaseImpl
{
@ -357,7 +357,7 @@ Any HTMLFormatDataProvider::getOOoData()
return oOOData;
}
//###########################
class PNGDataProvider : public DataProviderBaseImpl
{
@ -423,7 +423,7 @@ Any PNGDataProvider::getOOoData()
return oOOData;
}
//######################
class FileListDataProvider : public DataProviderBaseImpl
{
@ -487,7 +487,7 @@ Any FileListDataProvider::getOOoData()
return oOOData;
}
//###########################
DataFlavorMapper::DataFlavorMapper()
{

2
vcl/osx/DataFlavorMapping.hxx
View File

@ -56,7 +56,7 @@ public:
typedef std::auto_ptr<DataProvider> DataProviderPtr_t;
//################################
class DataFlavorMapper

4
vcl/osx/HtmlFmtFlt.cxx
View File

@ -33,7 +33,7 @@ using namespace com::sun::star::uno;
// converts the openoffice text/html clipboard format to the HTML Format
// well known under MS Windows
// the MS HTML Format has a header before the real html data
//
// Version:1.0 Version number of the clipboard. Staring is 0.9
// StartHTML: Byte count from the beginning of the clipboard to the start
// of the context, or -1 if no context
@ -47,7 +47,7 @@ using namespace com::sun::star::uno;
// start of the selection
// EndSelection: Byte count from the beginning of the clipboard to the
// end of the selection
//
// StartSelection and EndSelection are optional
// The fragment should be preceded and followed by the HTML comments
// <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the

8
vcl/osx/OSXTransferable.hxx
View File

@ -49,9 +49,9 @@ public:
virtual ~OSXTransferable();
//------------------------------------------------------------------------
// XTransferable
//------------------------------------------------------------------------
virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
@ -62,9 +62,9 @@ public:
virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------------------------------
// Helper functions not part of the XTransferable interface
//------------------------------------------------------------------------
void initClipboardItemList();

20
vcl/osx/clipboard.hxx
View File

@ -86,9 +86,9 @@ public:
~AquaClipboard();
//------------------------------------------------
// XClipboard
//------------------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents()
throw( ::com::sun::star::uno::RuntimeException );
@ -100,16 +100,16 @@ public:
virtual OUString SAL_CALL getName()
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XClipboardEx
//------------------------------------------------
virtual sal_Int8 SAL_CALL getRenderingCapabilities()
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XClipboardNotifier
//------------------------------------------------
virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
throw( ::com::sun::star::uno::RuntimeException );
@ -117,15 +117,15 @@ public:
virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XFlushableClipboard
//------------------------------------------------
virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XServiceInfo
//------------------------------------------------
virtual OUString SAL_CALL getImplementationName()
throw(::com::sun::star::uno::RuntimeException);

4
vcl/osx/documentfocuslistener.hxx
View File

@ -28,9 +28,9 @@
#include <set>
// -------------------------
// - DocumentFocusListener -
// -------------------------
class DocumentFocusListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >

4
vcl/osx/salframe.cxx
View File

@ -54,11 +54,11 @@
using namespace std;
// =======================================================================
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
// =======================================================================
AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
mpNSWindow(nil),

6
vcl/osx/salinst.cxx
View File

@ -211,7 +211,7 @@ bool ImplSVMainHook( int * pnInit )
return TRUE; // indicate that ImplSVMainHook is implemented
}
// =======================================================================
void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
@ -268,7 +268,7 @@ void InitSalMain()
{
}
// =======================================================================
SalYieldMutex::SalYieldMutex()
{
@ -333,7 +333,7 @@ void ImplSalYieldMutexRelease()
pInst->mpSalYieldMutex->release();
}
// =======================================================================
SalInstance* CreateSalInstance()
{

8
vcl/osx/salmenu.cxx
View File

@ -203,7 +203,7 @@ static void initAppMenu()
}
}
// =======================================================================
SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu )
{
@ -236,7 +236,7 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem )
}
// =======================================================================
/*
@ -524,7 +524,7 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem )
bool AquaSalMenu::VisibleMenuBar()
{
// Enable/disable experimental native menus code?
//
// To disable native menus, set the environment variable AQUA_NATIVE_MENUS to FALSE
static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS");
@ -904,7 +904,7 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame
);
}
// =======================================================================
/*
* SalMenuItem

2
vcl/osx/salobj.cxx
View File

@ -24,7 +24,7 @@
#include "osx/salobj.h"
#include "osx/salframe.h"
// =======================================================================
AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
mpFrame( pFrame ),

4
vcl/osx/salprn.cxx
View File

@ -45,7 +45,7 @@ using namespace com::sun::star;
using namespace com::sun::star::beans;
// =======================================================================
AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
mpGraphics( 0 ),
@ -608,7 +608,7 @@ sal_uLong AquaSalInfoPrinter::GetErrorCode() const
return 0;
}
// =======================================================================
AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) :
mpInfoPrinter( i_pInfoPrinter )

2
vcl/osx/salsys.cxx
View File

@ -30,7 +30,7 @@
#include "svids.hrc"
// =======================================================================
AquaSalSystem::~AquaSalSystem()
{

2
vcl/osx/saltimer.cxx
View File

@ -24,7 +24,7 @@
#include "osx/salframe.h"
#include "osx/salinst.h"
// =======================================================================
NSTimer* AquaSalTimer::pRunningTimer = nil;
bool AquaSalTimer::bDispatchTimer = false;

2
vcl/qa/complex/memCheck/CheckMemoryUsage.java
View File

@ -371,7 +371,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
}
// -----------------------------------------------------------------------------
private class OfficeMemchecker
{

4
vcl/qa/cppunit/canvasbitmaptest.cxx
View File

@ -690,7 +690,7 @@ void CanvasBitmapTest::runTest()
static const sal_Int8 lcl_depths[]={1,4,8,16,24};
// Testing VclCanvasBitmap wrapper
// ===============================
for( unsigned int i=0; i<SAL_N_ELEMENTS(lcl_depths); ++i )
{
@ -764,7 +764,7 @@ void CanvasBitmapTest::runTest()
}
// Testing XBitmap import
// ======================
uno::Reference< rendering::XIntegerReadOnlyBitmap > xTestBmp(
new TestBitmap( geometry::IntegerSize2D(10,10), true ));

BIN
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg
View File

Binary file not shown.

10
vcl/quartz/ctfonts.cxx
View File

@ -36,7 +36,7 @@
#include "basegfx/polygon/b2dpolygon.hxx"
#include "basegfx/matrix/b2dhommatrix.hxx"
// =======================================================================
inline double toRadian(int nDegree)
{
@ -232,7 +232,7 @@ void CoreTextStyle::SetTextColor( const RGBAColor& rColor )
CFRelease( pCGColor);
}
// =======================================================================
PhysicalFontFace* CoreTextFontData::Clone( void ) const
{
@ -288,7 +288,7 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu
return (int)nByteLength;
}
// =======================================================================
ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFontEnabled )
{
@ -423,7 +423,7 @@ static void CTFontEnumCallBack( const void* pValue, void* pContext )
}
}
// =======================================================================
SystemFontList::SystemFontList()
: mpCTFontCollection( NULL )
@ -492,7 +492,7 @@ bool SystemFontList::Init( void )
return true;
}
// =======================================================================
SystemFontList* GetCoretextFontList( void )
{

2
vcl/quartz/ctlayout.cxx
View File

@ -167,7 +167,7 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// drawing position relative to the right margin on our own to avoid the
// rounding errors. That is basically a hack, and it should go away if one day
// we managed to get rid of those rounding errors.
//
// We continue using GetDrawPosition() for non-right aligned text, to minimize
// any unforeseen side effects.
CGPoint CTLayout::GetTextDrawPosition(void) const

6
vcl/quartz/salbmp.cxx
View File

@ -46,14 +46,14 @@ static const unsigned long k32BitRedColorMask = 0x00ff0000;
static const unsigned long k32BitGreenColorMask = 0x0000ff00;
static const unsigned long k32BitBlueColorMask = 0x000000ff;
// =======================================================================
static bool isValidBitCount( sal_uInt16 nBitCount )
{
return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32);
}
// =======================================================================
QuartzSalBitmap::QuartzSalBitmap()
: mxGraphicContext( NULL )
@ -949,7 +949,7 @@ CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHe
return xMask;
}
// =======================================================================
/** QuartzSalBitmap::GetSystemData Get platform native image data from existing image
*

2
vcl/quartz/salgdi.cxx
View File

@ -59,7 +59,7 @@
using namespace vcl;
// =======================================================================
CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc )
: PhysicalFontFace( rSrc )

2
vcl/quartz/salvd.cxx
View File

@ -58,7 +58,7 @@ void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
delete pDevice;
}
// =======================================================================
AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
: mbGraphicsUsed( false )

68
vcl/source/app/dbggui.cxx
View File

@ -61,7 +61,7 @@
using namespace ::com::sun::star;
// =======================================================================
static const sal_Char* pDbgHelpText[] =
{
@ -275,11 +275,11 @@ static const sal_Char* pDbgHelpText[] =
NULL
};
// =======================================================================
namespace
{
// -------------------------------------------------------------------
typedef ::std::map< OUString, DbgChannelId > UserDefinedChannels;
UserDefinedChannels& ImplDbgGetUserDefinedChannels()
{
@ -287,7 +287,7 @@ namespace
return s_aChannels;
}
// -------------------------------------------------------------------
void ImplAppendUserDefinedChannels( ListBox& rList )
{
const UserDefinedChannels& rChannels = ImplDbgGetUserDefinedChannels();
@ -301,7 +301,7 @@ namespace
}
}
// -------------------------------------------------------------------
void ImplSelectChannel( ListBox& rList, sal_uLong nChannelToSelect, sal_uInt16 nPositionOffset )
{
if ( nChannelToSelect < DBG_OUT_USER_CHANNEL_0 )
@ -319,7 +319,7 @@ namespace
}
}
}
// -------------------------------------------------------------------
DbgChannelId ImplGetChannelId( const ListBox& rList, sal_uInt16 nPositionOffset )
{
sal_uInt16 nSelectedChannelPos = rList.GetSelectEntryPos();
@ -330,11 +330,11 @@ namespace
}
}
// =======================================================================
// -------------
// - DbgWindow -
// -------------
#define DBGWIN_MAXLINES 100
@ -356,9 +356,9 @@ private:
void GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast );
};
// -----------------
// - DbgInfoDialog -
// -----------------
class DbgInfoDialog : public ModalDialog
{
@ -373,9 +373,9 @@ public:
void SetInfoText( const OUString& rStr );
};
// -------------
// - DbgDialog -
// -------------
class DbgDialog : public ModalDialog
{
@ -425,12 +425,12 @@ public:
void RequestHelp( const HelpEvent& rHEvt );
};
// =======================================================================
static sal_Char aDbgInfoBuf[12288];
static sal_Char aDbgOutBuf[DBG_BUF_MAXLEN];
// =======================================================================
DbgWindow::DbgWindow() :
WorkWindow( NULL, WB_STDWORK ),
@ -453,7 +453,7 @@ DbgWindow::DbgWindow() :
Update();
}
// -----------------------------------------------------------------------
bool DbgWindow::Close()
{
@ -472,14 +472,14 @@ bool DbgWindow::Close()
return true;
}
// -----------------------------------------------------------------------
void DbgWindow::Resize()
{
maLstBox.SetSizePixel( GetOutputSizePixel() );
}
// -----------------------------------------------------------------------
void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& nFirst, sal_uInt16& nLast )
{
@ -500,7 +500,7 @@ void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16&
}
}
// -----------------------------------------------------------------------
bool DbgWindow::PreNotify( NotifyEvent& rNEvt )
{
@ -551,7 +551,7 @@ bool DbgWindow::PreNotify( NotifyEvent& rNEvt )
return WorkWindow::PreNotify( rNEvt );
}
// -----------------------------------------------------------------------
void DbgWindow::InsertLine( const OUString& rLine )
{
@ -580,7 +580,7 @@ void DbgWindow::InsertLine( const OUString& rLine )
maLstBox.Update();
}
// =======================================================================
DbgDialog::DbgDialog() :
ModalDialog( NULL, WB_STDMODAL | WB_SYSTEMWINDOW ),
@ -916,7 +916,7 @@ DbgDialog::DbgDialog() :
}
}
// -----------------------------------------------------------------------
IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
{
@ -1026,7 +1026,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
return 0;
}
// -----------------------------------------------------------------------
void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
{
@ -1046,7 +1046,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
}
}
// =======================================================================
DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) :
ModalDialog( pParent, WB_STDMODAL ),
@ -1071,7 +1071,7 @@ DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) :
SetOutputSizePixel( Size( 640, 420 ) );
}
// -----------------------------------------------------------------------
void DbgInfoDialog::SetInfoText( const OUString& rStr )
{
@ -1121,7 +1121,7 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr )
maListBox.SetUpdateMode( true );
}
// =======================================================================
void DbgDialogTest( Window* pWindow )
{
@ -1481,7 +1481,7 @@ void DbgDialogTest( Window* pWindow )
delete [] pRectAry;
}
// =======================================================================
#ifndef WNT
#define USE_VCL_MSGBOX
#define COPY_BUTTON_ID 25
@ -1612,7 +1612,7 @@ void DbgPrintMsgBox( const char* pLine )
DbgCoreDump();
}
// -----------------------------------------------------------------------
class SolarWindowPrinter : public ::vcl::SolarThreadExecutor
{
@ -1642,7 +1642,7 @@ long SolarWindowPrinter::doIt()
return 0L;
}
// -----------------------------------------------------------------------
void DbgPrintWindow( const char* pLine )
{
@ -1663,7 +1663,7 @@ void DbgPrintWindow( const char* pLine )
bIn = false;
}
// -----------------------------------------------------------------------
void DbgAbort( char const * i_message )
{
@ -1671,14 +1671,14 @@ void DbgAbort( char const * i_message )
Application::Abort( message );
}
// =======================================================================
void ImplDbgTestSolarMutex()
{
assert(ImplGetSVData()->mpDefInst->CheckYieldMutex());
}
// =======================================================================
void DbgGUIInit()
{
@ -1688,7 +1688,7 @@ void DbgGUIInit()
DbgSetAbort( DbgAbort );
}
// -----------------------------------------------------------------------
void DbgGUIDeInit()
{
@ -1701,7 +1701,7 @@ void DbgGUIDeInit()
delete pDbgWindow;
}
// -----------------------------------------------------------------------
void DbgGUIStart()
{

2
vcl/source/app/dndhelp.cxx
View File

@ -89,7 +89,7 @@ void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::sta
{
}
// =======================================================================
vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient )
{

8
vcl/source/app/help.cxx
View File

@ -33,7 +33,7 @@
#include "helpwin.hxx"
#include "svdata.hxx"
// =======================================================================
#define HELPWINSTYLE_QUICK 0
#define HELPWINSTYLE_BALLOON 1
@ -47,7 +47,7 @@
#define HELPTEXTMAXLEN 150
// =======================================================================
Help::Help()
{
@ -290,7 +290,7 @@ void Help::HideTip( sal_uLong nId )
ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks();
}
// =======================================================================
HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) :
FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window
@ -539,7 +539,7 @@ OUString HelpTextWindow::GetText() const
}
// =======================================================================
void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
const OUString& rHelpText, const OUString& rStatusText,

12
vcl/source/app/idlemgr.cxx
View File

@ -21,7 +21,7 @@
#include <idlemgr.hxx>
// =======================================================================
struct ImplIdleData
{
@ -32,7 +32,7 @@ struct ImplIdleData
#define IMPL_IDLETIMEOUT 350
// =======================================================================
ImplIdleMgr::ImplIdleMgr()
{
@ -42,7 +42,7 @@ ImplIdleMgr::ImplIdleMgr()
maTimer.SetTimeoutHdl( LINK( this, ImplIdleMgr, TimeoutHdl ) );
}
// -----------------------------------------------------------------------
ImplIdleMgr::~ImplIdleMgr()
{
@ -54,7 +54,7 @@ ImplIdleMgr::~ImplIdleMgr()
delete mpIdleList;
}
// -----------------------------------------------------------------------
bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority )
{
@ -90,7 +90,7 @@ bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority )
return true;
}
// -----------------------------------------------------------------------
void ImplIdleMgr::RemoveIdleHdl( const Link& rLink )
{
@ -107,7 +107,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link& rLink )
maTimer.Stop();
}
// -----------------------------------------------------------------------
IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl)
{

103
vcl/source/app/settings.cxx
View File

@ -259,8 +259,6 @@ struct ImplAllSettingsData
SvtSysLocale maSysLocale;
};
// =======================================================================
ImplMouseData::ImplMouseData()
{
mnOptions = 0;
@ -286,7 +284,7 @@ ImplMouseData::ImplMouseData()
mnWheelBehavior = MOUSE_WHEEL_ALWAYS;
}
// -----------------------------------------------------------------------
ImplMouseData::ImplMouseData( const ImplMouseData& rData )
{
@ -326,6 +324,7 @@ MouseSettings::GetOptions() const
return mpData->mnOptions;
}
void
MouseSettings::SetDoubleClickTime( sal_uLong nDoubleClkTime )
{
@ -575,7 +574,6 @@ MouseSettings::GetMiddleButtonAction() const
return mpData->mnMiddleButtonAction;
}
void
MouseSettings::SetWheelBehavior( sal_uInt16 nBehavior )
{
@ -589,28 +587,24 @@ MouseSettings::GetWheelBehavior() const
return mpData->mnWheelBehavior;
}
bool
MouseSettings::operator !=( const MouseSettings& rSet ) const
{
return !(*this == rSet);
}
// -----------------------------------------------------------------------
MouseSettings::MouseSettings()
: mpData(boost::make_shared<ImplMouseData>())
{
}
// -----------------------------------------------------------------------
MouseSettings::~MouseSettings()
{
}
// -----------------------------------------------------------------------
void MouseSettings::CopyData()
{
@ -620,7 +614,7 @@ void MouseSettings::CopyData()
}
}
// -----------------------------------------------------------------------
bool MouseSettings::operator ==( const MouseSettings& rSet ) const
{
@ -653,7 +647,7 @@ bool MouseSettings::operator ==( const MouseSettings& rSet ) const
return false;
}
// =======================================================================
ImplStyleData::ImplStyleData() :
mIconThemeScanner(vcl::IconThemeScanner::Create(vcl::IconThemeScanner::GetStandardIconThemePath())),
@ -697,7 +691,7 @@ ImplStyleData::ImplStyleData() :
SetStandardStyles();
}
// -----------------------------------------------------------------------
ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maActiveBorderColor( rData.maActiveBorderColor ),
@ -819,8 +813,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
mbPreviewUsesCheckeredBackground = rData.mbPreviewUsesCheckeredBackground;
}
// -----------------------------------------------------------------------
void ImplStyleData::SetStandardStyles()
{
Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
@ -2351,7 +2343,7 @@ const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const
return mpData->maListBoxPreviewDefaultPixelSize;
}
// -----------------------------------------------------------------------
void StyleSettings::Set3DColors( const Color& rColor )
{
@ -2412,7 +2404,7 @@ bool StyleSettings::GetUseImagesInMenus() const
}
}
// -----------------------------------------------------------------------
static BitmapEx readBitmapEx( const OUString& rPath )
{
@ -2504,7 +2496,7 @@ const BitmapEx StyleSettings::GetPersonaHeader() const
return mpData->maPersonaHeaderBitmap;
}
// -----------------------------------------------------------------------
void StyleSettings::SetStandardStyles()
{
@ -2512,7 +2504,7 @@ void StyleSettings::SetStandardStyles()
mpData->SetStandardStyles();
}
// -----------------------------------------------------------------------
Color StyleSettings::GetFaceGradientColor() const
{
@ -2526,7 +2518,7 @@ Color StyleSettings::GetFaceGradientColor() const
return Color( Color::HSBtoRGB( h, s, b ) );
}
// -----------------------------------------------------------------------
Color StyleSettings::GetSeparatorColor() const
{
@ -2538,8 +2530,6 @@ Color StyleSettings::GetSeparatorColor() const
return Color( Color::HSBtoRGB( h, s, b ) );
}
// -----------------------------------------------------------------------
void StyleSettings::CopyData()
{
// copy if other references exist
@ -2548,7 +2538,7 @@ void StyleSettings::CopyData()
}
}
// -----------------------------------------------------------------------
bool StyleSettings::operator ==( const StyleSettings& rSet ) const
{
@ -2671,7 +2661,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
return false;
}
// =======================================================================
ImplMiscData::ImplMiscData()
{
@ -2681,7 +2671,7 @@ ImplMiscData::ImplMiscData()
mbEnableLocalizedDecimalSep = (pEnv != NULL) ? true : false;
}
// -----------------------------------------------------------------------
ImplMiscData::ImplMiscData( const ImplMiscData& rData )
{
@ -2690,21 +2680,17 @@ ImplMiscData::ImplMiscData( const ImplMiscData& rData )
mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep;
}
// -----------------------------------------------------------------------
MiscSettings::MiscSettings()
: mpData(boost::make_shared<ImplMiscData>())
{
}
// -----------------------------------------------------------------------
MiscSettings::~MiscSettings()
{
}
// -----------------------------------------------------------------------
void MiscSettings::CopyData()
{
// copy if other references exist
@ -2713,7 +2699,7 @@ void MiscSettings::CopyData()
}
}
// -----------------------------------------------------------------------
bool MiscSettings::operator ==( const MiscSettings& rSet ) const
{
@ -2734,8 +2720,6 @@ MiscSettings::operator !=( const MiscSettings& rSet ) const
return !(*this == rSet);
}
// -----------------------------------------------------------------------
bool MiscSettings::GetDisablePrinting() const
{
if( mpData->mnDisablePrinting == TRISTATE_INDET )
@ -2749,7 +2733,7 @@ bool MiscSettings::GetDisablePrinting() const
return mpData->mnDisablePrinting != TRISTATE_FALSE;
}
// -----------------------------------------------------------------------
bool MiscSettings::GetEnableATToolSupport() const
{
@ -2886,7 +2870,7 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const
return mpData->mbEnableLocalizedDecimalSep;
}
// =======================================================================
ImplHelpData::ImplHelpData()
{
@ -2896,7 +2880,7 @@ ImplHelpData::ImplHelpData()
mnBalloonDelay = 1500;
}
// -----------------------------------------------------------------------
ImplHelpData::ImplHelpData( const ImplHelpData& rData )
{
@ -2906,21 +2890,17 @@ ImplHelpData::ImplHelpData( const ImplHelpData& rData )
mnBalloonDelay = rData.mnBalloonDelay;
}
// -----------------------------------------------------------------------
HelpSettings::HelpSettings()
: mpData(boost::make_shared<ImplHelpData>())
{
}
// -----------------------------------------------------------------------
HelpSettings::~HelpSettings()
{
}
// -----------------------------------------------------------------------
void HelpSettings::CopyData()
{
// copy if other references exist
@ -2929,7 +2909,7 @@ void HelpSettings::CopyData()
}
}
// -----------------------------------------------------------------------
bool HelpSettings::operator ==( const HelpSettings& rSet ) const
{
@ -3003,9 +2983,6 @@ HelpSettings::operator !=( const HelpSettings& rSet ) const
return !(*this == rSet);
}
// =======================================================================
ImplAllSettingsData::ImplAllSettingsData()
:
maLocale( LANGUAGE_SYSTEM ),
@ -3020,7 +2997,7 @@ ImplAllSettingsData::ImplAllSettingsData()
maMiscSettings.SetEnableLocalizedDecimalSep( maSysLocale.GetOptions().IsDecimalSeparatorAsLocale() );
}
// -----------------------------------------------------------------------
ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
maMouseSettings( rData.maMouseSettings ),
@ -3041,7 +3018,7 @@ ImplAllSettingsData::ImplAllSettingsData( const ImplAllSettingsData& rData ) :
mpUII18nHelper = NULL;
}
// -----------------------------------------------------------------------
ImplAllSettingsData::~ImplAllSettingsData()
{
@ -3053,28 +3030,26 @@ ImplAllSettingsData::~ImplAllSettingsData()
delete mpUII18nHelper;
}
// -----------------------------------------------------------------------
AllSettings::AllSettings()
: mpData(boost::make_shared<ImplAllSettingsData>())
{
}
// -----------------------------------------------------------------------
AllSettings::AllSettings( const AllSettings& rSet )
{
mpData = rSet.mpData;
}
// -----------------------------------------------------------------------
AllSettings::~AllSettings()
{
}
// -----------------------------------------------------------------------
void AllSettings::CopyData()
{
// copy if other references exist
@ -3084,7 +3059,7 @@ void AllSettings::CopyData()
}
// -----------------------------------------------------------------------
sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
{
@ -3148,7 +3123,7 @@ sal_uLong AllSettings::Update( sal_uLong nFlags, const AllSettings& rSet )
return nChangeFlags;
}
// -----------------------------------------------------------------------
sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const
{
@ -3173,7 +3148,7 @@ sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const
return nChangeFlags;
}
// -----------------------------------------------------------------------
bool AllSettings::operator ==( const AllSettings& rSet ) const
{
@ -3195,7 +3170,7 @@ bool AllSettings::operator ==( const AllSettings& rSet ) const
return false;
}
// -----------------------------------------------------------------------
void AllSettings::SetLanguageTag( const LanguageTag& rLanguageTag )
{
@ -3218,14 +3193,14 @@ void AllSettings::SetLanguageTag( const LanguageTag& rLanguageTag )
}
}
// -----------------------------------------------------------------------
void AllSettings::SetUILanguageTag( const LanguageTag& )
{
// there is only one UILocale per process
}
// -----------------------------------------------------------------------
namespace
{
@ -3286,7 +3261,7 @@ bool AllSettings::GetMathLayoutRTL() const
return GetConfigLayoutRTL(true);
}
// -----------------------------------------------------------------------
const LanguageTag& AllSettings::GetLanguageTag() const
{
@ -3297,7 +3272,7 @@ const LanguageTag& AllSettings::GetLanguageTag() const
return mpData->maLocale;
}
// -----------------------------------------------------------------------
const LanguageTag& AllSettings::GetUILanguageTag() const
{
@ -3308,7 +3283,7 @@ const LanguageTag& AllSettings::GetUILanguageTag() const
return mpData->maUILocale;
}
// -----------------------------------------------------------------------
const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const
{
@ -3318,7 +3293,7 @@ const LocaleDataWrapper& AllSettings::GetLocaleDataWrapper() const
return *mpData->mpLocaleDataWrapper;
}
// -----------------------------------------------------------------------
const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const
{
@ -3328,7 +3303,7 @@ const LocaleDataWrapper& AllSettings::GetUILocaleDataWrapper() const
return *mpData->mpUILocaleDataWrapper;
}
// -----------------------------------------------------------------------
const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const
{
@ -3339,7 +3314,7 @@ const vcl::I18nHelper& AllSettings::GetLocaleI18nHelper() const
return *mpData->mpI18nHelper;
}
// -----------------------------------------------------------------------
const vcl::I18nHelper& AllSettings::GetUILocaleI18nHelper() const
{

4
vcl/source/app/stdtext.cxx
View File

@ -25,7 +25,7 @@
#include <svdata.hxx>
// =======================================================================
OUString GetStandardText( sal_uInt16 nStdText )
{
@ -38,7 +38,7 @@ OUString GetStandardText( sal_uInt16 nStdText )
return OUString();
}
// =======================================================================
void ShowServiceNotAvailableError(Window* pParent,
const OUString& rServiceName, bool bError)

4
vcl/source/app/svdata.cxx
View File

@ -55,7 +55,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::awt;
// =======================================================================
namespace
{
@ -74,7 +74,7 @@ SalSystem* ImplGetSalSystem()
return pSVData->mpSalSystem;
}
// =======================================================================
void ImplInitSVData()
{

4
vcl/source/app/svmain.cxx
View File

@ -81,7 +81,7 @@
using namespace ::com::sun::star;
// =======================================================================
oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo* pInfo)
{
@ -139,7 +139,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
}
// =======================================================================
int ImplSVMain()
{
// The 'real' SVMain()

26
vcl/source/control/button.cxx
View File

@ -42,7 +42,7 @@
#include <window.h>
#include <controldata.hxx>
// =======================================================================
#define PUSHBUTTON_VIEW_STYLE (WB_3DLOOK | \
WB_LEFT | WB_CENTER | WB_RIGHT | \
@ -60,7 +60,7 @@
WB_TOP | WB_VCENTER | WB_BOTTOM | \
WB_WORDBREAK | WB_NOLABEL)
// =======================================================================
class ImplCommonButtonData
{
@ -90,7 +90,7 @@ ImplCommonButtonData::~ImplCommonButtonData()
{
}
// =======================================================================
Button::Button( WindowType nType ) :
Control( nType )
@ -619,7 +619,7 @@ bool Button::set_property(const OString &rKey, const OString &rValue)
return true;
}
// =======================================================================
void PushButton::ImplInitPushButtonData()
{
@ -1741,7 +1741,7 @@ bool PushButton::set_property(const OString &rKey, const OString &rValue)
}
// =======================================================================
void OKButton::ImplInit( Window* pParent, WinBits nStyle )
{
@ -1806,7 +1806,7 @@ void OKButton::Click()
}
}
// =======================================================================
void CancelButton::ImplInit( Window* pParent, WinBits nStyle )
{
@ -1877,7 +1877,7 @@ CloseButton::CloseButton( Window* pParent, WinBits nStyle )
SetText( Button::GetStandardText( BUTTON_CLOSE ) );
}
// =======================================================================
void HelpButton::ImplInit( Window* pParent, WinBits nStyle )
{
@ -1925,7 +1925,7 @@ void HelpButton::Click()
PushButton::Click();
}
// =======================================================================
void RadioButton::ImplInitRadioButtonData()
{
@ -3125,7 +3125,7 @@ Size RadioButton::GetOptimalSize() const
return CalcMinimumSize();
}
// =======================================================================
void CheckBox::ImplInitCheckBoxData()
{
@ -4032,7 +4032,7 @@ Size CheckBox::GetOptimalSize() const
return CalcMinimumSize();
}
// =======================================================================
ImageButton::ImageButton( Window* pParent, WinBits nStyle ) :
PushButton( pParent, nStyle )
@ -4082,7 +4082,7 @@ void ImageButton::ImplInitStyle()
SetStyle( nStyle );
}
// =======================================================================
ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) :
RadioButton( pParent, nStyle )
@ -4095,7 +4095,7 @@ ImageRadioButton::~ImageRadioButton()
{
}
// =======================================================================
TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) :
CheckBox( pParent, nStyle )
@ -4109,7 +4109,7 @@ TriStateBox::~TriStateBox()
{
}
// =======================================================================
DisclosureButton::DisclosureButton( Window* pParent, WinBits nStyle ) :
CheckBox( pParent, nStyle )

4
vcl/source/control/combobox.cxx
View File

@ -33,7 +33,7 @@
#include <ilstbox.hxx>
#include <controldata.hxx>
// =======================================================================
static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, const OUString& rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
{
@ -47,7 +47,7 @@ static void lcl_GetSelectedEntries( ::std::set< sal_uInt16 >& rSelectedPos, cons
}
}
// =======================================================================
ComboBox::ComboBox( WindowType nType ) :
Edit( nType )

2
vcl/source/control/ctrl.cxx
View File

@ -35,7 +35,7 @@
using namespace vcl;
// =======================================================================
void Control::ImplInitControlData()
{

12
vcl/source/control/edit.cxx
View File

@ -79,11 +79,11 @@ using namespace ::rtl;
// - Redo
// - Bei Tracking-Cancel DefaultSelection wieder herstellen
// =======================================================================
static FncGetSpecialChars pImplFncGetSpecialChars = NULL;
// =======================================================================
#define EDIT_ALIGN_LEFT 1
#define EDIT_ALIGN_CENTER 2
@ -96,7 +96,7 @@ static FncGetSpecialChars pImplFncGetSpecialChars = NULL;
#define EDIT_DELMODE_RESTOFWORD 12
#define EDIT_DELMODE_RESTOFCONTENT 13
// =======================================================================
struct DDInfo
{
@ -119,7 +119,7 @@ struct DDInfo
}
};
// =======================================================================
struct Impl_IMEInfos
{
@ -175,7 +175,7 @@ void Impl_IMEInfos::DestroyAttribs()
nLen = 0;
}
// =======================================================================
Edit::Edit( WindowType nType ) :
Control( nType )
@ -894,7 +894,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool
DBG_ASSERT( rStr.getLength() == 1, "unexpected string length. User input is expected to providse 1 char only!" );
// determine if input-sequence-checking should be applied or not
//
uno::Reference < i18n::XBreakIterator > xBI( ImplGetBreakIterator(), UNO_QUERY );
bool bIsInputSequenceChecking = rStr.getLength() == 1 &&
officecfg::Office::Common::I18N::CTL::CTLFont::get() &&

12
vcl/source/control/fixed.cxx
View File

@ -32,7 +32,7 @@
#include "impimagetree.hxx"
#include "window.h"
// =======================================================================
#define FIXEDLINE_TEXT_BORDER 4
@ -51,7 +51,7 @@
WB_TOP | WB_VCENTER | WB_BOTTOM | \
WB_SCALE)
// =======================================================================
static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
const Size& rObjSize, const Size& rWinSize )
@ -85,7 +85,7 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos,
return aPos;
}
// =======================================================================
void FixedText::ImplInit( Window* pParent, WinBits nStyle )
{
@ -523,7 +523,7 @@ void SelectableFixedText::LoseFocus()
Invalidate();
}
// =======================================================================
void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
{
@ -775,7 +775,7 @@ Size FixedLine::GetOptimalSize() const
return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) );
}
// =======================================================================
void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle )
{
@ -969,7 +969,7 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
queue_resize();
}
// =======================================================================
void FixedImage::ImplInit( Window* pParent, WinBits nStyle )
{

4
vcl/source/control/group.cxx
View File

@ -26,14 +26,14 @@
#include <controldata.hxx>
// =======================================================================
#define GROUP_BORDER 12
#define GROUP_TEXT_BORDER 2
#define GROUP_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL)
// =======================================================================
void GroupBox::ImplInit( Window* pParent, WinBits nStyle )
{

14
vcl/source/control/ilstbox.cxx
View File

@ -45,7 +45,7 @@
using namespace ::com::sun::star;
// =======================================================================
void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground )
{
@ -90,7 +90,7 @@ void ImplInitDropDownButton( PushButton* pButton )
pButton->SetBackground();
}
// =======================================================================
ImplEntryList::ImplEntryList( Window* pWindow )
{
@ -526,7 +526,7 @@ sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /*
return LISTBOX_ENTRY_NOTFOUND;
}
// =======================================================================
ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
Control( pParent, 0 ),
@ -2247,7 +2247,7 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const
return nTextStyle;
}
// =======================================================================
ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
Control( pParent, nWinStyle ),
@ -2741,7 +2741,7 @@ void ImplListBox::SetEdgeBlending(bool bNew)
}
}
// =======================================================================
ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
Control ( pParent, nWinStyle )
@ -3047,7 +3047,7 @@ void ImplWin::LoseFocus()
Control::LoseFocus();
}
// =======================================================================
ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) :
PushButton( pParent, nWinStyle ),
@ -3075,7 +3075,7 @@ void ImplBtn::MouseButtonDown( const MouseEvent& )
}
}
// =======================================================================
ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) // no drop shadow for list boxes

2
vcl/source/control/lstbox.cxx
View File

@ -1572,7 +1572,7 @@ sal_uInt16 ListBox::GetMRUCount() const
return mpImplLB->GetEntryList()->GetMRUCount();
}
// =======================================================================
MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
ListBox( WINDOW_MULTILISTBOX )
{

4
vcl/source/control/slider.cxx
View File

@ -26,7 +26,7 @@
#include "thumbpos.hxx"
// =======================================================================
#define SLIDER_DRAW_THUMB ((sal_uInt16)0x0001)
#define SLIDER_DRAW_CHANNEL1 ((sal_uInt16)0x0002)
@ -48,7 +48,7 @@
#define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT)
// =======================================================================
void Slider::ImplInit( Window* pParent, WinBits nStyle )
{

2
vcl/source/control/spinbtn.cxx
View File

@ -23,7 +23,7 @@
#include <vcl/spin.hxx>
#include <vcl/settings.hxx>
// =======================================================================
void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
{

4
vcl/source/control/spinfld.cxx
View File

@ -29,7 +29,7 @@
#include "controldata.hxx"
#include "svdata.hxx"
// =======================================================================
namespace {
@ -288,7 +288,7 @@ void ImplDrawSpinButton( OutputDevice* pOutDev,
aDecoView.DrawSymbol( aLowRect, eType2, rStyleSettings.GetButtonTextColor(), nSymStyle );
}
// =======================================================================
void SpinField::ImplInitSpinFieldData()
{

4
vcl/source/control/tabctrl.cxx
View File

@ -40,7 +40,7 @@
#include <boost/unordered_map.hpp>
#include <vector>
// =======================================================================
struct ImplTabItem
{
@ -89,7 +89,7 @@ struct ImplTabCtrlData
// for the Tab positions
#define TAB_PAGERECT 0xFFFF
// =======================================================================
void TabControl::ImplInit( Window* pParent, WinBits nStyle )
{

4
vcl/source/edit/texteng.cxx
View File

@ -2954,9 +2954,9 @@ void TextEngine::ImpInitWritingDirections( sal_uLong nPara )
const UBiDiLevel nBidiLevel = IsRightToLeft() ? 1 /*RTL*/ : 0 /*LTR*/;
OUString aText( pParaPortion->GetNode()->GetText() );
//
// Bidi functions from icu 2.0
//
UErrorCode nError = U_ZERO_ERROR;
UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError );
nError = U_ZERO_ERROR;

2
vcl/source/edit/vclmedit.cxx
View File

@ -1521,7 +1521,7 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
return nDone || Edit::PreNotify( rNEvt );
}
//
// Internals for derived classes, e.g. TextComponent
ExtTextEngine* VclMultiLineEdit::GetTextEngine() const

6
vcl/source/filter/FilterConfigItem.cxx
View File

@ -34,8 +34,8 @@ using namespace ::com::sun::star::beans ; // PropertyValue
using namespace ::com::sun::star::uno ; // Reference
using namespace ::com::sun::star::util ; // XChangesBatch
using namespace ::com::sun::star::awt ; // Size
using namespace ::com::sun::star::container ; //
using namespace ::com::sun::star::configuration; //
using namespace ::com::sun::star::container ;
using namespace ::com::sun::star::configuration;
using namespace ::com::sun::star::task ; // XStatusIndicator
static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const OUString& rTree )
@ -207,7 +207,7 @@ bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XProper
}
catch( ::com::sun::star::uno::Exception& )
{
//
}
}
if ( bRetValue )

24
vcl/source/filter/sgfbram.cxx
View File

@ -172,9 +172,9 @@ SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad)
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// PcxExpand ///////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// PcxExpand
class PcxExpand
{
@ -203,9 +203,9 @@ sal_uInt8 PcxExpand::GetByte(SvStream& rInp)
return Data;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfBMapFilter ///////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfBMapFilter
bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
{
@ -371,9 +371,9 @@ bool SgfBMapFilter(SvStream& rInp, SvStream& rOut)
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfVectFilter ///////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfVectFilter
// for StarDraw embedded SGF vector
long SgfVectXofs=0;
@ -384,9 +384,9 @@ long SgfVectXdiv=0;
long SgfVectYdiv=0;
bool SgfVectScal=false;
////////////////////////////////////////////////////////////
// Hpgl2SvFarbe ////////////////////////////////////////////
////////////////////////////////////////////////////////////
// Hpgl2SvFarbe
Color Hpgl2SvFarbe( sal_uInt8 nFarb )
{

28
vcl/source/filter/sgvmain.cxx
View File

@ -83,26 +83,26 @@
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Restrictions:
//
// - area patterns are matched to the available ones in Starview.
// - line ends are always rounded in StarView and continue past the end of line.
// - line patterns are matched to the available ones in Starview.
// transparency/opacity is not taken into account
// - no rotated ellipses
//
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// for font translation ///////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// for font translation
SgfFontLst* pSgfFonts = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////
// for circle kinds, text and rotated rectangles ///////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// for circle kinds, text and rotated rectangles
void RotatePoint(PointType& P, sal_Int16 cx, sal_Int16 cy, double sn, double cs)
{
sal_Int16 dx,dy;
@ -140,9 +140,9 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div)
return sal_uInt16(Temp);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfFilterSDrw ///////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
// SgfFilterSDrw
SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd)
{

4
vcl/source/filter/sgvmain.hxx
View File

@ -92,8 +92,8 @@ struct ObjAreaType {
// So don't clean the "unused dummy" fields away. (Actually it
// might well be that many other fields around here are never used
// in our code either.)
sal_uInt8 FDummy1; //
sal_Int16 FDummy2; //
sal_uInt8 FDummy1;
sal_Int16 FDummy2;
sal_uInt16 FMuster; // [Index] incl. Invers, transparency
};

122
vcl/source/filter/sgvtext.cxx
View File

@ -36,18 +36,18 @@ extern SgfFontLst* pSgfFonts;
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Limitations: only grey shadows, 2D and with fixed distance.
//
//
//
//
////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// Limitations: only grey shadows, 2D and with fixed distance.
// AbsBase.Pas
// vvv special characters in text buffer vvv
@ -62,7 +62,7 @@ extern SgfFontLst* pSgfFonts;
#define MaxEscValLen 8
#define MaxEscLen (MaxEscValLen+3)
//==============================================================================
// Escape sequences: [Esc]<Ident><Value>[Esc] at least 4 characters
// Max length of value should be: 8 chars (7+sign). Therefore max. length
// of a escape sequence: 11 chars.
@ -123,7 +123,7 @@ extern SgfFontLst* pSgfFonts;
#define EscToggl '\x1d' /* toggle flag */
#define EscNoFlg 0
#define EscNoVal -2147483647 /* -MaxLongInt */
//==============================================================================
#define NoTrenn 0xFFFF /* parameter value for 'Rest' of GetTextChar(), if separation should not occur */
#define DoTrenn 0xFFFE /* parameter value for 'Rest' of GetTextChar(), if separtion should occur */
@ -136,22 +136,22 @@ extern SgfFontLst* pSgfFonts;
#define MaxChar 255
//==============================================================================
#define CharTopToBase 100 /* due to quotes more as 75% */
#define CharTopToBtm 120 /* line height larger as text angle */
// for Avanti-Bold 'ue' actually even 130%
// end of AbsBase.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// DefBase.Pas
#define TextBoldBit 0x0001 /* bold */
@ -179,9 +179,9 @@ extern SgfFontLst* pSgfFonts;
#define MaxCharSlant 4200 /* maximum 42deg italic ! */
// end of DefBase.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
bool CheckTextOutl(ObjAreaType& F, ObjLineType& L)
@ -192,9 +192,9 @@ bool CheckTextOutl(ObjAreaType& F, ObjLineType& L)
}
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// Misc.Pas
short hPoint2Sgf(short a)
@ -207,12 +207,12 @@ short hPoint2Sgf(short a)
// End of Misc.Pas
// AbsRead.Pas
// ======================================================================
// Function GetTopToBaseLine() Function GetBaseLineToBtm()
//
// Calculate distance from ascender of line to baseline or from baseline to
// descender. All in SGF-units.
// ======================================================================
sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad)
{
@ -221,9 +221,9 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad)
return sal_uInt16(ret);
}
// ======================================================================
// Function GetTextChar() Function GetTextCharConv()
//
// Reads a character from textbuffer, in doing so escape sequences
// are evaluated and accordingly the input/output parameter AktAtr is set.
// Index is incremented accordingly.
@ -232,12 +232,12 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad)
// Otherwise the hyphenation does not work. If the constand NoTrenn
// is used instaed, no hyphenation is done. To the contrary then
// constant DoTrenn triggers hyphenation where a soft-break is present.
//
// Soft separators are converted to a minus sign.
// On top GetTextCharConv() converts HardSpace and AbsatzEnde
// in spaces, including HardTrenner in minus signs. TextEnde is
// always returned as Char(0).
// ======================================================================
@ -448,11 +448,11 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index,
}
// ======================================================================
// Function GetLineFeed()
//
// Required line spacing in SGF-Units. ChrVPos is taken into account.
// ======================================================================
sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextType AktAtr,
sal_uInt16 nChar, sal_uInt16& LF, sal_uInt16& MaxGrad)
{
@ -496,15 +496,15 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT
}
// End of AbsRead.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// iFont.Pas
#define SuperSubFact 60 /* superscript/subscript: 60% of text angle */
@ -613,14 +613,14 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u
}
// iFont.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// Absatz.Pas
struct ProcChrSta {
@ -929,14 +929,14 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType&
// End of Absatz.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// DrawText.Pas
void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uInt16 DrehWink,
@ -1072,9 +1072,9 @@ void TextType::Draw(OutputDevice& rOut)
}
// End of DrawText.Pas
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
sal_uInt32 ObjTextType::GetFont()
{
@ -1088,9 +1088,9 @@ void ObjTextType::SetFont(sal_uInt32 FontID)
}
/////////////////////////////////////////////////////////////////////////////////
// SGF.Ini lesen ////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
// SGF.Ini lesen
SgfFontOne::SgfFontOne()
{
Next=NULL;
@ -1154,7 +1154,7 @@ void SgfFontOne::ReadOne( const OString& rID, OString& Dsc )
}
}
/////////////////////////////////////////////////////////////////////////////////
SgfFontLst::SgfFontLst()
{

4
vcl/source/filter/wmf/emfwr.hxx
View File

@ -26,9 +26,9 @@
#include <vcl/virdev.hxx>
#include <vcl/fltcall.hxx>
// -------------
// - EMFWriter -
// -------------
class LineInfo;
namespace basegfx { class B2DPolygon; }

2
vcl/source/filter/wmf/enhwmf.cxx
View File

@ -1225,7 +1225,7 @@ bool EnhWMFReader::ReadEnhWMF()
// #i123216# Not used in the test case of #121382# (always identity in XForm), also
// no hints in ms docu if FontSize should be scaled with WT. Using with the example
// from #i123216# creates errors, so removing.
//
// // #i121382# Need to apply WorldTransform to FontHeight/Width; this should be completely
// // changed to basegfx::B2DHomMatrix instead of 'struct XForm', but not now due to time
// // constraints and dangers

2
vcl/source/filter/wmf/winmtf.cxx
View File

@ -902,7 +902,7 @@ void WinMtfOutput::UpdateClipRegion()
mbComplexClip = false;
mpGDIMetaFile->AddAction( new MetaPopAction() ); // taking the original clipregion
mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); //
mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) );
// skip for 'no clipping at all' case
if( !aClipPath.isEmpty() )

16
vcl/source/filter/wmf/winmtf.hxx
View File

@ -327,7 +327,7 @@ struct WinMtfFontStyle
WinMtfFontStyle( LOGFONTW& rLogFont );
};
// -----------------------------------------------------------------------------
typedef enum {
FillStyleSolid,
@ -394,7 +394,7 @@ struct WinMtfFillStyle
}
};
// -----------------------------------------------------------------------------
struct WinMtfLineStyle
{
@ -446,7 +446,7 @@ struct WinMtfLineStyle
}
};
// -----------------------------------------------------------------------------
struct XForm
{
@ -463,7 +463,7 @@ struct XForm
}
};
// -----------------------------------------------------------------------------
struct SaveStruct
{
@ -491,7 +491,7 @@ struct SaveStruct
typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr;
// -----------------------------------------------------------------------------
struct BSaveStruct
{
@ -515,7 +515,7 @@ struct BSaveStruct
typedef ::std::vector< BSaveStruct* > BSaveStructList_impl;
// -----------------------------------------------------------------------------
enum GDIObjectType {
GDI_DUMMY = 0,
@ -570,7 +570,7 @@ struct GDIObj
}
};
// -----------------------------------------------------------------------------
class WinMtfOutput
{
@ -758,7 +758,7 @@ public:
virtual ~WinMtfOutput();
};
// -----------------------------------------------------------------------------
class WinMtf
{

2
vcl/source/filter/wmf/winwmf.cxx
View File

@ -644,7 +644,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
// nSye and nSxe is the number of pixels that has to been used
// If they are set to zero, it is as indicator not to scale the bitmap later
//
if( nFunc == W_META_STRETCHDIB || nFunc == W_META_STRETCHBLT || nFunc == W_META_DIBSTRETCHBLT )
pWMF->ReadUInt16( nSye ).ReadUInt16( nSxe );

8
vcl/source/filter/wmf/wmfwr.hxx
View File

@ -26,11 +26,11 @@
#include <vcl/virdev.hxx>
#include <vcl/fltcall.hxx>
// -----------------------------------------------------------------------------
#define MAXOBJECTHANDLES 16
// -----------------------------------------------------------------------------
struct WMFWriterAttrStackMember
{
@ -47,9 +47,9 @@ struct WMFWriterAttrStackMember
sal_uInt16 nFlags;
};
// -------------
// - WMFWriter -
// -------------
class StarSymbolToMSMultiFont;
class LineInfo;

20
vcl/source/fontsubset/cff.cxx
View File

@ -39,7 +39,7 @@ typedef RealType ValType;
#include <vector>
typedef std::vector<ValType> ValVector;
// ====================================================================
static const char* pStringIds[] = {
/*0*/ ".notdef", "space", "exclam", "quotedbl",
@ -276,7 +276,7 @@ struct TYPE2OP
};
};
// ====================================================================
struct CffGlobal
{
@ -306,7 +306,7 @@ struct CffGlobal
int mnFamilyNameSID;
};
// ====================================================================
struct CffLocal
{
@ -339,7 +339,7 @@ struct CffLocal
bool mbForceBold;
};
// ====================================================================
class SubsetterContext
{
@ -355,7 +355,7 @@ public:
SubsetterContext::~SubsetterContext( void)
{}
// ====================================================================
class CffSubsetterContext
: public SubsetterContext
@ -547,7 +547,7 @@ void CffSubsetterContext::addHints( bool bVerticalHints)
// copy the remaining values to the hint arrays
// assert( (mnStackIdx & 1) == 0); // depends on called subrs
if( mnStackIdx & 1) --mnStackIdx;//#######
if( mnStackIdx & 1) --mnStackIdx;
// TODO: if( !bSubr) assert( mnStackIdx >= 2);
assert( (mnHintSize + mnStackIdx) <= 2*NMAXHINTS);
@ -1334,7 +1334,7 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const
mbSawError = false;
mbNeedClose = false;
mbIgnoreHints = false;
mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//#######
mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;
mnCntrMask = 0;
while( mpReadPtr < mpReadEnd)
convertOneTypeOp();
@ -1514,7 +1514,7 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase)
assert( mpReadEnd <= mpBaseEnd);
}
// ====================================================================
// initialize FONTDICT specific values
CffLocal::CffLocal( void)
@ -2335,7 +2335,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
return true;
}
// ====================================================================
bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
{
@ -2353,6 +2353,6 @@ bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
return bRC;
}
// ====================================================================
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Some files were not shown because too many files have changed in this diff Show More