cui/source/dialogs/hyphen.cxx | 18 +++++++----------
cui/source/inc/hyphen.hxx | 4 +--
sw/source/filter/html/htmlgrin.cxx | 27 ++++++++++----------------
sw/source/filter/html/htmlsect.cxx | 4 +--
sw/source/filter/html/htmltabw.cxx | 38 ++++++++++++++++---------------------
sw/source/filter/html/svxcss1.cxx | 23 ++++++++++------------
6 files changed, 51 insertions(+), 63 deletions(-)
New commits:
commit 038a6835d10c2f45d3aaa6df45ef331265a44c57
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Tue Jun 2 00:46:52 2015 +0200
Use more proper integer types
Change-Id: I66223e76ba886219f4e458f53a3c9db81a43ddb2
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 3f5ec0c..6576adf 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -342,7 +342,7 @@ void SvxCSS1BorderInfo::SetBorderLine( SvxBoxItemLine
nLine, SvxBoxItem &rBoxIte
SvxCSS1PropertyInfo::SvxCSS1PropertyInfo()
{
- for( sal_uInt16 i=0; i<4; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
aBorderInfos[i] = 0;
Clear();
@@ -378,7 +378,7 @@ SvxCSS1PropertyInfo::SvxCSS1PropertyInfo( const
SvxCSS1PropertyInfo& rProp ) :
ePageBreakAfter( rProp.ePageBreakAfter )
// /Feature: PrintExt
{
- for( sal_uInt16 i=0; i<4; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
aBorderInfos[i] = rProp.aBorderInfos[i]
? new SvxCSS1BorderInfo( *rProp.aBorderInfos[i] )
: 0;
@@ -391,7 +391,7 @@ SvxCSS1PropertyInfo::~SvxCSS1PropertyInfo()
void SvxCSS1PropertyInfo::DestroyBorderInfos()
{
- for( sal_uInt16 i=0; i<4; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
{
delete aBorderInfos[i];
aBorderInfos[i] = 0;
@@ -443,7 +443,7 @@ void SvxCSS1PropertyInfo::Merge( const SvxCSS1PropertyInfo&
rProp )
if( rProp.bTextIndent )
bTextIndent = true;
- for( sal_uInt16 i=0; i<4; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
{
if( rProp.aBorderInfos[i] )
{
@@ -572,9 +572,8 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
nBottomBorderDistance != USHRT_MAX ||
nLeftBorderDistance != USHRT_MAX ||
nRightBorderDistance != USHRT_MAX;
- sal_uInt16 i;
- for( i = 0; !bChg && i < 4; i++ )
+ for( size_t i=0; !bChg && i<SAL_N_ELEMENTS(aBorderInfos); ++i )
bChg = aBorderInfos[i]!=0;
if( !bChg )
@@ -600,7 +599,7 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
if( pInfo )
pInfo->SetBorderLine( SvxBoxItemLine::RIGHT, aBoxItem );
- for( i=0; i<4; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
{
SvxBoxItemLine nLine = SvxBoxItemLine::TOP;
sal_uInt16 nDist = 0;
@@ -1211,7 +1210,7 @@ static void ParseCSS1_font_style( const CSS1Expression
*pExpr,
// (wobei nor noch normal | italic und oblique zulaessig sind
// der Wert kann zwei Werte enthalten!
- for( sal_uInt16 i=0; pExpr && i<2; i++ )
+ for( int i=0; pExpr && i<2; ++i )
{
// Auch hier hinterlaesst MS-IEs Parser seine Spuren
if( (CSS1_IDENT==pExpr->GetType() || CSS1_STRING==pExpr->GetType()) &&
@@ -2254,7 +2253,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
long nMargins[4] = { 0, 0, 0, 0 };
bool bSetMargins[4] = { false, false, false, false };
- for( sal_uInt16 i=0; pExpr && i<4 && !pExpr->GetOp(); i++ )
+ for( int i=0; pExpr && i<4 && !pExpr->GetOp(); ++i )
{
bool bSetThis = false;
long nMargin = 0;
@@ -2481,7 +2480,7 @@ static void ParseCSS1_padding( const CSS1Expression
*pExpr,
SvxCSS1PropertyInfo& rPropInfo,
const SvxCSS1Parser& rParser )
{
- sal_uInt16 n=0;
+ int n=0;
while( n<4 && pExpr && !pExpr->GetOp() )
{
SvxBoxItemLine nLine = n==0 || n==2 ? SvxBoxItemLine::BOTTOM :
SvxBoxItemLine::LEFT;
@@ -2574,7 +2573,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression
*pExpr,
pExpr = pExpr->GetNext();
}
- for( sal_uInt16 i=0; i<4; i++ )
+ for( int i=0; i<4; ++i )
{
SvxBoxItemLine nLine = SvxBoxItemLine::TOP;
switch( i )
@@ -2897,7 +2896,7 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
SvxCSS1PropertyInfo& rPropInfo,
const SvxCSS1Parser& /*rParser*/ )
{
- sal_uInt16 n=0;
+ int n=0;
while( n<2 && pExpr && !pExpr->GetOp() )
{
switch( pExpr->GetType() )
commit 029b2d512752893f96114c6b2318339d8c581f33
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Tue Jun 2 00:31:40 2015 +0200
Use more proper integer types and range-based for loops
Change-Id: I48555d58af6c2cc814f9ac1cc39e221b31cce2f2
diff --git a/sw/source/filter/html/htmlsect.cxx
b/sw/source/filter/html/htmlsect.cxx
index 6cddcd9..a3789be 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -603,10 +603,10 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss
)
// Calculate width.
sal_uInt8 nPrcWidth = bPrcWidth ? (sal_uInt8)nWidth : 0;
- sal_uInt16 nTwipWidth = 0;
+ SwTwips nTwipWidth = 0;
if( !bPrcWidth && nWidth && Application::GetDefaultDevice() )
{
- nTwipWidth = (sal_uInt16)Application::GetDefaultDevice()
+ nTwipWidth = Application::GetDefaultDevice()
->PixelToLogic( Size(nWidth, 0),
MapMode(MAP_TWIP) ).Width();
}
diff --git a/sw/source/filter/html/htmltabw.cxx
b/sw/source/filter/html/htmltabw.cxx
index fbd39e2..4447505 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -151,9 +151,9 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableBox&
rBox,
else
{
const SwTableLines& rLines = rBox.GetTabLines();
- sal_uInt16 nCount = rLines.size();
+ const SwTableLines::size_type nCount = rLines.size();
bool bLeftRight = bLeft || bRight;
- for( sal_uInt16 i=0; !bRet && i<nCount; i++ )
+ for( SwTableLines::size_type i=0; !bRet && i<nCount; ++i )
{
bool bT = bTop && 0 == i;
bool bB = bBottom && nCount-1 == i;
@@ -180,9 +180,9 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableLine&
rLine,
if( !bRet )
{
const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
- sal_uInt16 nCount = rBoxes.size();
+ const SwTableBoxes::size_type nCount = rBoxes.size();
bool bTopBottom = bTop || bBottom;
- for( sal_uInt16 i=0; !bRet && i<nCount; i++ )
+ for( SwTableBoxes::size_type i=0; !bRet && i<nCount; ++i )
{
bool bL = bLeft && 0 == i;
bool bR = bRight && nCount-1 == i;
@@ -325,7 +325,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
}
long nWidth = 0;
- sal_uInt32 nPrcWidth = USHRT_MAX;
+ sal_uInt32 nPrcWidth = SAL_MAX_UINT32;
if( bOutWidth )
{
if( bLayoutExport )
@@ -344,7 +344,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
else
{
if( HasRelWidths() )
- nPrcWidth = (sal_uInt16)GetPrcWidth(nCol,nColSpan);
+ nPrcWidth = GetPrcWidth(nCol, nColSpan);
else
nWidth = GetAbsWidth( nCol, nColSpan );
}
@@ -372,7 +372,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).
append("=\"");
- if( nPrcWidth != USHRT_MAX )
+ if( nPrcWidth != SAL_MAX_UINT32 )
{
sOut.append(static_cast<sal_Int32>(nPrcWidth)).append('%');
}
@@ -513,7 +513,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
sal_Int16 eRowVertOri = text::VertOrientation::NONE;
if( rCells.size() > 1 )
{
- for( sal_uInt16 nCell = 0; nCell<rCells.size(); nCell++ )
+ for( SwWriteTableCells::size_type nCell = 0; nCell<rCells.size();
++nCell )
{
sal_Int16 eCellVertOri = rCells[nCell].GetVertOri();
if( 0==nCell )
@@ -553,8 +553,8 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
rWrt.IncIndentLevel(); // Inhalt von <TR>...</TR> einruecken
- for( sal_uInt16 nCell = 0; nCell<rCells.size(); nCell++ )
- OutTableCell( rWrt, &rCells[nCell],
text::VertOrientation::NONE==eRowVertOri );
+ for( const auto &rCell : rCells )
+ OutTableCell( rWrt, &rCell, text::VertOrientation::NONE==eRowVertOri );
rWrt.DecIndentLevel(); // Inhalt von <TR>...</TR> einruecken
@@ -567,8 +567,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
const OUString *pCaption, bool bTopCaption,
sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const
{
- sal_uInt16 nRow;
-
// Wert fuer FRAME bestimmen
sal_uInt16 nFrameMask = 15;
if( !(aRows.front())->bTopBorder )
@@ -584,7 +582,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
bool bRowsHaveBorder = false;
bool bRowsHaveBorderOnly = true;
SwWriteTableRow *pRow = aRows[0];
- for( nRow=1; nRow < aRows.size(); nRow++ )
+ for( SwWriteTableRows::size_type nRow=1; nRow < aRows.size(); ++nRow )
{
SwWriteTableRow *pNextRow = aRows[nRow];
bool bBorder = ( pRow->bBottomBorder || pNextRow->bTopBorder );
@@ -607,8 +605,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
bool bColsHaveBorder = false;
bool bColsHaveBorderOnly = true;
SwWriteTableCol *pCol = aCols[0];
- sal_uInt16 nCol;
- for( nCol=1; nCol<aCols.size(); nCol++ )
+ for( SwWriteTableCols::size_type nCol=1; nCol<aCols.size(); ++nCol )
{
SwWriteTableCol *pNextCol = aCols[nCol];
bool bBorder = ( pCol->bRightBorder || pNextCol->bLeftBorder );
@@ -627,7 +624,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
OStringBuffer sOut;
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_table);
- sal_uInt16 nOldDirection = rWrt.nDirection;
+ const sal_uInt16 nOldDirection = rWrt.nDirection;
if( pFrameFormat )
rWrt.nDirection = rWrt.GetHTMLDirection( pFrameFormat->GetAttrSet() );
if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection )
@@ -737,7 +734,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
OOO_STRING_SVTOOLS_HTML_caption, false );
}
- sal_uInt16 nCols = aCols.size();
+ const SwWriteTableCols::size_type nCols = aCols.size();
// <COLGRP>/<COL> ausgeben: Bei Export ueber Layout nur wenn beim
// Import welche da waren, sonst immer.
@@ -752,7 +749,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken
}
- for( nCol=0; nCol<nCols; nCol++ )
+ for( SwWriteTableCols::size_type nCol=0; nCol<nCols; ++nCol )
{
rWrt.OutNewLine(); // <COL> in neue Zeile
@@ -830,7 +827,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr.
}
- for( nRow = 0; nRow < aRows.size(); nRow++ )
+ for( SwWriteTableRows::size_type nRow = 0; nRow < aRows.size(); ++nRow )
{
const SwWriteTableRow *pRow2 = aRows[nRow];
@@ -838,8 +835,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16
eAlign,
if( !nCellSpacing && nRow < aRows.size()-1 && pRow2->bBottomBorder &&
pRow2->nBottomBorder > DEF_LINE_WIDTH_1 )
{
- sal_uInt16 nCnt = (pRow2->nBottomBorder / DEF_LINE_WIDTH_1) - 1;
- for( ; nCnt; nCnt-- )
+ for( auto nCnt = (pRow2->nBottomBorder / DEF_LINE_WIDTH_1) - 1;
nCnt; --nCnt )
{
rWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
OOO_STRING_SVTOOLS_HTML_tablerow,
commit afe66e34ac35db05d3eb378da1cb732d06f752a5
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Mon Jun 1 20:28:37 2015 +0200
Translate some German messages
Change-Id: I3c901c6a1195cf68bbd51fe6d6ee6d54bf808698
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index c87c590..7378aa7 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -94,7 +94,7 @@ HTMLOptionEnum aHTMLImgVAlignTable[] =
ImageMap *SwHTMLParser::FindImageMap( const OUString& rName ) const
{
- OSL_ENSURE( rName[0] != '#', "FindImageName: Name beginnt mit #!" );
+ OSL_ENSURE( rName[0] != '#', "FindImageMap: name begins with '#'!" );
if( pImageMaps )
{
@@ -443,7 +443,7 @@ IMAGE_SETEVENT:
if( pTextNode && ! pTextNode->IsCountedInList())
{
OSL_ENSURE( pTextNode->GetActualListLevel() ==
GetNumInfo().GetLevel(),
- "Numerierungs-Ebene stimmt nicht" );
+ "Numbering level is wrong" );
pTextNode->SetCountedInList( true );
@@ -1394,7 +1394,7 @@ void SwHTMLParser::StripTrailingPara()
SwContentNode* pNd = SwNodes::GoPrevious(&nNewNdIdx);
if(!pNd)
{
- OSL_ENSURE(false, "Hoppla, wo ist mein
Vorgaenger-Node");
+ OSL_ENSURE(false, "Oops, where is my predecessor
node?");
return;
}
// #i81002# - refactoring
commit 9f4b7c50d3017bb47956267bd4970080a6276132
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Mon Jun 1 20:21:20 2015 +0200
Use more proper integer types and range-based for loops
Change-Id: Ifb7edfa11855afff373e638d583efd6ce55e93d3
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index 1246d1d..c87c590 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -94,23 +94,19 @@ HTMLOptionEnum aHTMLImgVAlignTable[] =
ImageMap *SwHTMLParser::FindImageMap( const OUString& rName ) const
{
- ImageMap *pMap = 0;
-
OSL_ENSURE( rName[0] != '#', "FindImageName: Name beginnt mit #!" );
if( pImageMaps )
{
- for( sal_uInt16 i=0; i<pImageMaps->size(); i++ )
+ for( auto &rIMap : *pImageMaps )
{
- ImageMap *pIMap = &(*pImageMaps)[i];
- if( rName.equalsIgnoreAsciiCase( pIMap->GetName() ) )
+ if( rName.equalsIgnoreAsciiCase( rIMap.GetName() ) )
{
- pMap = pIMap;
- break;
+ return &rIMap;
}
}
}
- return pMap;
+ return nullptr;
}
void SwHTMLParser::ConnectImageMaps()
@@ -779,7 +775,7 @@ IMAGE_SETEVENT:
SFX_EVENT_MOUSEOUT_OBJECT,
0 };
- for( sal_uInt16 n = 0; aEvents[ n ]; ++n )
+ for( int n = 0; aEvents[ n ]; ++n )
{
const SvxMacro *pMacro = rINetFormat.GetMacro( aEvents[ n ] );
if( 0 != pMacro )
@@ -991,7 +987,7 @@ void SwHTMLParser::InsertBodyOptions()
static const sal_uInt16 aWhichIds[3] = { RES_CHRATR_FONTSIZE,
RES_CHRATR_CJK_FONTSIZE,
RES_CHRATR_CTL_FONTSIZE };
- for( sal_uInt16 i=0; i<3; i++ )
+ for( size_t i=0; i<SAL_N_ELEMENTS(aWhichIds); ++i )
{
if( SfxItemState::SET == aItemSet.GetItemState( aWhichIds[i],
false,
&pItem ) &&
@@ -1302,7 +1298,7 @@ bool SwHTMLParser::HasCurrentParaBookmarks( bool
bIgnoreStack ) const
// to check the last bookmark
if( !bIgnoreStack )
{
- for( sal_uInt16 i = aSetAttrTab.size(); i; )
+ for( auto i = aSetAttrTab.size(); i; )
{
_HTMLAttr* pAttr = aSetAttrTab[ --i ];
if( RES_FLTR_BOOKMARK == pAttr->pItem->Which() )
@@ -1354,9 +1350,8 @@ void SwHTMLParser::StripTrailingPara()
const SwFrameFormats& rFrameFormatTable =
*pDoc->GetSpzFrameFormats();
- for( sal_uInt16 i=0; i<rFrameFormatTable.size(); i++ )
+ for( auto pFormat : rFrameFormatTable )
{
- SwFrameFormat const*const pFormat = rFrameFormatTable[i];
SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
commit abfb418cbf8bfbec0de0f1a3b89871c8f38ee667
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Mon Jun 1 17:34:20 2015 +0200
sal_uInt16 to sal_Int16
Change-Id: I0791354f79017ac8100920568519f5a8bcb398f2
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index e13d183..421737e 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -57,7 +57,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
OUString m_aEditWord; // aEditWord and aWordEdit.GetText()
differ only by the character for the current selected hyphenation position
OUString m_aActWord; // actual word to be hyphenated
LanguageType m_nActLanguage; // and its language
- sal_uInt16 m_nMaxHyphenationPos; // right most valid hyphenation
pos
+ sal_Int16 m_nMaxHyphenationPos; // right most valid hyphenation
pos
sal_uInt16 m_nHyphPos;
sal_Int32 m_nOldPos;
sal_Int32 m_nHyphenationPositionsOffset;
commit 60d11ff67d9104151d63800765539fee5d627a3b
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date: Mon Jun 1 17:31:38 2015 +0200
Data members are already accessible by member functions
Change-Id: Ia56f23b0fca318131b8a985964c79a193c38f4e2
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 2634fcb..a605af4 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -98,9 +98,7 @@ void SvxHyphenWordDialog::EnableLRBtn_Impl()
}
-OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl(
- uno::Reference< linguistic2::XPossibleHyphens > &rxPossHyph,
- sal_uInt16 _nMaxHyphenationPos )
+OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
{
// returns a String showing only those hyphen positions which will result
// in a line break if hyphenation is done there
@@ -130,16 +128,16 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl(
// even if the user were to select one of them.
OUString aTxt;
- DBG_ASSERT(rxPossHyph.is(), "missing possible hyphens");
- if (rxPossHyph.is())
+ DBG_ASSERT(m_xPossHyph.is(), "missing possible hyphens");
+ if (m_xPossHyph.is())
{
- DBG_ASSERT( m_aActWord == rxPossHyph->getWord(), "word mismatch" );
+ DBG_ASSERT( m_aActWord == m_xPossHyph->getWord(), "word mismatch" );
- aTxt = rxPossHyph->getPossibleHyphens();
+ aTxt = m_xPossHyph->getPossibleHyphens();
m_nHyphenationPositionsOffset = 0;
uno::Sequence< sal_Int16 > aHyphenationPositions(
- rxPossHyph->getHyphenationPositions() );
+ m_xPossHyph->getHyphenationPositions() );
sal_Int32 nLen = aHyphenationPositions.getLength();
const sal_Int16 *pHyphenationPos =
aHyphenationPositions.getConstArray();
@@ -151,7 +149,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl(
sal_Int32 nStart = 0;
for (sal_Int32 i = 0; i < nLen; ++i)
{
- if (pHyphenationPos[i] > _nMaxHyphenationPos)
+ if (pHyphenationPos[i] > m_nMaxHyphenationPos)
break;
else
{
@@ -211,7 +209,7 @@ void SvxHyphenWordDialog::InitControls_Impl()
m_xPossHyph = m_xHyphenator->createPossibleHyphens( m_aActWord,
aLocale,
uno::Sequence<
beans::PropertyValue >() );
if (m_xPossHyph.is())
- m_aEditWord = EraseUnusableHyphens_Impl( m_xPossHyph,
m_nMaxHyphenationPos );
+ m_aEditWord = EraseUnusableHyphens_Impl();
}
m_pWordEdit->SetText( m_aEditWord );
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 5a589af..e13d183 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -64,7 +64,7 @@ class SvxHyphenWordDialog : public SfxModalDialog
bool m_bBusy;
void EnableLRBtn_Impl();
- OUString EraseUnusableHyphens_Impl( css::uno::Reference<
css::linguistic2::XPossibleHyphens > &rxPossHyph, sal_uInt16
nMaxHyphenationPos );
+ OUString EraseUnusableHyphens_Impl();
void InitControls_Impl();
void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue
by default
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
