You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/12/16 17:48:12 UTC
svn commit: r1551260 [4/4] - in /openoffice/branches/rejuvenate01: ./
main/instsetoo_native/util/ main/padmin/source/ main/solenv/bin/
main/solenv/bin/modules/installer/ main/solenv/bin/modules/installer/patch/
main/solenv/bin/modules/installer/windows...
Modified: openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/winlayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/winlayout.cxx?rev=1551260&r1=1551259&r2=1551260&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/winlayout.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/win/source/gdi/winlayout.cxx Mon Dec 16 16:48:11 2013
@@ -570,7 +570,7 @@ bool SimpleWinLayout::LayoutText( ImplLa
// -----------------------------------------------------------------------
-int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos, int& nStart,
+int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart,
long* pGlyphAdvances, int* pCharIndexes ) const
{
// return zero if no more glyph found
@@ -590,27 +590,27 @@ int SimpleWinLayout::GetNextGlyphs( int
int nCount = 0;
while( nCount < nLen )
{
- // update return values {nGlyphIndex,nCharPos,nGlyphAdvance}
- sal_GlyphId nGlyphIndex = mpOutGlyphs[ nStart ];
+ // update return values {aGlyphId,nCharPos,nGlyphAdvance}
+ sal_GlyphId aGlyphId = mpOutGlyphs[ nStart ];
if( mbDisableGlyphs )
{
if( mnLayoutFlags & SAL_LAYOUT_VERTICAL )
{
- const sal_UCS4 cChar = static_cast<sal_UCS4>(nGlyphIndex & GF_IDXMASK);
+ const sal_UCS4 cChar = static_cast<sal_UCS4>(aGlyphId & GF_IDXMASK);
if( mrWinFontData.HasGSUBstitutions( mhDC )
&& mrWinFontData.IsGSUBstituted( cChar ) )
- nGlyphIndex |= GF_GSUB | GF_ROTL;
+ aGlyphId |= GF_GSUB | GF_ROTL;
else
{
- nGlyphIndex |= GetVerticalFlags( cChar );
- if( (nGlyphIndex & GF_ROTMASK) == 0 )
- nGlyphIndex |= GF_VERT;
+ aGlyphId |= GetVerticalFlags( cChar );
+ if( (aGlyphId & GF_ROTMASK) == 0 )
+ aGlyphId |= GF_VERT;
}
}
- nGlyphIndex |= GF_ISCHAR;
+ aGlyphId |= GF_ISCHAR;
}
++nCount;
- *(pGlyphs++) = nGlyphIndex;
+ *(pGlyphIds++) = aGlyphId;
if( pGlyphAdvances )
*(pGlyphAdvances++) = mpGlyphAdvances[ nStart ];
if( pCharIndexes )
Propchange: openoffice/branches/rejuvenate01/test/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test:r1550069-1551245
Modified: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java?rev=1551260&r1=1551259&r2=1551260&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java (original)
+++ openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.java Mon Dec 16 16:48:11 2013
@@ -22,6 +22,8 @@ package org.openoffice.test.common;
import java.io.File;
import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Map.Entry;
import java.util.Set;
@@ -188,7 +190,10 @@ public class XMLReporter extends RunList
prop.setAttribute("value", "" + e.getValue());
props.appendChild(prop);
}
-
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd HH-mm-ss");
+ System.setProperty( "info.test.date", dateFormat.format( new Date()));
+
FileUtil.storeXML(doc, file);
File htmlFile = new File(outputDir, "result.html");
InputStream is = getClass().getResourceAsStream("XMLReporter.xsl");
Modified: openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl?rev=1551260&r1=1551259&r2=1551260&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl (original)
+++ openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl Mon Dec 16 16:48:11 2013
@@ -55,6 +55,7 @@ th.Error {background:#FF0000;}
<div class="header">Information</div>
<div style="padding: 6px">
<table class="infoTable" width="100%">
+ <tr><th>Test Date</th><td><span id="info.test.date">Unknown</span></td></tr>
<tr><th>Build ID</th><td><span id="info.app.buildid">Unknown</span> (<span id="info.app.AllLanguages"></span>)</td></tr>
<tr><th>Revision</th><td id="info.app.Revision">Unknown</td></tr>
<tr><th>OS</th><td><span id="info.os.name">Unknown</span>-<span id="info.os.version">Unknown</span>-<span id="info.os.arch">Unknown</span></td></tr>
@@ -134,13 +135,14 @@ function refresh() {
props[e.getAttribute("name")] = e.getAttribute("value");
}
+ $('info.test.date').innerHTML = props['info.test.date'] || 'Unknown';
$('info.app.buildid').innerHTML = props['info.app.buildid'] || 'Unknown';
$('info.app.AllLanguages').innerHTML = props['info.app.AllLanguages'] || '';
$('info.os.name').innerHTML = props['info.os.name'] || 'Unknown';
$('info.os.version').innerHTML = props['info.os.version'] || 'Unknown';
$('info.os.arch').innerHTML = props['info.os.arch'] || 'Unknown';
if (props['info.app.Revision'])
- $('info.app.Revision').innerHTML = '<a href="https://fisheye6.atlassian.com/changelog/~br=trunk/ooo/?showid=' + props['info.app.Revision'] + '">' + props['info.app.Revision'] + '</a>';
+ $('info.app.Revision').innerHTML = '<a href="http://svn.apache.org/viewvc?view=revision&revision=' + props['info.app.Revision'] + '">' + props['info.app.Revision'] + '</a>';
$('info.hostname').innerHTML = props['info.hostname'] || 'Unknown';
$('info.ip').innerHTML = props['info.ip'] || '0.0.0.0';
$('java.runtime.version').innerHTML = props['java.runtime.version'] || 'Unknown';