diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:19:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 11:19:25 +0000 |
| commit | 2c74ce98b20bc6fdac872d3875b6fd00a32e2ab2 (patch) | |
| tree | 5ce31d9deb45387c3a431f0f06ee95a06c727347 | |
| parent | 59b297ffac76c9c2e867d5434fd8af7954ff185c (diff) | |
INTEGRATION: CWS swwarnings (1.11.222); FILE MERGED
2007/03/26 12:09:12 tl 1.11.222.1: #i69287# warning-free code
| -rw-r--r-- | sw/source/ui/misc/bookmark.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index d8d68adbbb..605cc12fce 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bookmark.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:06:10 $ + * last change: $Author: hr $ $Date: 2007-09-27 12:19:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,11 +129,11 @@ IMPL_LINK( SwInsertBookmarkDlg, DeleteHdl, Button *, EMPTYARG ) void SwInsertBookmarkDlg::Apply() { - //at first remove deleted bookmarks to prevent multiple bookmarks with the same - //name + //at first remove deleted bookmarks to prevent multiple bookmarks with the same + //name for (USHORT nCount = aBookmarkBox.GetRemovedCount(); nCount > 0; nCount--) { - String sRemoved = aBookmarkBox.GetRemovedEntry( nCount -1 ).aName; + String sRemoved = aBookmarkBox.GetRemovedEntry( nCount -1 ).GetName(); rSh.DelBookmark( sRemoved ); SfxRequest aReq( rSh.GetView().GetViewFrame(), FN_DELETE_BOOKMARK ); aReq.AppendItem( SfxStringItem( FN_DELETE_BOOKMARK, sRemoved ) ); @@ -237,7 +237,7 @@ USHORT BookmarkCombo::GetNextSelEntryPos(USHORT nPos) const USHORT BookmarkCombo::GetSelEntryPos(USHORT nPos) const { - char cSep = GetMultiSelectionSeparator(); + sal_Unicode cSep = GetMultiSelectionSeparator(); USHORT nCnt = GetText().GetTokenCount(cSep); @@ -284,7 +284,7 @@ USHORT BookmarkCombo::GetSelectEntryPos( USHORT nSelIndex ) const { if (nSelIndex == nCnt) { - char cSep = GetMultiSelectionSeparator(); + sal_Unicode cSep = GetMultiSelectionSeparator(); String sEntry(GetText().GetToken(nPos, cSep)); sEntry.EraseLeadingChars(); sEntry.EraseTrailingChars(); |