diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:51:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:56:16 -0600 |
| commit | d9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch) | |
| tree | 19b6ed4d3b1dd538bb46205880505e59f8bb8002 | |
| parent | 0fb3bdc5d3aa47a61affc67b20bdbb775808fb66 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
206 files changed, 1246 insertions, 1280 deletions
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx index da3a3d66aad2..432fdf6c7e5b 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 536dd769904c..2871f2f8bab6 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 4a9d5572735a..44cb5a7776ac 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 53ccd83c055a..4c2443b51e54 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 f4abb2fb886b..a4712cc64dbc 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 67eafe8a86c8..84f0a494e1d3 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 d548f5dd4852..e2f50852d124 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 ea7790d900f1..9e8eef000917 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 50927df0ef59..961d17f6e7b7 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 5279c18e6bce..e8f4d843a92c 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 8040fa8c8dfb..716265059f99 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 223f672eb173..c00878d3479b 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 3d6c6b617c83..ff61207d3b13 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 9454700afb62..35d581706187 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 ce8989ce0e7d..2d037c498dec 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 df205d57129d..3a783bd75474 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 389c8143ace9..aad06c5f33e2 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 370e19f46cca..d8b1ab639cbe 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 75bc9267acb7..6f272941d81f 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 931bf6b355f5..e6cee9307343 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 c4219e95b91e..93f2df99c3ce 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 22b37d2b64ce..f1bae094eef4 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 8f7176d0766a..cc31ceadf414 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 3c13f77e5e58..bf9e4b4b35ba 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 4150dc779e9c..6cc843b68dbc 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 397299c15c9d..5994144237c5 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 cb3db3cef918..3fb3dc92aa2c 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 816cffc47ae9..cb07be0c2ee3 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 348dc51a12b5..59d8bc7ceccc 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 7d3d7df63efe..136e6d2d33c7 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 a6c8a8ce003f..f2c41eff979b 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 ed48a737dcd0..d8e29ac92777 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 3c4d04709432..bfed8fcd6966 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 219e2ce026fe..a9d224f25966 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 36fb3c29a830..589adfe3e97d 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 22b71c6b9d94..b1044429ecb2 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 9d0184c526f6..bfa420e6d44f 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 8a54fd987388..1d22fbd4e2dc 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 b9a38daa8f7f..3c804734e523 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 258d9a5f896a..c045e90a56f0 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 cddd366de440..cc8fd16d5126 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 844f052989bf..5face14e3f16 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 9a807c999c51..c65f7f5c84a3 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 498a71fce59d..b9d3f68d7cc5 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 c14ecf1f9224..07e01fad3eef 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 b24dffcb8411..25ec32e60a37 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 a80bd41d6dda..b22813795e19 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 c45e7f856584..11ef00fdd6d6 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 27885effd03f..cae40a2c7884 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 be63694863f8..596a287d5f22 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 1a604a677df5..834286683afe 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 ab5ef79fb67e..f06ec700ea78 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 ecc85eebe259..a03346c02131 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 b3a1736bd3ee..cf46277d9806 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 d749233e58a0..95bfe26491fa 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 8666988e2dd5..c4b032647b51 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 e31044e1d61b..5fd29a8b9acb 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 df8396be2c19..15a960117c93 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 30447e038fa8..3b5bc61338ec 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 a1bfecb7156f..017176b4fa14 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 Binary files differindex 33bbe9b5f9e1..104f2013190c 100644 --- 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 diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 72bc087ca368..c9a2116c298b 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 02583a16553a..9dfa7f60b01f 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 a30a22b1c4d1..50a75135c082 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 41e1b492baa6..c44eda16a720 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 5c163ce381a7..0320070d045b 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 79df6f7bf75b..de610b39a09a 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 393415a8fdd8..54b31c6bf33f 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 c4a7ea764f0b..c5ea894576b1 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 4f7ba2306ce6..d4930dea6331 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 90abade6db5d..0356c88c9154 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 fe6e1349e24e..2561e88d5e31 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 dfbb001cb769..0a0df59cb8aa 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 1191ef41186a..511a95ef1d70 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 7e5f28cef894..660256fa8d22 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 22ae03aca7e2..ce9400fb7c01 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 9a458295c28a..db925454b191 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 e24a474a1324..69af9da71d8e 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 ebe5367ef907..db1806eaeeb4 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 47fd9e25c8db..2dcbe33cd2e2 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 252fb7f67552..107cd75b1856 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 0ee8067a2a20..c7fe6133825a 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 35d01ed13c10..5c2a7ab96165 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 fccfe301b48e..905348116f14 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 8251a50d6951..67dacbd6fa74 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 1f388c42d553..e6284892fa62 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 985347cb0b42..46d0ad7ccd27 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 e3448fa02217..97e6d99a4d5f 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 253566b1be8e..88afc3fa0c20 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 fb028d7796fd..111482add734 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 28ef1fae7f3a..2dd014686fcf 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 93ba2a47bd75..ae0d35d735ad 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 39b581f373a4..5baad793f12d 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 -//============================================================================== + #define CharTopToBase 100 /* due to quotes more as 75% */ #define CharTopToBtm 120 /* line height larger as text angle */ // for Avanti-Bold 'ue' actually even 130% // end of AbsBase.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + + + + // DefBase.Pas #define TextBoldBit 0x0001 /* bold */ @@ -179,9 +179,9 @@ extern SgfFontLst* pSgfFonts; #define MaxCharSlant 4200 /* maximum 42deg italic ! */ // end of DefBase.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + bool CheckTextOutl(ObjAreaType& F, ObjLineType& L) @@ -192,9 +192,9 @@ bool CheckTextOutl(ObjAreaType& F, ObjLineType& L) } -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + // Misc.Pas short hPoint2Sgf(short a) @@ -207,12 +207,12 @@ short hPoint2Sgf(short a) // End of Misc.Pas // AbsRead.Pas -// ====================================================================== + // Function GetTopToBaseLine() Function GetBaseLineToBtm() -// + // Calculate distance from ascender of line to baseline or from baseline to // descender. All in SGF-units. -// ====================================================================== + sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) { @@ -221,9 +221,9 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) return sal_uInt16(ret); } -// ====================================================================== + // Function GetTextChar() Function GetTextCharConv() -// + // Reads a character from textbuffer, in doing so escape sequences // are evaluated and accordingly the input/output parameter AktAtr is set. // Index is incremented accordingly. @@ -232,12 +232,12 @@ sal_uInt16 GetTopToBaseLine(sal_uInt16 MaxGrad) // Otherwise the hyphenation does not work. If the constand NoTrenn // is used instaed, no hyphenation is done. To the contrary then // constant DoTrenn triggers hyphenation where a soft-break is present. -// + // Soft separators are converted to a minus sign. // On top GetTextCharConv() converts HardSpace and AbsatzEnde // in spaces, including HardTrenner in minus signs. TextEnde is // always returned as Char(0). -// ====================================================================== + @@ -448,11 +448,11 @@ UCHAR GetTextCharConv(UCHAR* TBuf, sal_uInt16& Index, } -// ====================================================================== + // Function GetLineFeed() -// + // Required line spacing in SGF-Units. ChrVPos is taken into account. -// ====================================================================== + sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextType AktAtr, sal_uInt16 nChar, sal_uInt16& LF, sal_uInt16& MaxGrad) { @@ -496,15 +496,15 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT } // End of AbsRead.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + + + + // iFont.Pas #define SuperSubFact 60 /* superscript/subscript: 60% of text angle */ @@ -613,14 +613,14 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u } // iFont.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + + + + // Absatz.Pas struct ProcChrSta { @@ -929,14 +929,14 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& // End of Absatz.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + + + + // DrawText.Pas void DrawChar(OutputDevice& rOut, UCHAR c, ObjTextType T, PointType Pos, sal_uInt16 DrehWink, @@ -1072,9 +1072,9 @@ void TextType::Draw(OutputDevice& rOut) } // End of DrawText.Pas -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + + + sal_uInt32 ObjTextType::GetFont() { @@ -1088,9 +1088,9 @@ void ObjTextType::SetFont(sal_uInt32 FontID) } -///////////////////////////////////////////////////////////////////////////////// -// SGF.Ini lesen //////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////// + +// SGF.Ini lesen + SgfFontOne::SgfFontOne() { Next=NULL; @@ -1154,7 +1154,7 @@ void SgfFontOne::ReadOne( const OString& rID, OString& Dsc ) } } -///////////////////////////////////////////////////////////////////////////////// + SgfFontLst::SgfFontLst() { diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index 1eddc51e2029..0ff838416a08 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -26,9 +26,9 @@ #include <vcl/virdev.hxx> #include <vcl/fltcall.hxx> -// ------------- + // - EMFWriter - -// ------------- + class LineInfo; namespace basegfx { class B2DPolygon; } diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index f2df15dbd012..47915a01e883 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1225,7 +1225,7 @@ bool EnhWMFReader::ReadEnhWMF() // #i123216# Not used in the test case of #121382# (always identity in XForm), also // no hints in ms docu if FontSize should be scaled with WT. Using with the example // from #i123216# creates errors, so removing. - // + // // #i121382# Need to apply WorldTransform to FontHeight/Width; this should be completely // // changed to basegfx::B2DHomMatrix instead of 'struct XForm', but not now due to time // // constraints and dangers diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index eca0d4f76798..adc76649eecf 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -902,7 +902,7 @@ void WinMtfOutput::UpdateClipRegion() mbComplexClip = false; mpGDIMetaFile->AddAction( new MetaPopAction() ); // taking the original clipregion - mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // + mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // skip for 'no clipping at all' case if( !aClipPath.isEmpty() ) diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index ab7291986de3..055b6999ed18 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -327,7 +327,7 @@ struct WinMtfFontStyle WinMtfFontStyle( LOGFONTW& rLogFont ); }; -// ----------------------------------------------------------------------------- + typedef enum { FillStyleSolid, @@ -394,7 +394,7 @@ struct WinMtfFillStyle } }; -// ----------------------------------------------------------------------------- + struct WinMtfLineStyle { @@ -446,7 +446,7 @@ struct WinMtfLineStyle } }; -// ----------------------------------------------------------------------------- + struct XForm { @@ -463,7 +463,7 @@ struct XForm } }; -// ----------------------------------------------------------------------------- + struct SaveStruct { @@ -491,7 +491,7 @@ struct SaveStruct typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; -// ----------------------------------------------------------------------------- + struct BSaveStruct { @@ -515,7 +515,7 @@ struct BSaveStruct typedef ::std::vector< BSaveStruct* > BSaveStructList_impl; -// ----------------------------------------------------------------------------- + enum GDIObjectType { GDI_DUMMY = 0, @@ -570,7 +570,7 @@ struct GDIObj } }; -// ----------------------------------------------------------------------------- + class WinMtfOutput { @@ -758,7 +758,7 @@ public: virtual ~WinMtfOutput(); }; -// ----------------------------------------------------------------------------- + class WinMtf { diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 26efbadd9a0a..cf84822fc56f 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -644,7 +644,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) // nSye and nSxe is the number of pixels that has to been used // If they are set to zero, it is as indicator not to scale the bitmap later - // + if( nFunc == W_META_STRETCHDIB || nFunc == W_META_STRETCHBLT || nFunc == W_META_DIBSTRETCHBLT ) pWMF->ReadUInt16( nSye ).ReadUInt16( nSxe ); diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index ceda7c5927b2..4322a764fe07 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -26,11 +26,11 @@ #include <vcl/virdev.hxx> #include <vcl/fltcall.hxx> -// ----------------------------------------------------------------------------- + #define MAXOBJECTHANDLES 16 -// ----------------------------------------------------------------------------- + struct WMFWriterAttrStackMember { @@ -47,9 +47,9 @@ struct WMFWriterAttrStackMember sal_uInt16 nFlags; }; -// ------------- + // - WMFWriter - -// ------------- + class StarSymbolToMSMultiFont; class LineInfo; diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 79c9f50ab577..b1411ac27e7d 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -39,7 +39,7 @@ typedef RealType ValType; #include <vector> typedef std::vector<ValType> ValVector; -// ==================================================================== + static const char* pStringIds[] = { /*0*/ ".notdef", "space", "exclam", "quotedbl", @@ -276,7 +276,7 @@ struct TYPE2OP }; }; -// ==================================================================== + struct CffGlobal { @@ -306,7 +306,7 @@ struct CffGlobal int mnFamilyNameSID; }; -// ==================================================================== + struct CffLocal { @@ -339,7 +339,7 @@ struct CffLocal bool mbForceBold; }; -// ==================================================================== + class SubsetterContext { @@ -355,7 +355,7 @@ public: SubsetterContext::~SubsetterContext( void) {} -// ==================================================================== + class CffSubsetterContext : public SubsetterContext @@ -547,7 +547,7 @@ void CffSubsetterContext::addHints( bool bVerticalHints) // copy the remaining values to the hint arrays // assert( (mnStackIdx & 1) == 0); // depends on called subrs - if( mnStackIdx & 1) --mnStackIdx;//####### + if( mnStackIdx & 1) --mnStackIdx; // TODO: if( !bSubr) assert( mnStackIdx >= 2); assert( (mnHintSize + mnStackIdx) <= 2*NMAXHINTS); @@ -1334,7 +1334,7 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const mbSawError = false; mbNeedClose = false; mbIgnoreHints = false; -mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//####### +mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1; mnCntrMask = 0; while( mpReadPtr < mpReadEnd) convertOneTypeOp(); @@ -1514,7 +1514,7 @@ void CffSubsetterContext::seekIndexEnd( int nIndexBase) assert( mpReadEnd <= mpBaseEnd); } -// ==================================================================== + // initialize FONTDICT specific values CffLocal::CffLocal( void) @@ -2335,7 +2335,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, return true; } -// ==================================================================== + bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths ) { @@ -2353,6 +2353,6 @@ bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths ) return bRC; } -// ==================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index ab0636f73c04..62d83504a421 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -23,7 +23,7 @@ #include <fontsubset.hxx> #include <sft.hxx> -// ==================================================================== + FontSubsetInfo::FontSubsetInfo() : m_nAscent( 0) @@ -168,6 +168,6 @@ bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths) return false; } -// ==================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx index 22365b709764..673924f31530 100644 --- a/vcl/source/fontsubset/xlat.cxx +++ b/vcl/source/fontsubset/xlat.cxx @@ -22,7 +22,7 @@ namespace { // anonymous namespace -// ==================================================================== + #define MAX_CVT_SELECT 6 @@ -40,7 +40,7 @@ private: rtl_UnicodeToTextContext maContexts[ MAX_CVT_SELECT+1 ]; }; -// ==================================================================== + ConverterCache::ConverterCache( void) { @@ -150,7 +150,7 @@ void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt1 } // anonymous namespace -// ==================================================================== + #include "xlat.hxx" diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 509f7ead46ef..1237c5338cd5 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -1063,11 +1063,11 @@ void Bitmap::ImplBlurContributions( const int aSize, const int aNumberOfContribu } // Separable Gaussian Blur -// + // Separable Gaussian Blur filter and accepts a blur radius // as a parameter so the user can change the strength of the blur. // Radius of 1.0 is 3 * standard deviation of gauss function. -// + // Separable Blur implementation uses 2x separable 1D convolution // to process the image. bool Bitmap::ImplSeparableBlurFilter(const double radius) diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 0e9cd05d7abc..840282eeee29 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -322,7 +322,7 @@ sal_uLong BitmapEx::GetChecksum() const return nCrc; } -// ------------------------------------------------------------------ + void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) { @@ -362,7 +362,7 @@ bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) return bRet; } -// ------------------------------------------------------------------ + bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { @@ -386,7 +386,7 @@ bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 n return bRet; } -// ------------------------------------------------------------------------ + bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { @@ -828,7 +828,7 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< return false; } -// ------------------------------------------------------------------ + namespace { @@ -925,7 +925,7 @@ BitmapEx BitmapEx::TransformBitmapEx( return BitmapEx(aDestination); } -// ------------------------------------------------------------------ + BitmapEx BitmapEx::getTransformed( const basegfx::B2DHomMatrix& rTransformation, @@ -1009,7 +1009,7 @@ BitmapEx BitmapEx::getTransformed( return aRetval; } -// ------------------------------------------------------------------ + BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorModifierStack) const { @@ -1167,7 +1167,7 @@ BitmapEx BitmapEx::ModifyBitmapEx(const basegfx::BColorModifierStack& rBColorMod } } -// ----------------------------------------------------------------------------- + BitmapEx VCL_DLLPUBLIC createBlendFrame( const Size& rSize, diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index d0b9c2f92582..9802557b8f4a 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -25,14 +25,14 @@ #include <vcl/bmpacc.hxx> #include <vcl/outdev.hxx> -////////////////////////////////////////////////////////////////////////////// + // - Defines - #define DIBCOREHEADERSIZE ( 12UL ) #define DIBINFOHEADERSIZE ( sizeof(DIBInfoHeader) ) #define DIBV5HEADERSIZE ( sizeof(DIBV5Header) ) -////////////////////////////////////////////////////////////////////////////// + // - Compression defines #define COMPRESS_OWN ('S'|('D'<<8UL)) @@ -42,7 +42,7 @@ #define BITFIELDS ( 3UL ) #define ZCOMPRESS ( COMPRESS_OWN | 0x01000000UL ) /* == 'SD01' (binary) */ -////////////////////////////////////////////////////////////////////////////// + // - DIBInfoHeader and DIBV5Header typedef sal_Int32 FXPT2DOT30; @@ -148,7 +148,7 @@ struct DIBV5Header : public DIBInfoHeader {} }; -////////////////////////////////////////////////////////////////////////////// + namespace { @@ -165,7 +165,7 @@ namespace } } -////////////////////////////////////////////////////////////////////////////// + bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& bTopDown) { @@ -1315,7 +1315,7 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI return( rOStm.GetError() == 0UL ); } -////////////////////////////////////////////////////////////////////////////// + bool ImplReadDIB( Bitmap& rTarget, Bitmap* @@ -1424,7 +1424,7 @@ bool ImplWriteDIB( return bRet; } -////////////////////////////////////////////////////////////////////////////// + bool ReadDIB( Bitmap& rTarget, @@ -1522,7 +1522,7 @@ bool ReadDIBV5( return ImplReadDIB(rTarget, &rTargetAlpha, rIStm, true); } -////////////////////////////////////////////////////////////////////////////// + bool WriteDIB( const Bitmap& rSource, diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 45623853bfda..cd918f8a9987 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> #include <vcl/graphictools.hxx> -////////////////////////////////////////////////////////////////////////////// + // helpers namespace @@ -255,7 +255,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // #i121267# Tooling to internally clip geometry against internal clip regions void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) @@ -446,9 +446,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) { switch(nType) { - // + // pixel actions, just check on inside - // + case META_PIXEL_ACTION : { const MetaPixelAction* pA = static_cast< const MetaPixelAction* >(pAction); @@ -479,9 +479,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // geometry actions - // + case META_LINE_ACTION : { const MetaLineAction* pA = static_cast< const MetaLineAction* >(pAction); @@ -705,10 +705,10 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // bitmap actions, create BitmapEx with alpha channel derived // from clipping - // + case META_BMPEX_ACTION : { const MetaBmpExAction* pA = static_cast< const MetaBmpExAction* >(pAction); @@ -857,9 +857,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // need to handle all those 'hacks' which hide data in comments - // + case META_COMMENT_ACTION : { const MetaCommentAction* pA = static_cast< const MetaCommentAction* >(pAction); @@ -963,9 +963,9 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) break; } - // + // need to handle gradient fills (hopefully only unroated ones) - // + case META_GRADIENT_ACTION : { @@ -1007,7 +1007,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } // not (yet) supported actions - // + // META_NULL_ACTION // META_TEXT_ACTION // META_TEXTARRAY_ACTION @@ -1064,7 +1064,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) } } -////////////////////////////////////////////////////////////////////////////// + bool VCL_DLLPUBLIC usesClipActions(const GDIMetaFile& rSource) { diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index 2674a1ad95da..e341c813b4a9 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -22,7 +22,7 @@ #include <vector> #include <set> -// ======================================================================= + CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount, @@ -35,7 +35,7 @@ CmapResult::CmapResult( bool bSymbolic, , mbRecoded( false) {} -// ======================================================================= + ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) : mpRangeCodes( rCR.mpRangeCodes ) @@ -58,7 +58,7 @@ static ImplFontCharMap* pDefaultImplFontCharMap = NULL; static const sal_UCS4 aDefaultUnicodeRanges[] = {0x0020,0xD800, 0xE000,0xFFF0}; static const sal_UCS4 aDefaultSymbolRanges[] = {0x0020,0x0100, 0xF020,0xF100}; -// ----------------------------------------------------------------------- + bool ImplFontCharMap::IsDefaultMap() const { @@ -66,7 +66,7 @@ bool ImplFontCharMap::IsDefaultMap() const return bIsDefault; } -// ----------------------------------------------------------------------- + ImplFontCharMap::~ImplFontCharMap() { @@ -77,7 +77,7 @@ ImplFontCharMap::~ImplFontCharMap() delete[] mpGlyphIds; } -// ----------------------------------------------------------------------- + ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) { @@ -100,14 +100,14 @@ ImplFontCharMap* ImplFontCharMap::GetDefaultMap( bool bSymbols) return pDefaultImplFontCharMap; } -// ----------------------------------------------------------------------- + void ImplFontCharMap::AddReference( void) const { ++mnRefCount; } -// ----------------------------------------------------------------------- + void ImplFontCharMap::DeReference( void) const { @@ -116,14 +116,14 @@ void ImplFontCharMap::DeReference( void) const delete this; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetCharCount() const { return mnCharCount; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const { @@ -142,7 +142,7 @@ int ImplFontCharMap::ImplFindRangeIndex( sal_UCS4 cChar ) const return nMid; } -// ----------------------------------------------------------------------- + bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const { @@ -161,7 +161,7 @@ bool ImplFontCharMap::HasChar( sal_UCS4 cChar ) const return bHasChar; } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const { @@ -198,7 +198,7 @@ int ImplFontCharMap::GetGlyphIndex( sal_UCS4 cChar ) const return nGlyphIndex; } -// ----------------------------------------------------------------------- + // returns the number of chars supported by the font, which // are inside the unicode range from cMin to cMax (inclusive) @@ -227,21 +227,21 @@ int ImplFontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const return nCount; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetFirstChar() const { return mpRangeCodes[0]; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetLastChar() const { return (mpRangeCodes[ 2*mnRangeCount-1 ] - 1); } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const { @@ -256,7 +256,7 @@ sal_UCS4 ImplFontCharMap::GetNextChar( sal_UCS4 cChar ) const return (cChar + 1); } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const { @@ -271,7 +271,7 @@ sal_UCS4 ImplFontCharMap::GetPrevChar( sal_UCS4 cChar ) const return (cChar - 1); } -// ----------------------------------------------------------------------- + int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { @@ -293,7 +293,7 @@ int ImplFontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const return -1; } -// ----------------------------------------------------------------------- + sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const { @@ -312,7 +312,7 @@ sal_UCS4 ImplFontCharMap::GetCharFromIndex( int nCharIndex ) const return mpRangeCodes[0]; } -// ======================================================================= + static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned Getsal_uInt16( const unsigned char* p ){ return((p[0]<<8) | p[1]);} @@ -602,13 +602,13 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) return true; } -// ======================================================================= + FontCharMap::FontCharMap() : mpImpl( ImplFontCharMap::GetDefaultMap() ) {} -// ----------------------------------------------------------------------- + FontCharMap::~FontCharMap() { @@ -616,21 +616,21 @@ FontCharMap::~FontCharMap() mpImpl = NULL; } -// ----------------------------------------------------------------------- + int FontCharMap::GetCharCount() const { return mpImpl->GetCharCount(); } -// ----------------------------------------------------------------------- + int FontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const { return mpImpl->CountCharsInRange( cMin, cMax ); } -// ----------------------------------------------------------------------- + void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) { @@ -647,56 +647,56 @@ void FontCharMap::Reset( const ImplFontCharMap* pNewMap ) } } -// ----------------------------------------------------------------------- + bool FontCharMap::IsDefaultMap() const { return mpImpl->IsDefaultMap(); } -// ----------------------------------------------------------------------- + bool FontCharMap::HasChar( sal_UCS4 cChar ) const { return mpImpl->HasChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetFirstChar() const { return mpImpl->GetFirstChar(); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetNextChar( sal_UCS4 cChar ) const { return mpImpl->GetNextChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetPrevChar( sal_UCS4 cChar ) const { return mpImpl->GetPrevChar( cChar ); } -// ----------------------------------------------------------------------- + int FontCharMap::GetIndexFromChar( sal_UCS4 cChar ) const { return mpImpl->GetIndexFromChar( cChar ); } -// ----------------------------------------------------------------------- + sal_UCS4 FontCharMap::GetCharFromIndex( int nIndex ) const { return mpImpl->GetCharFromIndex( nIndex ); } -// ======================================================================= + // on some systems we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available @@ -848,6 +848,6 @@ void UpdateAttributesFromPSName( const OUString& rPSName, ImplDevFontAttributes& } } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index 38becc56ddd7..e0d8d4d1a9ef 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -23,9 +23,9 @@ #include <tools/poly.hxx> #include <vcl/gdimtf.hxx> -// -------------- + // - Vectorizer - -// -------------- + class BitmapReadAccess; class ImplChain; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index e3977355321b..ebf9eb8fb634 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -30,7 +30,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <unotools/fontdefs.hxx> -// ======================================================================== + inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY ) { @@ -75,14 +75,14 @@ inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScal } } -// ======================================================================== + #define COMPAT( _def_rIStm ) VersionCompat aCompat( ( _def_rIStm ), STREAM_READ ); #define WRITE_BASE_COMPAT( _def_rOStm, _def_nVer, _pWriteData ) \ MetaAction::Write( ( _def_rOStm ), _pWriteData ); \ VersionCompat aCompat( ( _def_rOStm ), STREAM_WRITE, ( _def_nVer ) ); -// ======================================================================== + MetaAction::MetaAction() : mnRefCount( 1 ), @@ -233,7 +233,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData return pAction; } -// ======================================================================== + IMPL_META_ACTION( Pixel, META_PIXEL_ACTION ) @@ -302,7 +302,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } -// ======================================================================== + IMPL_META_ACTION( Point, META_POINT_ACTION ) @@ -367,7 +367,7 @@ void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( Line, META_LINE_ACTION ) @@ -464,7 +464,7 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Rect, META_RECT_ACTION ) @@ -529,7 +529,7 @@ void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -602,7 +602,7 @@ void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound ); } -// ======================================================================== + IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) @@ -667,7 +667,7 @@ void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( Arc, META_ARC_ACTION ) @@ -745,7 +745,7 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( Pie, META_PIE_ACTION ) @@ -823,7 +823,7 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -901,7 +901,7 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maEndPt ); } -// ======================================================================== + IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -1008,7 +1008,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Polygon, META_POLYGON_ACTION ) @@ -1090,7 +1090,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) @@ -1195,7 +1195,7 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Text, META_TEXT_ACTION ) @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + MetaTextArrayAction::MetaTextArrayAction() : MetaAction ( META_TEXTARRAY_ACTION ), @@ -1465,7 +1465,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) } } -// ======================================================================== + IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -1554,7 +1554,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -1633,7 +1633,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) maStr = read_uInt16_lenPrefixed_uInt16s_ToOUString(rIStm); } -// ======================================================================== + IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -1731,7 +1731,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) } } -// ======================================================================== + IMPL_META_ACTION( Bmp, META_BMP_ACTION ) @@ -1803,7 +1803,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -1883,7 +1883,7 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -1972,7 +1972,7 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION ) @@ -2044,7 +2044,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -2124,7 +2124,7 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -2213,7 +2213,7 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( Mask, META_MASK_ACTION ) @@ -2289,7 +2289,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maPt ); } -// ======================================================================== + IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -2372,7 +2372,7 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSz ); } -// ======================================================================== + IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -2466,7 +2466,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maSrcSz ); } -// ======================================================================== + IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION ) @@ -2535,7 +2535,7 @@ void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + MetaGradientExAction::MetaGradientExAction() : MetaAction ( META_GRADIENTEX_ACTION ) @@ -2623,7 +2623,7 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + IMPL_META_ACTION( Hatch, META_HATCH_ACTION ) @@ -2698,7 +2698,7 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadHatch( rIStm, maHatch ); } -// ======================================================================== + IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -2766,7 +2766,7 @@ void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadWallpaper( rIStm, maWallpaper ); } -// ======================================================================== + IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) @@ -2838,7 +2838,7 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbClip ); } -// ======================================================================== + IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) @@ -2903,7 +2903,7 @@ void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRectangle( rIStm, maRect ); } -// ======================================================================== + IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) @@ -2968,7 +2968,7 @@ void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadRegion( rIStm, maRegion ); } -// ======================================================================== + IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) @@ -3034,7 +3034,7 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) mnVertMove = nTmpVM; } -// ======================================================================== + IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) @@ -3092,7 +3092,7 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) @@ -3150,7 +3150,7 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) @@ -3201,7 +3201,7 @@ void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) maColor.Read( rIStm, true ); } -// ======================================================================== + IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) @@ -3259,7 +3259,7 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) @@ -3317,7 +3317,7 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) @@ -3375,7 +3375,7 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadCharAsBool( mbSet ); } -// ======================================================================== + IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) @@ -3428,7 +3428,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16; } -// ======================================================================== + IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION ) @@ -3489,7 +3489,7 @@ void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadMapMode( rIStm, maMapMode ); } -// ======================================================================== + IMPL_META_ACTION( Font, META_FONT_ACTION ) @@ -3565,7 +3565,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) pData->meActualCharSet = osl_getThreadTextEncoding(); } -// ======================================================================== + IMPL_META_ACTION( Push, META_PUSH_ACTION ) @@ -3616,7 +3616,7 @@ void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnFlags ); } -// ======================================================================== + IMPL_META_ACTION( Pop, META_POP_ACTION ) @@ -3650,7 +3650,7 @@ void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* ) COMPAT( rIStm ); } -// ======================================================================== + IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) @@ -3703,7 +3703,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16; } -// ======================================================================== + IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) @@ -3786,7 +3786,7 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt16( mnTransPercent ); } -// ======================================================================== + IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -3868,7 +3868,7 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGradient( rIStm, maGradient ); } -// ======================================================================== + IMPL_META_ACTION( EPS, META_EPS_ACTION ) @@ -3949,7 +3949,7 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadGDIMetaFile( rIStm, maSubst ); } -// ======================================================================== + IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) @@ -4006,7 +4006,7 @@ void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } -// ======================================================================== + MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) : MetaAction ( META_COMMENT_ACTION ), @@ -4240,7 +4240,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) mpData = NULL; } -// ======================================================================== + IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) @@ -4291,7 +4291,7 @@ void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) rIStm.ReadUInt32( mnLayoutMode ); } -// ======================================================================== + IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index 0ddf5ec69e1c..b1b0e8b568ac 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -26,7 +26,7 @@ #include <cstdio> -// ======================================================================= + ImplFontMetric::ImplFontMetric() : mnAscent( 0 ), @@ -39,7 +39,7 @@ ImplFontMetric::ImplFontMetric() mnRefCount( 1 ) {} -// ----------------------------------------------------------------------- + inline void ImplFontMetric::AddReference() { @@ -47,7 +47,7 @@ inline void ImplFontMetric::AddReference() ++mnRefCount; } -// ----------------------------------------------------------------------- + inline void ImplFontMetric::DeReference() { @@ -56,7 +56,7 @@ inline void ImplFontMetric::DeReference() delete this; } -// ----------------------------------------------------------------------- + bool ImplFontMetric::operator==( const ImplFontMetric& r ) const { @@ -76,13 +76,13 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } -// ======================================================================= + FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} -// ----------------------------------------------------------------------- + FontInfo::FontInfo( const FontInfo& rInfo ) : Font( rInfo ) @@ -91,14 +91,14 @@ FontInfo::FontInfo( const FontInfo& rInfo ) mpImplMetric->AddReference(); } -// ----------------------------------------------------------------------- + FontInfo::~FontInfo() { mpImplMetric->DeReference(); } -// ----------------------------------------------------------------------- + FontInfo& FontInfo::operator=( const FontInfo& rInfo ) { @@ -114,7 +114,7 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) return *this; } -// ----------------------------------------------------------------------- + bool FontInfo::operator==( const FontInfo& rInfo ) const { @@ -127,7 +127,7 @@ bool FontInfo::operator==( const FontInfo& rInfo ) const return false; } -// ----------------------------------------------------------------------- + FontType FontInfo::GetType() const { @@ -138,49 +138,49 @@ FontMetric::FontMetric( const FontMetric& rMetric ) : FontInfo( rMetric ) {} -// ----------------------------------------------------------------------- + long FontMetric::GetAscent() const { return mpImplMetric->GetAscent(); } -// ----------------------------------------------------------------------- + long FontMetric::GetDescent() const { return mpImplMetric->GetDescent(); } -// ----------------------------------------------------------------------- + long FontMetric::GetIntLeading() const { return mpImplMetric->GetIntLeading(); } -// ----------------------------------------------------------------------- + long FontMetric::GetExtLeading() const { return mpImplMetric->GetExtLeading(); } -// ----------------------------------------------------------------------- + long FontMetric::GetLineHeight() const { return mpImplMetric->GetLineHeight(); } -// ----------------------------------------------------------------------- + long FontMetric::GetSlant() const { return mpImplMetric->GetSlant(); } -// ----------------------------------------------------------------------- + FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { @@ -188,13 +188,13 @@ FontMetric& FontMetric::operator =( const FontMetric& rMetric ) return *this; } -// ----------------------------------------------------------------------- + bool FontMetric::operator==( const FontMetric& rMetric ) const { return FontInfo::operator==( rMetric ); } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index 439e385f5b94..ec309f9c90fd 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -1740,14 +1740,14 @@ void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineI Polygon aPoly = ImplLogicToDevicePixel( rPoly ); // #100127# LineInfo is not curve-safe, subdivide always - // + // What shall this mean? It's wrong to subdivide here when the // polygon is a fat line. In that case, the painted geometry // WILL be much different. // I also have no idea how this could be related to the given ID // which reads 'consolidate boost versions' in the task description. // Removing. - // + //if( aPoly.HasFlags() ) //{ // aPoly = ImplSubdivideBezier( aPoly ); diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index a5e2c57e6f0d..b3d074b454ed 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1714,7 +1714,7 @@ inline BitmapColor lcl_AlphaBlend( int nX, int nY, const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixelIndex( nY, nX ); // Perform porter-duff compositing 'over' operation - // + // Co = Cs + Cd*(1-As) // Ad = As + Ad*(1-As) nResAlpha = (int)nSrcAlpha + (int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255; @@ -2270,14 +2270,14 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask //Region aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) ); //ImplRegionInfo aInfo; //sal_Bool bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); - // + //while( bRgnRect ) //{ // Bitmap aBandBmp( aPaint ); // const Rectangle aBandRect( Point( nWorkX, nWorkY ), Size( nWorkWidth, nWorkHeight ) ); // const Point aMapPt( pMapX[ nWorkX ], pMapY[ nWorkY ] ); // const Size aMapSz( pMapX[ nWorkX + nWorkWidth ] - aMapPt.X(), pMapY[ nWorkY + nWorkHeight ] - aMapPt.Y() ); - // + // aBandBmp.Crop( aBandRect ); // ImplDrawBitmap( aMapPt, aMapSz, Point(), aBandBmp.GetSizePixel(), aBandBmp, META_BMPSCALEPART_ACTION ); // bRgnRect = aWorkRgn.ImplGetNextRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); @@ -2374,12 +2374,12 @@ void OutputDevice::ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor, //Region aWorkRgn( aMask.CreateRegion( COL_BLACK, Rectangle( Point(), aMask.GetSizePixel() ) ) ); //ImplRegionInfo aInfo; //sal_Bool bRgnRect = aWorkRgn.ImplGetFirstRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); - // + //while( bRgnRect ) //{ // const Point aMapPt( pMapX[ nWorkX ], pMapY[ nWorkY ] ); // const Size aMapSz( pMapX[ nWorkX + nWorkWidth ] - aMapPt.X(), pMapY[ nWorkY + nWorkHeight ] - aMapPt.Y() ); - // + // DrawRect( Rectangle( aMapPt, aMapSz ) ); // bRgnRect = aWorkRgn.ImplGetNextRect( aInfo, nWorkX, nWorkY, nWorkWidth, nWorkHeight ); //} diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 833caaa1bb00..de7261033153 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -4732,10 +4732,10 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, { // Whether hyphen or not: Put the word after the hyphen through // word boundary. - // + // nMaxBreakPos the last char that fits into the line // nBreakPos is the word's start - // + // We run into a problem if the doc is so narrow, that a word // is broken into more than two lines ... if ( xHyph.is() ) @@ -4774,10 +4774,10 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, // We can have two cases: // 1) "packen" turns into "pak-ken" // 2) "Schiffahrt" turns into "Schiff-fahrt" - // + // In case 1 we need to replace a char // In case 2 we add a char - // + // Correct recognition is made harder by words such as // "Schiffahrtsbrennesseln", as the Hyphenator splits all // positions of the word and comes up with "Schifffahrtsbrennnesseln" diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index c9a3e6369dda..2422dc27ef77 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -362,7 +362,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, // Also for printers always use PolyPolygon, as not all printers // can print polygons on top of each other. // Also virtual devices are excluded, as some drivers are too slow. - // + PolyPolygon* pPolyPoly; Rectangle aRect; Point aCenter; diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index 830a1ee3748e..5e6fa7f8fa3b 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -31,10 +31,10 @@ #include <outdata.hxx> #include <outdev.h> -// ======================================================================= -// ======================================================================= + + void OutputDevice::DrawRect( const Rectangle& rRect, sal_uLong nHorzRound, sal_uLong nVertRound ) diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index ba9fd16d9c06..57146b4ed212 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -42,10 +42,10 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -// ======================================================================= -// ======================================================================= + + static int const s_ImplArySize = MAP_PIXEL+1; static const long aImplNumeratorAry[s_ImplArySize] = @@ -53,7 +53,7 @@ static const long aImplNumeratorAry[s_ImplArySize] = static const long aImplDenominatorAry[s_ImplArySize] = { 2540, 254, 127, 127, 1000, 100, 10, 1, 72, 1440, 1 }; -// ----------------------------------------------------------------------- + /* Reduces accuracy until it is a fraction (should become @@ -97,7 +97,7 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) return aF; } -// ----------------------------------------------------------------------- + // Fraction.GetNumerator() // Fraction.GetDenominator() > 0 @@ -165,7 +165,7 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY, rThresRes.mnThresPixToLogY /= 2; } -// ----------------------------------------------------------------------- + static void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, ImplMapRes& rMapRes ) @@ -348,7 +348,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, } } -// ----------------------------------------------------------------------- + inline void ImplCalcMapResolution( const MapMode& rMapMode, long nDPIX, long nDPIY, @@ -359,7 +359,7 @@ inline void ImplCalcMapResolution( const MapMode& rMapMode, ImplCalcBigIntThreshold( nDPIX, nDPIY, rMapRes, rThresRes ); } -// ----------------------------------------------------------------------- + static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) @@ -395,7 +395,7 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, return n; } -// ----------------------------------------------------------------------- + static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) @@ -417,7 +417,7 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, return (n / 2); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicXToDevicePixel( long nX ) const { @@ -429,7 +429,7 @@ long OutputDevice::ImplLogicXToDevicePixel( long nX ) const maThresRes.mnThresLogToPixX )+mnOutOffX+mnOutOffOrigX; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicYToDevicePixel( long nY ) const { @@ -441,7 +441,7 @@ long OutputDevice::ImplLogicYToDevicePixel( long nY ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const { @@ -453,7 +453,7 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const maThresRes.mnThresLogToPixX ); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const { @@ -473,7 +473,7 @@ float OutputDevice::ImplFloatLogicHeightToDevicePixel( float fLogicHeight) const return fPixelHeight; } -// ----------------------------------------------------------------------- + long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const { @@ -485,7 +485,7 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const maThresRes.mnThresPixToLogX ); } -// ----------------------------------------------------------------------- + long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const { @@ -497,7 +497,7 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const maThresRes.mnThresPixToLogY ); } -// ----------------------------------------------------------------------- + Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const { @@ -512,7 +512,7 @@ Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const { @@ -527,7 +527,7 @@ Size OutputDevice::ImplLogicToDevicePixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const { @@ -554,7 +554,7 @@ Rectangle OutputDevice::ImplLogicToDevicePixel( const Rectangle& rLogicRect ) co maThresRes.mnThresLogToPixY )+mnOutOffY+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const { @@ -597,7 +597,7 @@ Polygon OutputDevice::ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -614,7 +614,7 @@ PolyPolygon OutputDevice::ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyP return aPolyPoly; } -// ----------------------------------------------------------------------- + LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const { @@ -643,7 +643,7 @@ LineInfo OutputDevice::ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const return aInfo; } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) const { @@ -670,7 +670,7 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const { @@ -682,7 +682,7 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + void OutputDevice::EnableMapMode( bool bEnable ) { @@ -692,7 +692,7 @@ void OutputDevice::EnableMapMode( bool bEnable ) mpAlphaVDev->EnableMapMode( bEnable ); } -// ----------------------------------------------------------------------- + void OutputDevice::SetMapMode() { @@ -726,7 +726,7 @@ void OutputDevice::SetMapMode() mpAlphaVDev->SetMapMode(); } -// ----------------------------------------------------------------------- + void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { @@ -826,7 +826,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) ImplInvalidateViewTransform(); } -// ----------------------------------------------------------------------- + void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { @@ -899,7 +899,7 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) mpAlphaVDev->SetRelativeMapMode( rNewMapMode ); } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const @@ -935,7 +935,7 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation() const } } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const @@ -963,7 +963,7 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation() const } } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMode ) const @@ -988,7 +988,7 @@ basegfx::B2DHomMatrix OutputDevice::GetViewTransformation( const MapMode& rMapMo return aTransform; } -// ----------------------------------------------------------------------- + // #i75163# basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& rMapMode ) const @@ -998,7 +998,7 @@ basegfx::B2DHomMatrix OutputDevice::GetInverseViewTransformation( const MapMode& return aMatrix; } -// ----------------------------------------------------------------------- + basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const { @@ -1009,7 +1009,7 @@ basegfx::B2DHomMatrix OutputDevice::ImplGetDeviceTransformation() const return aTransformation; } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const { @@ -1025,7 +1025,7 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const { @@ -1041,7 +1041,7 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize ) const maThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const { @@ -1063,7 +1063,7 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect ) const maThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const { @@ -1094,7 +1094,7 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const { @@ -1112,7 +1112,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const { @@ -1122,7 +1122,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { @@ -1132,7 +1132,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const { @@ -1168,7 +1168,7 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const @@ -1190,7 +1190,7 @@ Point OutputDevice::LogicToPixel( const Point& rLogicPt, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToPixel( const Size& rLogicSize, const MapMode& rMapMode ) const @@ -1212,7 +1212,7 @@ Size OutputDevice::LogicToPixel( const Size& rLogicSize, aThresRes.mnThresLogToPixY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, const MapMode& rMapMode ) const @@ -1240,7 +1240,7 @@ Rectangle OutputDevice::LogicToPixel( const Rectangle& rLogicRect, aThresRes.mnThresLogToPixY )+mnOutOffOrigY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const @@ -1277,7 +1277,7 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly, return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const @@ -1296,7 +1296,7 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly, return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const @@ -1307,7 +1307,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, const MapMode& rMapMode ) const @@ -1318,7 +1318,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const { @@ -1354,7 +1354,7 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1370,7 +1370,7 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const { @@ -1386,7 +1386,7 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize ) const maThresRes.mnThresPixToLogY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const { @@ -1408,7 +1408,7 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect ) const maThresRes.mnThresPixToLogY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const { @@ -1439,7 +1439,7 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly ) const return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const { @@ -1465,7 +1465,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const { @@ -1501,7 +1501,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return aRegion; } -// ----------------------------------------------------------------------- + Point OutputDevice::PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const @@ -1524,7 +1524,7 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::PixelToLogic( const Size& rDeviceSize, const MapMode& rMapMode ) const @@ -1547,7 +1547,7 @@ Size OutputDevice::PixelToLogic( const Size& rDeviceSize, aThresRes.mnThresPixToLogY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, const MapMode& rMapMode ) const @@ -1576,7 +1576,7 @@ Rectangle OutputDevice::PixelToLogic( const Rectangle& rDeviceRect, aThresRes.mnThresPixToLogY ) - aMapRes.mnMapOfsY - mnOutOffLogicY ); } -// ----------------------------------------------------------------------- + Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, const MapMode& rMapMode ) const @@ -1614,7 +1614,7 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly, return aPoly; } -// ----------------------------------------------------------------------- + PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const @@ -1633,7 +1633,7 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly, return aPolyPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly, const MapMode& rMapMode ) const @@ -1644,7 +1644,7 @@ basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixe return aTransformedPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly, const MapMode& rMapMode ) const @@ -1655,7 +1655,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -// ----------------------------------------------------------------------- + Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const { @@ -1691,7 +1691,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return aRegion; } -// ----------------------------------------------------------------------- + #define ENTER0( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ @@ -1701,7 +1701,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r if ( *pMapModeSource == *pMapModeDest ) \ return rSource -// ----------------------------------------------------------------------- + #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ ENTER0( rSource, pMapModeSource, pMapModeDest ); \ @@ -1734,7 +1734,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else \ aMapResDest = maMapRes -// ----------------------------------------------------------------------- + #define ENTER2( eUnitSource, eUnitDest ) \ DBG_ASSERT( eUnitSource != MAP_SYSFONT \ @@ -1750,7 +1750,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, \ "MAP_PIXEL mit 72dpi angenaehert" ) -// ----------------------------------------------------------------------- + #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ @@ -1769,7 +1769,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r else if( eUnitDest == MAP_PIXEL ) \ nNumerator *= 72 -// ----------------------------------------------------------------------- + #define ENTER4( rMapModeSource, rMapModeDest ) \ ImplMapRes aMapResSource; \ @@ -1784,7 +1784,7 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r ImplCalcMapResolution( rMapModeSource, 72, 72, aMapResSource ); \ ImplCalcMapResolution( rMapModeDest, 72, 72, aMapResDest ) -// ----------------------------------------------------------------------- + // return (n1 * n2 * n3) / (n4 * n5) static long fn5( const long n1, @@ -1904,7 +1904,7 @@ static long fn5( const long n1, } // of else } -// ----------------------------------------------------------------------- + // return (n1 * n2) / n3 static long fn3( const long n1, const long n2, const long n3 ) @@ -1941,7 +1941,7 @@ static long fn3( const long n1, const long n2, const long n3 ) } // of else } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, @@ -1959,7 +1959,7 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, aMapResDest.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode* pMapModeSource, @@ -1975,7 +1975,7 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, aMapResSource.mnMapScDenomY, aMapResDest.mnMapScNumY ) ); } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode* pMapModeSource, @@ -2001,7 +2001,7 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, aMapResDest.mnMapOfsY ); } -// ----------------------------------------------------------------------- + Point OutputDevice::LogicToLogic( const Point& rPtSource, const MapMode& rMapModeSource, @@ -2037,7 +2037,7 @@ Point OutputDevice::LogicToLogic( const Point& rPtSource, } } -// ----------------------------------------------------------------------- + Size OutputDevice::LogicToLogic( const Size& rSzSource, const MapMode& rMapModeSource, @@ -2071,7 +2071,7 @@ Size OutputDevice::LogicToLogic( const Size& rSzSource, } } -// ----------------------------------------------------------------------- + basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPolySource, const MapMode& rMapModeSource, @@ -2089,7 +2089,7 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly return aPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource, const MapMode& rMapModeSource, @@ -2107,7 +2107,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygo return aPoly; } -// ----------------------------------------------------------------------- + basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, const MapMode& rMapModeDest) { @@ -2148,7 +2148,7 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const MapMode& rMapModeSource, return aTransform; } -// ----------------------------------------------------------------------- + Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, const MapMode& rMapModeSource, @@ -2194,7 +2194,7 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource, } } -// ----------------------------------------------------------------------- + long OutputDevice::LogicToLogic( long nLongSource, MapUnit eUnitSource, MapUnit eUnitDest ) @@ -2208,7 +2208,7 @@ long OutputDevice::LogicToLogic( long nLongSource, return fn3( nLongSource, nNumerator, nDenominator ); } -// ----------------------------------------------------------------------- + void OutputDevice::SetPixelOffset( const Size& rOffset ) { @@ -2226,14 +2226,14 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) mpAlphaVDev->SetPixelOffset( rOffset ); } -// ----------------------------------------------------------------------- + Size OutputDevice::GetPixelOffset() const { return Size(mnOutOffOrigX, mnOutOffOrigY); } -// ----------------------------------------------------------------------- + long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { @@ -2260,7 +2260,7 @@ long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) return nX; } -// ----------------------------------------------------------------------- + long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index ccf7771b99ee..36b5c69c0ebe 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4401,10 +4401,10 @@ we check in the following sequence: considered the named destination in the target file, set relative or absolute as requested else strip the fragment from URL and then set URI or 'launch application' as requested */ -// + // FIXME: check if the decode mechanisms for URL processing throughout this implementation // are the correct one!! -// + // extract target file type INetURLObject aDocumentURL( m_aContext.BaseURL ); INetURLObject aTargetURL( rLink.m_aURL ); @@ -4503,7 +4503,7 @@ we check in the following sequence: // protocol then force the uri action on it // This code will permit the correct opening of application on web pages, // the one that normally have fragments (but I may be wrong...) - // and will force the use of URI when the protocol is not file:// + // and will force the use of URI when the protocol is not file: if( (!aFragment.isEmpty() && !bTargetHasPDFExtension) || eTargetProtocol != INET_PROT_FILE ) { diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 61329f0a98b2..d6eb73f59274 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -84,7 +84,7 @@ private: sal_uInt8* mpScanPrior; // pointer to the latest scanline sal_uInt8* mpTransTab; // for transparency in images with palette colortype sal_uInt8* mpScanCurrent; // pointer into the current scanline - sal_uInt8* mpColorTable; // + sal_uInt8* mpColorTable; sal_Size mnStreamSize; // estimate of PNG file size sal_uInt32 mnChunkType; // Type of current PNG chunk sal_Int32 mnChunkLen; // Length of current PNG chunk diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index b6b8f23de2b8..098deabe588e 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -712,12 +712,12 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // the number of metafile actions, and it finds all distinct // regions of rectangle-bounded connected components. This // algorithm was designed by AF. - // - // + + // STAGE 1: Detect background - // ========================== - // + + // Receives uniform background content, and is _not_ merged // nor checked for intersection against other aCCList elements @@ -860,10 +860,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, ++nActionNum; } - // + // STAGE 2: Generate connected components list - // =========================================== - // + + // iterate over all actions (start where background action // search left off) @@ -888,10 +888,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, bool bTreatSpecial( false ); ConnectedComponents aTotalComponents; - // + // STAGE 2.1: Search for intersecting cc entries - // ============================================= - // + + // if aBBCurrAct is empty, it will intersect with no // aCCList member. Thus, we can save the check. @@ -983,10 +983,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( bSomeComponentsChanged ); } - // + // STAGE 2.2: Determine special state for cc element - // ================================================= - // + + // now test whether the whole connected component must be // treated specially (i.e. rendered as a bitmap): if the @@ -1054,10 +1054,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } - // + // STAGE 2.3: Add newly generated CC list element - // ============================================== - // + + // set new bounds and add action to list aTotalComponents.aBounds = aTotalBounds; @@ -1104,10 +1104,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } } - // + // STAGE 3.1: Output background mtf actions (if there are any) - // =========================================================== - // + + ComponentList::iterator aCurrAct( aBackgroundComponent.aComponentList.begin() ); const ComponentList::iterator aLastAct( aBackgroundComponent.aComponentList.end() ); @@ -1119,10 +1119,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, } - // + // STAGE 3.2: Generate banded bitmaps for special regions - // ==================================================== - // + + Point aPageOffset; Size aTmpSize( GetOutputSizePixel() ); @@ -1296,10 +1296,10 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, while( nCount-- ) aMapModeVDev.Pop(); - // + // STAGE 4: Copy actions to output metafile - // ======================================== - // + + // iterate over all actions and duplicate the ones not in a // special aCCList member into rOutMtf diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index a64e6fc3ddff..7ce25b7ccbda 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -907,7 +907,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons } //fdo#61886 -// + //when printing is finished, set the paper size of the printer to either what //the user explicitly set as the desired paper size, or fallback to whatever //the printer had before printing started. That way it doesn't contain the last diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx index f7e0820f9c17..59d9c914799e 100644 --- a/vcl/source/gdi/regband.cxx +++ b/vcl/source/gdi/regband.cxx @@ -25,23 +25,23 @@ #include "regband.hxx" -// ======================================================================= -// + + // ImplRegionBand -// + // Each band contains all rectangles between upper and lower border. // For Union, Intersect, Xor and Exclude operations rectangles of // equal height are evaluated. The borders of the bands should always // be choosen such that this is possible. -// + // If possible, rectangles within the bands are condensed. -// + // When converting polygons all points of the polygon are registered // in the individual bands (for each band they are stored as // points in a list). After registration of these points they are // converted to rectangles and the points in the list are deleted. -// -// + + ImplRegionBand::ImplRegionBand( long nTop, long nBottom ) @@ -146,7 +146,7 @@ ImplRegionBand::~ImplRegionBand() } -// + // generate separations from lines and process union with existing // separations @@ -199,7 +199,7 @@ void ImplRegionBand::ProcessPoints() } -// + // generate separations from lines and process union with existing // separations @@ -339,7 +339,7 @@ void ImplRegionBand::ScaleX( double fHorzScale ) } -// + // combine overlaping sparations bool ImplRegionBand::OptimizeBand() @@ -591,50 +591,50 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) DBG_ASSERT( nXLeft <= nXRight, "ImplRegionBand::XOr(): nxLeft > nXRight" ); // #i46602# Reworked rectangle Xor - // + // In general, we can distinguish 11 cases of intersection // (details below). The old implementation explicitly handled 7 // cases (numbered in the order of appearance, use CVS to get your // hands on the old version), therefore, I've sticked to that // order, and added four more cases. The code below references // those numbers via #1, #2, etc. - // + // Num Mnem newX:oldX newY:oldY Description Result Can quit? - // + // #1 Empty band - - The band is empty, thus, simply add new bandSep just add Yes - // + // #2 apart - - The rectangles are disjunct, add new one as is just add Yes - // + // #3 atop == == The rectangles are _exactly_ the same, remove existing just remove Yes - // + // #4 around < > The new rectangle extends the old to both sides intersect No - // + // #5 left < < The new rectangle is left of the old (but intersects) intersect Yes - // + // #5b left-atop < == The new is left of the old, and coincides on the right intersect Yes - // + // #6 right > > The new is right of the old (but intersects) intersect No - // + // #6b right-atop == > The new is right of the old, and coincides on the left intersect No - // + // #7 inside > < The new is fully inside the old intersect Yes - // + // #8 inside-right > == The new is fully inside the old, coincides on the right intersect Yes - // + // #9 inside-left == < The new is fully inside the old, coincides on the left intersect Yes - // - // + + // Then, to correctly perform XOr, the segment that's switched off // (i.e. the overlapping part of the old and the new segment) must // be extended by one pixel value at each border: // 1 1 // 0 4 0 4 // 111100000001111 - // + // Clearly, the leading band sep now goes from 0 to 3, and the // trailing band sep from 11 to 14. This mimicks the xor look of a // bitmap operation. - // + // band empty? -> add element if ( !mpFirstSep ) @@ -737,7 +737,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) "ImplRegionBand::XOr(): Case 4,5,6,7 expected all coordinates to be not equal!" ); // The plain-jane check would look like this: - // + // if( nXLeft < nOldLeft ) // { // // #4,5 @@ -762,7 +762,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight ) // // #7 done! // } // } - // + // but since we generally don't have to care whether // it's 4 or 6 (only that we must not stop processing // here), condensed that in such a way that only the diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 8c536275a5ed..ff8314c61d57 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -32,10 +32,10 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// + + namespace { @@ -226,7 +226,7 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + bool Region::IsEmpty() const { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 13106ac7e1ac..b74a780cff67 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -21,10 +21,10 @@ #include <tools/debug.hxx> #include <regionband.hxx> -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// + + RegionBand::RegionBand() : mpFirstBand(0), diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 35f66b58924a..feb6e59ca390 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -45,9 +45,9 @@ #include "basegfx/polygon/b2dpolygon.hxx" -// ---------------------------------------------------------------------------- + // The only common SalFrame method -// ---------------------------------------------------------------------------- + SalFrameGeometry SalFrame::GetGeometry() { @@ -64,7 +64,7 @@ SalFrameGeometry SalFrame::GetGeometry() return maGeometry; } -// ---------------------------------------------------------------------------- + SalGraphics::SalGraphics() : m_nLayout( 0 ), @@ -79,7 +79,7 @@ SalGraphics::~SalGraphics() { } -// ---------------------------------------------------------------------------- + bool SalGraphics::drawTransformedBitmap( const basegfx::B2DPoint& /* rNull */, @@ -92,7 +92,7 @@ bool SalGraphics::drawTransformedBitmap( return false; } -// ---------------------------------------------------------------------------- + void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) const { @@ -270,7 +270,7 @@ void SalGraphics::mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack //bool bRegionRect; //Region aMirroredRegion; //long nX, nY, nWidth, nHeight; - // + //bRegionRect = rRgn.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight ); //while ( bRegionRect ) //{ @@ -376,7 +376,7 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rP return aRet; } -// ---------------------------------------------------------------------------- + bool SalGraphics::SetClipRegion( const Region& i_rClip, const OutputDevice *pOutDev ) { diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index c2bb8b7422b7..f22568e87479 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -70,7 +70,7 @@ FILE * mslLog() #endif } #endif -// ======================================================================= + std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) { @@ -185,7 +185,7 @@ bool IsDiacritic( sal_UCS4 nChar ) return false; } -// ======================================================================= + int GetVerticalFlags( sal_UCS4 nChar ) { @@ -347,7 +347,7 @@ inline bool IsControlChar( sal_UCS4 cChar ) return false; } -// ======================================================================= + bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL ) { @@ -510,7 +510,7 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef return true; } -// ======================================================================= + ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ) @@ -674,7 +674,7 @@ bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) return bValid; } -// ======================================================================= + SalLayout::SalLayout() : mnMinCharPos( -1 ), @@ -872,7 +872,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const return bRet; } -// ======================================================================= + GenericSalLayout::GenericSalLayout() {} @@ -1024,7 +1024,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // to get an array that maps input characters (not glyphs) to their absolute // position, GetTextArray() in turn calls SalLayout::FillDXArray() to get an // array of character widths that it converts to absolute positions. -// + // Writer would then apply justification adjustments to that array of absolute // character positions and return to OutputDevice, which eventually calls // ApplyDXArray(), which needs to extract the individual adjustments for each @@ -1034,7 +1034,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) // text layout bugs, and instead of fixing the broken design a hack after hack // have been applied on top of it, making it a complete mess that nobody // understands. -// + // As you can see by now, this is utterly stupid, why Writer does not just send // us directly the advance width transformations it wants to apply to each // character instead of this whole mess? @@ -1557,7 +1557,7 @@ void GenericSalLayout::SortGlyphItems() } } -// ======================================================================= + MultiSalLayout::MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont ) : SalLayout() diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 5786480c0296..fa3ebdf1e1d5 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -29,11 +29,11 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> -////////////////////////////////////////////////////////////////////////////// + using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// + BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( const Primitive2DSequence& rSequence, @@ -91,7 +91,7 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx( return aRetval; } -////////////////////////////////////////////////////////////////////////////// + void SvgData::ensureReplacement() { @@ -103,7 +103,7 @@ void SvgData::ensureReplacement() } } -////////////////////////////////////////////////////////////////////////////// + void SvgData::ensureSequenceAndRange() { @@ -160,7 +160,7 @@ void SvgData::ensureSequenceAndRange() } } -////////////////////////////////////////////////////////////////////////////// + SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLength, const OUString& rPath) : maSvgDataArray(rSvgDataArray), @@ -172,7 +172,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng { } -////////////////////////////////////////////////////////////////////////////// + SvgData::SvgData(const OUString& rPath): maSvgDataArray(), mnSvgDataArrayLength(0), @@ -200,7 +200,7 @@ SvgData::SvgData(const OUString& rPath): } } -////////////////////////////////////////////////////////////////////////////// + const basegfx::B2DRange& SvgData::getRange() const { @@ -209,7 +209,7 @@ const basegfx::B2DRange& SvgData::getRange() const return maRange; } -////////////////////////////////////////////////////////////////////////////// + const Primitive2DSequence& SvgData::getPrimitive2DSequence() const { @@ -218,7 +218,7 @@ const Primitive2DSequence& SvgData::getPrimitive2DSequence() const return maSequence; } -////////////////////////////////////////////////////////////////////////////// + const BitmapEx& SvgData::getReplacement() const { diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 2d774a58b7f9..e0b497311f21 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; -// ======================================================================= + void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index b4616e96668f..b453696c99d7 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -30,7 +30,7 @@ // #define GRLAYOUT_DEBUG 1 // Header files -// + // Standard Library #include <algorithm> #include <cassert> @@ -60,9 +60,9 @@ #include <graphite_features.hxx> // Module private type definitions and forward declarations. -// + // Module private names. -// + #ifdef GRLAYOUT_DEBUG static FILE * grLog() @@ -488,9 +488,9 @@ GraphiteLayout::append(gr_segment *pSeg, ImplLayoutArgs &rArgs, return cOrigin; } -// + // An implementation of the SalLayout interface to enable Graphite enabled fonts to be used. -// + GraphiteLayout::GraphiteLayout(const gr_face * face, gr_font * font, const grutils::GrFeatureParser * pFeatures) throw() : mpFace(face) diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src index 41170f88a7c2..bda7498be9a5 100644 --- a/vcl/source/src/images.src +++ b/vcl/source/src/images.src @@ -19,7 +19,7 @@ #include <svids.hrc> -// ======================================================================= + Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET) { @@ -42,7 +42,7 @@ Bitmap (SV_RESID_BITMAP_SCROLLMSK) File = "scrmsk.png"; }; -// ----------------------------------------------------------------------- + Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET) { @@ -294,7 +294,7 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRINTERADMIN) File = "printeradmin_16_8.png" ; }; -// ----------------------------------------------------------------------- + Bitmap (SV_ICON_LARGE_START) diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 61b5763f6646..c4aad9c36148 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -27,14 +27,14 @@ #include <map> #include <vector> -// ======================================================================= + typedef ::std::map< sal_uLong, ImplAccelEntry* > ImplAccelMap; typedef ::std::vector< ImplAccelEntry* > ImplAccelList; #define ACCELENTRY_NOTFOUND ((sal_uInt16)0xFFFF) -// ======================================================================= + class ImplAccelData { @@ -43,10 +43,10 @@ public: ImplAccelList maIdList; // Id-List }; -// ======================================================================= -// ======================================================================= + + sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId, sal_uInt16* pIndex = NULL ) @@ -155,7 +155,7 @@ static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nI return nIndex; } -// ======================================================================= + void Accelerator::ImplInit() { diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 66ce04be9c19..617fbf3c0caa 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -24,10 +24,10 @@ #include <vcl/accel.hxx> #include <accmgr.hxx> -// ======================================================================= -// ======================================================================= + + ImplAccelManager::~ImplAccelManager() { diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 27eafacfaac5..9f7e85bef537 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno; // useful caption height for title bar buttons #define MIN_CAPTION_HEIGHT 18 -// ======================================================================= + static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) { @@ -149,7 +149,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, } -// ======================================================================= + // - ImplBorderWindowView - @@ -1016,7 +1016,7 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData return nTitleWidth; } -// ======================================================================= + // - ImplNoBorderWindowView - @@ -1056,13 +1056,13 @@ void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* { } -// ======================================================================= + // - ImplSmallBorderWindowView - -// ======================================================================= + ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ) : mpBorderWindow(pBorderWindow) @@ -1414,7 +1414,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* } } -// ======================================================================= + // - ImplStdBorderWindowView - @@ -1847,7 +1847,7 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p } -// ======================================================================= + void ImplBorderWindow::ImplInit( Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ) @@ -1933,7 +1933,7 @@ void ImplBorderWindow::ImplInit( Window* pParent, InitView(); } -// ======================================================================= + ImplBorderWindow::ImplBorderWindow( Window* pParent, SystemParentData* pSystemParentData, diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index bfd3cb5ea2c0..16bc80b8705c 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -28,7 +28,7 @@ #include <tools/poly.hxx> -// ======================================================================= + struct ImplCursorData { @@ -44,7 +44,7 @@ struct ImplCursorData Window* mpWindow; // Zugeordnetes Windows }; -// ======================================================================= + static void ImplCursorInvert( ImplCursorData* pData ) { @@ -271,7 +271,7 @@ IMPL_LINK_NOARG(Cursor, ImplTimerHdl) return 0; } -// ======================================================================= + Cursor::Cursor() { diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index adcc3bd49292..df13ce4b8358 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -23,14 +23,14 @@ #include <vcl/window.hxx> #include <vcl/ctrl.hxx> -// ======================================================================= + #define BUTTON_DRAW_FLATTEST (BUTTON_DRAW_FLAT | \ BUTTON_DRAW_PRESSED | \ BUTTON_DRAW_CHECKED | \ BUTTON_DRAW_HIGHLIGHT) -// ======================================================================= + namespace { @@ -875,7 +875,7 @@ void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, mpOutDev->EnableMapMode( bOldMapMode ); } -// ======================================================================= + void DecorationView::DrawFrame( const Rectangle& rRect, const Color& rLeftTopColor, @@ -890,7 +890,7 @@ void DecorationView::DrawFrame( const Rectangle& rRect, mpOutDev->EnableMapMode( bOldMapMode ); } -// ======================================================================= + void DecorationView::DrawHighlightFrame( const Rectangle& rRect, sal_uInt16 nStyle ) @@ -940,7 +940,7 @@ void DecorationView::DrawHighlightFrame( const Rectangle& rRect, DrawFrame( rRect, aLightColor, aShadowColor ); } -// ======================================================================= + Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { @@ -975,7 +975,7 @@ Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) return aRect; } -// ======================================================================= + Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle ) { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 334a155a5f80..a531bbde66ac 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -53,7 +53,7 @@ #include <touch/touch.h> #endif -// ======================================================================= + static OString ImplGetDialogText( Dialog* pDialog ) { @@ -72,7 +72,7 @@ static OString ImplGetDialogText( Dialog* pDialog ) return aErrorStr.makeStringAndClear(); } -// ======================================================================= + static bool ImplIsMnemonicCtrl( Window* pWindow ) { @@ -261,7 +261,7 @@ static Window* getActionAreaButtonList(Dialog *pDialog) return pDialog->GetWindow(WINDOW_FIRSTCHILD); } -// ======================================================================= + static PushButton* ImplGetDefaultButton( Dialog* pDialog ) { @@ -338,7 +338,7 @@ static void ImplMouseAutoPos( Dialog* pDialog ) } } -// ======================================================================= + struct DialogImpl { @@ -349,7 +349,7 @@ struct DialogImpl DialogImpl() : mnResult( -1 ), mbStartedModal( false ) {} }; -// ======================================================================= + void Dialog::ImplInitDialogData() { @@ -1363,7 +1363,7 @@ ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUStr { } -// ======================================================================= + ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) : Dialog( WINDOW_MODALDIALOG ) diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 5874e24dc603..5bc9c92e5d44 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -// ======================================================================= + static bool ImplHasIndirectTabParent( Window* pWindow ) { diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index c67d86b600f1..49ca76f28e1f 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -33,9 +33,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; -//================================================================================================== + // DNDEventDispatcher::DNDEventDispatcher -//================================================================================================== + DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ): m_pTopWindow( pTopWindow ), @@ -43,9 +43,9 @@ DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ): { } -//================================================================================================== + // DNDEventDispatcher::~DNDEventDispatcher -//================================================================================================== + DNDEventDispatcher::~DNDEventDispatcher() { @@ -76,9 +76,9 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) return pChildWindow; } -//================================================================================================== + // DNDEventDispatcher::drop -//================================================================================================== + void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) @@ -116,9 +116,9 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) m_aDataFlavorList.realloc( 0 ); } -//================================================================================================== + // DNDEventDispatcher::dragEnter -//================================================================================================== + void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException) @@ -144,9 +144,9 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd } -//================================================================================================== + // DNDEventDispatcher::dragExit -//================================================================================================== + void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) throw(RuntimeException) @@ -160,9 +160,9 @@ void SAL_CALL DNDEventDispatcher::dragExit( const DropTargetEvent& /*dte*/ ) m_aDataFlavorList.realloc( 0 ); } -//================================================================================================== + // DNDEventDispatcher::dragOver -//================================================================================================== + void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException) @@ -201,9 +201,9 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) } } -//================================================================================================== + // DNDEventDispatcher::dropActionChanged -//================================================================================================== + void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException) @@ -243,9 +243,9 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& } -//================================================================================================== + // DNDEventDispatcher::dragGestureRecognized -//================================================================================================== + void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException) @@ -259,34 +259,34 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction ); } -//================================================================================================== + // DNDEventDispatcher::disposing -//================================================================================================== + void SAL_CALL DNDEventDispatcher::disposing( const EventObject& ) throw(RuntimeException) { } -//================================================================================================== + // DNDEventDispatcher::acceptDrag -//================================================================================================== + void SAL_CALL DNDEventDispatcher::acceptDrag( sal_Int8 /*dropAction*/ ) throw(RuntimeException) { } -//================================================================================================== + // DNDEventDispatcher::rejectDrag -//================================================================================================== + void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException) { } -//================================================================================================== + // DNDEventDispatcher::fireDragEnterEvent -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, @@ -320,9 +320,9 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, return n; } -//================================================================================================== + // DNDEventDispatcher::fireDragOverEvent -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, @@ -353,9 +353,9 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, return n; } -//================================================================================================== + // DNDEventDispatcher::fireDragExitEvent -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(RuntimeException) { @@ -380,9 +380,9 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime return n; } -//================================================================================================== + // DNDEventDispatcher::fireDropActionChangedEvent -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, @@ -413,9 +413,9 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, return n; } -//================================================================================================== + // DNDEventDispatcher::fireDropEvent -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, @@ -458,9 +458,9 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, return n; } -//================================================================================================== + // DNDEventDispatcher::fireDragGestureRecognized -//================================================================================================== + sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, const Reference< XDragSource >& xSource, const Any event, diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index 130ee3d774b9..b6a4ecef0782 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -25,9 +25,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; -//================================================================================================== -// -//================================================================================================== + + + DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex()) @@ -36,17 +36,17 @@ DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) m_nDefaultActions = nDefaultActions; } -//================================================================================================== -// -//================================================================================================== + + + DNDListenerContainer::~DNDListenerContainer() { } -//================================================================================================== + // DNDListenerContainer::addDragGestureListener -//================================================================================================== + void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException) @@ -54,9 +54,9 @@ void SAL_CALL DNDListenerContainer::addDragGestureListener( const Reference< XDr rBHelper.addListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } -//================================================================================================== + // DNDListenerContainer::removeDragGestureListener -//================================================================================================== + void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< XDragGestureListener >& dgl ) throw(RuntimeException) @@ -64,18 +64,18 @@ void SAL_CALL DNDListenerContainer::removeDragGestureListener( const Reference< rBHelper.removeListener( getCppuType( ( const Reference< XDragGestureListener > * ) 0 ), dgl ); } -//================================================================================================== + // DNDListenerContainer::resetRecognizer -//================================================================================================== + void SAL_CALL DNDListenerContainer::resetRecognizer( ) throw(RuntimeException) { } -//================================================================================================== + // DNDListenerContainer::addDropTargetListener -//================================================================================================== + void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException) @@ -83,9 +83,9 @@ void SAL_CALL DNDListenerContainer::addDropTargetListener( const Reference< XDro rBHelper.addListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } -//================================================================================================== + // DNDListenerContainer::removeDropTargetListener -//================================================================================================== + void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< XDropTargetListener >& dtl ) throw(RuntimeException) @@ -93,9 +93,9 @@ void SAL_CALL DNDListenerContainer::removeDropTargetListener( const Reference< X rBHelper.removeListener( getCppuType( ( const Reference< XDropTargetListener > * ) 0 ), dtl ); } -//================================================================================================== + // DNDListenerContainer::isActive -//================================================================================================== + sal_Bool SAL_CALL DNDListenerContainer::isActive( ) throw(RuntimeException) @@ -103,9 +103,9 @@ sal_Bool SAL_CALL DNDListenerContainer::isActive( ) return m_bActive; } -//================================================================================================== + // DNDListenerContainer::setActive -//================================================================================================== + void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) throw(RuntimeException) @@ -113,9 +113,9 @@ void SAL_CALL DNDListenerContainer::setActive( sal_Bool active ) m_bActive = active; } -//================================================================================================== + // DNDListenerContainer::getDefaultActions -//================================================================================================== + sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) throw(RuntimeException) @@ -123,9 +123,9 @@ sal_Int8 SAL_CALL DNDListenerContainer::getDefaultActions( ) return m_nDefaultActions; } -//================================================================================================== + // DNDListenerContainer::setDefaultActions -//================================================================================================== + void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) throw(RuntimeException) @@ -133,9 +133,9 @@ void SAL_CALL DNDListenerContainer::setDefaultActions( sal_Int8 actions ) m_nDefaultActions = actions; } -//================================================================================================== + // DNDListenerContainer::fireDropEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDropContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, @@ -206,9 +206,9 @@ sal_uInt32 DNDListenerContainer::fireDropEvent( const Reference< XDropTargetDrop return nRet; } -//================================================================================================== + // DNDListenerContainer::fireDragExitEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDragExitEvent() { @@ -250,9 +250,9 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent() return nRet; } -//================================================================================================== + // DNDListenerContainer::fireDragOverEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) @@ -315,9 +315,9 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget return nRet; } -//================================================================================================== + // DNDListenerContainer::fireDragEnterEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, @@ -381,9 +381,9 @@ sal_uInt32 DNDListenerContainer::fireDragEnterEvent( const Reference< XDropTarge return nRet; } -//================================================================================================== + // DNDListenerContainer::fireDropActionChangedEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XDropTargetDragContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ) @@ -446,9 +446,9 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD return nRet; } -//================================================================================================== + // DNDListenerContainer::fireDragGestureEvent -//================================================================================================== + sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, const Reference< XDragSource >& dragSource, const Any& triggerEvent ) @@ -492,9 +492,9 @@ sal_uInt32 DNDListenerContainer::fireDragGestureEvent( sal_Int8 dragAction, sal_ return nRet; } -//================================================================================================== + // DNDListenerContainer::acceptDrag -//================================================================================================== + void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw (RuntimeException) { @@ -505,18 +505,18 @@ void SAL_CALL DNDListenerContainer::acceptDrag( sal_Int8 dragOperation ) throw ( } } -//================================================================================================== + // DNDListenerContainer::rejectDrag -//================================================================================================== + void SAL_CALL DNDListenerContainer::rejectDrag( ) throw (RuntimeException) { // nothing to do here } -//================================================================================================== + // DNDListenerContainer::acceptDrop -//================================================================================================== + void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw (RuntimeException) { @@ -524,18 +524,18 @@ void SAL_CALL DNDListenerContainer::acceptDrop( sal_Int8 dropOperation ) throw ( m_xDropTargetDropContext->acceptDrop( dropOperation ); } -//================================================================================================== + // DNDListenerContainer::rejectDrop -//================================================================================================== + void SAL_CALL DNDListenerContainer::rejectDrop( ) throw (RuntimeException) { // nothing to do here } -//================================================================================================== + // DNDListenerContainer::dropComplete -//================================================================================================== + void SAL_CALL DNDListenerContainer::dropComplete( sal_Bool success ) throw (RuntimeException) { diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 22d91bdf9ab0..e7c6d92a2fa1 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -27,7 +27,7 @@ #include <map> -// ======================================================================= + class DockingAreaWindow::ImplData { @@ -47,7 +47,7 @@ DockingAreaWindow::ImplData::~ImplData() { } -// ======================================================================= + static void ImplInitBackground( DockingAreaWindow* pThis ) { diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index fc865cdbc90b..2ff6f0c79a6b 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -39,7 +39,6 @@ #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_PINABLE | WB_ROLLABLE ) - class ImplDockFloatWin2 : public FloatingWindow { private: @@ -75,7 +74,6 @@ public: sal_uLong GetLastTicks() const { return mnLastTicks; } }; - ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ) : FloatingWindow( pParent, nWinBits ), @@ -306,7 +304,6 @@ bool ImplDockFloatWin2::Close() return mpDockWin->Close(); } - DockingManager::DockingManager() { } @@ -464,10 +461,10 @@ Rectangle DockingManager::GetPosSizePixel( const Window *pWindow ) return aRect; } -// ======================================================================= + // special floating window for popup mode // main purpose: provides tear-off area for undocking -// ======================================================================= + // if TEAROFF_DASHED defined a single dashed line is used // otherwise multiple smaller lines will be painted @@ -890,7 +887,6 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) return true; } - void ImplDockingWindowWrapper::ImplInitData() { mpDockingWindow = NULL; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 8bf14c6fca78..9f029f62b6f1 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -249,7 +249,6 @@ bool ImplDockFloatWin::Close() return mpDockWin->Close(); } - bool DockingWindow::ImplStartDocking( const Point& rPos ) { if ( !mbDockable ) @@ -303,7 +302,6 @@ bool DockingWindow::ImplStartDocking( const Point& rPos ) return true; } - void DockingWindow::ImplInitDockingWindowData() { mpImplData = new ImplData; diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index f006df88c0fd..41e9bcdc022a 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -58,7 +58,6 @@ Rectangle& FloatingWindow::ImplGetItemEdgeClipRect() return mpImplData->maItemEdgeClipRect; } - void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) { mpImplData = new ImplData; @@ -149,7 +148,6 @@ void FloatingWindow::ImplInitSettings() SetBackground( aColor ); } - FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_FLOATINGWINDOW ) { diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 10baa88203f0..f49f8601a21d 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -28,7 +28,7 @@ -// ======================================================================= + void IntroWindow::ImplInitIntroWindowData() { diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 8e1f439a6f0e..9ed1e4502c3f 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -28,7 +28,7 @@ #include <tools/rc.h> -// ======================================================================= + static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] = { 0, 0, 0, 0, // KEYFUNC_DONTKNOW @@ -64,7 +64,7 @@ void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, rCode4 = aImplKeyFuncTab[nIndex+3]; } -// ======================================================================= + KeyCode::KeyCode( KeyFuncType eFunction ) { diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 800ee0983849..e30a4699fd24 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; -// ======================================================================= + MnemonicGenerator::MnemonicGenerator() { @@ -318,7 +318,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) // do // { // c = aKey.GetChar( nIndex ); -// + // nMnemonicIndex = ImplGetMnemonicIndex( c ); // if ( nMnemonicIndex != MNEMONIC_INDEX_NOTFOUND ) // { @@ -327,7 +327,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) // bChanged = sal_True; // break; // } -// + // // Search for next word // do // { diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 780283efc064..64512d60a588 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -36,7 +36,7 @@ #include <vcl/settings.hxx> -// ======================================================================= + static void ImplInitMsgBoxImageList() { @@ -54,7 +54,7 @@ static void ImplInitMsgBoxImageList() } } -// ======================================================================= + void MessBox::ImplInitMessBoxData() { @@ -432,7 +432,7 @@ Size MessBox::GetOptimalSize() const return Size( 250, 100 ); } -// ============================================================================ + void InfoBox::ImplInitInfoBoxData() { @@ -475,7 +475,7 @@ Image InfoBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 4 ); } -// ============================================================================ + void WarningBox::ImplInitWarningBoxData() { @@ -520,7 +520,7 @@ Image WarningBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 3 ); } -// ============================================================================ + void ErrorBox::ImplInitErrorBoxData() { @@ -565,7 +565,7 @@ Image ErrorBox::GetStandardImage() return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 ); } -// ============================================================================ + void QueryBox::ImplInitQueryBoxData() { diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx index 7a037943d666..2cf4c059a15c 100644 --- a/vcl/source/window/popupmenuwindow.cxx +++ b/vcl/source/window/popupmenuwindow.cxx @@ -39,7 +39,7 @@ PopupMenuFloatingWindow::ImplData::~ImplData() { } -// ============================================================================ + PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) : FloatingWindow(pParent, nStyle), diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 6de81b334fbc..9ec2a83e0f05 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1840,9 +1840,9 @@ void PrintDialog::previewBackward() } -// + // PrintProgressDialog -// + PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax) diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 7fff5407523c..05d7d4b62c03 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -49,7 +49,7 @@ namespace }; } -// ======================================================================= + void Splitter::ImplInitSplitterData() { diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 834a8131ed15..e492500e0c2b 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -32,7 +32,7 @@ #include <svdata.hxx> #include <window.h> -// ======================================================================= + #define STATUSBAR_OFFSET_X STATUSBAR_OFFSET #define STATUSBAR_OFFSET_Y 2 @@ -84,7 +84,7 @@ struct ImplStatusItem OUString maCommand; }; -// ======================================================================= + inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize ) { diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index a871d2db2914..eab804ce50d0 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; -// ======================================================================= + long ImplSysChildProc( void* pInst, SalObject* /* pObject */, sal_uInt16 nEvent, const void* /* pEvent */ ) @@ -110,7 +110,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, return nRet; } -// ======================================================================= + void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index fb87f72f0a76..3281e8a564da 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -// ======================================================================= + class SystemWindow::ImplData { public: @@ -61,7 +61,7 @@ SystemWindow::ImplData::~ImplData() delete mpTaskPaneList; } -// ======================================================================= + SystemWindow::SystemWindow( WindowType nType ) : Window( nType ) diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index b2f8d718fda9..8a027487eac4 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -25,7 +25,7 @@ -// ======================================================================= + void TabDialog::ImplInitTabDialogData() { diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index a8cbdb528404..2ec86723ff37 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> -// ======================================================================= + void TabPage::ImplInit( Window* pParent, WinBits nStyle ) { diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index da13a444f259..47ed31576464 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -172,7 +172,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) // The old design was the following one: // < Ctrl-TAB cycles through Menubar, Toolbars and Floatingwindows only and is // < only active if one of those items has the focus - // + // Since the design of Ctrl-Tab looks to be inconsistent ( non-modal dialogs are not reachable // and the shortcut conflicts with tab-control shortcut ), it is no more supported bool bSplitterOnly = false; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b0401ae3545c..992cbf3777c5 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -49,10 +49,10 @@ #include <vector> #include <math.h> -// ======================================================================= -// ======================================================================= + + #define SMALLBUTTON_HSIZE 7 #define SMALLBUTTON_VSIZE 7 diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index aa27d30c9a45..be9926ca86d9 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -56,7 +56,6 @@ using namespace vcl; using namespace com::sun::star; - #define TB_SEP_SIZE 8 ImplToolBoxPrivateData::ImplToolBoxPrivateData() : diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index d68ec89ffa0f..557de5b0a070 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -108,7 +108,7 @@ using namespace com::sun; using ::com::sun::star::awt::XTopWindow; -// ======================================================================= + #define IMPL_PAINT_PAINT ((sal_uInt16)0x0001) #define IMPL_PAINT_PAINTALL ((sal_uInt16)0x0002) @@ -352,7 +352,7 @@ const char* ImplDbgCheckWindow( const void* pObj ) } #endif -// ======================================================================= + bool Window::HasMirroredGraphics() const { @@ -720,7 +720,7 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSour return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); } -// ======================================================================= + void Window::ImplInitWindowData( WindowType nType ) { @@ -1877,7 +1877,7 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) //sal_uLong nRectCount; //ImplRegionInfo aInfo; //sal_Bool bRegionRect; - // + //nRectCount = aRegion.GetRectCount(); //mpWindowImpl->mpSysObj->BeginSetClipRegion( nRectCount ); //bRegionRect = aRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight ); @@ -5907,7 +5907,7 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) //sal_uLong nRectCount; //ImplRegionInfo aInfo; //sal_Bool bRegionRect; - // + //nRectCount = mpWindowImpl->maWinRegion.GetRectCount(); //mpWindowImpl->mpFrame->BeginSetClipRegion( nRectCount ); //bRegionRect = mpWindowImpl->maWinRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight ); @@ -8545,7 +8545,7 @@ Window* Window::GetAccessibleParentWindow() const } // If this is a floating window which has a native border window, then that border should be reported as // the accessible parent, unless the floating window is a PopupMenuFloatingWindow - // + // The logic here has to match that of AccessibleFactory::createAccessibleContext in // accessibility/source/helper/acc_factory.cxx to avoid PopupMenuFloatingWindow // becoming a11y parents of themselves @@ -9419,7 +9419,7 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr Sequence< Any > aArg(6); // Feed any with operating system's window handle - // ============================================== + // common: first any is VCL pointer to window (for VCL canvas) aArg[ 0 ] = makeAny( reinterpret_cast<sal_Int64>(this) ); @@ -9456,7 +9456,7 @@ uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr uno::Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); // Create canvas instance with window handle - // ========================================= + static ::vcl::DeleteUnoReferenceOnDeinit<lang::XMultiComponentFactory> xStaticCanvasFactory( rendering::CanvasFactory::create( xContext ) ); uno::Reference<lang::XMultiComponentFactory> xCanvasFactory(xStaticCanvasFactory.get()); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 6214e9017857..c6e68b97ce4b 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -48,19 +48,19 @@ using namespace com::sun::star; -// ======================================================================= + #define IMPL_MAXSAVEBACKSIZE (640*480) #define IMPL_MAXALLSAVEBACKSIZE (800*600*2) -// ======================================================================= + struct ImplFocusDelData : public ImplDelData { Window* mpFocusWin; }; -// ======================================================================= + bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const { @@ -149,7 +149,7 @@ bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const return false; } -// ======================================================================= + void Window::ImplSaveOverlapBackground() { diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 69f2db6f02b7..b81fb9d8728c 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -52,11 +52,11 @@ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/awt/MouseEvent.hpp> -// ======================================================================= + #define IMPL_MIN_NEEDSYSWIN 49 -// ======================================================================= + bool ImplCallPreNotify( NotifyEvent& rEvt ) { @@ -1950,7 +1950,7 @@ static void ImplHandleUserEvent( ImplSVEvent* pSVEvent ) } } -// ======================================================================= + static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent ) { diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 3f29acade5bd..ba18b541f0ac 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -34,7 +34,7 @@ #include <brdwin.hxx> #include <window.h> -// ======================================================================= + void WorkWindow::ImplInitWorkWindowData() { diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 1c798ae8ec6a..ac62b621275d 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -39,9 +39,9 @@ #include "salframe.hxx" -// + // i. preedit start callback -// + int @@ -59,9 +59,9 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) } -// + // ii. preedit done callback -// + void @@ -77,15 +77,15 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer ) } -// + // iii. preedit draw callback -// -// + + // Handle deletion of text in a preedit_draw_callback // from and howmuch are guaranteed to be nonnegative -// + void Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) @@ -148,10 +148,10 @@ enlarge_buffer ( preedit_text_t *ptext, int nnewlimit ) nnewsize * sizeof(XIMFeedback)); } -// + // Handle insertion of text in a preedit_draw_callback // string field of XIMText struct is guaranteed to be != NULL -// + void Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) @@ -241,9 +241,9 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) pText->pUnicodeBuffer[pText->nLength] = (sal_Unicode)0; } -// + // Handle the change of attributes in a preedit_draw_callback -// + void Preedit_UpdateAttributes ( preedit_text_t* ptext, XIMFeedback* feedback, int from, int amount ) @@ -376,9 +376,9 @@ PreeditDrawCallback(XIC ic, XPointer client_data, } } - // + // build the SalExtTextInputEvent and send it up - // + pPreeditData->aInputEv.mnTime = 0; pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL( pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags); @@ -402,9 +402,9 @@ PreeditDrawCallback(XIC ic, XPointer client_data, void GetPreeditSpotLocation(XIC ic, XPointer client_data) { - // + // Send SalEventExtTextInputPos event to get spotlocation - // + SalExtTextInputPosEvent mPosEvent; preedit_data_t* pPreeditData = (preedit_data_t*)client_data; @@ -424,9 +424,9 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) } -// + // iv. preedit caret callback -// + #if OSL_DEBUG_LEVEL > 1 @@ -473,10 +473,10 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* ) } -// + // v. commit string callback: convert an extended text input (iiimp ... ) // into an ordinary key-event -// + Bool @@ -489,9 +489,9 @@ IsControlCode(sal_Unicode nChar) } -// + // vi. status callbacks: for now these are empty, they are just needed for turbo linux -// + void @@ -558,9 +558,9 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data) } -// + // vii. destroy callbacks: internally disable all IC/IM calls -// + void diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index d486066e82b8..4430caaef58b 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -57,10 +57,10 @@ static void sendEmptyCommit( SalFrame* pFrame ) } -// + // Constructor / Destructor, the InputContext is bound to the SalFrame, as it // needs the shell window as a focus window -// + SalI18N_InputContext::~SalI18N_InputContext() @@ -134,9 +134,9 @@ get_font_set( Display *p_display ) } -// + // Constructor for a InputContext (IC) -// + SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : @@ -196,9 +196,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; - // + // Status attributes - // + switch ( mnStatusStyle ) { @@ -236,9 +236,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : break; } - // + // set preedit attributes - // + switch ( mnPreeditStyle ) { @@ -374,10 +374,10 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : } -// + // In Solaris 8 the status window does not unmap if the frame unmapps, so // unmap it the hard way -// + void @@ -420,10 +420,10 @@ SalI18N_InputContext::Map( SalFrame *pFrame ) } -// + // Handle DestroyCallbacks // in fact this is a callback called from the XNDestroyCallback -// + void @@ -434,10 +434,10 @@ SalI18N_InputContext::HandleDestroyIM() } -// + // make sure, the input method gets all the X-Events it needs, this is only // called once on each frame, it relys on a valid maContext -// + void @@ -461,9 +461,9 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) } -// + // tune the styles provided by the input method with the supported one -// + unsigned int @@ -548,9 +548,9 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles ) } -// + // handle extended and normal key input -// + int @@ -604,11 +604,11 @@ SalI18N_InputContext::UpdateSpotLocation() } -// + // set and unset the focus for the Input Context // the context may be NULL despite it is useable if the framewindow is // in unmapped state -// + void @@ -656,9 +656,9 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame ) } -// + // multi byte input method only -// + void diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 576023b3621b..04c88e0c8deb 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -49,10 +49,10 @@ extern "C" char * XSetIMValues(XIM im, ...); #endif -// + // kinput2 IME needs special key handling since key release events are filtered in // preeditmode and XmbResetIC does not work -// + bool @@ -144,9 +144,9 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const } -// + // locale handling -// + // Locale handling of the operating system layer @@ -263,9 +263,9 @@ SalI18N_InputMethod::PosixLocale() } -// + // Constructor / Destructor / Initialisation -// + SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ), @@ -286,10 +286,10 @@ SalI18N_InputMethod::~SalI18N_InputMethod() XCloseIM ( maMethod ); } -// + // XXX // debug routine: lets have a look at the provided method styles -// + #if OSL_DEBUG_LEVEL > 1 @@ -352,10 +352,10 @@ PrintInputStyle( XIMStyles *pStyle ) #endif -// + // this is the real constructing routine, since locale setting has to be done // prior to xopendisplay, the xopenim call has to be delayed -// + bool SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) @@ -401,9 +401,9 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) return mbUseable; } -// + // give IM the opportunity to look at the event, and possibly hide it -// + bool SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window ) @@ -447,14 +447,14 @@ SalI18N_InputMethod::HandleDestroyIM() } -// + // add a connection watch into the SalXLib yieldTable to allow iiimp // connection processing: soffice waits in select() not in XNextEvent(), so // there may be requests pending on the iiimp internal connection that will // not be processed until XNextEvent is called the next time. If we do not // have the focus because the atok12 lookup choice aux window has it we stay // deaf and dump otherwise. -// + int diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 0bdebe44c81e..50c53696acce 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -52,13 +52,13 @@ namespace vcl_sal { int nReplacements; }; - // ==================================================================== - // + + // CAUTION CAUTION CAUTION // every string value in the replacements tables must be in UTF8 // be careful with your editor ! - // - // ==================================================================== + + static const struct KeysymNameReplacement aImplReplacements_English[] = { diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index eaff1710a4c6..180631f3474a 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <cppuhelper/compbase2.hxx> -// ------------------------------------------------------------------------ + #define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport" @@ -118,13 +118,13 @@ namespace x11 { virtual com::sun::star::uno::Reference< XInterface > getReference() throw(); }; -// ------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames(); com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance( const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); -// ------------------------------------------------------------------------ + } // namepspace diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index cb968f24f147..db8c8741b9e1 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -49,7 +49,7 @@ namespace x11 { class PixmapHolder; // in bmp.hxx -// ------------------------------------------------------------------------ + rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); class SelectionAdaptor @@ -507,7 +507,7 @@ namespace x11 { throw( ::com::sun::star::uno::RuntimeException ); }; -// ------------------------------------------------------------------------ + ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance( @@ -517,7 +517,7 @@ namespace x11 { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory); -// ------------------------------------------------------------------------ + } diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 34bdd27a0068..4ecac7165a36 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -46,13 +46,13 @@ X11Transferable::X11Transferable( { } -//================================================================================================== + X11Transferable::~X11Transferable() { } -//================================================================================================== + Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException) @@ -85,7 +85,7 @@ Any SAL_CALL X11Transferable::getTransferData( const DataFlavor& rFlavor ) return aRet; } -//================================================================================================== + Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() throw(RuntimeException) @@ -98,7 +98,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors() return aFlavorList; } -//================================================================================================== + sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException) diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx index 44e82c5b44c9..51dd9b58ed29 100644 --- a/vcl/unx/generic/gdi/gcach_xpeer.cxx +++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx @@ -29,7 +29,7 @@ #include "gcach_xpeer.hxx" #include "xrender_peer.hxx" -// =========================================================================== + X11GlyphPeer::X11GlyphPeer() { @@ -62,7 +62,7 @@ X11GlyphPeer::~X11GlyphPeer() } } -// =========================================================================== + X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer ) : GlyphCache( rPeer ) @@ -118,13 +118,13 @@ void X11GlyphCache::KillInstance() return theGlyphCacheHolder::get().release(); } -// =========================================================================== + void X11SalGraphics::releaseGlyphPeer() { X11GlyphCache::KillInstance(); } -// =========================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 2bc1c65a16a0..a8da77564967 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -594,7 +594,7 @@ bool X11SalGraphics::setClipRegion( const Region& i_rClip ) // aRect.y = (short)nY; // aRect.width = (unsigned short)nW; // aRect.height = (unsigned short)nH; - // + // XUnionRectWithRegion( &aRect, mpClipRegion, mpClipRegion ); // } // bRegionRect = i_rClip.ImplGetNextRect( aInfo, nX, nY, nW, nH ); diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 7f40deb81377..c234973d4330 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -92,9 +92,9 @@ struct _XRegion }; -// + // X11SalGraphics -// + GC @@ -468,9 +468,9 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont } -// + // SalGraphics -// + sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 3ea71a3af5e9..172fb1fb35a6 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -76,7 +76,7 @@ public: const _XTrap*, int nCount ) const; }; -//===================================================================== + inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const { @@ -189,7 +189,7 @@ inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs, XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount ); } -//===================================================================== + inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 ) { @@ -214,7 +214,7 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar return aRetVal; } -//===================================================================== + #endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 7a0bdcca3d31..4bfd29a169d5 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3316,9 +3316,9 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) } } - // + // update the spot location for PreeditPosition IME style - // + if (! aDeleteWatch.isDeleted()) { if (mpInputContext != NULL && mpInputContext->UseContext()) diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index f718ed30eb43..a06a7df96a40 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -39,7 +39,7 @@ #include <salwtype.hxx> -// ======================================================================= + // SalInstance member to create and destroy a SalObject SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) @@ -180,7 +180,7 @@ void X11SalInstance::DestroyObject( SalObject* pObject ) } -// ====================================================================== + // SalClipRegion is a member of SalObject // definition of SalClipRegion my be found in unx/inc/salobj.h @@ -230,7 +230,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) } -// ======================================================================= + // SalObject Implementation diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 7b7fe395eb8a..da9f630b57bb 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -370,7 +370,7 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } -//===================================================================== + struct FilterEntry { @@ -406,7 +406,7 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; -//===================================================================== + FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) @@ -506,7 +506,7 @@ dialog_remove_buttons( GtkDialog *pDialog ) namespace { - //................................................................................ + struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: @@ -515,7 +515,7 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - //............................................................................ + bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -596,7 +596,7 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter -// + void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) @@ -617,7 +617,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt } -// + void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) @@ -643,7 +643,7 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) } -// + void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) @@ -785,7 +785,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::Runtim uno::Sequence< OUString > aFiles = getSelectedFiles(); /* The previous multiselection API design was completely broken - and unimplementable for some hetrogenous pseudo-URIs eg. search:// + and unimplementable for some hetrogenous pseudo-URIs eg. search: Thus crop unconditionally to a single selection. */ aFiles.realloc (1); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 4e25b0e14df8..c40355f8791f 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,9 +33,9 @@ #include "gtk/fpicker/SalGtkPicker.hxx" -//---------------------------------------------------------- + // Implementation class for the XFilePicker Interface -//---------------------------------------------------------- + struct FilterEntry; struct ElementEntry_Impl; @@ -46,9 +46,9 @@ typedef ::com::sun::star::beans::StringPair UnoFilterEntry; typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + typedef cppu::WeakComponentImplHelper5< ::com::sun::star::ui::dialogs::XFilePickerControlAccess, @@ -65,18 +65,18 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // constructor SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -84,9 +84,9 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); @@ -104,16 +104,16 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker2 functions - //------------------------------------------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -124,16 +124,16 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException); @@ -150,9 +150,9 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XFilePreview - //------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); @@ -175,31 +175,31 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XInitialization - //------------------------------------------------ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // FilePicker Event functions - //------------------------------------------------------------------------------------ + private: // prevent copy and assignment diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index 9e7689e0f363..c0921dfd7a3c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,9 +37,9 @@ class SalGtkFolderPicker : // constructor SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -47,9 +47,9 @@ class SalGtkFolderPicker : virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFolderPicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); @@ -63,16 +63,16 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 33a9db0877b9..209343526218 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> -//----------------------------------- + // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications // with and without parameter // this is an application of the // "command" pattern see GoF -//----------------------------------- + class CEventNotification { diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index c73131b0898a..22b8794cba2e 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1991,7 +1991,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, bool forwardButtonInsensitive = rScrollbarVal.mnMax == 0 || rScrollbarVal.mnCur + rScrollbarVal.mnVisibleSize >= rScrollbarVal.mnMax; - // ----------------- BUTTON 1 // + // ----------------- BUTTON 1 if ( has_backward ) { NWConvertVCLStateToGTKState( rScrollbarVal.mnButton1State, &stateType, &shadowType ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 265070c0823f..285809042ab7 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1817,10 +1817,10 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) //For these floating windows we don't want the main window to lose focus, and metacity has... // metacity-2.24.0/src/core/window.c - // + // if ((focus_window != NULL) && XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time)) // "compare" window focus prevented by other activity - // + // where "compare" is this window // which leads to... @@ -1833,7 +1833,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) // "The focus window %s is an ancestor of the newly mapped " // "window %s which isn't being focused. Unfocusing the " // "ancestor.\n", - // + // i.e. having a time < that of the toplevel frame means that the toplevel frame gets unfocused. // awesome. if( nUserTime == 0 ) @@ -2721,7 +2721,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) // FIXME: for some unknown reason gdk_pointer_grab does not // really produce owner events for GtkPlug windows // the cause is yet unknown - // + // this is of course a bad hack, especially as we cannot // set the right cursor this way if( !pEnv || !*pEnv ) @@ -3564,7 +3564,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f // while we have the pointer grabbed, this should not come from // the window manager. Is this an event that was still queued ? // The focus does not seem to get set inside our process - // + // in the meantime do not propagate focus get/lose if floats are open if( m_nFloats == 0 ) pThis->CallCallback( pEvent->in ? SALEVENT_GETFOCUS : SALEVENT_LOSEFOCUS, NULL ); diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 258e1d97cfac..ae83e26a2879 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -780,7 +780,7 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) { } -// ======================================================================= + /* * GtkSalMenuItem diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 300385e7666e..311746d92f3b 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -431,7 +431,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, bool forwardButtonInsensitive = pScrollbarVal->mnMax == 0 || pScrollbarVal->mnCur + pScrollbarVal->mnVisibleSize >= pScrollbarVal->mnMax; - // ----------------- BUTTON 1 // + // ----------------- BUTTON 1 if ( has_backward ) { NWConvertVCLStateToGTKState( pScrollbarVal->mnButton1State, &stateFlags, &shadowType ); diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index 4d63289e908d..f10eac36f379 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -29,9 +29,9 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////// + // UnxFilePickerCommandThread -////////////////////////////////////////////////////////////////////////// + UnxFilePickerCommandThread::UnxFilePickerCommandThread( UnxFilePickerNotifyThread *pNotifyThread, int nReadFD ) : m_pNotifyThread( pNotifyThread ), diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index cfd5e3783b8f..ca378f6534fc 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -60,9 +60,9 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -////////////////////////////////////////////////////////////////////////// + // helper functions -////////////////////////////////////////////////////////////////////////// + namespace { @@ -80,9 +80,9 @@ namespace } } -////////////////////////////////////////////////////////////////////////// + // UnxFilePicker -////////////////////////////////////////////////////////////////////////// + UnxFilePicker::UnxFilePicker( const uno::Reference<uno::XComponentContext>& ) : UnxFilePicker_Base( m_rbHelperMtx ), diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index 60eb14933082..0b43d2afda1e 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -22,9 +22,9 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////// + // UnxFilePickerNotifyThread -////////////////////////////////////////////////////////////////////////// + UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), diff --git a/vcl/unx/kde/fpicker/kdecommandthread.cxx b/vcl/unx/kde/fpicker/kdecommandthread.cxx index 55559d2117f1..b2e47786faa4 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.cxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.cxx @@ -35,9 +35,9 @@ #include <iostream> #endif -////////////////////////////////////////////////////////////////////////// + // CommandEvent -////////////////////////////////////////////////////////////////////////// + KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringList ) : QCustomEvent( TypeId, pStringList ), @@ -73,9 +73,9 @@ KDECommandEvent::KDECommandEvent( const QString &qCommand, QStringList *pStringL m_eCommand = pIdx->eType; } -////////////////////////////////////////////////////////////////////////// + // CommandThread -////////////////////////////////////////////////////////////////////////// + KDECommandThread::KDECommandThread( QWidget *pObject ) : m_pObject( pObject ) diff --git a/vcl/unx/kde/fpicker/kdefilepicker.cxx b/vcl/unx/kde/fpicker/kdefilepicker.cxx index 4dafb1ef0e4e..73210557980b 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.cxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.cxx @@ -89,9 +89,9 @@ #include <algorithm> #include <iostream> -////////////////////////////////////////////////////////////////////////// + // KDEFileDialog -////////////////////////////////////////////////////////////////////////// + KDEFileDialog::KDEFileDialog( const QString &startDir, const QString &filter, QWidget *parent, const char *name ) diff --git a/vcl/unx/kde/fpicker/kdefpmain.cxx b/vcl/unx/kde/fpicker/kdefpmain.cxx index ed01febd3057..03ea2c1a293a 100644 --- a/vcl/unx/kde/fpicker/kdefpmain.cxx +++ b/vcl/unx/kde/fpicker/kdefpmain.cxx @@ -56,9 +56,9 @@ #define KLocale TDELocale #endif // ENABLE_TDE -////////////////////////////////////////////////////////////////////////// + // Main -////////////////////////////////////////////////////////////////////////// + static const KCmdLineOptions sOptions[] = { diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx index 57e889a58460..da938183867f 100644 --- a/vcl/unx/kde/fpicker/kdemodalityfilter.cxx +++ b/vcl/unx/kde/fpicker/kdemodalityfilter.cxx @@ -33,9 +33,9 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -////////////////////////////////////////////////////////////////////////// + // Modality filter -////////////////////////////////////////////////////////////////////////// + KDEModalityFilter::KDEModalityFilter( WId nWinId ) : m_nWinId( nWinId ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 54f7458d55bc..e8ddaebd5464 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -80,9 +80,9 @@ using namespace ::com::sun::star::uno; #define ALLOW_REMOTE_URLS 0 #endif -////////////////////////////////////////////////////////////////////////// + // helper functions -////////////////////////////////////////////////////////////////////////// + #include <QDebug> @@ -109,9 +109,9 @@ QString toQString(const OUString& s) return QString::fromUtf16(s.getStr(), s.getLength()); } -////////////////////////////////////////////////////////////////////////// + // KDE4FilePicker -////////////////////////////////////////////////////////////////////////// + KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) : KDE4FilePicker_Base(_helperMutex) diff --git a/vcl/unx/x11/xlimits.cxx b/vcl/unx/x11/xlimits.cxx index 71b99831c4b4..2d3606d7090a 100644 --- a/vcl/unx/x11/xlimits.cxx +++ b/vcl/unx/x11/xlimits.cxx @@ -17,7 +17,7 @@ Pixmap limitXCreatePixmap(Display *display, Drawable d, unsigned int width, unsi // limits of the Xserver; which we should catch by a failed XCreatePixmap // call. However extra large values should be caught here since we'd run into // 16 bit truncation here without noticing. - // + // see, e.g. moz#424333 if (width > SAL_MAX_INT16 || height > SAL_MAX_INT16) { diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 73d2e6edf22e..a650c8e2d99d 100644 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -23,7 +23,7 @@ #include "win/saldata.hxx" -// ======================================================================= + rtl_TextEncoding ImplSalGetSystemEncoding() { @@ -53,7 +53,7 @@ OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen) RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT ); } -// ======================================================================= + int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) { @@ -81,7 +81,7 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ) return nRet; } -// ======================================================================= + BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index ece177210cb2..d639d894c752 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -83,7 +83,7 @@ #include <sehandler.hxx> #endif -// ======================================================================= + void SalAbort( const OUString& rErrorText, bool ) { @@ -103,12 +103,12 @@ void SalAbort( const OUString& rErrorText, bool ) } } -// ======================================================================= + LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); -// ======================================================================= + class SalYieldMutex : public vcl::SolarMutexObject { @@ -340,7 +340,7 @@ bool WinSalInstance::CheckYieldMutex() return true; } -// ======================================================================= + void SalData::initKeyCodeMap() { @@ -366,7 +366,7 @@ void SalData::initKeyCodeMap() initKey( ';', KEY_SEMICOLON ); } -// ======================================================================= + // SalData diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index fa66249df02e..8d72b021fae0 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -22,11 +22,11 @@ #include <tools/debug.hxx> #include <win/saldata.hxx> -// ======================================================================= + SalShlData aSalShlData; -// ======================================================================= + extern "C" { @@ -54,7 +54,7 @@ BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) } -// ======================================================================= + HCURSOR ImplLoadSalCursor( int nId ) { diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 68cd6ca5098e..ef99cd86db8e 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -27,12 +27,12 @@ #endif -// ======================================================================= + // maximum period #define MAX_SYSPERIOD 65533 -// ======================================================================= + void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex ) { diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 845fb22a43af..04faaa67151d 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -33,12 +33,12 @@ #include <win/salframe.h> #include <basegfx/matrix/b2dhommatrixtools.hxx> -// ======================================================================= + // comment out to prevent use of beziers on GDI functions #define USE_GDI_BEZIERS -// ======================================================================= + #define DITHER_PAL_DELTA 51 #define DITHER_PAL_STEPS 6 @@ -47,7 +47,7 @@ #define DITHER_EXTRA_COLORS 1 #define DMAP( _def_nVal, _def_nThres ) ((pDitherDiff[_def_nVal]>(_def_nThres))?pDitherHigh[_def_nVal]:pDitherLow[_def_nVal]) -// ======================================================================= + struct SysColorEntry { @@ -55,7 +55,7 @@ struct SysColorEntry SysColorEntry* pNext; }; -// ======================================================================= + static SysColorEntry* pFirstSysColor = NULL; static SysColorEntry* pActSysColor = NULL; @@ -118,19 +118,19 @@ static BYTE aOrdDither16Bit[8][8] = { 5, 3, 4, 2, 5, 3, 4, 2 } }; -// ======================================================================= + // we must create pens with 1-pixel width; otherwise the S3-graphics card // map has many paint problems when drawing polygons/polyLines and a // complex is set #define GSL_PEN_WIDTH 1 -// ======================================================================= + #define SAL_POLYPOLYCOUNT_STACKBUF 8 #define SAL_POLYPOLYPOINTS_STACKBUF 64 -// ======================================================================= + void ImplInitSalGDI() { @@ -411,7 +411,7 @@ static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue ) return FALSE; } -// ======================================================================= + int ImplIsSysColorEntry( SalColor nSalColor ) { @@ -430,7 +430,7 @@ int ImplIsSysColorEntry( SalColor nSalColor ) return FALSE; } -// ======================================================================= + static void ImplInsertSysColorEntry( int nSysIndex ) { @@ -453,7 +453,7 @@ static void ImplInsertSysColorEntry( int nSysIndex ) } } -// ======================================================================= + void ImplUpdateSysColorEntries() { @@ -504,7 +504,7 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor ) return nSalColor; } -// ======================================================================= + void ImplSalInitGraphics( WinSalGraphics* pData ) { @@ -538,7 +538,7 @@ void ImplSalDeInitGraphics( WinSalGraphics* pData ) SelectFont( pData->getHDC(), pData->mhDefFont ); } -// ======================================================================= + HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) { @@ -572,7 +572,7 @@ HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp ) return pC->mhDC; } -// ======================================================================= + void ImplReleaseCachedDC( sal_uLong nID ) { @@ -583,7 +583,7 @@ void ImplReleaseCachedDC( sal_uLong nID ) SelectObject( pC->mhDC, pC->mhSelBmp ); } -// ======================================================================= + void ImplClearHDCCache( SalData* pData ) { @@ -604,7 +604,7 @@ void ImplClearHDCCache( SalData* pData ) } } -// ======================================================================= + // #100127# Fill point and flag memory from array of points which // might also contain bezier control points for the PolyDraw() GDI method @@ -677,7 +677,7 @@ void ImplPreparePolyDraw( bool bCloseFigures, } } -// ======================================================================= + // #100127# draw an array of points which might also contain bezier control points void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) @@ -707,7 +707,7 @@ void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const B } } -// ======================================================================= + WinSalGraphics::WinSalGraphics() { @@ -1052,7 +1052,7 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip ) // debug code if you weant to check range of the newly applied ClipRegion //RECT aBound; //const int aRegionType = GetRgnBox(mhRegion, &aBound); - // + //bool bBla = true; } else diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index d81229604ebb..a39bf3c3c518 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -55,7 +55,7 @@ bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const return bRet; } -// ======================================================================= + void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 2fd048fed949..29448a48d47a 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -77,14 +77,14 @@ inline int IntTimes256FromFixed(FIXED f) return nFixedTimes256; } -// ======================================================================= + // these variables can be static because they store system wide settings static bool bImplSalCourierScalable = false; static bool bImplSalCourierNew = false; -// ======================================================================= + @@ -228,7 +228,7 @@ void ImplFontAttrCache::AddFontAttr( const OUString& rFontFileName, const ImplDe } } -// ======================================================================= + // raw font data with a scoped lifetime class RawFontData @@ -294,7 +294,7 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag ) } } -// =========================================================================== + // platform specific font substitution hooks for glyph fallback enhancement // TODO: move into i18n module (maybe merge with svx/ucsubset.* // or merge with i18nutil/source/utility/unicode_data.h) @@ -601,7 +601,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon return bFound; } -// ======================================================================= + struct ImplEnumInfo { @@ -618,7 +618,7 @@ struct ImplEnumInfo int mnFontCount; }; -// ======================================================================= + static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet ) { @@ -1033,7 +1033,7 @@ void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ) } } -// ======================================================================= + #if ENABLE_GRAPHITE #ifdef DEBUG @@ -1415,7 +1415,7 @@ void ImplWinFontData::GetFontCapabilities( HDC hDC ) const } } -// ======================================================================= + void WinSalGraphics::SetTextColor( SalColor nSalColor ) { @@ -2098,7 +2098,7 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL, // byte offsets 0x4CE/0x4CF: winascent // byte offsets 0x4D0/0x4D1: winascent+windescent-emunits // byte offsets 0x4DF/0x4E0: avgwidth - //... + return true; } diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 0703bbbbb64a..cfba8a449b1e 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -20,14 +20,14 @@ // General info: // http://msdn.microsoft.com/en-us/library/windows/desktop/hh270423%28v=vs.85%29.aspx // http://msdn.microsoft.com/en-us/library/windows/desktop/bb773178%28v=vs.85%29.aspx -// + // Useful tool to explore the themes & their rendering: // http://privat.rejbrand.se/UxExplore.exe // (found at http://stackoverflow.com/questions/4009701/windows-visual-themes-gallery-of-parts-and-states/4009712#4009712) -// + // Theme subclasses: // http://msdn.microsoft.com/en-us/library/windows/desktop/bb773218%28v=vs.85%29.aspx -// + // Drawing in non-client area (general DWM-related info): // http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index cc10cac3fb55..b1dbab938ee9 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -576,7 +576,7 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS //also says that the MS DMPAPER_B4 is JIS, which makes most sense. And //matches our Excel filter's belief about the matching XlPaperSize //enumeration. - // + //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx said ////"DMPAPER_B4 12 B4 (JIS) 250 x 354" //which is bogus as it's either JIS 257 x 364 or ISO 250 x 353 diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 420d312711da..89eaba889d26 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -28,7 +28,7 @@ #include <win/salgdi.h> #include <win/salvd.h> -// ======================================================================= + static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount ) @@ -67,7 +67,7 @@ static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, return hBitmap; } -// ======================================================================= + SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, long nDX, long nDY, @@ -158,7 +158,7 @@ void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) delete pDevice; } -// ======================================================================= + WinSalVirtualDevice::WinSalVirtualDevice() { diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 947219a582f7..a3aca6d5c4e4 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -62,7 +62,7 @@ typedef boost::unordered_map<int,int> IntMap; #include <config_mingw.h> -// ======================================================================= + // win32 specific physical font instance class ImplWinFontEntry : public ImplFontEntry @@ -117,7 +117,7 @@ inline int ImplWinFontEntry::GetCachedGlyphWidth( int nCharCode ) const return it->second; } -// ======================================================================= + class WinLayout : public SalLayout { @@ -141,7 +141,7 @@ protected: ImplWinFontEntry& mrWinFontEntry; }; -// ======================================================================= + class SimpleWinLayout : public WinLayout { @@ -187,7 +187,7 @@ private: BYTE mnCharSet; }; -// ======================================================================= + WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE ) : mhDC( hDC ), @@ -229,7 +229,7 @@ HFONT WinLayout::DisableFontScaling() const return SelectFont( mhDC, hHugeFont ); } -// ======================================================================= + SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet, const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry ) @@ -974,7 +974,7 @@ void SimpleWinLayout::Simplify( bool /*bIsBase*/ ) mnWidth = mnBaseAdv = 0; } -// ======================================================================= + struct VisualItem { @@ -1755,7 +1755,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, //position so that iterating over glyph slots one at a time for //glyph fallback can keep context as to what characters are the //inputs that caused a missing glyph in a given font. - // + //See: fdo#46923/fdo#46896/fdo#46750 for extra complexities { int dir = 1; @@ -2703,7 +2703,7 @@ sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth) // This class uses the SIL Graphite engine to provide complex text layout services to the VCL // @author tse -// + class GraphiteWinLayout : public WinLayout { private: @@ -2896,7 +2896,7 @@ void GraphiteWinLayout::Simplify( bool is_base ) maImpl.Simplify(is_base); } #endif // ENABLE_GRAPHITE -// ======================================================================= + SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) { @@ -2961,7 +2961,7 @@ int WinSalGraphics::GetMinKashidaWidth() return nMinKashida; } -// ======================================================================= + ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD ) : ImplFontEntry( rFSD ) @@ -3045,7 +3045,7 @@ bool ImplWinFontEntry::InitKashidaHandling( HDC hDC ) return true; } -// ======================================================================= + PhysicalFontFace* ImplWinFontData::Clone() const { @@ -3067,6 +3067,6 @@ ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) co return pEntry; } -// ======================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index 017955186cdd..00dd4351d076 100644 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -60,13 +60,13 @@ namespace vcl_sal { int nReplacements; }; - // ==================================================================== - // + + // CAUTION CAUTION CAUTION // Every string value in the replacements tables must be in UTF-8 // but with the UTF-8 bytes encoded, not as such! Be careful! - // - // ==================================================================== + + static const struct KeysNameReplacement aImplReplacements_Asturian[] = { diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index aaae35c8b72f..e6ab38a3eaa5 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -113,20 +113,20 @@ using namespace ::com::sun::star::beans; # define WM_MOUSEHWHEEL 0x020E #endif -// ======================================================================= + const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); sal_Bool WinSalFrame::mbInReparent = FALSE; -// ======================================================================= + // Macros for support of WM_UNICHAR & Keyman 6.0 //#define Uni_UTF32ToSurrogate1(ch) (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800) #define Uni_UTF32ToSurrogate2(ch) (((unsigned long) (ch) - 0x10000) % 0x400 + 0xDC00) #define Uni_SupplementaryPlanesStart 0x10000 -// ======================================================================= + static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ); static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL ); @@ -282,7 +282,7 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) } } -// ======================================================================= + SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uLong nSalFrameStyle ) @@ -525,7 +525,7 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ) hWndParent, 0, hInstance, (void*)GetWindowPtr( oldhWnd ) ); } -// ======================================================================= + // translation table from System keycodes into StartView keycodes #define KEY_TAB_SIZE 146 @@ -681,7 +681,7 @@ static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] = 0 // SCROLLLOCK 145 }; -// ======================================================================= + static UINT ImplSalGetWheelScrollLines() { diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 1284636990dc..7bbfd39fc475 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -39,7 +39,7 @@ static DWORD myerr=0; -// ======================================================================= + sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) { @@ -49,7 +49,7 @@ sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) return TRUE; } -// ======================================================================= + // WinSalInst factory methods @@ -125,7 +125,7 @@ void WinSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) } -// ======================================================================= + static void ImplDrawMenuBar( SalMenu *pMenu ) { @@ -140,7 +140,7 @@ static void ImplDrawMenuBar( SalMenu *pMenu ) } } -// ======================================================================= + /* @@ -377,7 +377,7 @@ void WinSalMenu::GetSystemMenuData( SystemMenuData* pData ) pData->hMenu = mhMenu; } -// ======================================================================= + /* * SalMenuItem diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index ac70f7a8183a..d4ac6f002ec2 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -31,7 +31,7 @@ #include <win/salframe.h> #include <win/salobj.h> -// ======================================================================= + static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) { @@ -260,7 +260,7 @@ void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ ) pSalData->mnSalObjWantKeyEvt = 0; } -// ======================================================================= + LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { @@ -470,7 +470,7 @@ LRESULT CALLBACK SalSysObjChildWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LP return nRet; } -// ======================================================================= + SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) { @@ -567,7 +567,7 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ) return NULL; } -// ======================================================================= + WinSalObject::WinSalObject() { |
