diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-01 00:11:35 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-06-01 01:18:17 +0200 |
| commit | 8b55fe96cf64c64e4877d0ffa8ea694dc7dc8d17 (patch) | |
| tree | a8917daa89bab5d39503df948ed93ad43e0ff841 /sw | |
| parent | f18096f1b5cce12033e6721fa6624f02e797acc3 (diff) | |
Use auto or more proper integer types, avoid temporaries
Change-Id: Iae81c30d23aa61e92b8dfd79c326c554b4164987
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/uwriter.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/config/barcfg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationMenuButton.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/lingu/sdrhhcwrap.cxx | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 61d400b92eaf..d1e74600fb58 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 db7c647115ab..a14b8396713c 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 88cef259b597..35342855b683 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 b2ff36866f55..2df32e5f72bd 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 e899234b948d..5d8e364e5918 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() ); |