diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-23 00:29:20 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-03-24 23:22:10 +0100 |
| commit | 7f48d14419690a9bd4c9081b4dec11810f2c8ce6 (patch) | |
| tree | 9cc8b7352207a30e75617473b0a08ccef05603c3 /sw | |
| parent | 9c925ddd5efdfc32dd62481c3a1f6469c4149bd4 (diff) | |
sal_uInt16 to sal_Int32 and remove a temporary OUString
Change-Id: Ia305ad3b1e04129e172f0f2fe3428f84e4654576
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index f8b383cce5fe..e612bd2247e4 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -40,11 +40,11 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) if(!bSelEntries) { OUString sTmp = pBox->GetText(); - sal_uInt16 nLen = sTmp.getLength(); + const sal_Int32 nLen = sTmp.getLength(); OUString sMsg; - for(sal_uInt16 i = 0; i < BookmarkCombo::aForbiddenChars.getLength(); i++) + for(sal_Int32 i = 0; i < BookmarkCombo::aForbiddenChars.getLength(); i++) { - sal_uInt16 nTmpLen = sTmp.getLength(); + const sal_Int32 nTmpLen = sTmp.getLength(); sTmp = comphelper::string::remove(sTmp, BookmarkCombo::aForbiddenChars[i]); if(sTmp.getLength() != nTmpLen) sMsg += OUString(BookmarkCombo::aForbiddenChars[i]); @@ -52,9 +52,7 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) if(sTmp.getLength() != nLen) { pBox->SetText(sTmp); - OUString sWarning(sRemoveWarning); - sWarning += sMsg; - InfoBox(this, sWarning).Execute(); + InfoBox(this, sRemoveWarning+sMsg).Execute(); } } @@ -136,7 +134,7 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRe // fill Combobox with existing bookmarks IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess(); - sal_uInt16 nId = 0; + sal_Int32 nId = 0; for( IDocumentMarkAccess::const_iterator_t ppBookmark = pMarkAccess->getBookmarksBegin(); ppBookmark != pMarkAccess->getBookmarksEnd(); ++ppBookmark) |