diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-21 13:59:56 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-22 00:08:24 +0200 |
| commit | b7c30884e17027cdb71b05dea5971869b8dbea6c (patch) | |
| tree | 0adf6c23bc88309873adca42749fd68ca088799d /vcl | |
| parent | 775da61892fa852c35ca6e2afe9a37620eaf14f7 (diff) | |
It is just an innocent hyphen not a hyphenator
Change-Id: I7454d90adfd507aae4c7efd1d4075454f03cddd8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index e2a4f384fd7e..dd93f55a88ce 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -6016,11 +6016,11 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, } sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, - sal_Unicode nHyphenatorChar, sal_Int32& rHyphenatorPos, + sal_Unicode nHyphenChar, sal_Int32& rHyphenPos, sal_Int32 nIndex, sal_Int32 nLen, long nCharExtra ) const { - rHyphenatorPos = -1; + rHyphenPos = -1; SalLayout* pSalLayout = ImplLayout( rStr, nIndex, nLen ); sal_Int32 nRetVal = -1; @@ -6046,24 +6046,24 @@ sal_Int32 OutputDevice::GetTextBreak( const OUString& rStr, long nTextWidth, nRetVal = pSalLayout->GetTextBreak( nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor ); // calculate hyphenated break position - OUString aHyphenatorStr(nHyphenatorChar); + OUString aHyphenStr(nHyphenChar); sal_Int32 nTempLen = 1; - SalLayout* pHyphenatorLayout = ImplLayout( aHyphenatorStr, 0, nTempLen ); - if( pHyphenatorLayout ) + SalLayout* pHyphenLayout = ImplLayout( aHyphenStr, 0, nTempLen ); + if( pHyphenLayout ) { // calculate subpixel width of hyphenation character - long nHyphenatorPixelWidth = pHyphenatorLayout->GetTextWidth() * nSubPixelFactor; - pHyphenatorLayout->Release(); + long nHyphenPixelWidth = pHyphenLayout->GetTextWidth() * nSubPixelFactor; + pHyphenLayout->Release(); // calculate hyphenated break position - nTextPixelWidth -= nHyphenatorPixelWidth; + nTextPixelWidth -= nHyphenPixelWidth; if( nExtraPixelWidth > 0 ) nTextPixelWidth -= nExtraPixelWidth; - rHyphenatorPos = pSalLayout->GetTextBreak(nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor); + rHyphenPos = pSalLayout->GetTextBreak(nTextPixelWidth, nExtraPixelWidth, nSubPixelFactor); - if( rHyphenatorPos > nRetVal ) - rHyphenatorPos = nRetVal; + if( rHyphenPos > nRetVal ) + rHyphenPos = nRetVal; } pSalLayout->Release(); |