diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:14:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:14:35 +0000 |
| commit | 9d5586d8be187f855a250c2a21d844d6ab0e642f (patch) | |
| tree | 4390e985871f83d803acb2f576cc7a658da0736e /starmath/source/rect.cxx | |
| parent | 1fa5effa42646544b66d466e3d577e9c696649f2 (diff) | |
INTEGRATION: CWS tl32 (1.18.20); FILE MERGED
2006/12/20 12:21:11 tl 1.18.20.3: #i69286# warning-free code
2006/11/01 13:10:07 tl 1.18.20.2: #i69286# make starmath warning-free for unxlngi6(.pro)
2006/10/30 10:35:13 tl 1.18.20.1: #i69286# make starmath warning-free
Diffstat (limited to 'starmath/source/rect.cxx')
| -rw-r--r-- | starmath/source/rect.cxx | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 093e6f6f6bb6..cfe40f7dfef5 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -4,9 +4,9 @@ * * $RCSfile: rect.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:54:27 $ + * last change: $Author: vg $ $Date: 2007-05-25 12:14:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -210,8 +210,16 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, // get GlyphBoundRect Rectangle aGlyphRect; - BOOL bSuccess = SmGetGlyphBoundRect(rDev, rText, aGlyphRect); - DBG_ASSERT(bSuccess, "Sm : Ooops... (fehlt evtl. der Font?)"); +#if OSL_DEBUG_LEVEL > 1 + BOOL bSuccess = +#endif + SmGetGlyphBoundRect(rDev, rText, aGlyphRect); +#if OSL_DEBUG_LEVEL > 1 + if (!bSuccess) + { + DBG_ERROR( "Sm : Ooops... (fehlt evtl. der Font?)"); + } +#endif nItalicLeftSpace = GetLeft() - aGlyphRect.Left() + nBorderWidth; nItalicRightSpace = aGlyphRect.Right() - GetRight() + nBorderWidth; @@ -251,20 +259,20 @@ void SmRect::BuildRect(const OutputDevice &rDev, const SmFormat *pFormat, void SmRect::Init(const OutputDevice &rDev, const SmFormat *pFormat, - const XubString &rText, USHORT nBorderWidth) + const XubString &rText, USHORT nEBorderWidth) // get rectangle fitting for drawing 'rText' on OutputDevice 'rDev' { - BuildRect(rDev, pFormat, rText, nBorderWidth); + BuildRect(rDev, pFormat, rText, nEBorderWidth); } SmRect::SmRect(const OutputDevice &rDev, const SmFormat *pFormat, - const XubString &rText, long nBorderWidth) + const XubString &rText, long nEBorderWidth) { - DBG_ASSERT( nBorderWidth >= 0, "BorderWidth negativ" ); - if (nBorderWidth < 0) - nBorderWidth = 0; - Init(rDev, pFormat, rText, (USHORT) nBorderWidth); + DBG_ASSERT( nEBorderWidth >= 0, "BorderWidth negativ" ); + if (nEBorderWidth < 0) + nEBorderWidth = 0; + Init(rDev, pFormat, rText, (USHORT) nEBorderWidth); } |