diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-22 10:12:25 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-22 10:12:25 +0000 |
| commit | dcc38c820ce3e646e634ca50308597c05f0f15be (patch) | |
| tree | 1deff8191e98e76b9d6bf377a8bb6711eedcf2d5 /vcl/win | |
| parent | 7831470cb28ce4b7dce29f97fbbd0fade059829a (diff) | |
#100000# no std workspace for min & max
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 6 | ||||
| -rwxr-xr-x | vcl/win/source/gdi/winlayout.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 64f1aed2c379..2107957f3900 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2003-04-17 15:20:50 $ + * last change: $Author: vg $ $Date: 2003-04-22 11:12:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1555,7 +1555,7 @@ String ImplGetFontNameFromFile( SalData& rSalData, const String& rFontFileURL ) char aResourceName[512]; int nMaxLen = sizeof(aResourceName)/sizeof(*aResourceName) - 16; int nLen = ::GetTempPathA( nMaxLen, aResourceName ); - ::strncpy( aResourceName + nLen, aFileName, std::max( 0, nMaxLen - nLen )); + ::strncpy( aResourceName + nLen, aFileName, max( 0, nMaxLen - nLen )); ::DeleteFileA( aResourceName ); // Create font resource file (typically with a .fot file name extension). diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 96cc87b2450a..0df1570edac9 100755 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: winlayout.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: rt $ $Date: 2003-04-17 15:26:39 $ + * last change: $Author: vg $ $Date: 2003-04-22 11:12:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -622,7 +622,7 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const Point aPos = GetDrawPosition( Point( mnBaseAdv, 0 ) ); // #108267#, limit the number of glyphs to avoid paint errors - UINT limitedGlyphCount = std::min( 8192, mnGlyphCount ); + UINT limitedGlyphCount = min( 8192, mnGlyphCount ); if( mnDrawOptions || aSalShlData.mbWNT ) { ::ExtTextOutW( aHDC, aPos.X(), aPos.Y(), mnDrawOptions, NULL, |