[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx vcl/win
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 02:58:54 PST 2014
vcl/generic/app/geninst.cxx | 4
vcl/generic/fontmanager/fontconfig.cxx | 4
vcl/generic/fontmanager/fontsubst.cxx | 6
vcl/generic/glyphs/gcach_ftyp.cxx | 18 -
vcl/generic/glyphs/gcach_ftyp.hxx | 10
vcl/generic/glyphs/gcach_layout.cxx | 10
vcl/generic/glyphs/graphite_serverfont.cxx | 6
vcl/generic/glyphs/scrptrun.cxx | 2
vcl/generic/print/genpspgraphics.cxx | 6
vcl/headless/svpgdi.cxx | 4
vcl/inc/controldata.hxx | 12
vcl/inc/dndevdis.hxx | 6
vcl/inc/dndlcon.hxx | 6
vcl/inc/generic/glyphcache.hxx | 20 -
vcl/inc/graphite_layout.hxx | 2
vcl/inc/graphite_serverfont.hxx | 2
vcl/inc/helpwin.hxx | 4
vcl/inc/image.h | 26 -
vcl/inc/impfont.hxx | 16
vcl/inc/impgraph.hxx | 8
vcl/inc/impoct.hxx | 26 -
vcl/inc/osx/a11yfocustracker.hxx | 4
vcl/inc/osx/a11ylistener.hxx | 4
vcl/inc/osx/keyboardfocuslistener.hxx | 4
vcl/inc/osx/salframe.h | 4
vcl/inc/osx/salobj.h | 4
vcl/inc/osx/salprn.h | 8
vcl/inc/osx/salsys.h | 4
vcl/inc/outfont.hxx | 24 -
vcl/inc/quartz/salbmp.h | 4
vcl/inc/quartz/salgdi.h | 8
vcl/inc/regionband.hxx | 4
vcl/inc/salgdi.hxx | 4
vcl/inc/salobj.hxx | 4
vcl/inc/salptype.hxx | 12
vcl/inc/salwtype.hxx | 24 -
vcl/inc/unx/gtk/gtkframe.hxx | 2
vcl/inc/unx/salbmp.h | 12
vcl/inc/unx/saldisp.hxx | 2
vcl/inc/win/salbmp.h | 6
vcl/inc/win/salframe.h | 4
vcl/inc/win/salobj.h | 4
vcl/inc/win/salprn.h | 12
vcl/inc/win/salvd.h | 4
vcl/inc/win/wincomp.hxx | 20 -
vcl/osx/DataFlavorMapping.cxx | 14
vcl/osx/DataFlavorMapping.hxx | 2
vcl/osx/HtmlFmtFlt.cxx | 4
vcl/osx/OSXTransferable.hxx | 8
vcl/osx/clipboard.hxx | 20 -
vcl/osx/documentfocuslistener.hxx | 4
vcl/osx/salframe.cxx | 4
vcl/osx/salinst.cxx | 6
vcl/osx/salmenu.cxx | 8
vcl/osx/salobj.cxx | 2
vcl/osx/salprn.cxx | 4
vcl/osx/salsys.cxx | 2
vcl/osx/saltimer.cxx | 2
vcl/qa/complex/memCheck/CheckMemoryUsage.java | 2
vcl/qa/cppunit/canvasbitmaptest.cxx | 4
vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg |binary
vcl/quartz/ctfonts.cxx | 10
vcl/quartz/ctlayout.cxx | 2
vcl/quartz/salbmp.cxx | 6
vcl/quartz/salgdi.cxx | 2
vcl/quartz/salvd.cxx | 2
vcl/source/app/dbggui.cxx | 68 ++--
vcl/source/app/dndhelp.cxx | 2
vcl/source/app/help.cxx | 8
vcl/source/app/idlemgr.cxx | 12
vcl/source/app/settings.cxx | 103 ++----
vcl/source/app/stdtext.cxx | 4
vcl/source/app/svdata.cxx | 4
vcl/source/app/svmain.cxx | 4
vcl/source/control/button.cxx | 26 -
vcl/source/control/combobox.cxx | 4
vcl/source/control/ctrl.cxx | 2
vcl/source/control/edit.cxx | 12
vcl/source/control/fixed.cxx | 12
vcl/source/control/group.cxx | 4
vcl/source/control/ilstbox.cxx | 14
vcl/source/control/lstbox.cxx | 2
vcl/source/control/slider.cxx | 4
vcl/source/control/spinbtn.cxx | 2
vcl/source/control/spinfld.cxx | 4
vcl/source/control/tabctrl.cxx | 4
vcl/source/edit/texteng.cxx | 4
vcl/source/edit/vclmedit.cxx | 2
vcl/source/filter/FilterConfigItem.cxx | 6
vcl/source/filter/sgfbram.cxx | 24 -
vcl/source/filter/sgvmain.cxx | 28 -
vcl/source/filter/sgvmain.hxx | 4
vcl/source/filter/sgvtext.cxx | 122 +++----
vcl/source/filter/wmf/emfwr.hxx | 4
vcl/source/filter/wmf/enhwmf.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 2
vcl/source/filter/wmf/winmtf.hxx | 16
vcl/source/filter/wmf/winwmf.cxx | 2
vcl/source/filter/wmf/wmfwr.hxx | 8
vcl/source/fontsubset/cff.cxx | 20 -
vcl/source/fontsubset/fontsubset.cxx | 4
vcl/source/fontsubset/xlat.cxx | 6
vcl/source/gdi/bitmap4.cxx | 4
vcl/source/gdi/bitmapex.cxx | 14
vcl/source/gdi/dibtools.cxx | 16
vcl/source/gdi/gdimetafiletools.cxx | 28 -
vcl/source/gdi/impfont.cxx | 66 ++--
vcl/source/gdi/impvect.hxx | 4
vcl/source/gdi/metaact.cxx | 112 +++---
vcl/source/gdi/metric.cxx | 38 +-
vcl/source/gdi/outdev.cxx | 4
vcl/source/gdi/outdev2.cxx | 10
vcl/source/gdi/outdev3.cxx | 8
vcl/source/gdi/outdev4.cxx | 2
vcl/source/gdi/outdev5.cxx | 4
vcl/source/gdi/outmap.cxx | 164 +++++-----
vcl/source/gdi/pdfwriter_impl.cxx | 6
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/print2.cxx | 50 +--
vcl/source/gdi/print3.cxx | 2
vcl/source/gdi/regband.cxx | 58 +--
vcl/source/gdi/region.cxx | 6
vcl/source/gdi/regionband.cxx | 4
vcl/source/gdi/salgdilayout.cxx | 14
vcl/source/gdi/sallayout.cxx | 18 -
vcl/source/gdi/svgdata.cxx | 18 -
vcl/source/gdi/virdev.cxx | 2
vcl/source/glyphs/graphite_layout.cxx | 10
vcl/source/src/images.src | 6
vcl/source/window/accel.cxx | 10
vcl/source/window/accmgr.cxx | 4
vcl/source/window/brdwin.cxx | 16
vcl/source/window/cursor.cxx | 6
vcl/source/window/decoview.cxx | 12
vcl/source/window/dialog.cxx | 12
vcl/source/window/dlgctrl.cxx | 2
vcl/source/window/dndevdis.cxx | 68 ++--
vcl/source/window/dndlcon.cxx | 92 ++---
vcl/source/window/dockingarea.cxx | 4
vcl/source/window/dockmgr.cxx | 8
vcl/source/window/dockwin.cxx | 2
vcl/source/window/floatwin.cxx | 2
vcl/source/window/introwin.cxx | 2
vcl/source/window/keycod.cxx | 4
vcl/source/window/mnemonic.cxx | 6
vcl/source/window/msgbox.cxx | 12
vcl/source/window/popupmenuwindow.cxx | 2
vcl/source/window/printdlg.cxx | 4
vcl/source/window/split.cxx | 2
vcl/source/window/status.cxx | 4
vcl/source/window/syschild.cxx | 4
vcl/source/window/syswin.cxx | 4
vcl/source/window/tabdlg.cxx | 2
vcl/source/window/tabpage.cxx | 2
vcl/source/window/taskpanelist.cxx | 2
vcl/source/window/toolbox.cxx | 4
vcl/source/window/toolbox2.cxx | 1
vcl/source/window/window.cxx | 16
vcl/source/window/window2.cxx | 8
vcl/source/window/winproc.cxx | 6
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/app/i18n_cb.cxx | 48 +-
vcl/unx/generic/app/i18n_ic.cxx | 44 +-
vcl/unx/generic/app/i18n_im.cxx | 28 -
vcl/unx/generic/app/keysymnames.cxx | 8
vcl/unx/generic/dtrans/X11_clipboard.hxx | 6
vcl/unx/generic/dtrans/X11_selection.hxx | 6
vcl/unx/generic/dtrans/X11_transferable.cxx | 8
vcl/unx/generic/gdi/gcach_xpeer.cxx | 8
vcl/unx/generic/gdi/salgdi.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 8
vcl/unx/generic/gdi/xrender_peer.hxx | 6
vcl/unx/generic/window/salframe.cxx | 4
vcl/unx/generic/window/salobj.cxx | 6
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 16
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 56 +--
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 16
vcl/unx/gtk/fpicker/eventnotification.hxx | 4
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/unx/gtk/window/gtksalframe.cxx | 10
vcl/unx/gtk/window/gtksalmenu.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2
vcl/unx/kde/UnxCommandThread.cxx | 4
vcl/unx/kde/UnxFilePicker.cxx | 8
vcl/unx/kde/UnxNotifyThread.cxx | 4
vcl/unx/kde/fpicker/kdecommandthread.cxx | 8
vcl/unx/kde/fpicker/kdefilepicker.cxx | 4
vcl/unx/kde/fpicker/kdefpmain.cxx | 4
vcl/unx/kde/fpicker/kdemodalityfilter.cxx | 4
vcl/unx/kde4/KDE4FilePicker.cxx | 8
vcl/unx/x11/xlimits.cxx | 2
vcl/win/source/app/saldata.cxx | 6
vcl/win/source/app/salinst.cxx | 10
vcl/win/source/app/salshl.cxx | 6
vcl/win/source/app/saltimer.cxx | 4
vcl/win/source/gdi/salgdi.cxx | 36 +-
vcl/win/source/gdi/salgdi2.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 18 -
vcl/win/source/gdi/salnativewidgets-luna.cxx | 6
vcl/win/source/gdi/salprn.cxx | 2
vcl/win/source/gdi/salvd.cxx | 6
vcl/win/source/gdi/winlayout.cxx | 24 -
vcl/win/source/window/keynames.cxx | 8
vcl/win/source/window/salframe.cxx | 12
vcl/win/source/window/salmenu.cxx | 10
vcl/win/source/window/salobj.cxx | 8
206 files changed, 1246 insertions(+), 1280 deletions(-)
New commits:
commit d9f0af83b7f0abe7119eefca62cbbca7eff818ef
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 22:51:59 2014 +0100
Remove visual noise from vcl
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index da3a3d6..432fdf6 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -27,9 +27,9 @@
#include "generic/geninst.h"
-//
+
// SalYieldMutex
-//
+
SalYieldMutex::SalYieldMutex()
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 536dd76..2871f2f 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -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--);
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 4a9d557..44cb5a7 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -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: */
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 53ccd83..4c2443b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -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: */
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index f4abb2f..a4712cc 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -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
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 67eafe8..84f0a49 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -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: */
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx
index d548f5d..e2f5085 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -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),
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index ea7790d..9e8eef0 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -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
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 50927df..961d17f 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -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
{
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 5279c18..e8f4d84 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -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.
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index 8040fa8..7162650 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -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
diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 223f672..c00878d 100644
--- a/vcl/inc/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
@@ -98,9 +98,9 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException);
};
-//==================================================================================================
-//
-//==================================================================================================
+
+
+
#endif
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index 3d6c6b6..ff61207 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
@@ -109,9 +109,9 @@ public:
};
-//==================================================================================================
-//
-//==================================================================================================
+
+
+
#endif
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 9454700..35d5817 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -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
{
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index ce8989c..2d037c4 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -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:
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index df205d5..3a783bd 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -42,7 +42,7 @@ private:
// This class implments the server font specific parts.
// @author tse
-//
+
class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout
{
private:
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 389c814..aad06c5 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -23,9 +23,9 @@
#include <vcl/floatwin.hxx>
#include <vcl/timer.hxx>
-// ------------------
+
// - HelpTextWindow -
-// ------------------
+
class HelpTextWindow : public FloatingWindow
{
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 370e19f..d8b1ab6 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -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
{
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 75bc926..6f27294 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -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;
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 931bf6b..e6cee93 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -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;
diff --git a/vcl/inc/impoct.hxx b/vcl/inc/impoct.hxx
index c4219e9..93f2df9 100644
--- a/vcl/inc/impoct.hxx
+++ b/vcl/inc/impoct.hxx
@@ -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 )
{
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 22b37d2..f1bae09 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -34,9 +34,9 @@ class Window;
class ToolBox;
class DocumentFocusListener;
-// ------------------------
+
// - AquaA11yFocusTracker -
-// ------------------------
+
class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker>
{
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 8f7176d..cc31cea 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -28,9 +28,9 @@
#include <set>
#include <com/sun/star/awt/Rectangle.hpp>
-// -------------------------
+
// - AquaA11yEventListener -
-// -------------------------
+
class AquaA11yEventListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx
index 3c13f77..bf9e4b4 100644
--- a/vcl/inc/osx/keyboardfocuslistener.hxx
+++ b/vcl/inc/osx/keyboardfocuslistener.hxx
@@ -24,9 +24,9 @@
#include <rtl/ref.hxx>
-// -------------------------
+
// - KeyboardFocusListener -
-// -------------------------
+
class KeyboardFocusListener : public rtl::IReference
{
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 4150dc7..6cc843b 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -45,9 +45,9 @@ class AquaBlinker;
typedef struct SalFrame::SalPointerState SalPointerState;
-// ----------------
+
// - AquaSalFrame -
-// ----------------
+
class AquaSalFrame : public SalFrame
{
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 397299c..5994144 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -27,9 +27,9 @@ class AquaSalFrame;
class AquaSalObject;
-// -----------------
+
// - SalObjectData -
-// -----------------
+
struct SalObjectData
{
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index cb3db3c..3fb3dc9 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -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
{
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 816cffc..cb07be0 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -24,9 +24,9 @@
#include <list>
-// -----------------
+
// - SalSystemData -
-// -----------------
+
class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
{
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index 348dc51..59d8bc7 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -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
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 7d3d7df..136e6d2 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -36,9 +36,9 @@
#include "salvd.hxx"
#include "salbmp.hxx"
-// --------------
+
// - SalBitmap -
-// --------------
+
struct BitmapBuffer;
class BitmapPalette;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index a6c8a8c..f2c41ef 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -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;
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index ed48a73..d8e29ac 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -26,7 +26,7 @@
const char* ImplDbgTestRegionBand(const void*);
#endif
-//////////////////////////////////////////////////////////////////////////////
+
class RegionBand
{
@@ -80,5 +80,5 @@ public:
#endif // INCLUDED_VCL_INC_REGIONBAND_HXX
-//////////////////////////////////////////////////////////////////////////////
+
//eof
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 3c4d047..bfed8fc 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -53,9 +53,9 @@ namespace basegfx {
class B2DPolyPolygon;
}
-// ---------------------
+
// - SalGraphics-Codes -
-// ---------------------
+
#define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004)
#define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000)
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 219e2ce..a9d224f 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -27,9 +27,9 @@
struct SystemEnvData;
-// -------------------
+
// - SalObject-Types -
-// -------------------
+
#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001)
#define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002)
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index 36fb3c2..589adfe 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -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 );
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 22b71c6..b104442 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -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)
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 9d0184c..bfa420e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -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
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 8a54fd9..1d22fbd 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -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;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index b9a38da..3c80473 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -62,7 +62,7 @@ namespace vcl_sal { class WMAdaptor; }
#define PROPERTY_DEFAULT 0x00000FCB
-// ------------------------------------------------------------------------
+
// server vendor
typedef enum {
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 258d9a5..c045e90 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -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
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index cddd366..cc8fd16 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -25,9 +25,9 @@
class WinSalGraphics;
-// ----------------
+
// - WinSalFrame -
-// ----------------
+
class WinSalFrame : public SalFrame
{
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index 844f052..5face14 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -22,9 +22,9 @@
#include <salobj.hxx>
-// -----------------
+
// - SalObjectData -
-// -----------------
+
class WinSalObject : public SalObject
{
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index 9a807c9..c65f7f5 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -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
{
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 498a71f..b9d3f68 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -24,9 +24,9 @@
class WinSalGraphics;
-// -----------------
+
// - SalVirDevData -
-// -----------------
+
class WinSalVirtualDevice : public SalVirtualDevice
{
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index c14ecf1..07e01fa 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -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
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index b24dffc..25ec32e 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -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()
{
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index a80bd41..b228137 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -56,7 +56,7 @@ public:
typedef std::auto_ptr<DataProvider> DataProviderPtr_t;
-//################################
+
class DataFlavorMapper
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index c45e7f8..11ef00f 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -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
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 27885ef..cae40a2 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -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();
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index be63694..596a287 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -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);
diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 1a604a6..8342866 100644
--- a/vcl/osx/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -28,9 +28,9 @@
#include <set>
-// -------------------------
+
// - DocumentFocusListener -
-// -------------------------
+
class DocumentFocusListener :
public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index ab5ef79..f06ec70 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -54,11 +54,11 @@
using namespace std;
-// =======================================================================
+
AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
-// =======================================================================
+
AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
mpNSWindow(nil),
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index ecc85eeb..a03346c 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -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()
{
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index b3a1736..cf46277 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -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
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index d749233..95bfe26 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -24,7 +24,7 @@
#include "osx/salobj.h"
#include "osx/salframe.h"
-// =======================================================================
+
AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
mpFrame( pFrame ),
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 8666988..c4b0326 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -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 )
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index e31044e..5fd29a8 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -30,7 +30,7 @@
#include "svids.hrc"
-// =======================================================================
+
AquaSalSystem::~AquaSalSystem()
{
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx
index df8396b..15a9601 100644
--- a/vcl/osx/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -24,7 +24,7 @@
#include "osx/salframe.h"
#include "osx/salinst.h"
-// =======================================================================
+
NSTimer* AquaSalTimer::pRunningTimer = nil;
bool AquaSalTimer::bDispatchTimer = false;
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 30447e0..3b5bc61 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -371,7 +371,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
}
-// -----------------------------------------------------------------------------
+
private class OfficeMemchecker
{
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index a1bfecb..017176b 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -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 ));
diff --git a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg
index 33bbe9b..104f201 100644
Binary files a/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg and b/vcl/qa/cppunit/graphicfilter/data/jpg/fail/CVE-2008-5314-1.jpg differ
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 72bc087..c9a2116 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -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 )
{
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 02583a1..9dfa7f6 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -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
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index a30a22b..50a7513 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -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
*
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 41e1b49..c44eda1 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -59,7 +59,7 @@
using namespace vcl;
-// =======================================================================
+
CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc )
: PhysicalFontFace( rSrc )
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 5c163ce..0320070 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -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 )
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 79df6f7..de610b3 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -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()
{
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index 393415a..54b31c6 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.cxx
@@ -89,7 +89,7 @@ void vcl::unohelper::DragAndDropClient::dropActionChanged( const ::com::sun::sta
{
}
-// =======================================================================
+
vcl::unohelper::DragAndDropWrapper::DragAndDropWrapper( DragAndDropClient* pClient )
{
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index c4a7ea7..c5ea894 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -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,
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index 4f7ba23..d4930de 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -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)
{
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 90abade..0356c88 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -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
{
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index fe6e134..2561e88 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -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)
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index dfbb001..0a0df59 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -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()
{
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 1191ef4..511a95e 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -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()
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 7e5f28c..660256f 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -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 )
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 22ae03a..ce9400f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -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 )
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 9a45829..db92545 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -35,7 +35,7 @@
using namespace vcl;
-// =======================================================================
+
void Control::ImplInitControlData()
{
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e24a474..69af9da 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -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() &&
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index ebe5367..db1806e 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -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 )
{
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 47fd9e2..2dcbe33 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -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 )
{
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 252fb7f..107cd75 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -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
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 0ee8067..c7fe613 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1572,7 +1572,7 @@ sal_uInt16 ListBox::GetMRUCount() const
return mpImplLB->GetEntryList()->GetMRUCount();
}
-// =======================================================================
+
MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
ListBox( WINDOW_MULTILISTBOX )
{
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 35d01ed..5c2a7ab 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -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 )
{
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index fccfe30..9053481 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -23,7 +23,7 @@
#include <vcl/spin.hxx>
#include <vcl/settings.hxx>
-// =======================================================================
+
void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
{
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 8251a50..67dacbd 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -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()
{
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 1f388c4..e628489 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -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 )
{
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 985347c..46d0ad7 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -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;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e3448fa..97e6d99 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -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
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 253566b..88afc3f 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -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 )
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index fb028d7..111482a 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -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 )
{
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 28ef1fa..2dd0146 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -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)
{
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 93ba2a4..ae0d35d 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -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
};
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 39b581f..5baad79 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -36,18 +36,18 @@ extern SgfFontLst* pSgfFonts;
#endif
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
+
+
// 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
-//==============================================================================
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list