You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [29/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/...
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.cxx Wed Dec 18 13:27:09 2013
@@ -335,20 +335,18 @@ void PspGraphics::drawRect( long nX, lon
m_pPrinterGfx->DrawRect (Rectangle(Point(nX, nY), Size(nDX, nDY)));
}
-void PspGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry )
+void PspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void PspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
}
-void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
- const sal_uInt32 *pPoints,
- PCONSTSALPOINT *pPtAry )
+void PspGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry )
{
m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry);
}
@@ -364,13 +362,13 @@ bool PspGraphics::drawPolyLine(
return false;
}
-sal_Bool PspGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
}
-sal_Bool PspGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool PspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
return sal_True;
@@ -392,7 +390,7 @@ bool PspGraphics::drawPolyPolygon( const
return false;
}
-void PspGraphics::invert( sal_uLong /*nPoints*/,
+void PspGraphics::invert( sal_uInt32 /*nPoints*/,
const SalPoint* /*pPtAry*/,
SalInvert /*nFlags*/ )
{
@@ -564,7 +562,7 @@ bool PspFontLayout::LayoutText( ImplLayo
if( aFontEnc == RTL_TEXTENCODING_SYMBOL )
if( cChar < 256 )
cChar += 0xf000;
- int nGlyphIndex = cChar; // printer glyphs = unicode
+ sal_GlyphId aGlyphId( cChar); // printer glyphs = unicode
// update fallback_runs if needed
psp::CharacterMetric aMetric;
@@ -581,7 +579,7 @@ bool PspFontLayout::LayoutText( ImplLayo
for( std::list< KernPair >::const_iterator it = rKernPairs.begin();
it != rKernPairs.end(); ++it )
{
- if( it->first == nOldGlyphId && it->second == nGlyphIndex )
+ if( it->first == nOldGlyphId && it->second == aGlyphId )
{
int nTextScale = mrPrinterGfx.GetFontWidth();
if( ! nTextScale )
@@ -598,14 +596,14 @@ bool PspFontLayout::LayoutText( ImplLayo
// finish previous glyph
if( nOldGlyphId >= 0 )
AppendGlyph( aPrevItem );
- nOldGlyphId = nGlyphIndex;
+ nOldGlyphId = aGlyphId;
aNewPos.X() += nGlyphWidth;
// prepare GlyphItem for appending it in next round
nUnitsPerPixel = mrPrinterGfx.GetCharWidth( cChar, cChar, &nGlyphWidth );
int nGlyphFlags = bRightToLeft ? GlyphItem::IS_RTL_GLYPH : 0;
- nGlyphIndex |= GF_ISCHAR;
- aPrevItem = GlyphItem( nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nGlyphWidth );
+ aGlyphId |= GF_ISCHAR;
+ aPrevItem = GlyphItem( nCharPos, aGlyphId, aNewPos, nGlyphFlags, nGlyphWidth );
}
// append last glyph item if any
@@ -685,15 +683,15 @@ static void DrawPrinterLayout( const Sal
{
nXOffset += aWidthAry[ i ];
aIdxAry[ i ] = nXOffset / nUnitsPerPixel;
- sal_Int32 nGlyphIdx = aGlyphAry[i] & (GF_IDXMASK | GF_ROTMASK);
+ sal_GlyphId aGlyphId = aGlyphAry[i] & (GF_IDXMASK | GF_ROTMASK);
if( bIsPspServerFontLayout )
aUnicodes[i] = (aCharPosAry[i] >= nMinCharPos && aCharPosAry[i] <= nMaxCharPos) ? pText[ aCharPosAry[i] ] : 0;
else
- aUnicodes[i] = (aGlyphAry[i] & GF_ISCHAR) ? nGlyphIdx : 0;
- aGlyphAry[i] = nGlyphIdx;
+ aUnicodes[i] = (aGlyphAry[i] & GF_ISCHAR) ? aGlyphId : 0;
+ aGlyphAry[i] = aGlyphId;
}
- rGfx.DrawGlyphs( aPos, (sal_uInt32 *)aGlyphAry, aUnicodes, nGlyphCount, aIdxAry );
+ rGfx.DrawGlyphs( aPos, aGlyphAry, aUnicodes, nGlyphCount, aIdxAry );
}
}
@@ -874,26 +872,26 @@ sal_uLong PspGraphics::GetKernPairs( sal
return nHavePairs;
}
-sal_Bool PspGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+bool PspGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
- return sal_False;
+ return false;
- nGlyphIndex &= ~GF_FONTMASK;
- const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
+ aGlyphId &= ~GF_FONTMASK;
+ const GlyphMetric& rGM = pSF->GetGlyphMetric( aGlyphId );
rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
- return sal_True;
+ return true;
}
-sal_Bool PspGraphics::GetGlyphOutline( long nGlyphIndex,
+bool PspGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
return sal_False;
@@ -901,11 +899,9 @@ sal_Bool PspGraphics::GetGlyphOutline( l
if( !pSF )
return sal_False;
- nGlyphIndex &= ~GF_FONTMASK;
- if( pSF->GetGlyphOutline( nGlyphIndex, rB2DPolyPoly ) )
- return sal_True;
-
- return sal_False;
+ aGlyphId &= ~GF_FONTMASK;
+ bool bOK = pSF->GetGlyphOutline( aGlyphId, rB2DPolyPoly );
+ return bOK;
}
SalLayout* PspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
@@ -933,7 +929,7 @@ SalLayout* PspGraphics::GetTextLayout( I
sal_Bool PspGraphics::CreateFontSubset(
const rtl::OUString& rToFile,
const ImplFontData* pFont,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphCount,
@@ -951,7 +947,7 @@ sal_Bool PspGraphics::CreateFontSubset(
bool bSuccess = rMgr.createFontSubset( rInfo,
aFont,
rToFile,
- pGlyphIDs,
+ pGlyphIds,
pEncoding,
pWidths,
nGlyphCount );
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.hxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/headless/svppspgraphics.hxx Wed Dec 18 13:27:09 2013
@@ -113,7 +113,7 @@ public:
virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile,
const ImplFontData*,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphs,
@@ -130,8 +130,8 @@ public:
bool bVertical,
Int32Vector& rWidths,
Ucs2UIntMap& rUnicodeEnc );
- virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& );
- virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& );
+ virtual bool GetGlyphBoundRect( sal_GlyphId, Rectangle& );
+ virtual bool GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
virtual void DrawServerFontLayout( const ServerFontLayout& );
virtual bool supportsOperation( OutDevSupportType ) const;
@@ -139,8 +139,8 @@ public:
virtual void drawPixel( long nX, long nY, SalColor nSalColor );
virtual void drawLine( long nX1, long nY1, long nX2, long nY2 );
virtual void drawRect( long nX, long nY, long nWidth, long nHeight );
- virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
- virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
+ virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry );
+ virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
virtual bool drawPolyLine(
const ::basegfx::B2DPolygon&,
@@ -151,10 +151,10 @@ public:
virtual void drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
PCONSTSALPOINT* pPtAry );
- virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uLong nPoints,
+ virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
@@ -185,7 +185,7 @@ public:
virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight );
virtual SalColor getPixel( long nX, long nY );
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
- virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+ virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
Modified: openoffice/branches/ooxml-osba/main/vcl/unx/headless/svptext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/unx/headless/svptext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/unx/headless/svptext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/unx/headless/svptext.cxx Wed Dec 18 13:27:09 2013
@@ -52,12 +52,12 @@ class SvpGlyphPeer
public:
SvpGlyphPeer() {}
- BitmapDeviceSharedPtr GetGlyphBmp( ServerFont&, int nGlyphIndex,
+ BitmapDeviceSharedPtr GetGlyphBmp( ServerFont&, sal_GlyphId,
sal_uInt32 nBmpFormat, B2IPoint& rTargetPos );
protected:
virtual void RemovingFont( ServerFont& );
- virtual void RemovingGlyph( ServerFont&, GlyphData&, int nGlyphIndex );
+ virtual void RemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId );
class SvpGcpHelper
{
@@ -90,9 +90,9 @@ SvpGlyphCache& SvpGlyphCache::GetInstanc
// ===========================================================================
BitmapDeviceSharedPtr SvpGlyphPeer::GetGlyphBmp( ServerFont& rServerFont,
- int nGlyphIndex, sal_uInt32 nBmpFormat, B2IPoint& rTargetPos )
+ sal_GlyphId aGlyphId, sal_uInt32 nBmpFormat, B2IPoint& rTargetPos )
{
- GlyphData& rGlyphData = rServerFont.GetGlyphData( nGlyphIndex );
+ GlyphData& rGlyphData = rServerFont.GetGlyphData( aGlyphId );
SvpGcpHelper* pGcpHelper = (SvpGcpHelper*)rGlyphData.ExtDataRef().mpData;
// nothing to do if the GlyphPeer hasn't allocated resources for the glyph
@@ -107,10 +107,10 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetG
switch( nBmpFormat )
{
case Format::ONE_BIT_LSB_GREY:
- bFound = rServerFont.GetGlyphBitmap1( nGlyphIndex, pGcpHelper->maRawBitmap );
+ bFound = rServerFont.GetGlyphBitmap1( aGlyphId, pGcpHelper->maRawBitmap );
break;
case Format::EIGHT_BIT_GREY:
- bFound = rServerFont.GetGlyphBitmap8( nGlyphIndex, pGcpHelper->maRawBitmap );
+ bFound = rServerFont.GetGlyphBitmap8( aGlyphId, pGcpHelper->maRawBitmap );
break;
default:
DBG_ERROR( "SVP GCP::GetGlyphBmp(): illegal scanline format");
@@ -121,7 +121,7 @@ BitmapDeviceSharedPtr SvpGlyphPeer::GetG
}
// return .notdef glyph if needed
- if( !bFound && (nGlyphIndex != 0) )
+ if( !bFound && (aGlyphId != 0) )
{
delete pGcpHelper;
return GetGlyphBmp( rServerFont, 0, nBmpFormat, rTargetPos );
@@ -152,7 +152,7 @@ void SvpGlyphPeer::RemovingFont( ServerF
//--------------------------------------------------------------------------
-void SvpGlyphPeer::RemovingGlyph( ServerFont&, GlyphData& rGlyphData, int /*nGlyphIndex*/ )
+void SvpGlyphPeer::RemovingGlyph( ServerFont&, GlyphData& rGlyphData, sal_GlyphId /*aGlyphId*/ )
{
if( rGlyphData.ExtDataRef().mpData != Format::NONE )
{
@@ -189,7 +189,7 @@ void PspKernInfo::Initialize() const
return;
// feed psprint's kerning list into a lookup-friendly container
- maUnicodeKernPairs.resize( rKernPairs.size() );
+ maUnicodeKernPairs.rehash( rKernPairs.size() );
PspKernPairs::const_iterator it = rKernPairs.begin();
for(; it != rKernPairs.end(); ++it )
{
@@ -338,7 +338,7 @@ bool SvpSalGraphics::AddTempDevFont( Imp
sal_Bool SvpSalGraphics::CreateFontSubset(
const rtl::OUString& rToFile,
const ImplFontData* pFont,
- sal_Int32* pGlyphIDs,
+ sal_GlyphId* pGlyphIds,
sal_uInt8* pEncoding,
sal_Int32* pWidths,
int nGlyphCount,
@@ -356,7 +356,7 @@ sal_Bool SvpSalGraphics::CreateFontSubse
bool bSuccess = rMgr.createFontSubset( rInfo,
aFont,
rToFile,
- pGlyphIDs,
+ pGlyphIds,
pEncoding,
pWidths,
nGlyphCount );
@@ -418,39 +418,37 @@ void SvpSalGraphics::GetGlyphWidths( con
// ---------------------------------------------------------------------------
-sal_Bool SvpSalGraphics::GetGlyphBoundRect( long nGlyphIndex, Rectangle& rRect )
+bool SvpSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
- return sal_False;
+ return false;
- nGlyphIndex &= ~GF_FONTMASK;
- const GlyphMetric& rGM = pSF->GetGlyphMetric( nGlyphIndex );
+ aGlyphId &= ~GF_FONTMASK;
+ const GlyphMetric& rGM = pSF->GetGlyphMetric( aGlyphId );
rRect = Rectangle( rGM.GetOffset(), rGM.GetSize() );
- return sal_True;
+ return true;
}
// ---------------------------------------------------------------------------
-sal_Bool SvpSalGraphics::GetGlyphOutline( long nGlyphIndex, B2DPolyPolygon& rPolyPoly )
+bool SvpSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, B2DPolyPolygon& rPolyPoly )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ const int nLevel = aGlyphId >> GF_FONTSHIFT;
if( nLevel >= MAX_FALLBACK )
- return sal_False;
+ return false;
const ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
- return sal_False;
+ return false;
- nGlyphIndex &= ~GF_FONTMASK;
- if( pSF->GetGlyphOutline( nGlyphIndex, rPolyPoly ) )
- return sal_True;
-
- return sal_False;
+ aGlyphId &= ~GF_FONTMASK;
+ bool bOK = pSF->GetGlyphOutline( aGlyphId, rPolyPoly );
+ return bOK;
}
// ---------------------------------------------------------------------------
@@ -471,21 +469,21 @@ void SvpSalGraphics::DrawServerFontLayou
{
// iterate over all glyphs in the layout
Point aPos;
- sal_GlyphId nGlyphIndex;
+ sal_GlyphId aGlyphId;
SvpGlyphPeer& rGlyphPeer = SvpGlyphCache::GetInstance().GetPeer();
- for( int nStart = 0; rSalLayout.GetNextGlyphs( 1, &nGlyphIndex, aPos, nStart ); )
+ for( int nStart = 0; rSalLayout.GetNextGlyphs( 1, &aGlyphId, aPos, nStart ); )
{
- int nLevel = nGlyphIndex >> GF_FONTSHIFT;
+ int nLevel = aGlyphId >> GF_FONTSHIFT;
DBG_ASSERT( nLevel < MAX_FALLBACK, "SvpGDI: invalid glyph fallback level" );
ServerFont* pSF = m_pServerFont[ nLevel ];
if( !pSF )
continue;
// get the glyph's alpha mask and adjust the drawing position
- nGlyphIndex &= ~GF_FONTMASK;
+ aGlyphId &= ~GF_FONTMASK;
B2IPoint aDstPoint( aPos.X(), aPos.Y() );
BitmapDeviceSharedPtr aAlphaMask
- = rGlyphPeer.GetGlyphBmp( *pSF, nGlyphIndex, m_eTextFmt, aDstPoint );
+ = rGlyphPeer.GetGlyphBmp( *pSF, aGlyphId, m_eTextFmt, aDstPoint );
if( !aAlphaMask ) // ignore empty glyphs
continue;
Modified: openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi.cxx Wed Dec 18 13:27:09 2013
@@ -791,7 +791,7 @@ WinSalGraphics::~WinSalGraphics()
// -----------------------------------------------------------------------
-void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );
@@ -1409,7 +1409,7 @@ void WinSalGraphics::drawRect( long nX,
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1424,7 +1424,7 @@ void WinSalGraphics::drawPolyLine( sal_u
// -----------------------------------------------------------------------
-void WinSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry )
+void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Unter NT koennen wir das Array direkt weiterreichen
DBG_ASSERT( sizeof( POINT ) == sizeof( SalPoint ),
@@ -1512,7 +1512,7 @@ void WinSalGraphics::drawPolyPolygon( sa
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// Unter NT koennen wir das Array direkt weiterreichen
@@ -1529,7 +1529,7 @@ sal_Bool WinSalGraphics::drawPolyLineBez
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
+sal_Bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
{
#ifdef USE_GDI_BEZIERS
// Unter NT koennen wir das Array direkt weiterreichen
Modified: openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi2.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi2.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi2.cxx Wed Dec 18 13:27:09 2013
@@ -777,7 +777,7 @@ void WinSalGraphics::invert( long nX, lo
// -----------------------------------------------------------------------
-void WinSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
+void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
{
HPEN hPen;
HPEN hOldPen;
Modified: openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi3.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi3.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/salgdi3.cxx Wed Dec 18 13:27:09 2013
@@ -2426,7 +2426,7 @@ void WinSalGraphics::GetDevFontSubstList
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::GetGlyphBoundRect( long nIndex, Rectangle& rRect )
+bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
HDC hDC = getHDC();
@@ -2436,14 +2436,14 @@ sal_Bool WinSalGraphics::GetGlyphBoundRe
aMat.eM12 = aMat.eM21 = FixedFromDouble( 0.0 );
UINT nGGOFlags = GGO_METRICS;
- if( !(nIndex & GF_ISCHAR) )
+ if( !(aGlyphId & GF_ISCHAR) )
nGGOFlags |= GGO_GLYPH_INDEX;
- nIndex &= GF_IDXMASK;
+ aGlyphId &= GF_IDXMASK;
GLYPHMETRICS aGM;
aGM.gmptGlyphOrigin.x = aGM.gmptGlyphOrigin.y = 0;
aGM.gmBlackBoxX = aGM.gmBlackBoxY = 0;
- DWORD nSize = ::GetGlyphOutlineW( hDC, nIndex, nGGOFlags, &aGM, 0, NULL, &aMat );
+ DWORD nSize = ::GetGlyphOutlineW( hDC, aGlyphId, nGGOFlags, &aGM, 0, NULL, &aMat );
if( nSize == GDI_ERROR )
return false;
@@ -2458,7 +2458,7 @@ sal_Bool WinSalGraphics::GetGlyphBoundRe
// -----------------------------------------------------------------------
-sal_Bool WinSalGraphics::GetGlyphOutline( long nIndex,
+bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rB2DPolyPoly )
{
rB2DPolyPoly.clear();
@@ -2471,23 +2471,23 @@ sal_Bool WinSalGraphics::GetGlyphOutline
aMat.eM12 = aMat.eM21 = FixedFromDouble( 0.0 );
UINT nGGOFlags = GGO_NATIVE;
- if( !(nIndex & GF_ISCHAR) )
+ if( !(aGlyphId & GF_ISCHAR) )
nGGOFlags |= GGO_GLYPH_INDEX;
- nIndex &= GF_IDXMASK;
+ aGlyphId &= GF_IDXMASK;
GLYPHMETRICS aGlyphMetrics;
- const DWORD nSize1 = ::GetGlyphOutlineW( hDC, nIndex, nGGOFlags, &aGlyphMetrics, 0, NULL, &aMat );
+ const DWORD nSize1 = ::GetGlyphOutlineW( hDC, aGlyphId, nGGOFlags, &aGlyphMetrics, 0, NULL, &aMat );
if( !nSize1 ) // blank glyphs are ok
- return TRUE;
+ return true;
else if( nSize1 == GDI_ERROR )
- return FALSE;
+ return false;
- BYTE* pData = new BYTE[ nSize1 ];
- const DWORD nSize2 = ::GetGlyphOutlineW( hDC, nIndex, nGGOFlags,
+ BYTE* pData = new BYTE[ nSize1 ];
+ const DWORD nSize2 = ::GetGlyphOutlineW( hDC, aGlyphId, nGGOFlags,
&aGlyphMetrics, nSize1, pData, &aMat );
if( nSize1 != nSize2 )
- return FALSE;
+ return false;
// TODO: avoid tools polygon by creating B2DPolygon directly
int nPtSize = 512;
@@ -2637,7 +2637,7 @@ sal_Bool WinSalGraphics::GetGlyphOutline
rB2DPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix(fFactor, fFactor));
}
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
@@ -2701,7 +2701,7 @@ int ScopedTrueTypeFont::open(void * pBuf
}
sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
- const ImplFontData* pFont, long* pGlyphIDs, sal_uInt8* pEncoding,
+ const ImplFontData* pFont, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding,
sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
{
// TODO: use more of the central font-subsetting code, move stuff there if needed
@@ -2744,18 +2744,18 @@ sal_Bool WinSalGraphics::CreateFontSubse
const ImplFontCharMap* pCharMap = pWinFontData->GetImplFontCharMap();
pCharMap->AddReference();
- long nRealGlyphIds[ 256 ];
+ sal_GlyphId aRealGlyphIds[ 256 ];
for( int i = 0; i < nGlyphCount; ++i )
{
// TODO: remap notdef glyph if needed
// TODO: use GDI's GetGlyphIndices instead? Does it handle GSUB properly?
- sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
- if( pGlyphIDs[i] & GF_ISCHAR ) // remaining pseudo-glyphs need to be translated
- nGlyphIdx = pCharMap->GetGlyphIndex( nGlyphIdx );
- if( (pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0) // TODO: vertical substitution
+ sal_GlyphId aGlyphId = pGlyphIds[i] & GF_IDXMASK;
+ if( pGlyphIds[i] & GF_ISCHAR ) // remaining pseudo-glyphs need to be translated
+ aGlyphId = pCharMap->GetGlyphIndex( aGlyphId );
+ if( (pGlyphIds[i] & (GF_ROTMASK|GF_GSUB)) != 0) // TODO: vertical substitution
{/*####*/}
- nRealGlyphIds[i] = nGlyphIdx;
+ aRealGlyphIds[i] = aGlyphId;
}
pCharMap->DeReference(); // TODO: and and use a RAII object
@@ -2764,7 +2764,7 @@ sal_Bool WinSalGraphics::CreateFontSubse
FILE* pOutFile = fopen( aToFile.GetBuffer(), "wb" );
rInfo.LoadFont( FontSubsetInfo::CFF_FONT, aRawCffData.get(), aRawCffData.size() );
bool bRC = rInfo.CreateFontSubset( FontSubsetInfo::TYPE1_PFB, pOutFile, NULL,
- nRealGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
+ aRealGlyphIds, pEncoding, nGlyphCount, pGlyphWidths );
fclose( pOutFile );
return bRC;
}
@@ -2804,21 +2804,21 @@ sal_Bool WinSalGraphics::CreateFontSubse
for( i = 0; i < nGlyphCount; ++i )
{
aTempEncs[i] = pEncoding[i];
- sal_uInt32 nGlyphIdx = pGlyphIDs[i] & GF_IDXMASK;
- if( pGlyphIDs[i] & GF_ISCHAR )
+ sal_GlyphId aGlyphId = pGlyphIds[i] & GF_IDXMASK;
+ if( pGlyphIds[i] & GF_ISCHAR )
{
- sal_Unicode cChar = static_cast<sal_Unicode>(nGlyphIdx); // TODO: sal_UCS4
- const bool bVertical = ((pGlyphIDs[i] & (GF_ROTMASK|GF_GSUB)) != 0);
- nGlyphIdx = ::MapChar( aSftTTF.get(), cChar, bVertical );
- if( (nGlyphIdx == 0) && pFont->IsSymbolFont() )
+ sal_Unicode cChar = static_cast<sal_Unicode>(aGlyphId); // TODO: sal_UCS4
+ const bool bVertical = ((pGlyphIds[i] & (GF_ROTMASK|GF_GSUB)) != 0);
+ aGlyphId = ::MapChar( aSftTTF.get(), cChar, bVertical );
+ if( (aGlyphId == 0) && pFont->IsSymbolFont() )
{
// #i12824# emulate symbol aliasing U+FXXX <-> U+0XXX
cChar = (cChar & 0xF000) ? (cChar & 0x00FF) : (cChar | 0xF000);
- nGlyphIdx = ::MapChar( aSftTTF.get(), cChar, bVertical );
+ aGlyphId = ::MapChar( aSftTTF.get(), cChar, bVertical );
}
}
- aShortIDs[i] = static_cast<sal_uInt16>( nGlyphIdx );
- if( !nGlyphIdx )
+ aShortIDs[i] = static_cast<sal_uInt16>( aGlyphId );
+ if( !aGlyphId )
if( nNotDef < 0 )
nNotDef = i; // first NotDef glyph found
}
Modified: openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/winlayout.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/winlayout.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/winlayout.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/win/source/gdi/winlayout.cxx Wed Dec 18 13:27:09 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 )
Modified: openoffice/branches/ooxml-osba/main/vcl/win/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vcl/win/source/window/salframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vcl/win/source/window/salframe.cxx Wed Dec 18 13:27:09 2013
@@ -92,7 +92,6 @@
using ::std::max;
#endif
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
#include <oleacc.h>
#include <com/sun/star/accessibility/XMSAAService.hpp>
@@ -101,7 +100,6 @@ using ::std::max;
#endif
#include <win/g_msaasvc.h>
#endif
-//-----IAccessibility2 Implementation 2009
#include <com/sun/star/uno/Exception.hdl>
#include <time.h>
@@ -163,12 +161,10 @@ sal_Bool WinSalFrame::mbInReparent = FAL
#define Uni_SupplementaryPlanesStart 0x10000
// =======================================================================
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
using namespace ::com::sun::star::accessibility;
XMSAAService* g_acc_manager1 = NULL;
#endif
-//-----IAccessibility2 Implementation 2009
static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame );
static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect = NULL );
@@ -6194,7 +6190,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
ImplHandleIMENotify( hWnd, wParam );
break;
-//IAccessibility2 implementation 2009-----
#ifdef WNT
case WM_GETOBJECT:
{
@@ -6247,7 +6242,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
break;
}
#endif
-//-----IAccessibility2 implementation 2009
case WM_APPCOMMAND:
if( ImplHandleAppCommand( hWnd, lParam ) )
@@ -6469,7 +6463,6 @@ sal_Bool ImplWriteLastError( DWORD lastE
// -----------------------------------------------------------------------
-//IAccessibility2 implementation 2009-----
#ifdef WNT
bool IsWNTInitAccessBridge()
{
@@ -6490,4 +6483,3 @@ bool WNTEnableAccessInterface(bool bEnab
return bPreVal;
}
#endif
-//-----IAccessibility2 implementation 2009
Modified: openoffice/branches/ooxml-osba/main/vos/source/module.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/vos/source/module.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/vos/source/module.cxx (original)
+++ openoffice/branches/ooxml-osba/main/vos/source/module.cxx Wed Dec 18 13:27:09 2013
@@ -39,7 +39,7 @@ OModule::OModule()
OModule::OModule(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode) : m_Module(0)
{
- if (ustrModuleName)
+ if( !ustrModuleName.isEmpty())
load(ustrModuleName, nRtldMode);
}
@@ -51,7 +51,7 @@ OModule::~OModule()
sal_Bool OModule::load(const rtl::OUString& ustrModuleName, sal_Int32 nRtldMode)
{
- VOS_ASSERT(ustrModuleName);
+ VOS_ASSERT( !ustrModuleName.isEmpty());
unload();
@@ -76,7 +76,7 @@ sal_Bool OModule::isLoaded()
void *OModule::getSymbol(const rtl::OUString& strSymbolName)
{
- VOS_ASSERT(strSymbolName);
+ VOS_ASSERT( !strSymbolName.isEmpty());
VOS_ASSERT(m_Module);
return ( osl_getSymbol( m_Module, strSymbolName.pData ) );
}
Modified: openoffice/branches/ooxml-osba/main/winaccessibility/inc/AccContainerEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/winaccessibility/inc/AccContainerEventListener.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/winaccessibility/inc/AccContainerEventListener.hxx (original)
+++ openoffice/branches/ooxml-osba/main/winaccessibility/inc/AccContainerEventListener.hxx Wed Dec 18 13:27:09 2013
@@ -89,10 +89,8 @@ public:
virtual void handleSectionChangedEvent (const Any &oldValue, const Any &newValue);
virtual void handleColumnChangedEvent (const Any &oldValue, const Any &newValue);
- //IAccessibility2 Implementation 2009-----
//for name changed event
virtual void SAL_CALL handleNameChangedEvent(Any name);
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccComponentEventListener.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccComponentEventListener.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccComponentEventListener.cxx (original)
+++ openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccComponentEventListener.cxx Wed Dec 18 13:27:09 2013
@@ -191,8 +191,8 @@ void AccComponentEventListener::setCompo
pAgent->UpdateState(pAccessible);
pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
// 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
- if( getRole() != AccessibleRole::LABEL
- && getRole() != AccessibleRole::SCROLL_BAR) //IAccessibility2 Implementation 2009
+ if( getRole() != AccessibleRole::LABEL
+ && getRole() != AccessibleRole::SCROLL_BAR)
pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
}
else
Modified: openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccContainerEventListener.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccContainerEventListener.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccContainerEventListener.cxx (original)
+++ openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccContainerEventListener.cxx Wed Dec 18 13:27:09 2013
@@ -548,7 +548,6 @@ void AccContainerEventListener::handleCo
pAgent->NotifyAccEvent(UM_EVENT_COLUMN_CHANGED, pAccessible);
}
-//IAccessibility2 Implementation 2009-----
void AccContainerEventListener::handleNameChangedEvent( Any name )
{
if (getRole() == AccessibleRole::COMBO_BOX)
@@ -570,4 +569,3 @@ void AccContainerEventListener::handleN
}
AccEventListener::handleNameChangedEvent(name);
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccObject.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccObject.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccObject.cxx (original)
+++ openoffice/branches/ooxml-osba/main/winaccessibility/source/service/AccObject.cxx Wed Dec 18 13:27:09 2013
@@ -182,13 +182,11 @@ void AccObject::UpdateName( )
if( ( TEXT_FRAME == m_accRole ) && ( m_pParentObj !=NULL )&& ( SCROLL_PANE == m_pParentObj -> m_accRole ) )
m_pIMAcc->Put_XAccName( m_pParentObj->m_xAccContextRef->getAccessibleName().getStr() );
- //IAccessibility2 Implementation 2009-----
if ( PARAGRAPH == m_accRole)
{
::rtl::OUString emptyStr = ::rtl::OUString::createFromAscii("");
m_pIMAcc->Put_XAccName(emptyStr.getStr());
}
- //-----IAccessibility2 Implementation 2009
else
m_pIMAcc->Put_XAccName(m_xAccContextRef->getAccessibleName().getStr());
@@ -314,7 +312,6 @@ void AccObject::SetValue( Any pAny )
m_pIMAcc->Put_XAccValue( val.getStr() );
break;
case TREE_ITEM:
- //IAccessibility2 Implementation 2009-----
//case CHECK_BOX: //Commented by Li Xing to disable the value for general checkbox
case COMBO_BOX:
case TABLE_CELL:
@@ -326,7 +323,6 @@ void AccObject::SetValue( Any pAny )
case CHECK_BOX:
if( ( m_pParentObj !=NULL ) && (TREE == m_pParentObj->m_accRole || TREE_ITEM == m_pParentObj->m_accRole ))
m_pIMAcc->Put_XAccValue( GetMAccessibleValueFromAny(pAny).getStr() );
- //-----IAccessibility2 Implementation 2009
break;
default:
break;
Modified: openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Wed Dec 18 13:27:09 2013
@@ -1270,6 +1270,7 @@ void DomainMapper_Impl::PushAnnotation()
-----------------------------------------------------------------------*/
void DomainMapper_Impl::PopFootOrEndnote()
{
+ RemoveLastParagraph();
m_aTextAppendStack.pop();
}
/*-- 22.12.2008 13:45:15---------------------------------------------------
Modified: openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/PropertyMap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/PropertyMap.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/PropertyMap.cxx (original)
+++ openoffice/branches/ooxml-osba/main/writerfilter/source/dmapper/PropertyMap.cxx Wed Dec 18 13:27:09 2013
@@ -363,7 +363,7 @@ void SectionPropertyMap::SetPageStyleNa
for( sal_Int32 nStyle = 0; nStyle < rPageStyleNames.getLength(); ++nStyle)
{
if( pStyleNames[nStyle].getLength() > nDefaultLength &&
- !rtl_ustr_compare_WithLength( sDefaultStyle, nDefaultLength, pStyleNames[nStyle], nDefaultLength))
+ !rtl_ustr_compare_WithLength( sDefaultStyle.getStr(), nDefaultLength, pStyleNames[nStyle].getStr(), nDefaultLength))
{
sal_Int32 nIndex = pStyleNames[nStyle].copy( nDefaultLength ).toInt32();
if( nIndex > nMaxIndex)
Modified: openoffice/branches/ooxml-osba/main/xmlhelp/source/com/sun/star/help/HelpSearch.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmlhelp/source/com/sun/star/help/HelpSearch.java?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmlhelp/source/com/sun/star/help/HelpSearch.java (original)
+++ openoffice/branches/ooxml-osba/main/xmlhelp/source/com/sun/star/help/HelpSearch.java Wed Dec 18 13:27:09 2013
@@ -273,7 +273,7 @@ public class HelpSearch
// Perform search
TopDocs aHits = searcher.search( aQuery, 100 );
- int nHitCount = aHits.totalHits;
+ int nHitCount = aHits.scoreDocs.length;
String aDocs[] = new String[nHitCount];
float aScores[] = null;
Modified: openoffice/branches/ooxml-osba/main/xmloff/source/core/DocumentSettingsContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/core/DocumentSettingsContext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/core/DocumentSettingsContext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/core/DocumentSettingsContext.cxx Wed Dec 18 13:27:09 2013
@@ -600,7 +600,7 @@ void XMLConfigItemContext::Characters( c
if( sTrimmedChars.getLength() )
{
rtl::OUString sChars;
- if( msValue )
+ if( !msValue.isEmpty() )
{
sChars = msValue;
sChars += sTrimmedChars;
Modified: openoffice/branches/ooxml-osba/main/xmloff/source/core/XMLBase64ImportContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/core/XMLBase64ImportContext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/core/XMLBase64ImportContext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/core/XMLBase64ImportContext.cxx Wed Dec 18 13:27:09 2013
@@ -65,7 +65,7 @@ void XMLBase64ImportContext::Characters(
if( sTrimmedChars.getLength() )
{
OUString sChars;
- if( sBase64CharsLeft )
+ if( !sBase64CharsLeft.isEmpty() )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
Modified: openoffice/branches/ooxml-osba/main/xmloff/source/draw/ximpstyl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/draw/ximpstyl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/draw/ximpstyl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/draw/ximpstyl.cxx Wed Dec 18 13:27:09 2013
@@ -1306,7 +1306,7 @@ void SdXMLStylesContext::EndElement()
//
void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const
{
- UniString sPrefix(rMaster.GetDisplayName(), (sal_uInt16)rMaster.GetDisplayName().getLength());
+ UniString sPrefix( rMaster.GetDisplayName());
sPrefix += sal_Unicode('-');
if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName())) try
Modified: openoffice/branches/ooxml-osba/main/xmloff/source/text/XMLTextFrameContext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmloff/source/text/XMLTextFrameContext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmloff/source/text/XMLTextFrameContext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmloff/source/text/XMLTextFrameContext.cxx Wed Dec 18 13:27:09 2013
@@ -1247,7 +1247,7 @@ void XMLTextFrameContext_Impl::Character
if( bOwnBase64Stream && xBase64Stream.is() )
{
OUString sChars;
- if( sBase64CharsLeft )
+ if( !sBase64CharsLeft.isEmpty() )
{
sChars = sBase64CharsLeft;
sChars += sTrimmedChars;
Modified: openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx Wed Dec 18 13:27:09 2013
@@ -62,7 +62,7 @@ cssu::Reference< cssxc::XXMLSecurityCont
//Initialize the crypto engine
if( sCertDB.getLength() > 0 )
{
- rtl::OString sCertDir(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US);
+ rtl::OString sCertDir( OUStringToOString( sCertDB, RTL_TEXTENCODING_ASCII_US));
n_pCertStore = sCertDir.getStr();
n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
if( n_hStoreHandle == NULL )
Modified: openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx (original)
+++ openoffice/branches/ooxml-osba/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx Wed Dec 18 13:27:09 2013
@@ -38,11 +38,11 @@ uno::Reference< xml::crypto::XCipherCont
xResult->m_pSlot = PK11_GetBestSlot( nNSSCipherID, NULL );
if ( xResult->m_pSlot )
{
- SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >( reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ), aKey.getLength() };
+ SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >( reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ), static_cast<unsigned>(aKey.getLength()) };
xResult->m_pSymKey = PK11_ImportSymKey( xResult->m_pSlot, nNSSCipherID, PK11_OriginDerive, bEncryption ? CKA_ENCRYPT : CKA_DECRYPT, &aKeyItem, NULL );
if ( xResult->m_pSymKey )
{
- SECItem aIVItem = { siBuffer, const_cast< unsigned char* >( reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray() ) ), aInitializationVector.getLength() };
+ SECItem aIVItem = { siBuffer, const_cast< unsigned char* >( reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray() ) ), static_cast<unsigned>(aInitializationVector.getLength()) };
xResult->m_pSecParam = PK11_ParamFromIV( nNSSCipherID, &aIVItem );
if ( xResult->m_pSecParam )
{
Propchange: openoffice/branches/ooxml-osba/test/
------------------------------------------------------------------------------
Merged /openoffice/branches/rejuvenate01/test:r1534063
Merged /openoffice/trunk/test:r1543343-1551926
Modified: openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.java?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.java (original)
+++ openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.java Wed Dec 18 13:27:09 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;
@@ -62,6 +64,7 @@ public class XMLReporter extends RunList
private long ignored = 0;
+ private long runStart = 0;
private long testStart = 0;
@Override
@@ -137,6 +140,7 @@ public class XMLReporter extends RunList
public void testRunStarted(Description description) throws Exception {
suiteName = description.getDisplayName();
FileUtil.deleteFile(outputDir);//clear all old output
+ runStart = System.currentTimeMillis();
startSuite();
}
@@ -188,7 +192,17 @@ public class XMLReporter extends RunList
prop.setAttribute("value", "" + e.getValue());
props.appendChild(prop);
}
-
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy/MM/dd HH:mm:ss");
+ String aRunStartStr = dateFormat.format( new Date( runStart));
+ long nRunEnd = System.currentTimeMillis();
+ String aRunEndStr = dateFormat.format( new Date( nRunEnd));
+ double fDuration = (nRunEnd - runStart) / 1000.0;
+ if( fDuration < 20*3600e3) // strip the end date if it is obvious
+ aRunEndStr = aRunEndStr.substring( 11);
+ String aTestTimeStr = String.format( "From %s to %s (%.1f secs)", aRunStartStr, aRunEndStr, fDuration);
+ System.setProperty( "info.test.date", aTestTimeStr);
+
FileUtil.storeXML(doc, file);
File htmlFile = new File(outputDir, "result.html");
InputStream is = getClass().getResourceAsStream("XMLReporter.xsl");
Modified: openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl (original)
+++ openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/common/XMLReporter.xsl Wed Dec 18 13:27:09 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';
Propchange: openoffice/branches/ooxml-osba/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1543343-1551926
Merged /openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl:r1534063