diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-01 17:31:38 +0200 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-02 09:20:58 +0200 |
commit | 60d11ff67d9104151d63800765539fee5d627a3b (patch) | |
tree | 4bdefbecfb5cd06cbb7fae4f85ec31c4d702447e /cui | |
parent | 290cc96e98c8d66396402f9be51739646b1eafa7 (diff) |
Data members are already accessible by member functions
Change-Id: Ia56f23b0fca318131b8a985964c79a193c38f4e2
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/hyphen.cxx | 18 | ||||
-rw-r--r-- | cui/source/inc/hyphen.hxx | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 2634fcb828a4..a605af4841dc 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 5a589af282bf..e13d183ae21a 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 |