[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source

[Matteo Casalin]

 sw/qa/core/uwriter.cxx                          |    2 +-
 sw/source/filter/html/htmlftn.cxx               |    2 +-
 sw/source/filter/xml/swxml.cxx                  |    2 +-
 sw/source/uibase/config/barcfg.cxx              |    2 +-
 sw/source/uibase/docvw/AnnotationMenuButton.cxx |    3 +--
 sw/source/uibase/lingu/sdrhhcwrap.cxx           |    2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit e61fcfea5c2a306e44a053976e921160e78917ac
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Jun 1 01:14:07 2015 +0200

    WaE - Fix C4389: ´==´ : signed/unsigned mismatch
    
    Change-Id: I049ca27a0b69887d7ab82312dd30311ddb2bed63

diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index e0145c3..b8eaa26 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -275,7 +275,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt )
     if( rFormatFootnote.IsEndNote() )
     {
         nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->size() : 0;
-        OSL_ENSURE( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote,
+        OSL_ENSURE( nPos == static_cast<size_t>(rHTMLWrt.nFootNote + rHTMLWrt.nEndNote),
                 "OutHTML_SwFormatFootnote: Position falsch" );
         sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc;
         sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) );
commit 8b55fe96cf64c64e4877d0ffa8ea694dc7dc8d17
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Mon Jun 1 00:11:35 2015 +0200

    Use auto or more proper integer types, avoid temporaries
    
    Change-Id: Iae81c30d23aa61e92b8dfd79c326c554b4164987

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 61d400b..d1e7460 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1054,7 +1054,7 @@ void SwDocTest::randomTest()
         "Jim", "Bob", "JimBobina", "Helga", "Gertrude", "Spagna", "Hurtleweed"
     };
 
-    for( sal_uInt16 rlm = 0; rlm < SAL_N_ELEMENTS(modes); rlm++ )
+    for( size_t rlm = 0; rlm < SAL_N_ELEMENTS(modes); rlm++ )
     {
         m_pDoc->ClearDoc();
 
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index db7c64711..a14b839 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -383,7 +383,7 @@ static void lcl_AdjustOutlineStylesForOOo(SwDoc& _rDoc)
         for ( sal_uInt8 i = 0; i < MAXLEVEL; ++i )
         {
             sStyleName =
-                SwStyleNameMapper::GetProgName( static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i),
+                SwStyleNameMapper::GetProgName( RES_POOLCOLL_HEADLINE1 + i,
                                                 sStyleName );
             aDefOutlStyleNames[i] = sStyleName;
         }
diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx
index 88cef25..3534285 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -38,7 +38,7 @@ SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) :
     ConfigItem(bWeb ? OUString("Office.WriterWeb/ObjectBar") : OUString("Office.Writer/ObjectBar"),
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
 {
-    for(sal_uInt16 i = 0; i <= SEL_TYPE_GRAPHIC; i++ )
+    for(int i = 0; i <= SEL_TYPE_GRAPHIC; ++i)
         aTbxIdArray[i] = -1;
 
     Sequence<OUString> aNames = GetPropertyNames();
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index b2ff368..2df32e5 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -189,8 +189,7 @@ void AnnotationMenuButton::Paint(vcl::RenderContext& rRenderContext, const Recta
 void AnnotationMenuButton::KeyInput(const KeyEvent& rKeyEvt)
 {
     const vcl::KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
-    const sal_uInt16 nKey = rKeyCode.GetCode();
-    if (nKey == KEY_TAB)
+    if (rKeyCode.GetCode() == KEY_TAB)
     {
         mrSidebarWin.ActivatePostIt();
         mrSidebarWin.GrabFocus();
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index e899234..5d8e364 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -122,7 +122,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
         pTextObj = NULL;
     }
 
-    sal_uInt16 n = nDocIndex;
+    const auto n = nDocIndex;
 
     std::list<SdrTextObj*> aTextObjs;
     SwDrawContact::GetTextObjectsFromFormat( aTextObjs, pView->GetDocShell()->GetDoc() );