[Libreoffice-commits] core.git: cui/source

[Julien Nabet]

 cui/source/dialogs/SpellDialog.cxx |   15 +++++++--------
 cui/source/inc/SpellDialog.hxx     |   12 ++++++------
 2 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 4fca2ef76a6dfe6c74ada71ab4806dc4ad568b82
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Sep 27 19:57:02 2017 +0200

    Use sal_Int32 to stick with other SetAttrib methods
    
    + use size_t GetUndoActionCount like other existing ones
    
    Change-Id: Ibfae20e7fd75df980f395e055063f0bdba1047f7
    Reviewed-on: https://gerrit.libreoffice.org/42873
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Muhammet Kara <muhammet.kara at pardus.org.tr>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 26fee0bcdca5..82c91910d130 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1060,7 +1060,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
                         sServiceName = xNamed->getName();
                     SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(),
                                     aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), nullptr);
-                    m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
+                    m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, nStartPosition, nEndPosition );
                 }
                 else if(aStart->bIsGrammarError )
                 {
@@ -1086,11 +1086,11 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
                         &aStart->aGrammarError.aFullComment,
                         &aStart->aGrammarError.aRuleIdentifier,
                         &sFullCommentURL );
-                    m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
+                    m_pSentenceED->SetAttrib( SpellErrorAttrib(aDesc), 0, nStartPosition, nEndPosition );
                 }
                 if(aStart->bIsField)
-                    m_pSentenceED->SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
-                m_pSentenceED->SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
+                    m_pSentenceED->SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, nStartPosition, nEndPosition );
+                m_pSentenceED->SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, nStartPosition, nEndPosition );
                 nStartPosition = nEndPosition;
             }
             ++aStart;
@@ -1622,7 +1622,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, const css
 }
 
 
-void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError)
+void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_Int32 nStart, sal_Int32 nEnd, bool bGrammarError)
 {
     TextEngine* pTextEngine = GetTextEngine();
     pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTCOLOR );
@@ -1748,8 +1748,7 @@ void SentenceEditWindow_Impl::SetAlternatives( const Reference< XSpellAlternativ
     GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd );
 }
 
-
-void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
+void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd )
 {
     GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd);
 }
@@ -1937,7 +1936,7 @@ void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction )
 }
 
 
-sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount()
+size_t SentenceEditWindow_Impl::GetUndoActionCount()
 {
     return GetTextEngine()->GetUndoManager().GetUndoActionCount();
 }
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 06b7f4623205..41d68d99ba68 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -61,10 +61,10 @@ class SentenceEditWindow_Impl : public VclMultiLineEdit
     using VclMultiLineEdit::SetText;
 
 private:
-    std::set< sal_uInt16 >      m_aIgnoreErrorsAt;
+    std::set< sal_Int32 >      m_aIgnoreErrorsAt;
     VclPtr<ToolBox>     m_xToolbar;
-    sal_uInt16          m_nErrorStart;
-    sal_uInt16          m_nErrorEnd;
+    sal_Int32           m_nErrorStart;
+    sal_Int32           m_nErrorEnd;
     bool                m_bIsUndoEditMode;
 
     Link<Edit&,void>    m_aModifyLink;
@@ -84,12 +84,12 @@ public:
     void            Init(VclPtr<ToolBox> const &rToolbar);
     void            SetModifyHdl(const Link<Edit&,void>& rLink) override { m_aModifyLink = rLink;}
 
-    void            SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
+    void            SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd );
     void            SetText( const OUString& rStr ) override;
 
     bool            MarkNextError( bool bIgnoreCurrentError, const css::uno::Reference<css::linguistic2::XSpellChecker1>& );
     void            ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage);
-    void            MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar);
+    void            MoveErrorMarkTo(sal_Int32 nErrorStart, sal_Int32 nErrorEnd, bool bGrammar);
     OUString        GetErrorText() const;
     void            RestoreCurrentError();
 
@@ -111,7 +111,7 @@ public:
     void            ResetUndo();
     void            Undo();
     void            AddUndoAction( SfxUndoAction *pAction );
-    sal_uInt16      GetUndoActionCount();
+    size_t          GetUndoActionCount();
     void            UndoActionStart( sal_uInt16 nId );
     void            UndoActionEnd();