diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
| commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
| tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /sw/source/ui | |
| parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) | |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'sw/source/ui')
83 files changed, 297 insertions, 4182 deletions
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src deleted file mode 100644 index ab383e24ec29..000000000000 --- a/sw/source/ui/app/app.src +++ /dev/null @@ -1,577 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svl/style.hrc> -#include <sfx2/sfx.hrc> -#include <svx/dialogs.hrc> -#include "cmdid.h" -#include "access.hrc" -#include "globals.hrc" -#include "app.hrc" -#include "statstr.hrc" -#include "swstyle.h" -#include "comcore.hrc" -#include "shells.hrc" -#include "helpid.h" - -String STR_PARAGRAPHSTYLEFAMILY -{ - Text [ en-US ] = "Paragraph Styles" ; -}; - -String STR_CHARACTERSTYLEFAMILY -{ - Text [ en-US ] = "Character Styles" ; -}; - -String STR_FRAMESTYLEFAMILY -{ - Text [ en-US ] = "Frame Styles" ; -}; - -String STR_PAGESTYLEFAMILY -{ - Text [ en-US ] = "Page Styles" ; -}; - -String STR_LISTSTYLEFAMILY -{ - Text [ en-US ] = "List Styles" ; -}; - -String STR_TABLESTYLEFAMILY -{ - Text [ en-US ] = "Table Styles" ; -}; - -StringArray RID_PARAGRAPHSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - < "Automatic" ; SFXSTYLEBIT_AUTO ; > ; - < "Text Styles" ; SWSTYLEBIT_TEXT ; > ; - < "Chapter Styles" ; SWSTYLEBIT_CHAPTER ; > ; - < "List Styles" ; SWSTYLEBIT_LIST ; > ; - < "Index Styles" ; SWSTYLEBIT_IDX ; > ; - < "Special Styles" ; SWSTYLEBIT_EXTRA ; > ; - < "HTML Styles" ; SWSTYLEBIT_HTML ; > ; - < "Conditional Styles" ; SWSTYLEBIT_CONDCOLL ; > ; - }; -}; - -StringArray RID_CHARACTERSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_FRAMESTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_PAGESTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_LISTSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_TABLESTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -String STR_ENV_TITLE -{ - Text [ en-US ] = "Envelope" ; -}; - -String STR_LAB_TITLE -{ - Text [ en-US ] = "Labels" ; -}; - - // ShortName!!! -String STR_HUMAN_SWDOC_NAME -{ - Text [ en-US ] = "Text" ; -}; - -String STR_WRITER_DOCUMENT_FULLTYPE -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Text Document"; -}; - -String STR_CANTOPEN -{ - Text [ en-US ] = "Cannot open document." ; -}; - -String STR_CANTCREATE -{ - Text [ en-US ] = "Can't create document."; -}; - -String STR_DLLNOTFOUND -{ - Text [ en-US ] = "Filter not found." ; -}; - -String STR_LOAD_GLOBAL_DOC -{ - Text [ en-US ] = "Name and Path of Master Document" ; -}; - -String STR_LOAD_HTML_DOC -{ - Text [ en-US ] = "Name and Path of the HTML Document" ; -}; - -String STR_JAVA_EDIT -{ - Text [ en-US ] = "Edit Script" ; -}; - -String STR_REMOVE_WARNING -{ - Text [ en-US ] = "The following characters are not valid and have been removed: "; -}; - -String STR_BOOKMARK_DEF_NAME -{ - Text [ en-US ] = "Bookmark"; -}; - -String STR_BOOKMARK_NAME -{ - Text [ en-US ] = "Name"; -}; - -String STR_BOOKMARK_TEXT -{ - Text [ en-US ] = "Text"; -}; - -String SW_STR_NONE -{ - Text [ en-US ] = "[None]" ; -}; - -String STR_CAPTION_BEGINNING -{ - Text [ en-US ] = "Start" ; -}; - -String STR_CAPTION_END -{ - Text [ en-US ] = "End" ; -}; - -String STR_CAPTION_ABOVE -{ - Text [ en-US ] = "Above" ; -}; - -String STR_CAPTION_BELOW -{ - Text [ en-US ] = "Below" ; -}; - -String SW_STR_READONLY -{ - Text [ en-US ] = "read-only" ; -}; - -String STR_READONLY_PATH -{ - Text [ en-US ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?"; -}; - -String STR_DOC_STAT -{ - Text [ en-US ] = "Statistics" ; -}; - - // Statusbar-titles - -String STR_STATSTR_W4WREAD -{ - Text [ en-US ] = "Importing document..." ; -}; - -String STR_STATSTR_W4WWRITE -{ - Text [ en-US ] = "Exporting document..." ; -}; - -String STR_STATSTR_SWGREAD -{ - Text [ en-US ] = "Loading document..." ; -}; - -String STR_STATSTR_SWGWRITE -{ - Text [ en-US ] = "Saving document..." ; -}; - -String STR_STATSTR_REFORMAT -{ - Text [ en-US ] = "Repagination..." ; -}; - -String STR_STATSTR_AUTOFORMAT -{ - Text [ en-US ] = "Formatting document automatically..." ; -}; - -String STR_STATSTR_SEARCH -{ - Text [ en-US ] = "Search..." ; -}; - -String STR_STATSTR_LETTER -{ - Text [ en-US ] = "Letter" ; -}; - -String STR_STATSTR_SPELL -{ - Text [ en-US ] = "Spellcheck..." ; -}; - -String STR_STATSTR_HYPHEN -{ - Text [ en-US ] = "Hyphenation..." ; -}; - -String STR_STATSTR_TOX_INSERT -{ - Text [ en-US ] = "Inserting Index..." ; -}; - -String STR_STATSTR_TOX_UPDATE -{ - Text [ en-US ] = "Updating Index..." ; -}; - -String STR_STATSTR_SUMMARY -{ - Text [ en-US ] = "Creating abstract..." ; -}; - -String STR_STATSTR_SWGPRTOLENOTIFY -{ - Text [ en-US ] = "Adapt Objects..."; -}; - -String STR_TABLE_DEFNAME -{ - Text [ en-US ] = "Table" ; -}; - -String STR_GRAPHIC_DEFNAME -{ - Text[ en-US ] = "Image" ; -}; - -String STR_OBJECT_DEFNAME -{ - Text [ en-US ] = "Object" ; -}; - -String STR_FRAME_DEFNAME -{ - Text [ en-US ] = "Frame" ; -}; - -String STR_SHAPE_DEFNAME -{ - Text [ en-US ] = "Shape" ; -}; - -String STR_REGION_DEFNAME -{ - Text [ en-US ] = "Section" ; -}; - -String STR_NUMRULE_DEFNAME -{ - Text [ en-US ] = "Numbering" ; -}; - -String STR_EMPTYPAGE -{ - Text [ en-US ] = "blank page" ; -}; - -String STR_ABSTRACT_TITLE -{ - Text [ en-US ] = "Abstract: " ; -}; - -String STR_FDLG_TEMPLATE_NAME -{ - Text [ en-US ] = "separated by: " ; -}; - -String STR_FDLG_OUTLINE_LEVEL -{ - Text [ en-US ] = "Outline: Level "; -}; - -String STR_FDLG_STYLE -{ - Text [ en-US ] = "Style: "; -}; - -String STR_PAGEOFFSET -{ - Text [ en-US ] = "Page number: " ; -}; - -String STR_PAGEBREAK -{ - Text [ en-US ] = "Break before new page" ; -}; - -String STR_WESTERN_FONT -{ - Text [ en-US ] = "Western text: "; -}; - -String STR_CJK_FONT -{ - Text [ en-US ] = "Asian text: "; -}; - -String STR_REDLINE_UNKNOWN_AUTHOR -{ - Text [ en-US ] = "Unknown Author"; -}; - -String STR_DELETE_NOTE_AUTHOR -{ - Text [ en-US ] = "Delete ~All Comments by $1"; -}; - -String STR_HIDE_NOTE_AUTHOR -{ - Text [ en-US ] = "H~ide All Comments by $1"; -}; - -String STR_OUTLINE_NUMBERING -{ - Text [ en-US ] = "Outline Numbering"; -}; - -String STR_STATUSBAR_WORDCOUNT_NO_SELECTION -{ - Text [ en-US ] = "%1 words, %2 characters"; -}; - -String STR_STATUSBAR_WORDCOUNT -{ - Text [ en-US ] = "%1 words, %2 characters selected"; -}; - -String STR_CONVERT_TEXT_TABLE -{ - Text [ en-US ] = "Convert Text to Table" ; -}; - -String STR_ADD_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Add AutoFormat" ; -}; - -String STR_ADD_AUTOFORMAT_LABEL -{ - Text [ en-US ] = "Name" ; -}; - -String STR_DEL_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Delete AutoFormat" ; -}; - -String STR_DEL_AUTOFORMAT_MSG -{ - Text [ en-US ] = "The following AutoFormat entry will be deleted:" ; -}; - -String STR_RENAME_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Rename AutoFormat" ; -}; - -String STR_BTN_AUTOFORMAT_CLOSE -{ - Text [ en-US ] = "~Close" ; -}; - -String STR_JAN -{ - Text [ en-US ] = "Jan" ; -}; - -String STR_FEB -{ - Text [ en-US ] = "Feb" ; -}; - -String STR_MAR -{ - Text [ en-US ] = "Mar" ; -}; - -String STR_NORTH -{ - Text [ en-US ] = "North" ; -}; - -String STR_MID -{ - Text [ en-US ] = "Mid" ; -}; - -String STR_SOUTH -{ - Text [ en-US ] = "South" ; -}; - -String STR_SUM -{ - Text [ en-US ] = "Sum" ; -}; - -String STR_INVALID_AUTOFORMAT_NAME -{ - Text [ en-US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ; -}; - -String STR_NUMERIC -{ - Text [ en-US ] = "Numeric"; -}; - -String STR_ROW -{ - Text [ en-US ] = "Rows" ; -}; - -String STR_COL -{ - Text [ en-US ] = "Column" ; -}; - -String STR_AUTHMRK_EDIT -{ - - Text [ en-US ] = "Edit Bibliography Entry"; -}; - -String STR_AUTHMRK_INSERT -{ - - Text [ en-US ] = "Insert Bibliography Entry"; -}; - -String STR_ACCESS_PAGESETUP_SPACING -{ - Text [ en-US ] = "Spacing between %1 and %2"; -}; - -String STR_ACCESS_COLUMN_WIDTH -{ - Text [ en-US ] = "Column %1 Width"; -}; - -String STR_CAPTION_TABLE -{ - Text [ en-US ] = "%PRODUCTNAME Writer Table"; -}; - -String STR_CAPTION_FRAME -{ - Text [ en-US ] = "%PRODUCTNAME Writer Frame"; -}; - -String STR_CAPTION_GRAPHIC -{ - Text [ en-US ] = "%PRODUCTNAME Writer Image"; -}; - -String STR_CAPTION_OLE -{ - Text [ en-US ] = "Other OLE Objects"; -}; - -String STR_WRONG_TABLENAME -{ - Text [ en-US ] = "The name of the table must not contain spaces." ; -}; - -String STR_ERR_TABLE_MERGE -{ - Text [ en-US ] = "Selected table cells are too complex to merge." ; -}; - -String STR_SRTERR -{ - Text [ en-US ] = "Cannot sort selection" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src deleted file mode 100644 index 35d774455b5f..000000000000 --- a/sw/source/ui/app/error.src +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "globals.hrc" -#include "app.hrc" -#include "swerror.h" -#include "comcore.hrc" - -String STR_COMCORE_READERROR -{ - Text [ en-US ] = "Read Error" ; -}; -String STR_COMCORE_CANT_SHOW -{ - Text [ en-US ] = "Image cannot be displayed." ; -}; - -String STR_ERROR_CLPBRD_READ -{ - Text [ en-US ] = "Error reading from the clipboard." ; -}; - -#define ERR_CODE( class, err ) (class | (err - ERRCODE_AREA_SW)) -#define WARN_CODE( class, err ) (class | ( err - WARN_SW_BASE)) - -StringArray RID_SW_ERRHDL -{ - ItemList [ en-US ] = - { - // Import-Errors - < "File format error found." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) ; >; - < "Error reading file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) ; >; - < "Input file error." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) ; >; - < "This is not a %PRODUCTNAME Writer file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_NOWRITER_FILE ) ; >; - < "Unexpected end of file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_UNEXPECTED_EOF ) ; >; - < "Password-protected files cannot be opened." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_PASSWD ) ; >; - < "This is not a valid WinWord6 file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR ) ; >; - < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_FASTSAVE_ERR ) ; >; - < "File format error found at $(ARG1)(row,col)." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >; - < "File has been written in a newer version." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) ; >; - < "This is not a valid WinWord97 file."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) ; >; - < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >; - // Export-Errors - < "Error writing file." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) ; >; - < "Wrong AutoText document version." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) ; >; - < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) ; >; - // Import-/Export-Errors - < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) ; >; - < "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) ; >; - < "$(ARG1) has changed." ; ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) ; >; - < "$(ARG1) does not exist." ; ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) ; >; - < "Cells cannot be further split." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) ; >; - < "Additional columns cannot be inserted." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) ; >; - < "The structure of a linked table cannot be modified." ; ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) ; >; - - < "No drawings could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS ) ; >; - < "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) ; >; - < "Not all attributes could be read." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) ; >; - < "Not all attributes could be recorded." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) ; >; - < "Some OLE objects could only be loaded as images." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE ) ; >; - < "Some OLE objects could only be saved as images." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE ) ; >; - < "Document could not be completely loaded." ; WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD ) ; >; - < "Document could not be completely saved." ; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_POOR_LOAD ) ; >; - < "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."; WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_HTML_NO_MACROS) ; >; - < "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_WRITE_ERROR_FILE ) ; >; - < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 446524cbac0e..7ab97a220950 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -34,6 +34,7 @@ #include <poolfmt.hxx> #include <chrdlg.hrc> +#include <strings.hrc> #include <SwStyleNameMapper.hxx> void SwBreakDlg::Apply() diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 85e5155d4525..e2206072ed32 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -43,6 +43,7 @@ #include <globals.hrc> #include <chrdlg.hrc> +#include <strings.hrc> #include <chrdlgmodes.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src deleted file mode 100644 index 1e7a66c672d9..000000000000 --- a/sw/source/ui/chrdlg/chrdlg.src +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "chrdlg.hrc" - -String STR_TEXTCOLL_HEADER -{ - Text [ en-US ] = "(Paragraph Style: " ; -}; -String STR_ILLEGAL_PAGENUM -{ - Text [ en-US ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index e7a92eb8d293..0359fea82d63 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -25,6 +25,7 @@ #include "view.hxx" #include "wrtsh.hxx" #include "globals.hrc" +#include "strings.hrc" #include <vcl/metric.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 19cb6729e59e..14605445d377 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -21,6 +21,7 @@ #include "swtypes.hxx" #include "hintids.hxx" #include "globals.hrc" +#include "strings.hrc" #include "helpid.h" #include <sfx2/objsh.hxx> #include <sfx2/htmlmode.hxx> diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index bd57bdd2d30c..33b14a55b291 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -36,7 +36,7 @@ #include "viewopt.hxx" #include <numpara.hxx> #include "chrdlg.hrc" -#include "poolfmt.hrc" +#include "strings.hrc" #include <svx/svxids.hrc> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc deleted file mode 100644 index 2de8d4218158..000000000000 --- a/sw/source/ui/config/config.hrc +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SW_SOURCE_UI_CONFIG_HRC -#define INCLUDED_SW_SOURCE_UI_CONFIG_HRC - -#include "rcid.hrc" - -// strings for configuration - -#define STR_ARR_METRIC (RC_CONFIG_BEGIN + 26) -#define CONFIG_ACT_END STR_ARR_METRIC - -#if CONFIG_ACT_END > RC_CONFIG_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index a5d2c436776e..3652ca979edf 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/mail/MailServiceProvider.hpp> #include <vcl/msgbox.hxx> #include <globals.hrc> -#include <config.hrc> #include <dbui.hrc> #include "bitmaps.hlst" #include <helpid.h> diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src deleted file mode 100644 index 9f4173a9f8b6..000000000000 --- a/sw/source/ui/config/optdlg.src +++ /dev/null @@ -1,167 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -/* StarView resource file */ -#include <sfx2/sfx.hrc> -#include <svx/dialogs.hrc> -#include "globals.hrc" -#include "config.hrc" -#include "helpid.h" - -String ST_SCRIPT_ASIAN -{ - Text [ en-US ] = "Asian"; -}; -String ST_SCRIPT_CTL -{ - Text [ en-US ] = "CTL"; -}; -String ST_SCRIPT_WESTERN -{ - Text [ en-US ] = "Western"; -}; - -String STR_PRINTOPTUI_PRODUCTNAME -{ - Text [ en-US ] = "%PRODUCTNAME %s"; -}; -String STR_PRINTOPTUI_CONTENTS -{ - Text [ en-US ] = "Contents"; -}; -String STR_PRINTOPTUI_PAGE_BACKGROUND -{ - Text [ en-US ] = "Page ba~ckground"; -}; -String STR_PRINTOPTUI_PICTURES -{ - Text [ en-US ] = "P~ictures and other graphic objects"; -}; -String STR_PRINTOPTUI_HIDDEN -{ - Text [ en-US ] = "Hidden te~xt"; -}; -String STR_PRINTOPTUI_TEXT_PLACEHOLDERS -{ - Text [ en-US ] = "~Text placeholders"; -}; -String STR_PRINTOPTUI_FORM_CONTROLS -{ - Text [ en-US ] = "Form control~s"; -}; -String STR_PRINTOPTUI_COLOR -{ - Text [ en-US ] = "Color"; -}; -String STR_PRINTOPTUI_PRINT_BLACK -{ - Text [ en-US ] = "Print text in blac~k"; -}; -String STR_PRINTOPTUI_PAGES_TEXT -{ - Text [ en-US ] = "Pages"; -}; -String STR_PRINTOPTUI_PRINT_BLANK -{ - Text [ en-US ] = "Print ~automatically inserted blank pages"; -}; -String STR_PRINTOPTUI_ONLY_PAPER -{ - Text [ en-US ] = "~Use only paper tray from printer preferences"; -}; -String STR_PRINTOPTUI_PRINT -{ - Text [ en-US ] = "Print"; -}; -String STR_PRINTOPTUI_NONE -{ - Text [ en-US ] = "None (document only)"; -}; -String STR_PRINTOPTUI_COMMENTS_ONLY -{ - Text [ en-US ] = "Comments only"; -}; -String STR_PRINTOPTUI_PLACE_END -{ - Text [ en-US ] = "Place at end of document"; -}; -String STR_PRINTOPTUI_PLACE_PAGE -{ - Text [ en-US ] = "Place at end of page"; -}; -String STR_PRINTOPTUI_COMMENTS -{ - Text [ en-US ] = "~Comments"; -}; -String STR_PRINTOPTUI_PAGE_SIDES -{ - Text [ en-US ] = "Page sides"; -}; -String STR_PRINTOPTUI_ALL_PAGES -{ - Text [ en-US ] = "All pages"; -}; -String STR_PRINTOPTUI_BACK_PAGES -{ - Text [ en-US ] = "Back sides / left pages"; -}; -String STR_PRINTOPTUI_FONT_PAGES -{ - Text [ en-US ] = "Front sides / right pages"; -}; -String STR_PRINTOPTUI_INCLUDE -{ - Text [ en-US ] = "Include"; -}; -String STR_PRINTOPTUI_BROCHURE -{ - Text [ en-US ] = "Broch~ure"; -}; -String STR_PRINTOPTUI_LEFT_SCRIPT -{ - Text [ en-US ] = "Left-to-right script"; -}; -String STR_PRINTOPTUI_RIGHT_SCRIPT -{ - Text [ en-US ] = "Right-to-left script"; -}; -String STR_PRINTOPTUI_RANGE_COPIES -{ - Text [ en-US ] = "Range and copies"; -}; -String STR_PRINTOPTUI_ALLPAGES -{ - Text [ en-US ] = "~All pages"; -}; -String STR_PRINTOPTUI_SOMEPAGES -{ - Text [ en-US ] = "Pa~ges"; -}; -String STR_PRINTOPTUI_SELECTION -{ - Text [ en-US ] = "~Selection"; -}; -String STR_PRINTOPTUI_PLACE_MARGINS -{ - Text [ en-US ] = "Place in margins"; -}; - - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index a994ee54484d..e22191afa640 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -31,6 +31,8 @@ #include <view.hxx> #include "globals.hrc" +#include "strings.hrc" +#include "optload.hrc" #include "cmdid.h" #include "optload.hxx" @@ -43,6 +45,7 @@ #include <svtools/insdlg.hxx> #include <svtools/treelistentry.hxx> +#include <tools/resary.hxx> #include <vcl/builderfactory.hxx> #include <vcl/settings.hxx> @@ -50,7 +53,6 @@ #include <unotools/configmgr.hxx> #include <docsh.hxx> #include <app.hrc> -#include <config.hrc> #include <SwStyleNameMapper.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> @@ -62,6 +64,25 @@ using namespace ::com::sun::star; #include <svl/eitem.hxx> +sal_uInt32 SwFieldUnitTable::Count() +{ + return SAL_N_ELEMENTS(STR_ARR_METRIC); +} + +OUString SwFieldUnitTable::GetString(sal_uInt32 nPos) +{ + if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count()) + return SwResId(STR_ARR_METRIC[nPos].first); + return OUString(); +} + +FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos) +{ + if (RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count()) + return STR_ARR_METRIC[nPos].second; + return FUNIT_NONE; +} + SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet) , m_pWrtShell(nullptr) @@ -82,11 +103,10 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pShowStandardizedPageCount, "standardizedpageshow"); get(m_pStandardizedPageSizeNF, "standardpagesize"); - SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr)); - for ( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) + for (sal_uInt32 i = 0; i < SwFieldUnitTable::Count(); ++i) { - const OUString sMetric = aMetricArr.GetStringByPos( i ); - FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i ); + const OUString sMetric = SwFieldUnitTable::GetString(i); + FieldUnit eFUnit = SwFieldUnitTable::GetValue(i); switch ( eFUnit ) { diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src deleted file mode 100644 index 855acbb809bb..000000000000 --- a/sw/source/ui/config/optload.src +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "config.hrc" - -StringArray STR_ARR_METRIC -{ - ItemList [ en-US ] = - { - < "Millimeter" ; FUNIT_MM ; > ; - < "Centimeter" ; FUNIT_CM ; > ; - < "Meter" ; FUNIT_M ; > ; - < "Kilometer" ; FUNIT_KM ; > ; - < "Inch" ; FUNIT_INCH ; > ; - < "Foot" ; FUNIT_FOOT ; > ; - < "Miles" ; FUNIT_MILE ; > ; - < "Pica" ; FUNIT_PICA ; > ; - < "Point" ; FUNIT_POINT ; > ; - < "Char" ; FUNIT_CHAR ; >; - < "Line" ; FUNIT_LINE ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index d608139bfee6..bc51b37bd194 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -45,7 +45,7 @@ #include <crstate.hxx> #include <viewopt.hxx> #include <globals.hrc> -#include <config.hrc> +#include <strings.hrc> #include <swwrtshitem.hxx> #include <unomid.h> @@ -73,6 +73,8 @@ #include <vcl/builderfactory.hxx> #include <vcl/svapp.hxx> +#include "optload.hxx" + using namespace ::com::sun::star; namespace { @@ -128,11 +130,10 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, m_pVRulerRightCBox->Hide(); m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl )); - SvxStringArray aMetricArr(ResId(STR_ARR_METRIC, *pSwResMgr)); - for ( size_t i = 0; i < aMetricArr.Count(); ++i ) + for (size_t i = 0; i < SwFieldUnitTable::Count(); ++i) { - const OUString sMetric = aMetricArr.GetStringByPos( i ); - FieldUnit eFUnit = (FieldUnit)aMetricArr.GetValue( i ); + const OUString sMetric = SwFieldUnitTable::GetString(i); + FieldUnit eFUnit = SwFieldUnitTable::GetValue(i); switch ( eFUnit ) { diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index b5ca4fc4aabc..0fc38dd56497 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -29,7 +29,7 @@ #include <vcl/scrbar.hxx> #include <vcl/msgbox.hxx> #include <vcl/builderfactory.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> @@ -42,6 +42,7 @@ #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <tools/urlobj.hxx> #include <dbui.hrc> +#include <strings.hrc> #include <helpid.h> #include <unomid.h> @@ -479,10 +480,10 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( else { //database has to be created - const ResStringArray& rAddressHeader = rConfig.GetDefaultAddressHeaders(); - const sal_uInt32 nCount = rAddressHeader.Count(); + const std::vector<std::pair<OUString, int>>& rAddressHeader = rConfig.GetDefaultAddressHeaders(); + const sal_uInt32 nCount = rAddressHeader.size(); for(sal_uInt32 nHeader = 0; nHeader < nCount; ++nHeader) - m_pCSVData->aDBColumnHeaders.push_back( rAddressHeader.GetString(nHeader)); + m_pCSVData->aDBColumnHeaders.push_back(rAddressHeader[nHeader].first); std::vector<OUString> aNewData; aNewData.insert(aNewData.begin(), nCount, OUString()); m_pCSVData->aDBData.push_back(aNewData); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 207da08081b4..1d2ce52cfe64 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -86,6 +86,7 @@ #include <comphelper/uno3.hxx> #include "tabsh.hxx" #include "swabstdlg.hxx" +#include "strings.hrc" #include "table.hrc" #include <unomid.h> #include <IDocumentMarkAccess.hxx> diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src deleted file mode 100644 index 019177e0f337..000000000000 --- a/sw/source/ui/dbui/dbui.src +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbui.hrc" -#include "helpid.h" - -StringArray SA_ADDRESS_HEADER -{ - ItemList [en-US]= - { - < "Title" ; MM_PART_TITLE ;> ; - < "First Name" ; MM_PART_FIRSTNAME ;> ; - < "Last Name" ; MM_PART_LASTNAME ;> ; - < "Company Name" ; MM_PART_COMPANY ;> ; - < "Address Line 1" ; MM_PART_ADDRESS_1 ;> ; - < "Address Line 2" ; MM_PART_ADDRESS_2 ;> ; - < "City" ; MM_PART_CITY ;> ; - < "State" ; MM_PART_REGION ;> ; - < "ZIP" ; MM_PART_ZIP ;> ; - < "Country" ; MM_PART_COUNTRY ;> ; - < "Telephone private" ; MM_PART_PHONE_PRIVATE ;> ; - < "Telephone business" ; MM_PART_PHONE_BUSINESS ;> ; - < "E-mail Address" ; MM_PART_E_MAIL ;> ; - < "Gender"; MM_PART_GENDER ;> ; - }; -}; -String STR_NOTASSIGNED -{ - Text[ en-US ] = " not yet matched "; -}; -String STR_FILTER_ALL -{ - Text [ en-US ] = "All files" ; -}; -String STR_FILTER_ALL_DATA -{ - Text [ en-US ] = "Address lists(*.*)" ; -}; -String STR_FILTER_SXB -{ - Text [ en-US ] = "%PRODUCTNAME Base (*.odb)" ; -}; -String STR_FILTER_SXC -{ - Text [ en-US ] = "%PRODUCTNAME Calc (*.ods;*.sxc)" ; -}; -String STR_FILTER_SXW -{ - Text [ en-US ] = "%PRODUCTNAME Writer (*.odt;*.sxw)" ; -}; -String STR_FILTER_DBF -{ - Text [ en-US ] = "dBase (*.dbf)" ; -}; -String STR_FILTER_XLS -{ - Text [ en-US ] = "Microsoft Excel (*.xls;*.xlsx)" ; -}; -String STR_FILTER_DOC -{ - Text [ en-US ] = "Microsoft Word (*.doc;*.docx)" ; -}; -String STR_FILTER_TXT -{ - Text [ en-US ] = "Plain text (*.txt)" ; -}; -String STR_FILTER_CSV -{ - Text [ en-US ] = "Text Comma Separated (*.csv)" ; -}; -String STR_FILTER_MDB -{ - Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ; -}; -String STR_FILTER_ACCDB -{ - Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ; -}; - -String ST_CONFIGUREMAIL -{ - Text[ en-US ] = "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?"; -}; - -String ST_FILTERNAME -{ - Text [ en-US ] = "%PRODUCTNAME Address List (.csv)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index cc6ba7230bf7..84820c20826f 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -26,6 +26,7 @@ #include <mmconfigitem.hxx> #include <swabstdlg.hxx> #include <dbui.hrc> +#include <strings.hrc> #include <view.hxx> #include <dbmgr.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src deleted file mode 100644 index 20651fd67962..000000000000 --- a/sw/source/ui/dbui/mailmergewizard.src +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <dbui.hrc> - -String ST_STARTING -{ - Text [ en-US ] = "Select starting document"; -}; - -String ST_DOCUMENTTYPE -{ - Text [ en-US ] = "Select document type"; -}; - -String ST_ADDRESSBLOCK -{ - Text [ en-US ] = "Insert address block"; -}; - -String ST_ADDRESSLIST -{ - Text [ en-US ] = "Select address list"; -}; - -String ST_GREETINGSLINE -{ - Text [ en-US ] = "Create salutation"; -}; - -String ST_LAYOUT -{ - Text [ en-US ] = "Adjust layout"; -}; - -String ST_EXCLUDE -{ - Text [ en-US ] = "Exclude recipient"; -}; - -String ST_FINISH -{ - Text [ en-US ] = "~Finish"; -}; - -String ST_MMWTITLE -{ - Text [ en-US ] = "Mail Merge Wizard"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 16a57ee05c80..b704f9d8c49f 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -35,7 +35,9 @@ #include <vector> #include <globals.hrc> +#include <strings.hrc> #include <dbui.hrc> +#include "mmaddressblockpage.hrc" #include <helpid.h> using namespace svt; @@ -518,12 +520,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) ); pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT)); pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT) ); - ResStringArray aSalutArr(ResId(RA_SALUTATION, *pSwResMgr)); - for(sal_uInt32 i = 0; i < aSalutArr.Count(); ++i) - m_aSalutations.push_back(aSalutArr.GetString(i)); - ResStringArray aPunctArr(ResId(RA_PUNCTUATION, *pSwResMgr)); - for(sal_uInt32 i = 0; i < aPunctArr.Count(); ++i) - m_aPunctuations.push_back(aPunctArr.GetString(i)); + for (size_t i = 0; i < SAL_N_ELEMENTS(RA_SALUTATION); ++i) + m_aSalutations.push_back(SwResId(RA_SALUTATION[i])); + for (size_t i = 0; i < SAL_N_ELEMENTS(RA_PUNCTUATION); ++i) + m_aPunctuations.push_back(SwResId(RA_PUNCTUATION[i])); m_pDragED->SetText(" "); SetText(SwResId(eType == GREETING_MALE ? ST_TITLE_MALE : ST_TITLE_FEMALE)); m_pAddressElementsFT->SetText(SwResId(ST_SALUTATIONELEMENTS)); @@ -548,10 +548,10 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_pUpIB->SetHelpId( HID_MM_ADDBLOCK_MOVEBUTTONS ); } - const ResStringArray& rHeaders = m_rConfigItem.GetDefaultAddressHeaders(); - for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i) + const std::vector<std::pair<OUString, int>>& rHeaders = m_rConfigItem.GetDefaultAddressHeaders(); + for (size_t i = 0; i < rHeaders.size(); ++i) { - SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders.GetString( i )); + SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders[i].first); pEntry->SetUserData(reinterpret_cast<void*>((sal_IntPtr)i)); } m_pOK->SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl)); @@ -878,7 +878,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) long nHBHeight = m_aHeaderHB->CalcWindowSizePixel().Height(); //get the name of the default headers - const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders(); //get the actual data uno::Reference< XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), uno::UNO_QUERY); //get the name of the actual columns @@ -898,9 +898,9 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) //fill the controls long nControlWidth = aOutputSize.Width() / 3; long nControlHeight = -1; - for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i) + for (size_t i = 0; i < rHeaders.size(); ++i) { - const OUString rHeader = rHeaders.GetString( i ); + const OUString rHeader = rHeaders[i].first; VclPtr<FixedText> pNewText = VclPtr<FixedText>::Create(m_aWindow.get(), WB_VCENTER); pNewText->SetText("<" + rHeader + ">"); VclPtr<ListBox> pNewLB = VclPtr<ListBox>::Create(m_aWindow.get(), WB_DROPDOWN | WB_VCENTER | WB_TABSTOP); @@ -967,7 +967,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) pNewPreview->Show(); pNewPreview->SetPosPixel(Point(2 * nControlWidth + 6, nMove)); } - m_aVScroll->SetRange(Range(0, rHeaders.Count())); + m_aVScroll->SetRange(Range(0, rHeaders.size())); m_aVScroll->SetPageSize((aOutputSize.Height() - nHBHeight - m_nLBStartTopPos)/ m_nYOffset); m_aVScroll->EnableDrag(); m_aVScroll->SetVisibleSize(m_aVScroll->GetPageSize()); @@ -1223,7 +1223,7 @@ void SwAssignFieldsDialog::dispose() uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() { uno::Sequence< OUString > aAssignments( - m_rConfigItem.GetDefaultAddressHeaders().Count()); + m_rConfigItem.GetDefaultAddressHeaders().size()); OUString* pAssignments = aAssignments.getArray(); sal_Int32 nIndex = 0; for(auto aLBIter = m_pFieldsControl->m_aMatches.begin(); diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src deleted file mode 100644 index aa2f3555e811..000000000000 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ /dev/null @@ -1,113 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <dbui.hrc> -#include <helpid.h> - -String ST_TITLE_EDIT -{ - Text [ en-US ] = "Edit Address Block"; -}; - -String ST_TITLE_MALE -{ - Text [ en-US ] = "Custom Salutation (Male Recipients)"; -}; -String ST_TITLE_FEMALE -{ - Text [ en-US ] = "Custom Salutation (Female Recipients)"; -}; -String ST_SALUTATIONELEMENTS -{ - Text[ en-US ] = "Salutation e~lements" ; -}; -String ST_INSERTSALUTATIONFIELD -{ - Text[ en-US ] = "Add to salutation"; -}; -String ST_REMOVESALUTATIONFIELD -{ - Text[ en-US ] = "Remove from salutation"; -}; -String ST_DRAGSALUTATION -{ - Text[ en-US ] = "1. ~Drag salutation elements into the box below" ; -}; -String ST_SALUTATION -{ - Text[ en-US ] = "Salutation"; -}; -String ST_PUNCTUATION -{ - Text[ en-US ] = "Punctuation Mark"; -}; -String ST_TEXT -{ - Text[ en-US ] = "Text"; -}; -StringArray RA_SALUTATION -{ - ItemList [en-US]= - { - < "Dear" ; > ; - < "Hello" ; > ; - < "Hi" ; > ; - }; -}; -StringArray RA_PUNCTUATION -{ - ItemList [en-US]= - { - < "," ; > ; - < ":" ; > ; - < "!" ; > ; - < "(none)" ; > ; - }; -}; - -String ST_SALUTATIONMATCHING -{ - Text[ en-US ] = "Assign the fields from your data source to match the salutation elements." ; -}; - -String ST_SALUTATIONPREVIEW -{ - Text[ en-US ] = "Salutation preview"; -}; - -String ST_ADDRESSELEMENT -{ - Text[ en-US ] = "Address elements" ; -}; - -String ST_SALUTATIONELEMENT -{ - Text[ en-US ] = "Salutation elements" ; -}; - -String ST_MATCHESTO -{ - Text[ en-US ] = "Matches to field:" ; -}; - -String ST_PREVIEW -{ - Text[ en-US ] = "Preview" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 1edd167e825c..a7e7f47fc9f3 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -331,14 +331,14 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( const OUString rExcludeCountry = rConfigItem.GetExcludeCountry(); bool bSpecialReplacementForCountry = (!bIncludeCountry || !rExcludeCountry.isEmpty()); - const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders(); Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); const OUString* pAssignment = aAssignment.getConstArray(); const OUString sCountryColumn( (aAssignment.getLength() > MM_PART_COUNTRY && !aAssignment[MM_PART_COUNTRY].isEmpty()) ? aAssignment[MM_PART_COUNTRY] - : rHeaders.GetString(MM_PART_COUNTRY)); + : rHeaders[MM_PART_COUNTRY].first); OUString sHideParagraphsExpression; SwAddressIterator aIter(aBlocks[0]); @@ -349,11 +349,11 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( { OUString sConvertedColumn = aItem.sText; for(sal_uInt32 nColumn = 0; - nColumn < rHeaders.Count() && + nColumn < rHeaders.size() && nColumn < static_cast<sal_uInt32>(aAssignment.getLength()); ++nColumn) { - if (rHeaders.GetString(nColumn) == aItem.sText && + if (rHeaders[nColumn].first == aItem.sText && !pAssignment[nColumn].isEmpty()) { sConvertedColumn = pAssignment[nColumn]; @@ -557,7 +557,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig aFieldMgr.InsertField( aData ); } //now the text has to be inserted - const ResStringArray& rHeaders = rConfigItem.GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rHeaders = rConfigItem.GetDefaultAddressHeaders(); Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); const OUString* pAssignment = aAssignment.getConstArray(); @@ -569,11 +569,11 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig { OUString sConvertedColumn = aItem.sText; for(sal_uInt32 nColumn = 0; - nColumn < rHeaders.Count() && + nColumn < rHeaders.size() && nColumn < static_cast<sal_uInt32>(aAssignment.getLength()); ++nColumn) { - if (rHeaders.GetString(nColumn) == aItem.sText && + if (rHeaders[nColumn].first == aItem.sText && !pAssignment[nColumn].isEmpty()) { sConvertedColumn = pAssignment[nColumn]; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 03eaa93efb4b..6903eb6bfba0 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -22,6 +22,7 @@ #include <mmconfigitem.hxx> #include <vcl/msgbox.hxx> #include <dbui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <swtypes.hxx> diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 70770c5e98f2..ea064a57ef42 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -69,7 +69,7 @@ #include <helpid.h> #include <doc.hxx> #include <sfx2/app.hxx> -#include <statstr.hrc> +#include <strings.hrc> #include <unomid.h> #include <comphelper/string.hxx> @@ -458,8 +458,8 @@ void SwMMResultEmailDialog::FillInEmailSettings() m_pMailToLB->SelectEntryPos(0); // then select the right one - may not be available - const ResStringArray& rHeaders = xConfigItem->GetDefaultAddressHeaders(); - OUString sEMailColumn = rHeaders.GetString( MM_PART_E_MAIL ); + const std::vector<std::pair<OUString, int>>& rHeaders = xConfigItem->GetDefaultAddressHeaders(); + OUString sEMailColumn = rHeaders[MM_PART_E_MAIL].first; Sequence< OUString> aAssignment = xConfigItem->GetColumnAssignment(xConfigItem->GetCurrentDBData()); if (aAssignment.getLength() > MM_PART_E_MAIL && !aAssignment[MM_PART_E_MAIL].isEmpty()) sEMailColumn = aAssignment[MM_PART_E_MAIL]; diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 7da94798041f..f0e3f3a7c86e 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -32,6 +32,7 @@ #include <unomid.h> #include <dbui.hrc> +#include <strings.hrc> #include <helpid.h> using namespace ::com::sun::star; diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src deleted file mode 100644 index a5c7e403c162..000000000000 --- a/sw/source/ui/dbui/selectdbtabledialog.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <dbui.hrc> -#include <helpid.h> - -String ST_NAME -{ - Text [ en-US ] = "Name"; -}; - -String ST_TYPE -{ - Text [ en-US ] = "Type"; -}; - -String ST_TABLE -{ - Text [ en-US ] = "Table"; -}; - -String ST_QUERY -{ - Text [ en-US ] = "Query"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src deleted file mode 100644 index d30bcf8d73fb..000000000000 --- a/sw/source/ui/dialog/dialog.src +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "dialog.hrc" - -String STR_QUERY_SPELL_CONTINUE -{ - Text [ en-US ] = "Continue checking at beginning of document?" ; -}; -String STR_SPELLING_COMPLETED -{ - Text [ en-US ] = "The spellcheck is complete." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 0a38fa43b0b9..ebfcae266a42 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -31,6 +31,7 @@ #include "swevent.hxx" #include "docsh.hxx" #include "globals.hrc" +#include "strings.hrc" #include "view.hxx" #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx deleted file mode 100644 index d9c86575cb6e..000000000000 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dialmgr.hxx" -#include "swtypes.hxx" -#include <tools/resmgr.hxx> - -#ifndef DISABLE_DYNLOADING -ResMgr* pSwResMgr=nullptr; -#else -static ResMgr *pSwResMgr; -#endif - -ResMgr* SwDialogsResMgr::GetResMgr() -{ - if ( !pSwResMgr ) - { - pSwResMgr = ResMgr::CreateResMgr( "sw" ); - } - - return pSwResMgr; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 0840530fe608..06572ad3df92 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -28,10 +28,8 @@ #include "dbui.hrc" #include "globals.hrc" #include "fldui.hrc" -#include "envelp.hrc" -#include "dochdl.hrc" +#include "strings.hrc" #include <index.hrc> -#include <../../uibase/dialog/regionsw.hrc> #include <wordcountdialog.hxx> #include "abstract.hxx" diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index b53ee82b5921..a54748b0c9ef 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -23,7 +23,6 @@ #include "ascfldlg.hxx" #include "break.hxx" #include "convert.hxx" -#include "dialmgr.hxx" #include "dbinsdlg.hxx" #include "DropDownFieldDialog.hxx" #include "fldtdlg.hxx" @@ -53,8 +52,6 @@ namespace swui { if ( !pFactory ) pFactory = new SwAbstractDialogFactory_Impl; - if ( !pSwResMgr) - SwDialogsResMgr::GetResMgr(); return pFactory; } } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index e04571585bd9..1aa953548264 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -54,8 +54,7 @@ #include <helpid.h> #include <cmdid.h> -#include <../../uibase/dialog/regionsw.hrc> -#include <comcore.hrc> +#include <strings.hrc> #include <globals.hrc> #include "bitmaps.hlst" #include <sfx2/bindings.hxx> diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src deleted file mode 100644 index e2de36634542..000000000000 --- a/sw/source/ui/dochdl/dochdl.src +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dochdl.hrc" -#include "globals.hrc" - -String STR_NOGLOS -{ - Text [ en-US ] = "AutoText for Shortcut '%1' not found." ; -}; - -String STR_NO_TABLE -{ - Text [ en-US ] = "A table with no rows or no cells cannot be inserted"; -}; - -String STR_TABLE_TOO_LARGE -{ - Text [ en-US ] = "The table cannot be inserted because it is too large"; -}; - -String STR_ERR_INSERT_GLOS -{ - Text [ en-US ] = "AutoText could not be created." ; -}; - -String STR_CLPBRD_FORMAT_ERROR -{ - Text [ en-US ] = "Requested clipboard format is not available." ; -}; - -String STR_PRIVATETEXT -{ - Text [ en-US ] = "%PRODUCTNAME Writer" ; -}; -String STR_PRIVATEGRAPHIC -{ - Text [ en-US ] = "Image [%PRODUCTNAME Writer]" ; -}; -String STR_PRIVATEOLE -{ - Text [ en-US ] = "Object [%PRODUCTNAME Writer]" ; -}; -String STR_DDEFORMAT -{ - Text [ en-US ] = "DDE link" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 2332d2a7e2aa..dd70fbdada59 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -21,7 +21,7 @@ #include "selglos.hxx" -#include "dochdl.hrc" +#include "strings.hrc" #include <vcl/layout.hxx> SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src deleted file mode 100644 index 39cfd246a52d..000000000000 --- a/sw/source/ui/docvw/access.src +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "access.hrc" - -String STR_ACCESS_DOC_NAME -{ - Text [ en-US ] = "Document view"; -}; -String STR_ACCESS_DOC_DESC -{ - Text [ en-US ] = "Document view"; -}; -String STR_ACCESS_HEADER_NAME -{ - Text [ en-US ] = "Header $(ARG1)"; -}; -String STR_ACCESS_HEADER_DESC -{ - Text [ en-US ] = "Header page $(ARG1)"; -}; -String STR_ACCESS_FOOTER_NAME -{ - Text [ en-US ] = "Footer $(ARG1)"; -}; -String STR_ACCESS_FOOTER_DESC -{ - Text [ en-US ] = "Footer page $(ARG1)"; -}; -String STR_ACCESS_FOOTNOTE_NAME -{ - Text [ en-US ] = "Footnote $(ARG1)"; -}; -String STR_ACCESS_FOOTNOTE_DESC -{ - Text [ en-US ] = "Footnote $(ARG1)"; -}; -String STR_ACCESS_ENDNOTE_NAME -{ - Text [ en-US ] = "Endnote $(ARG1)"; -}; -String STR_ACCESS_ENDNOTE_DESC -{ - Text [ en-US ] = "Endnote $(ARG1)"; -}; -String STR_ACCESS_TABLE_DESC -{ - Text [ en-US ] = "$(ARG1) on page $(ARG2)"; -}; -String STR_ACCESS_PAGE_NAME -{ - Text [ en-US ] = "Page $(ARG1)"; -}; -String STR_ACCESS_PAGE_DESC -{ - Text [ en-US ] = "Page: $(ARG1)"; -}; -String STR_ACCESS_ANNOTATION_AUTHOR_NAME -{ - Text [ en-US ] = "Author"; -}; -String STR_ACCESS_ANNOTATION_DATE_NAME -{ - Text [ en-US ] = "Date"; -}; -String STR_ACCESS_ANNOTATION_BUTTON_NAME -{ - Text [ en-US ] = "Actions"; -}; -String STR_ACCESS_ANNOTATION_BUTTON_DESC -{ - Text [ en-US ] = "Activate this button to open a list of actions which can be performed on this comment and other comments"; -}; - -String STR_ACCESS_PREVIEW_DOC_NAME -{ - Text [ en-US ] = "Document preview"; -}; -String STR_ACCESS_PREVIEW_DOC_SUFFIX -{ - Text [ en-US ] = "(Preview mode)"; -}; -String STR_ACCESS_DOC_WORDPROCESSING -{ - Text [ en-US ] = "%PRODUCTNAME Document"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/docvw/annotation.src b/sw/source/ui/docvw/annotation.src deleted file mode 100644 index c47afa14f364..000000000000 --- a/sw/source/ui/docvw/annotation.src +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "annotation.hrc" -#include "cmdid.h" - -String STR_DELETE_ALL_NOTES -{ - Text [ en-US ] = "All Comments" ; -}; - -String STR_FORMAT_ALL_NOTES -{ - Text [ en-US ] = "All Comments" ; -}; - -String STR_DELETE_AUTHOR_NOTES -{ - Text [ en-US ] = "Comments by " ; -}; - -String STR_NODATE -{ - Text [ en-US ] = "(no date)" ; -}; - -String STR_NOAUTHOR -{ - Text [ en-US ] = "(no author)" ; -}; - -String STR_REPLY -{ - Text [ en-US ] = "Reply to $1" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src deleted file mode 100644 index c24421399c75..000000000000 --- a/sw/source/ui/envelp/envelp.src +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "envelp.hrc" -#include "globals.hrc" - -String STR_SENDER_TOKENS -{ - Text [ en-US ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src deleted file mode 100644 index b7123b1f4380..000000000000 --- a/sw/source/ui/envelp/label.src +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "label.hrc" -#include "globals.hrc" -#include "helpid.h" - -String STR_CUSTOM -{ - Text [ en-US ] = "[User]"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index eee6e2302ddb..804292b1749c 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -34,7 +34,7 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <../../uibase/envelp/label.hrc> +#include <strings.hrc> #include <envimg.hxx> void SwLabRec::SetFromItem( const SwLabItem& rItem ) @@ -130,7 +130,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, // Read user label from writer.cfg SwLabItem aItem(static_cast<const SwLabItem&>(rSet.Get( FN_LABEL ))); std::unique_ptr<SwLabRec> pRec(new SwLabRec); - pRec->aMake = pRec->aType = SwResId( STR_CUSTOM ); + pRec->aMake = pRec->aType = SwResId(STR_CUSTOM_LABEL); pRec->SetFromItem( aItem ); bool bDouble = false; @@ -201,7 +201,7 @@ SwLabRec* SwLabDlg::GetRecord(const OUString &rRecName, bool bCont) { SwLabRec* pRec = nullptr; bool bFound = false; - const OUString sCustom(SwResId(STR_CUSTOM)); + const OUString sCustom(SwResId(STR_CUSTOM_LABEL)); const size_t nCount = Recs().size(); for (size_t i = 0; i < nCount; ++i) @@ -377,7 +377,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) const size_t nCount = GetParentSwLabDlg()->Recs().size(); size_t nLstType = 0; - const OUString sCustom(SwResId(STR_CUSTOM)); + const OUString sCustom(SwResId(STR_CUSTOM_LABEL)); //insert the entries into the sorted list box for ( size_t i = 0; i < nCount; ++i ) { diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index b9ff4bb54257..6474089ffd3b 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -32,8 +32,7 @@ #include "labfmt.hxx" #include "uitool.hxx" -#include "../../uibase/envelp/label.hrc" -#include "labfmt.hrc" +#include "strings.hrc" #include <unomid.h> using namespace utl; @@ -503,7 +502,7 @@ void SwLabFormatPage::FillItem(SwLabItem& rItem) { if (bModified) { - rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM); + rItem.m_aMake = rItem.m_aType = SwResId(STR_CUSTOM_LABEL); SwLabRec& rRec = *GetParentSwLabDlg()->Recs()[0]; rItem.m_lHDist = rRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField )); diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc deleted file mode 100644 index 2aa9340b41a0..000000000000 --- a/sw/source/ui/envelp/labfmt.hrc +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HRC -#define INCLUDED_SW_SOURCE_UI_ENVELP_LABFMT_HRC - -#include "envelp.hrc" - -// global resources ******************************************************** - -#define STR_HDIST (RC_LABFMT_BEGIN + 1) -#define STR_VDIST (RC_LABFMT_BEGIN + 2) -#define STR_WIDTH (RC_LABFMT_BEGIN + 3) -#define STR_HEIGHT (RC_LABFMT_BEGIN + 4) -#define STR_LEFT (RC_LABFMT_BEGIN + 5) -#define STR_UPPER (RC_LABFMT_BEGIN + 6) -#define STR_COLS (RC_LABFMT_BEGIN + 7) -#define STR_ROWS (RC_LABFMT_BEGIN + 8) - -// overflow check ******************************************************** - -#define LABFMT_ACT_END STR_ROWS - -#if LABFMT_ACT_END > RC_LABFMT_END -#error Resource overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src deleted file mode 100644 index d72efc34ab7c..000000000000 --- a/sw/source/ui/envelp/labfmt.src +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "labfmt.hrc" -#include "helpid.h" - -String STR_HDIST -{ - Text [ en-US ] = "H. Pitch" ; -}; -String STR_VDIST -{ - Text [ en-US ] = "V. Pitch" ; -}; -String STR_WIDTH -{ - Text [ en-US ] = "Width" ; -}; -String STR_HEIGHT -{ - Text [ en-US ] = "Height" ; -}; -String STR_LEFT -{ - Text [ en-US ] = "Left margin" ; -}; -String STR_UPPER -{ - Text [ en-US ] = "Top margin" ; -}; -String STR_COLS -{ - Text [ en-US ] = "Columns" ; -}; -String STR_ROWS -{ - Text [ en-US ] = "Rows" ; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index ac5c6b6b128c..3d694efd76f5 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -37,7 +37,6 @@ #include <swmodule.hxx> #include <modcfg.hxx> #include <mailmergehelper.hxx> -#include <envelp.hrc> #include <mailmrge.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index c72019ece137..3f57f26562d5 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -40,7 +40,7 @@ #include <fldui.hrc> #include <globals.hrc> -#include <utlui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <unomid.h> diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 0295644857f3..8e587a072ada 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -27,6 +27,7 @@ #include <helpid.h> #include <swtypes.hxx> #include <globals.hrc> +#include <strings.hrc> #include <fldbas.hxx> #include <docufld.hxx> #include <wrtsh.hxx> @@ -160,7 +161,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) if( rProperties.getLength() ) { - pInfo = m_pTypeTLB->InsertEntry( SwResId( STR_CUSTOM ) ); + pInfo = m_pTypeTLB->InsertEntry(SwResId(STR_CUSTOM_FIELD)); pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX)); for (sal_Int32 n=0; n < rProperties.getLength(); n++) diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 35c7df610a71..282103b90e12 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -21,6 +21,7 @@ #include <flddat.hxx> #include <docufld.hxx> #include <globals.hrc> +#include <strings.hrc> #include <chpfld.hxx> #include <fldui.hrc> #include <flddok.hxx> @@ -467,27 +468,27 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); FillFormatLB(nTypeId); - sal_uInt32 nTextRes = 0; + const char* pTextRes = nullptr; switch (nTypeId) { case TYP_CHAPTERFLD: - nTextRes = STR_LEVEL; + pTextRes = STR_LEVEL; break; case TYP_PREVPAGEFLD: case TYP_NEXTPAGEFLD: - nTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( + pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( m_pFormatLB->GetSelectEntryPos() )) ? STR_VALUE : STR_OFFSET; break; case TYP_PAGENUMBERFLD: - nTextRes = STR_OFFSET; + pTextRes = STR_OFFSET; break; } - if( nTextRes ) - m_pValueFT->SetText( SwResId( nTextRes )); + if (pTextRes) + m_pValueFT->SetText(SwResId(pTextRes)); } sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 5b5a1a3b280f..10843305d963 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -23,6 +23,7 @@ #include <docsh.hxx> #include <swtypes.hxx> #include <globals.hrc> +#include <strings.hrc> #include <fldbas.hxx> #include <docufld.hxx> #include <view.hxx> @@ -210,6 +211,15 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) } } +static const char* FMT_MARK_ARY[] = +{ + FMT_MARK_TEXT, + FMT_MARK_TABLE, + FMT_MARK_FRAME, + FMT_MARK_GRAFIC, + FMT_MARK_OLE +}; + IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) { // save old ListBoxPos @@ -245,7 +255,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) if (nSize) { if (IsFieldEdit() && nTypeId == TYP_JUMPEDITFLD) - m_pFormatLB->SelectEntry(SwResId(FMT_MARK_BEGIN + GetCurField()->GetFormat())); + m_pFormatLB->SelectEntry(SwResId(FMT_MARK_ARY[GetCurField()->GetFormat()])); if (!m_pFormatLB->GetSelectEntryCount()) m_pFormatLB->SelectEntryPos(0); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index bf4e837362ad..9813ad78930f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -28,6 +28,7 @@ #include <fldui.hrc> #include <globals.hrc> +#include <strings.hrc> #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> #include <ndtxt.hxx> @@ -739,6 +740,36 @@ bool SwFieldRefPage::MatchSubstring( const OUString& rListString, const OUString return aListString.indexOf(aSubstr) >= 0; } +enum FMT_REF_IDX +{ + FMT_REF_PAGE_IDX = 0, + FMT_REF_CHAPTER_IDX = 1, + FMT_REF_TEXT_IDX = 2, + FMT_REF_UPDOWN_IDX = 3, + FMT_REF_PAGE_PGDSC_IDX = 4, + FMT_REF_ONLYNUMBER_IDX = 5, + FMT_REF_ONLYCAPTION_IDX = 6, + FMT_REF_ONLYSEQNO_IDX = 7, + FMT_REF_NUMBER_IDX = 8, + FMT_REF_NUMBER_NO_CONTEXT_IDX = 9, + FMT_REF_NUMBER_FULL_CONTEXT_IDX = 10 +}; + +static const char* FMT_REF_ARY[] = +{ + FMT_REF_PAGE, + FMT_REF_CHAPTER, + FMT_REF_TEXT, + FMT_REF_UPDOWN, + FMT_REF_PAGE_PGDSC, + FMT_REF_ONLYNUMBER, + FMT_REF_ONLYCAPTION, + FMT_REF_ONLYSEQNO, + FMT_REF_NUMBER, + FMT_REF_NUMBER_NO_CONTEXT, + FMT_REF_NUMBER_FULL_CONTEXT +}; + sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) { OUString sOldSel; @@ -765,7 +796,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) case REFFLDFLAG_BOOKMARK: case REFFLDFLAG_FOOTNOTE: case REFFLDFLAG_ENDNOTE: - nSize = FMT_REF_PAGE_PGDSC - FMT_REF_BEGIN + 1; + nSize = FMT_REF_PAGE_PGDSC_IDX + 1; break; default: @@ -773,7 +804,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) if ( REFFLDFLAG & nTypeId ) { - nSize = FMT_REF_ONLYSEQNO - FMT_REF_BEGIN + 1; + nSize = FMT_REF_ONLYSEQNO_IDX + 1; } else { @@ -793,13 +824,13 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) // #i83479# if ( bAddCrossRefFormats ) { - sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN; + sal_uInt16 nFormat = FMT_REF_NUMBER_IDX; sal_Int32 nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat )); m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat ))); - nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN; + nFormat = FMT_REF_NUMBER_NO_CONTEXT_IDX; nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat )); m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat ))); - nFormat = FMT_REF_NUMBER_FULL_CONTEXT - FMT_REF_BEGIN; + nFormat = FMT_REF_NUMBER_FULL_CONTEXT_IDX; nPos = m_pFormatLB->InsertEntry(GetFieldMgr().GetFormatStr( nTypeId, nFormat )); m_pFormatLB->SetEntryData( nPos, reinterpret_cast<void*>(GetFieldMgr().GetFormatId( nTypeId, nFormat ))); nSize += 3; @@ -811,7 +842,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) if (!IsFieldEdit()) m_pFormatLB->SelectEntry(sOldSel); else - m_pFormatLB->SelectEntry(SwResId(FMT_REF_BEGIN + GetCurField()->GetFormat())); + m_pFormatLB->SelectEntry(SwResId(FMT_REF_ARY[GetCurField()->GetFormat()])); if (!m_pFormatLB->GetSelectEntryCount()) { diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src deleted file mode 100644 index a3642cd4f9e7..000000000000 --- a/sw/source/ui/fldui/fldui.src +++ /dev/null @@ -1,609 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "index.hrc" -#include "fldui.hrc" -#include "helpid.h" - -/*-------------------------------------------------------------------- - Description: strings for the types - --------------------------------------------------------------------*/ - - // range document - -String STR_DATEFLD -{ - Text [ en-US ] = "Date" ; -}; -String STR_TIMEFLD -{ - Text [ en-US ] = "Time" ; -}; -String STR_FILENAMEFLD -{ - Text [ en-US ] = "File name" ; -}; -String STR_DBNAMEFLD -{ - Text [ en-US ] = "Database Name" ; -}; -String STR_CHAPTERFLD -{ - Text [ en-US ] = "Chapter" ; -}; -String STR_PAGENUMBERFLD -{ - Text [ en-US ] = "Page numbers" ; -}; -String STR_DOCSTATFLD -{ - Text [ en-US ] = "Statistics" ; -}; -String STR_AUTHORFLD -{ - Text [ en-US ] = "Author" ; -}; -String STR_TEMPLNAMEFLD -{ - Text [ en-US ] = "Templates" ; -}; -String STR_EXTUSERFLD -{ - Text [ en-US ] = "Sender" ; -}; - - // range functions - -String STR_SETFLD -{ - Text [ en-US ] = "Set variable" ; -}; -String STR_GETFLD -{ - Text [ en-US ] = "Show variable" ; -}; -String STR_FORMELFLD -{ - Text [ en-US ] = "Insert Formula" ; -}; -String STR_INPUTFLD -{ - Text [ en-US ] = "Input field" ; -}; -String STR_SETINPUTFLD -{ - Text [ en-US ] = "Input field (variable)" ; -}; -String STR_USRINPUTFLD -{ - Text [ en-US ] = "Input field (user)" ; -}; -String STR_CONDTXTFLD -{ - Text [ en-US ] = "Conditional text" ; -}; -String STR_DDEFLD -{ - Text [ en-US ] = "DDE field" ; -}; -String STR_MACROFLD -{ - Text [ en-US ] = "Execute macro" ; -}; -String STR_SEQFLD -{ - Text [ en-US ] = "Number range" ; -}; -String STR_SETREFPAGEFLD -{ - Text [ en-US ] = "Set page variable" ; -}; -String STR_GETREFPAGEFLD -{ - Text [ en-US ] = "Show page variable" ; -}; -String STR_INTERNETFLD -{ - Text [ en-US ] = "Load URL" ; -}; -String STR_JUMPEDITFLD -{ - Text [ en-US ] = "Placeholder" ; -}; -String STR_COMBINED_CHARS -{ - Text [ en-US ] = "Combine characters"; -}; -String STR_DROPDOWN -{ - Text [ en-US ] = "Input list" ; -}; - - // range references - -String STR_SETREFFLD -{ - Text [ en-US ] = "Set Reference" ; -}; -String STR_GETREFFLD -{ - Text [ en-US ] = "Insert Reference" ; -}; - - // range database - -String STR_DBFLD -{ - Text [ en-US ] = "Mail merge fields" ; -}; -String STR_DBNEXTSETFLD -{ - Text [ en-US ] = "Next record" ; -}; -String STR_DBNUMSETFLD -{ - Text [ en-US ] = "Any record" ; -}; -String STR_DBSETNUMBERFLD -{ - Text [ en-US ] = "Record number" ; -}; -String STR_PREVPAGEFLD -{ - Text [ en-US ] = "Previous page" ; -}; -String STR_NEXTPAGEFLD -{ - Text [ en-US ] = "Next page" ; -}; -String STR_HIDDENTXTFLD -{ - Text [ en-US ] = "Hidden text" ; -}; - - // range user fields - -String STR_USERFLD -{ - Text [ en-US ] = "User Field" ; -}; -String STR_POSTITFLD -{ - Text [ en-US ] = "Note" ; -}; -String STR_SCRIPTFLD -{ - Text [ en-US ] = "Script" ; -}; -String STR_AUTHORITY -{ - Text [ en-US ] = "Bibliography entry"; -}; -String STR_HIDDENPARAFLD -{ - Text [ en-US ] = "Hidden Paragraph" ; -}; - - // range DocumentInfo - -String STR_DOCINFOFLD -{ - Text [ en-US ] = "DocInformation" ; -}; -/*-------------------------------------------------------------------- - Description: SubCmd-Strings - --------------------------------------------------------------------*/ -String FLD_DATE_STD -{ - Text [ en-US ] = "Date"; -}; -String FLD_DATE_FIX -{ - Text [ en-US ] = "Date (fixed)" ; -}; -String FLD_TIME_STD -{ - Text [ en-US ] = "Time"; -}; -String FLD_TIME_FIX -{ - Text [ en-US ] = "Time (fixed)" ; -}; - - // SubCmd Statistic - -String FLD_STAT_TABLE -{ - Text [ en-US ] = "Tables" ; -}; -String FLD_STAT_CHAR -{ - Text [ en-US ] = "Characters" ; -}; -String FLD_STAT_WORD -{ - Text [ en-US ] = "Words" ; -}; -String FLD_STAT_PARA -{ - Text [ en-US ] = "Paragraphs" ; -}; -String FLD_STAT_GRF -{ - Text [ en-US ] = "Image" ; -}; -String FLD_STAT_OBJ -{ - Text [ en-US ] = "Objects" ; -}; -String FLD_STAT_PAGE -{ - Text [ en-US ] = "Pages" ; -}; - // SubCmd DDETypes - -String FMT_DDE_HOT -{ - Text [ en-US ] = "DDE automatic" ; -}; -String FMT_DDE_NORMAL -{ - Text [ en-US ] = "DDE manual" ; -}; -String FLD_INPUT_TEXT -{ - Text = "[Text]" ; -}; -/*-------------------------------------------------------------------- - Description: SubType Extuser - --------------------------------------------------------------------*/ -String FLD_EU_FIRMA -{ - Text [ en-US ] = "Company" ; -}; -String FLD_EU_VORNAME -{ - Text [ en-US ] = "First Name" ; -}; -String FLD_EU_NAME -{ - Text [ en-US ] = "Last Name" ; -}; -String FLD_EU_ABK -{ - Text [ en-US ] = "Initials" ; -}; -String FLD_EU_STRASSE -{ - Text [ en-US ] = "Street" ; -}; -String FLD_EU_LAND -{ - Text [ en-US ] = "Country" ; -}; -String FLD_EU_PLZ -{ - Text [ en-US ] = "Zip code" ; -}; -String FLD_EU_ORT -{ - Text [ en-US ] = "City" ; -}; -String FLD_EU_TITEL -{ - Text [ en-US ] = "Title" ; -}; -String FLD_EU_POS -{ - Text [ en-US ] = "Position" ; -}; -String FLD_EU_TELPRIV -{ - Text [ en-US ] = "Tel. (Home)" ; -}; -String FLD_EU_TELFIRMA -{ - Text [ en-US ] = "Tel. (Work)" ; -}; -String FLD_EU_FAX -{ - Text [ en-US ] = "FAX" ; -}; -String FLD_EU_EMAIL -{ - Text [ en-US ] = "E-mail" ; -}; -String FLD_EU_STATE -{ - Text [ en-US ] = "State" ; -}; -String FLD_PAGEREF_OFF -{ - Text [ en-US ] = "off" ; -}; -String FLD_PAGEREF_ON -{ - Text [ en-US ] = "on" ; -}; -/*-------------------------------------------------------------------- - Description: path name - --------------------------------------------------------------------*/ - // Formate FileName -String FMT_FF_NAME -{ - Text [ en-US ] = "File name" ; -}; -String FMT_FF_NAME_NOEXT -{ - Text [ en-US ] = "File name without extension" ; -}; -String FMT_FF_PATHNAME -{ - Text [ en-US ] = "Path/File name" ; -}; -String FMT_FF_PATH -{ - Text [ en-US ] = "Path" ; -}; -String FMT_FF_UI_NAME -{ - Text [ en-US ] = "Style" ; -}; -String FMT_FF_UI_RANGE -{ - Text [ en-US ] = "Category" ; -}; -/*-------------------------------------------------------------------- - Description: format chapter - --------------------------------------------------------------------*/ -String FMT_CHAPTER_NAME -{ - Text [ en-US ] = "Chapter name" ; -}; -String FMT_CHAPTER_NO -{ - Text [ en-US ] = "Chapter number" ; -}; -String FMT_CHAPTER_NO_NOSEPARATOR -{ - Text [ en-US ] = "Chapter number without separator" ; -}; -String FMT_CHAPTER_NAMENO -{ - Text [ en-US ] = "Chapter number and name" ; -}; -/*-------------------------------------------------------------------- - Description: formats - --------------------------------------------------------------------*/ -String FMT_NUM_ABC -{ - Text = "A B C" ; -}; -String FMT_NUM_SABC -{ - Text = "a b c" ; -}; -String FMT_NUM_ABC_N -{ - Text = "A .. AA .. AAA" ; -}; -String FMT_NUM_SABC_N -{ - Text = "a .. aa .. aaa" ; -}; -String FMT_NUM_ROMAN -{ - Text [ en-US ] = "Roman (I II III)" ; -}; -String FMT_NUM_SROMAN -{ - Text [ en-US ] = "Roman (i ii iii)" ; -}; -String FMT_NUM_ARABIC -{ - Text [ en-US ] = "Arabic (1 2 3)" ; -}; -String FMT_NUM_PAGEDESC -{ - Text [ en-US ] = "As Page Style" ; -}; -String FMT_NUM_PAGESPECIAL -{ - Text [ en-US ] = "Text" ; -}; -/*-------------------------------------------------------------------- - Description: Author - --------------------------------------------------------------------*/ -String FMT_AUTHOR_NAME -{ - Text [ en-US ] = "Name" ; -}; -String FMT_AUTHOR_SCUT -{ - Text [ en-US ] = "Initials" ; -}; -/*-------------------------------------------------------------------- - Description: set variable - --------------------------------------------------------------------*/ -String FMT_SETVAR_SYS -{ - Text [ en-US ] = "System" ; -}; -String FMT_SETVAR_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String FMT_GETVAR_NAME -{ - Text [ en-US ] = "Name" ; -}; -String FMT_GETVAR_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String FMT_USERVAR_CMD -{ - Text [ en-US ] = "Formula" ; -}; -String FMT_USERVAR_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String FMT_DBFLD_DB -{ - Text [ en-US ] = "Database" ; -}; -String FMT_DBFLD_SYS -{ - Text [ en-US ] = "System" ; -}; -/*-------------------------------------------------------------------- - Description: storage fields - --------------------------------------------------------------------*/ -String FMT_REG_AUTHOR -{ - Text [ en-US ] = "Author" ; -}; -String FMT_REG_TIME -{ - Text [ en-US ] = "Time" ; -}; -String FMT_REG_DATE -{ - Text [ en-US ] = "Date" ; -}; -/*-------------------------------------------------------------------- - Description: formats references - --------------------------------------------------------------------*/ -String FMT_REF_TEXT -{ - Text [ en-US ] = "Reference" ; -}; -String FMT_REF_PAGE -{ - Text [ en-US ] = "Page" ; -}; -String FMT_REF_CHAPTER -{ - Text [ en-US ] = "Chapter" ; -}; -String FMT_REF_UPDOWN -{ - Text [ en-US ] = "Above/Below" ; -}; -String FMT_REF_PAGE_PGDSC -{ - Text [ en-US ] = "As Page Style" ; -}; -String FMT_REF_ONLYNUMBER -{ - Text [ en-US ] = "Category and Number" ; -}; -String FMT_REF_ONLYCAPTION -{ - Text [ en-US ] = "Caption Text" ; -}; -String FMT_REF_ONLYSEQNO -{ - Text [ en-US ] = "Numbering"; -}; -String FMT_REF_NUMBER -{ - Text [ en-US ] = "Number"; -}; -String FMT_REF_NUMBER_NO_CONTEXT -{ - Text [ en-US ] = "Number (no context)"; -}; -String FMT_REF_NUMBER_FULL_CONTEXT -{ - Text [ en-US ] = "Number (full context)"; -}; -/*-------------------------------------------------------------------- - Description: placeholder - --------------------------------------------------------------------*/ -String FMT_MARK_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String FMT_MARK_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String FMT_MARK_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String FMT_MARK_GRAFIC -{ - Text [ en-US ] = "Image" ; -}; -String FMT_MARK_OLE -{ - Text [ en-US ] = "Object" ; -}; -/*-------------------------------------------------------------------- - Description: ExchangeStrings for Edit/NameFT - --------------------------------------------------------------------*/ -String STR_COND -{ - Text [ en-US ] = "~Condition" ; -}; -String STR_TEXT -{ - Text [ en-US ] = "Then, Else" ; -}; -String STR_DDE_CMD -{ - Text [ en-US ] = "DDE Statement" ; -}; -String STR_INSTEXT -{ - Text [ en-US ] = "Hidden t~ext" ; -}; -String STR_MACNAME -{ - Text [ en-US ] = "~Macro name" ; -}; -String STR_PROMPT -{ - Text [ en-US ] = "~Reference" ; -}; -String STR_COMBCHRS_FT -{ - Text [ en-US ] = "Ch~aracters"; -}; -String STR_OFFSET -{ - Text [ en-US ] = "O~ffset" ; -}; -String STR_VALUE -{ - Text [ en-US ] = "Value" ; -}; -String STR_FORMULA -{ - Text [ en-US ] = "Formula" ; -}; -String STR_CUSTOM -{ - Text [ en-US ] = "Custom" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index a421c24d6e93..f6fe754e0e65 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -34,6 +34,7 @@ #include <calc.hxx> #include <svl/zformat.hxx> #include <globals.hrc> +#include <strings.hrc> #include <fldui.hrc> #define USER_DATA_VERSION_1 "1" diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 6f0076ded866..c71cdbcb13a7 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -35,6 +35,7 @@ #include <fldui.hrc> #include <globals.hrc> +#include <strings.hrc> using namespace ::com::sun::star; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 84431a85e5e6..7d6c16e23b02 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -24,6 +24,7 @@ #include "hintids.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> +#include <svx/strings.hrc> #include <sfx2/htmlmode.hxx> #include <svx/colorbox.hxx> #include <svx/xtable.hxx> @@ -58,12 +59,12 @@ #include "prcntfld.hxx" #include "paratr.hxx" #include "frmui.hrc" -#include "poolfmt.hrc" +#include "strings.hrc" #include <section.hxx> #include <docary.hxx> #include <pagedesc.hxx> -#include "access.hrc" +#include "strings.hrc" //to match associated data in ColumnPage.ui #define LISTBOX_SELECTION 0 diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 424cdf7d5c58..4a80bfb85f5b 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -44,6 +44,7 @@ #include "initui.hxx" #include <frmui.hrc> #include <globals.hrc> +#include <strings.hrc> #include <SwStyleNameMapper.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 19d81ef64a44..1a7906ce2b4b 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -35,6 +35,7 @@ #include <frmui.hrc> #include <globals.hrc> +#include <strings.hrc> #include <svx/svxids.hrc> #include <svx/flagsdef.hxx> #include <svx/svxdlg.hxx> @@ -78,7 +79,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame, if(pStr) { - SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")"); + SetText(GetText() + SwResId(STR_FRMUI_COLL_HEADER) + *pStr + ")"); } m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index b6ffbe1dd6ab..4c914dd67a63 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -62,6 +62,7 @@ #include <sal/macros.h> #include <frmui.hrc> +#include <strings.hrc> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> @@ -814,7 +815,7 @@ void SwFramePage::setOptimalFrameWidth() for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end(); aI != aEnd; ++aI) { - m_pHorizontalDLB->InsertEntry(m_aFramePosString.GetString(*aI)); + m_pHorizontalDLB->InsertEntry(SvxSwFramePosString::GetString(*aI)); } Size aBiggest(m_pHorizontalDLB->GetOptimalSize()); @@ -855,7 +856,7 @@ void SwFramePage::setOptimalRelWidth() for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end(); aI != aEnd; ++aI) { - m_pHoriRelationLB->InsertEntry(m_aFramePosString.GetString(*aI)); + m_pHoriRelationLB->InsertEntry(SvxSwFramePosString::GetString(*aI)); } Size aBiggest(m_pHoriRelationLB->GetOptimalSize()); @@ -956,9 +957,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) else { if ( m_bNew ) - SetText( SwResId(STR_OLE_INSERT)); + SetText(SwResId(STR_FRMUI_OLE_INSERT)); else - SetText( SwResId(STR_OLE_EDIT)); + SetText(SwResId(STR_FRMUI_OLE_EDIT)); } } else @@ -974,8 +975,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) const SwFormatFrameSize& rFrameSize = static_cast<const SwFormatFrameSize&>(rSet->Get(RES_FRM_SIZE)); - m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME)); - m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME)); + m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME)); + m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME)); if (rFrameSize.GetWidthPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetWidthPercent() != 0) { //calculate the rerference value from the with and relative width values @@ -987,8 +988,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet ) else m_pRelWidthRelationLB->Disable(); - m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME)); - m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME)); + m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME)); + m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME)); if (rFrameSize.GetHeightPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetHeightPercent() != 0) { //calculate the rerference value from the with and relative width values @@ -1425,7 +1426,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap, m_bIsVerticalFrame, m_bIsVerticalL2R, m_bIsInRightToLeft); - OUString sEntry(m_aFramePosString.GetString(eStrId)); + OUString sEntry(SvxSwFramePosString::GetString(eStrId)); if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND) { // don't insert entries when frames are character bound @@ -1490,7 +1491,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap, m_bIsVerticalFrame, m_bIsVerticalL2R, m_bIsInRightToLeft); - const OUString sEntry = m_aFramePosString.GetString(sStrId1); + const OUString sEntry = SvxSwFramePosString::GetString(sStrId1); sal_Int32 nPos = _rLB.InsertEntry(sEntry); _rLB.SetEntryData(nPos, &rCharMap); if (_pMap[nMapPos].nAlign == _nAlign) @@ -1553,7 +1554,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap, m_bIsVerticalFrame, m_bIsVerticalL2R, m_bIsInRightToLeft); - const OUString sEntry = m_aFramePosString.GetString(eStrId1); + const OUString sEntry = SvxSwFramePosString::GetString(eStrId1); sal_Int32 nPos = _rLB.InsertEntry(sEntry); _rLB.SetEntryData(nPos, &rMap); if (sSelEntry.isEmpty() && rMap.nRelation == _nRel) @@ -1690,7 +1691,7 @@ sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox &rAlignLB ) { SvxSwFramePosString::StringId eResId = pMap[i].eStrId; - OUString sEntry = m_aFramePosString.GetString(eResId); + OUString sEntry = SvxSwFramePosString::GetString(eResId); sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry ); if (sEntry == sSelEntry) diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src deleted file mode 100644 index 1943fd85262a..000000000000 --- a/sw/source/ui/frmdlg/frmui.src +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "frmui.hrc" - -/*----------------------------------------------------------------------- - Description: character alignment for frmsh.cxx - context menu - -----------------------------------------------------------------------*/ -String STR_TOP_BASE -{ - Text [ en-US ] = "Base line at ~top" ; -}; -String STR_BOTTOM_BASE -{ - Text [ en-US ] = "~Base line at bottom" ; -}; -String STR_CENTER_BASE -{ - Text [ en-US ] = "Base line ~centered" ; -}; -String STR_LINE_TOP -{ - Text [ en-US ] = "Top of line" ; -}; -String STR_LINE_BOTTOM -{ - Text [ en-US ] = "Bottom of line" ; -}; -String STR_LINE_CENTER -{ - Text [ en-US ] = "Center of line" ; -}; -String STR_OLE_INSERT -{ - Text [ en-US ] = "Insert object" ; -}; -String STR_OLE_EDIT -{ - Text [ en-US ] = "Edit object" ; -}; -String STR_COLL_HEADER -{ - Text [ en-US ] = " (Template: " ; -}; -String STR_FRMUI_BORDER -{ - Text [ en-US ] = "Borders" ; -}; -String STR_FRMUI_PATTERN -{ - Text [ en-US ] = "Background" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index ca2e467ff638..d7be56794271 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -22,6 +22,7 @@ #include "swtypes.hxx" #include "pattern.hxx" #include "frmui.hrc" +#include "strings.hrc" SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index f0e95a46cd28..4e34b1b940ab 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -28,6 +28,7 @@ #include "swtypes.hxx" #include "uiborder.hxx" #include "frmui.hrc" +#include "strings.hrc" SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) : SfxSingleTabDialog(pParent, rSet) diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src deleted file mode 100644 index 73039f72507d..000000000000 --- a/sw/source/ui/globdoc/globdoc.src +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "globdoc.hrc" - -String STR_HUMAN_SWGLOBDOC_NAME -{ - Text [ en-US ] = "Master Document" ; -}; -String STR_WRITER_GLOBALDOC_FULLTYPE -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Master Document"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 205be4835b8e..8b0ed87d09c2 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <com/sun/star/text/XDocumentIndexesSupplier.hpp> #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/style/BreakType.hpp> @@ -45,7 +45,7 @@ #include <swmodule.hxx> #include <cmdid.h> -#include <utlui.hrc> +#include <strings.hrc> #include <index.hrc> #include <globals.hrc> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e1ff6605bb51..19490c9551db 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -20,7 +20,7 @@ #include <config_folders.h> #include <comphelper/string.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> #include <vcl/builderfactory.hxx> @@ -53,7 +53,7 @@ #include <cnttab.hxx> #include <swuicnttab.hxx> #include <poolfmt.hxx> -#include <poolfmt.hrc> +#include <strings.hrc> #include <uitool.hxx> #include <fmtcol.hxx> #include <fldbas.hxx> @@ -66,9 +66,10 @@ #include <cmdid.h> #include <helpid.h> -#include <utlui.hrc> +#include <strings.hrc> #include <index.hrc> #include <globals.hrc> +#include <cnttab.hrc> #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> #include <toxwrap.hxx> @@ -779,7 +780,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", "modules/swriter/ui/tocindexpage.ui", &rAttrSet) - , aFromNames(ResId(RES_SRCTYPES, *pSwResMgr)) , pIndexRes(nullptr) , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE)) , m_bWaitingInitialSettings(true) @@ -848,11 +848,10 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r sAddStyleContent = m_pAddStylesCB->GetText(); - ResStringArray& rNames = aFromNames.GetNames(); - for(sal_uInt32 i = 0; i < rNames.Count(); i++) + for (size_t i = 0; i < SAL_N_ELEMENTS(RES_SRCTYPES); i++) { - m_pFromObjCLB->InsertEntry(rNames.GetString(i)); - m_pFromObjCLB->SetEntryData( i, reinterpret_cast<void*>(rNames.GetValue(i)) ); + m_pFromObjCLB->InsertEntry(SwResId(RES_SRCTYPES[i].first)); + m_pFromObjCLB->SetEntryData(i, reinterpret_cast<void*>(RES_SRCTYPES[i].second)); } SetExchangeSupport(); @@ -1790,6 +1789,44 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) SvTreeListBox::RequestHelp(rHEvt); } +namespace +{ + const char* STR_AUTH_FIELD_ARY[] = + { + STR_AUTH_FIELD_IDENTIFIER, + STR_AUTH_FIELD_AUTHORITY_TYPE, + STR_AUTH_FIELD_ADDRESS, + STR_AUTH_FIELD_ANNOTE, + STR_AUTH_FIELD_AUTHOR, + STR_AUTH_FIELD_BOOKTITLE, + STR_AUTH_FIELD_CHAPTER, + STR_AUTH_FIELD_EDITION, + STR_AUTH_FIELD_EDITOR, + STR_AUTH_FIELD_HOWPUBLISHED, + STR_AUTH_FIELD_INSTITUTION, + STR_AUTH_FIELD_JOURNAL, + STR_AUTH_FIELD_MONTH, + STR_AUTH_FIELD_NOTE, + STR_AUTH_FIELD_NUMBER, + STR_AUTH_FIELD_ORGANIZATIONS, + STR_AUTH_FIELD_PAGES, + STR_AUTH_FIELD_PUBLISHER, + STR_AUTH_FIELD_SCHOOL, + STR_AUTH_FIELD_SERIES, + STR_AUTH_FIELD_TITLE, + STR_AUTH_FIELD_TYPE, + STR_AUTH_FIELD_VOLUME, + STR_AUTH_FIELD_YEAR, + STR_AUTH_FIELD_URL, + STR_AUTH_FIELD_CUSTOM1, + STR_AUTH_FIELD_CUSTOM2, + STR_AUTH_FIELD_CUSTOM3, + STR_AUTH_FIELD_CUSTOM4, + STR_AUTH_FIELD_CUSTOM5, + STR_AUTH_FIELD_ISBN + }; +} + SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocEntriesPage", "modules/swriter/ui/tocentriespage.ui", &rAttrSet) @@ -1919,7 +1956,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt //fill the types in for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) { - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i])); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast< void * >(sal::static_int_cast< sal_uIntPtr >(i))); } sal_Int32 nPos = m_pFirstKeyLB->InsertEntry(sNoCharSortKey); @@ -2255,7 +2292,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) { //fill it into the ListBox sal_uInt32 nData = rToken.nAuthorityField; - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + nData)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[nData])); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData)); } @@ -2380,7 +2417,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) m_pAuthFieldsLB->Clear(); for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++) { - sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_START + i)); + sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i])); m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i)); } @@ -2675,6 +2712,34 @@ OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const return sRet; } +static const char* STR_TOKEN_ARY[] = +{ + STR_TOKEN_ENTRY_NO, + STR_TOKEN_ENTRY, //mapped from original STR_TOKEN_ENTRY_TEXT, + STR_TOKEN_ENTRY, + STR_TOKEN_TAB_STOP, + nullptr, + STR_TOKEN_PAGE_NUMS, + STR_TOKEN_CHAPTER_INFO, + STR_TOKEN_LINK_START, + STR_TOKEN_LINK_END, + STR_TOKEN_AUTHORITY +}; + +static const char* STR_TOKEN_HELP_ARY[] = +{ + STR_TOKEN_HELP_ENTRY_NO, + STR_TOKEN_HELP_ENTRY, // mapped from original STR_TOKEN_HELP_ENTRY_TEXT, + STR_TOKEN_HELP_ENTRY, + STR_TOKEN_HELP_TAB_STOP, + STR_TOKEN_HELP_TEXT, + STR_TOKEN_HELP_PAGE_NUMS, + STR_TOKEN_HELP_CHAPTER_INFO, + STR_TOKEN_HELP_LINK_START, + STR_TOKEN_HELP_LINK_END, + STR_TOKEN_HELP_AUTHORITY +}; + SwTokenWindow::SwTokenWindow(vcl::Window* pParent) : VclHBox(pParent) , m_pForm(nullptr) @@ -2693,15 +2758,12 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent) for (sal_uInt32 i = 0; i < TOKEN_END; ++i) { - sal_uInt32 nTextId = STR_BUTTON_TEXT_START + i; - if( STR_TOKEN_ENTRY_TEXT == nTextId ) - nTextId = STR_TOKEN_ENTRY; - m_aButtonTexts[i] = SwResId(nTextId); + const char* pTextId = STR_TOKEN_ARY[i]; + if (pTextId) + m_aButtonTexts[i] = SwResId(pTextId); - sal_uInt32 nHelpId = STR_BUTTON_HELP_TEXT_START + i; - if(STR_TOKEN_HELP_ENTRY_TEXT == nHelpId) - nHelpId = STR_TOKEN_HELP_ENTRY; - m_aButtonHelpTexts[i] = SwResId(nHelpId); + const char* pHelpId = STR_TOKEN_HELP_ARY[i]; + m_aButtonHelpTexts[i] = SwResId(pHelpId); } m_sAccessibleName = SwResId(STR_STRUCTURE); diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src deleted file mode 100644 index 82f561abb841..000000000000 --- a/sw/source/ui/index/cnttab.src +++ /dev/null @@ -1,186 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "index.hrc" -#include "globals.hrc" -#include "cmdid.h" -#include "helpid.h" - -String STR_TITLE -{ - Text [ en-US ] = "Title" ; -}; -String STR_ALPHA -{ - Text [ en-US ] = "Separator" ; -}; -String STR_LEVEL -{ - Text [ en-US ] = "Level " ; -}; -String STR_FILE_NOT_FOUND -{ - Text [ en-US ] = "The file, \"%1\" in the \"%2\" path could not be found."; -}; - -String STR_USER_DEFINED_INDEX -{ - Text [ en-US ] = "User-Defined Index"; -}; - -String STR_NOSORTKEY -{ - Text [ en-US ] = "<None>"; -}; - -String STR_NO_CHAR_STYLE -{ - Text [ en-US ] = "<None>"; -}; - -String STR_DELIM -{ - Text [ en-US ] = "S"; -}; - -String STR_TOKEN_ENTRY_NO -{ - Text [ en-US ] = "E#"; -}; -String STR_TOKEN_ENTRY -{ - Text [ en-US ] = "E"; -}; -String STR_TOKEN_TAB_STOP -{ - Text [ en-US ] = "T"; -}; -String STR_TOKEN_TEXT -{ - Text = ""; - //unused -}; -String STR_TOKEN_PAGE_NUMS -{ - Text [ en-US ] = "#"; -}; -String STR_TOKEN_CHAPTER_INFO -{ - Text [ en-US ] = "CI"; -}; -String STR_TOKEN_LINK_START -{ - Text [ en-US ] = "LS"; -}; -String STR_TOKEN_LINK_END -{ - Text [ en-US ] = "LE"; -}; -String STR_TOKEN_AUTHORITY -{ - Text [ en-US ] = "A"; -}; -String STR_TOKEN_HELP_ENTRY_NO -{ - Text [ en-US ] = "Chapter number"; -}; -String STR_TOKEN_HELP_ENTRY -{ - Text [ en-US ] = "Entry"; -}; -String STR_TOKEN_HELP_TAB_STOP -{ - Text [ en-US ] = "Tab stop"; -}; -String STR_TOKEN_HELP_TEXT -{ - Text [ en-US ] = "Text"; -}; -String STR_TOKEN_HELP_PAGE_NUMS -{ - Text [ en-US ] = "Page number"; -}; -String STR_TOKEN_HELP_CHAPTER_INFO -{ - Text [ en-US ] = "Chapter info"; -}; -String STR_TOKEN_HELP_LINK_START -{ - Text [ en-US ] = "Hyperlink start"; -}; -String STR_TOKEN_HELP_LINK_END -{ - Text [ en-US ] = "Hyperlink end"; -}; -String STR_TOKEN_HELP_AUTHORITY -{ - Text [ en-US ] = "Bibliography entry: "; -}; - -String STR_CHARSTYLE -{ - Text [ en-US ] = "Character Style: "; -}; - -StringArray RES_SRCTYPES -{ - /* ids from tox.hxx - SwTOOElements::Math = 0x01, - SwTOOElements::Chart = 0x02, - TOO_IMAGE = 0x04, - SwTOOElements::Calc = 0x08, - SwTOOElements::DrawImpress= 0x10, - SwTOOElements::Other = 0x80 - */ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Math" ; 1;> ; - < "%PRODUCTNAME Chart" ; 2;> ; - < "%PRODUCTNAME Calc" ; 8;> ; - < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ; - < "Other OLE Objects"; 128;> ; - }; -}; - -String STR_STRUCTURE -{ - Text [ en-US ] = "Structure text"; -}; - -String STR_ADDITIONAL_ACCNAME_STRING1 -{ - Text [ en-US ] = "Press Ctrl+Alt+A to move focus for more operations"; -}; - -String STR_ADDITIONAL_ACCNAME_STRING2 -{ - Text [ en-US ] = "Press left or right arrow to choose the structure controls"; -}; - -String STR_ADDITIONAL_ACCNAME_STRING3 -{ - Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control"; -}; - -String STR_AUTOMARK_TYPE -{ - Text [ en-US ] = "Selection file for the alphabetical index (*.sdi)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src deleted file mode 100644 index 0519dbecc979..000000000000 --- a/sw/source/ui/index/idxmrk.src +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/controldims.hrc> -#include "index.hrc" -#include "helpid.h" -#include "cmdid.h" - -String STR_IDXMRK_EDIT -{ - Text [ en-US ] = "Edit Index Entry" ; -}; - -String STR_IDXMRK_INSERT -{ - Text [ en-US ] = "Insert Index Entry" ; -}; - -String STR_QUERY_CHANGE_AUTH_ENTRY -{ - Text [ en-US ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 91b2a360ead5..7e133a3d0217 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -51,7 +51,7 @@ #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include <swcont.hxx> #include <svl/cjkoptions.hxx> #include <ndtxt.hxx> @@ -1428,6 +1428,44 @@ void SwAuthorMarkPane::Activate() m_pActionBT->Enable(!pSh->HasReadonlySel()); } +namespace +{ + const char* STR_AUTH_FIELD_ARY[] = + { + STR_AUTH_FIELD_IDENTIFIER, + STR_AUTH_FIELD_AUTHORITY_TYPE, + STR_AUTH_FIELD_ADDRESS, + STR_AUTH_FIELD_ANNOTE, + STR_AUTH_FIELD_AUTHOR, + STR_AUTH_FIELD_BOOKTITLE, + STR_AUTH_FIELD_CHAPTER, + STR_AUTH_FIELD_EDITION, + STR_AUTH_FIELD_EDITOR, + STR_AUTH_FIELD_HOWPUBLISHED, + STR_AUTH_FIELD_INSTITUTION, + STR_AUTH_FIELD_JOURNAL, + STR_AUTH_FIELD_MONTH, + STR_AUTH_FIELD_NOTE, + STR_AUTH_FIELD_NUMBER, + STR_AUTH_FIELD_ORGANIZATIONS, + STR_AUTH_FIELD_PAGES, + STR_AUTH_FIELD_PUBLISHER, + STR_AUTH_FIELD_SCHOOL, + STR_AUTH_FIELD_SERIES, + STR_AUTH_FIELD_TITLE, + STR_AUTH_FIELD_TYPE, + STR_AUTH_FIELD_VOLUME, + STR_AUTH_FIELD_YEAR, + STR_AUTH_FIELD_URL, + STR_AUTH_FIELD_CUSTOM1, + STR_AUTH_FIELD_CUSTOM2, + STR_AUTH_FIELD_CUSTOM3, + STR_AUTH_FIELD_CUSTOM4, + STR_AUTH_FIELD_CUSTOM5, + STR_AUTH_FIELD_ISBN + }; +} + SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, const OUString pFields[], SwWrtShell& rSh, @@ -1458,14 +1496,14 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, pFixedTexts[nIndex]->set_grid_left_attach(0); pFixedTexts[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : nRightRow); - pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_START + aCurInfo.nToxField)); + pFixedTexts[nIndex]->SetText(SwResId(STR_AUTH_FIELD_ARY[aCurInfo.nToxField])); pFixedTexts[nIndex]->Show(); pEdits[nIndex] = nullptr; if( AUTH_FIELD_AUTHORITY_TYPE == aCurInfo.nToxField ) { pTypeListBox = VclPtr<ListBox>::Create(bLeft ? pLeft : pRight, WB_DROPDOWN|WB_BORDER|WB_VCENTER); - for(int j = 0; j < AUTH_TYPE_END; j++) - pTypeListBox->InsertEntry(SwResId(STR_AUTH_TYPE_START + j)); + for (int j = 0; j < AUTH_TYPE_END; j++) + pTypeListBox->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[j])); if(!pFields[aCurInfo.nToxField].isEmpty()) { pTypeListBox->SelectEntryPos(pFields[aCurInfo.nToxField].toInt32()); diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index cf6e0786de28..2680d6f3bf5d 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -35,6 +35,7 @@ #include "bookmark.hxx" #include "docsh.hxx" #include "globals.hrc" +#include "strings.hrc" using namespace ::com::sun::star; diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 7eaa028790ff..13a78ef7bc4b 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -36,6 +36,7 @@ #include <swunohelper.hxx> #include <misc.hrc> +#include <strings.hrc> #define PATH_CASE_SENSITIVE 0x01 #define PATH_READONLY 0x02 diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index f1379fe97251..9976982ea2e8 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -71,7 +71,7 @@ #include <memory> -#include "access.hrc" +#include "strings.hrc" using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src deleted file mode 100644 index 7d44cdfebc6b..000000000000 --- a/sw/source/ui/misc/glossary.src +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "misc.hrc" -#include "cmdid.h" -#include "helpid.h" -#include "access.hrc" - -String STR_DOUBLE_SHORTNAME -{ - Text [ en-US ] = "Shortcut name already exists. Please choose another name." ; -}; -String STR_QUERY_DELETE -{ - Text[ en-US ] = "Delete AutoText?" ; -}; -String STR_QUERY_DELETE_GROUP1 -{ - Text [ en-US ] = "Delete the category " ; -}; -String STR_QUERY_DELETE_GROUP2 -{ - Text [ en-US ] = "?" ; -}; -String STR_GLOSSARY -{ - Text [ en-US ] = "AutoText :" ; -}; -String STR_SAVE_GLOSSARY -{ - Text[ en-US ] = "Save AutoText"; -}; -String STR_NO_GLOSSARIES -{ - Text [ en-US ] = "There is no AutoText in this file."; -}; - -String STR_MY_AUTOTEXT -{ - Text[ en-US ] = "My AutoText"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index a8020dd42ff5..cad31b1e29cf 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -32,7 +32,7 @@ #include "linenum.hxx" #include "uitool.hxx" #include <fmtline.hxx> -#include "poolfmt.hrc" +#include "strings.hrc" #include <IDocumentStylePoolAccess.hxx> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d3032c298a4c..1599249cc243 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -45,6 +45,7 @@ #include <svtools/ctrlbox.hxx> #include <helpid.h> #include <globals.hrc> +#include <strings.hrc> #include <misc.hrc> #include <paratr.hxx> diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index f23964aa1378..bd2742abbb8c 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -41,6 +41,7 @@ #include <sfx2/objsh.hxx> #include <globals.hrc> +#include <strings.hrc> #include <misc.hrc> #include <memory> diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index b33fedc9f169..470972e06429 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -38,6 +38,7 @@ #include <wrtsh.hxx> #include <misc.hrc> #include <app.hrc> +#include <strings.hrc> #include <swtable.hxx> #include <node.hxx> #include <tblsel.hxx> diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index bfe7bdfdf8e1..f1a017cc97ff 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -35,7 +35,7 @@ #include <helpid.h> #include <cmdid.h> #include <misc.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <vector> #include <redlndlg.hxx> diff --git a/sw/source/ui/misc/swruler.src b/sw/source/ui/misc/swruler.src deleted file mode 100644 index 5299309ef58f..000000000000 --- a/sw/source/ui/misc/swruler.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "misc.hrc" - -String STR_COMMENTS_LABEL -{ - Text [ en-US ] = "Comments" ; -}; - -String STR_SHOW_COMMENTS -{ - Text [ en-US ] = "Show comments" ; -}; - -String STR_HIDE_COMMENTS -{ - Text [ en-US ] = "Hide comments" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src deleted file mode 100644 index b573c47c5960..000000000000 --- a/sw/source/ui/shells/shells.src +++ /dev/null @@ -1,157 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svx/svxids.hrc> -#include "helpid.h" -#include "shells.hrc" -#include "globals.hrc" -#include "cmdid.h" - -String STR_GRFILTER_OPENERROR -{ - Text [ en-US ] = "Image file cannot be opened" ; -}; -String STR_GRFILTER_IOERROR -{ - Text [ en-US ] = "Image file cannot be read" ; -}; -String STR_GRFILTER_FORMATERROR -{ - Text [ en-US ] = "Unknown image format" ; -}; -String STR_GRFILTER_VERSIONERROR -{ - Text [ en-US ] = "This image file version is not supported" ; -}; -String STR_GRFILTER_FILTERERROR -{ - Text [ en-US ] = "Image filter not found" ; -}; -String STR_GRFILTER_TOOBIG -{ - Text [ en-US ] = "Not enough memory to insert the image." ; -}; -String STR_INSERT_GRAPHIC -{ - Text [ en-US ] = "Insert Image" ; -}; -String STR_REDLINE_COMMENT -{ - Text [ en-US ] = "Comment: " ; -}; -String STR_REDLINE_INSERTED -{ - Text [ en-US ] = "Insertion" ; -}; -String STR_REDLINE_DELETED -{ - Text [ en-US ] = "Deletion" ; -}; -String STR_REDLINE_AUTOFMT -{ - Text [ en-US ] = "AutoCorrect"; -}; - -String STR_REDLINE_FORMATED -{ - Text [ en-US ] = "Formats" ; -}; -String STR_REDLINE_TABLECHG -{ - Text [ en-US ] = "Table Changes" ; -}; -String STR_REDLINE_FMTCOLLSET -{ - Text [ en-US ] = "Applied Paragraph Styles"; -}; -String STR_REDLINE_TITLE -{ - Text [ en-US ] = "AutoCorrect"; -}; -String STR_REDLINE_MSG -{ - Text [ en-US ] = "AutoCorrect completed.\nYou can accept or reject all changes,\nor accept or reject particular changes."; -}; -String STR_REDLINE_ACCEPT_ALL -{ - Text [ en-US ] = "Accept All"; -}; -String STR_REDLINE_REJECT_ALL -{ - Text [ en-US ] = "Reject All"; -}; -String STR_REDLINE_EDIT -{ - Text [ en-US ] = "Edit Changes"; -}; -String STR_PAGE -{ - Text [ en-US ] = "Page " ; -}; -String STR_PAGE_COUNT -{ - Text [ en-US ] = "Page %1 of %2" ; -}; -String STR_PAGE_COUNT_CUSTOM -{ - Text [ en-US ] = "Page %1 of %2 (Page %3)" ; -}; - //Strings for gallery/background -String STR_SWBG_PARAGRAPH -{ - Text [ en-US ] = "Paragraph" ; -}; -String STR_SWBG_GRAPHIC -{ - Text [ en-US ] = "Image" ; -}; -String STR_SWBG_OLE -{ - Text [ en-US ] = "OLE object" ; -}; -String STR_SWBG_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String STR_SWBG_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String STR_SWBG_TABLE_ROW -{ - Text [ en-US ] = "Table row" ; -}; -String STR_SWBG_TABLE_CELL -{ - Text [ en-US ] = "Table cell" ; -}; -String STR_SWBG_PAGE -{ - Text [ en-US ] = "Page" ; -}; -String STR_SWBG_HEADER -{ - Text [ en-US ] = "Header" ; -}; -String STR_SWBG_FOOTER -{ - Text [ en-US ] = "Footer" ; -}; - //End: strings for gallery/background - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/sidebar/PagePropertyPanel.src b/sw/source/ui/sidebar/PagePropertyPanel.src deleted file mode 100644 index f1e244e3a4b6..000000000000 --- a/sw/source/ui/sidebar/PagePropertyPanel.src +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "PropertyPanel.hrc" -#include "helpid.h" - -String STR_MARGIN_TOOLTIP_LEFT -{ - Text [ en-US ] = "Left: "; -}; -String STR_MARGIN_TOOLTIP_RIGHT -{ - Text [ en-US ] = ". Right: "; -}; -String STR_MARGIN_TOOLTIP_INNER -{ - Text [ en-US ] = "Inner: "; -}; -String STR_MARGIN_TOOLTIP_OUTER -{ - Text [ en-US ] = ". Outer: "; -}; -String STR_MARGIN_TOOLTIP_TOP -{ - Text [ en-US ] = ". Top: "; -}; -String STR_MARGIN_TOOLTIP_BOT -{ - Text [ en-US ] = ". Bottom: "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index d37c808cce8a..75d53c645107 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -32,6 +32,7 @@ #include "tblafmt.hxx" #include "app.hrc" +#include "strings.hrc" #include "table.hrc" #include "swabstdlg.hxx" #include <swuiexp.hxx> diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index b1f9298fd594..e4204208ce56 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -37,7 +37,7 @@ #include <fmtrowsplt.hxx> #include <sfx2/htmlmode.hxx> -#include "access.hrc" +#include "strings.hrc" #include <docsh.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 5e5701f3ce80..0bb614d7d79a 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -33,6 +33,7 @@ #include <svtools/accessibilityoptions.hxx> #include <svx/framelinkarray.hxx> #include "app.hrc" +#include "strings.hrc" #include "swmodule.hxx" #include "swtypes.hxx" #include "view.hxx" diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src deleted file mode 100644 index c0a876b64797..000000000000 --- a/sw/source/ui/utlui/poolfmt.src +++ /dev/null @@ -1,834 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "poolfmt.hrc" - - // Format names - -String STR_POOLCHR_FOOTNOTE -{ - Text [ en-US ] = "Footnote Characters" ; -}; -String STR_POOLCHR_PAGENO -{ - Text [ en-US ] = "Page Number" ; -}; -String STR_POOLCHR_LABEL -{ - Text [ en-US ] = "Caption Characters" ; -}; -String STR_POOLCHR_DROPCAPS -{ - Text [ en-US ] = "Drop Caps" ; -}; -String STR_POOLCHR_NUM_LEVEL -{ - Text [ en-US ] = "Numbering Symbols" ; -}; -String STR_POOLCHR_BUL_LEVEL -{ - Text [ en-US ] = "Bullets" ; -}; -String STR_POOLCHR_INET_NORMAL -{ - Text [ en-US ] = "Internet Link" ; -}; -String STR_POOLCHR_INET_VISIT -{ - Text [ en-US ] = "Visited Internet Link" ; -}; -String STR_POOLCHR_JUMPEDIT -{ - Text [ en-US ] = "Placeholder" ; -}; -String STR_POOLCHR_TOXJUMP -{ - Text [ en-US ] = "Index Link" ; -}; -String STR_POOLCHR_ENDNOTE -{ - Text [ en-US ] = "Endnote Characters" ; -}; -String STR_POOLPAGE_LANDSCAPE -{ - Text [ en-US ] = "Landscape" ; -}; -String STR_POOLCHR_LINENUM -{ - Text [ en-US ] = "Line Numbering" ; -}; -String STR_POOLCHR_IDX_MAIN_ENTRY -{ - Text [ en-US ] = "Main Index Entry"; -}; -String STR_POOLCHR_FOOTNOTE_ANCHOR -{ - Text [ en-US ] = "Footnote Anchor"; -}; -String STR_POOLCHR_ENDNOTE_ANCHOR -{ - Text [ en-US ] = "Endnote Anchor"; -}; - - // Drawing templates for HTML -String STR_POOLCHR_HTML_EMPHASIS -{ - Text [ en-US ] = "Emphasis" ; -}; -String STR_POOLCHR_HTML_CITIATION -{ - Text [ en-US ] = "Quotation" ; -}; -String STR_POOLCHR_HTML_STRONG -{ - Text [ en-US ] = "Strong Emphasis" ; -}; -String STR_POOLCHR_HTML_CODE -{ - Text [ en-US ] = "Source Text" ; -}; -String STR_POOLCHR_HTML_SAMPLE -{ - Text [ en-US ] = "Example" ; -}; -String STR_POOLCHR_HTML_KEYBOARD -{ - Text [ en-US ] = "User Entry" ; -}; -String STR_POOLCHR_HTML_VARIABLE -{ - Text [ en-US ] = "Variable" ; -}; -String STR_POOLCHR_HTML_DEFINSTANCE -{ - Text [ en-US ] = "Definition" ; -}; -String STR_POOLCHR_HTML_TELETYPE -{ - Text [ en-US ] = "Teletype" ; -}; - -// Border templates -String STR_POOLFRM_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String STR_POOLFRM_GRAPHIC -{ - Text [ en-US ] = "Graphics" ; -}; -String STR_POOLFRM_OLE -{ - Text [ en-US ] = "OLE" ; -}; -String STR_POOLFRM_FORMEL -{ - Text [ en-US ] = "Formula" ; -}; -String STR_POOLFRM_MARGINAL -{ - Text [ en-US ] = "Marginalia" ; -}; -String STR_POOLFRM_WATERSIGN -{ - Text [ en-US ] = "Watermark" ; -}; -String STR_POOLFRM_LABEL -{ - Text [ en-US ] = "Labels" ; -}; - - // Template names - -// tdf#107211 please don't change STANDARD, except back to "Default" -String STR_POOLCOLL_STANDARD -{ - Text [ en-US ] = "Default Style" ; -}; -String STR_POOLCOLL_TEXT -{ - Text [ en-US ] = "Text Body" ; -}; -String STR_POOLCOLL_TEXT_IDENT -{ - Text [ en-US ] = "First Line Indent" ; -}; -String STR_POOLCOLL_TEXT_NEGIDENT -{ - Text [ en-US ] = "Hanging Indent" ; -}; -String STR_POOLCOLL_TEXT_MOVE -{ - Text [ en-US ] = "Text Body Indent" ; -}; -String STR_POOLCOLL_GREETING -{ - Text [ en-US ] = "Complimentary Close" ; -}; -String STR_POOLCOLL_SIGNATURE -{ - Text [ en-US ] = "Signature" ; -}; -String STR_POOLCOLL_HEADLINE_BASE -{ - Text [ en-US ] = "Heading" ; -}; -String STR_POOLCOLL_NUMBUL_BASE -{ - Text [ en-US ] = "List" ; -}; -String STR_POOLCOLL_REGISTER_BASE -{ - Text [ en-US ] = "Index" ; -}; -String STR_POOLCOLL_CONFRONTATION -{ - Text [ en-US ] = "List Indent" ; -}; -String STR_POOLCOLL_MARGINAL -{ - Text [ en-US ] = "Marginalia" ; -}; -String STR_POOLCOLL_HEADLINE1 -{ - Text [ en-US ] = "Heading 1" ; -}; -String STR_POOLCOLL_HEADLINE2 -{ - Text [ en-US ] = "Heading 2" ; -}; -String STR_POOLCOLL_HEADLINE3 -{ - Text [ en-US ] = "Heading 3" ; -}; -String STR_POOLCOLL_HEADLINE4 -{ - Text [ en-US ] = "Heading 4" ; -}; -String STR_POOLCOLL_HEADLINE5 -{ - Text [ en-US ] = "Heading 5" ; -}; -String STR_POOLCOLL_HEADLINE6 -{ - Text [ en-US ] = "Heading 6" ; -}; -String STR_POOLCOLL_HEADLINE7 -{ - Text [ en-US ] = "Heading 7" ; -}; -String STR_POOLCOLL_HEADLINE8 -{ - Text [ en-US ] = "Heading 8" ; -}; -String STR_POOLCOLL_HEADLINE9 -{ - Text [ en-US ] = "Heading 9" ; -}; -String STR_POOLCOLL_HEADLINE10 -{ - Text [ en-US ] = "Heading 10" ; -}; -String STR_POOLCOLL_NUM_LEVEL1S -{ - Text [ en-US ] = "Numbering 1 Start" ; -}; -String STR_POOLCOLL_NUM_LEVEL1 -{ - Text [ en-US ] = "Numbering 1" ; -}; -String STR_POOLCOLL_NUM_LEVEL1E -{ - Text [ en-US ] = "Numbering 1 End" ; -}; -String STR_POOLCOLL_NUM_NONUM1 -{ - Text [ en-US ] = "Numbering 1 Cont." ; -}; -String STR_POOLCOLL_NUM_LEVEL2S -{ - Text [ en-US ] = "Numbering 2 Start" ; -}; -String STR_POOLCOLL_NUM_LEVEL2 -{ - Text [ en-US ] = "Numbering 2" ; -}; -String STR_POOLCOLL_NUM_LEVEL2E -{ - Text [ en-US ] = "Numbering 2 End" ; -}; -String STR_POOLCOLL_NUM_NONUM2 -{ - Text [ en-US ] = "Numbering 2 Cont." ; -}; -String STR_POOLCOLL_NUM_LEVEL3S -{ - Text [ en-US ] = "Numbering 3 Start" ; -}; -String STR_POOLCOLL_NUM_LEVEL3 -{ - Text [ en-US ] = "Numbering 3" ; -}; -String STR_POOLCOLL_NUM_LEVEL3E -{ - Text [ en-US ] = "Numbering 3 End" ; -}; -String STR_POOLCOLL_NUM_NONUM3 -{ - Text [ en-US ] = "Numbering 3 Cont." ; -}; -String STR_POOLCOLL_NUM_LEVEL4S -{ - Text [ en-US ] = "Numbering 4 Start" ; -}; -String STR_POOLCOLL_NUM_LEVEL4 -{ - Text [ en-US ] = "Numbering 4" ; -}; -String STR_POOLCOLL_NUM_LEVEL4E -{ - Text [ en-US ] = "Numbering 4 End" ; -}; -String STR_POOLCOLL_NUM_NONUM4 -{ - Text [ en-US ] = "Numbering 4 Cont." ; -}; -String STR_POOLCOLL_NUM_LEVEL5S -{ - Text [ en-US ] = "Numbering 5 Start" ; -}; -String STR_POOLCOLL_NUM_LEVEL5 -{ - Text [ en-US ] = "Numbering 5" ; -}; -String STR_POOLCOLL_NUM_LEVEL5E -{ - Text [ en-US ] = "Numbering 5 End" ; -}; -String STR_POOLCOLL_NUM_NONUM5 -{ - Text [ en-US ] = "Numbering 5 Cont." ; -}; -String STR_POOLCOLL_BUL_LEVEL1S -{ - Text [ en-US ] = "List 1 Start" ; -}; -String STR_POOLCOLL_BUL_LEVEL1 -{ - Text [ en-US ] = "List 1" ; -}; -String STR_POOLCOLL_BUL_LEVEL1E -{ - Text [ en-US ] = "List 1 End" ; -}; -String STR_POOLCOLL_BUL_NONUM1 -{ - Text [ en-US ] = "List 1 Cont." ; -}; -String STR_POOLCOLL_BUL_LEVEL2S -{ - Text [ en-US ] = "List 2 Start" ; -}; -String STR_POOLCOLL_BUL_LEVEL2 -{ - Text [ en-US ] = "List 2" ; -}; -String STR_POOLCOLL_BUL_LEVEL2E -{ - Text [ en-US ] = "List 2 End" ; -}; -String STR_POOLCOLL_BUL_NONUM2 -{ - Text [ en-US ] = "List 2 Cont." ; -}; -String STR_POOLCOLL_BUL_LEVEL3S -{ - Text [ en-US ] = "List 3 Start" ; -}; -String STR_POOLCOLL_BUL_LEVEL3 -{ - Text [ en-US ] = "List 3" ; -}; -String STR_POOLCOLL_BUL_LEVEL3E -{ - Text [ en-US ] = "List 3 End" ; -}; -String STR_POOLCOLL_BUL_NONUM3 -{ - Text [ en-US ] = "List 3 Cont." ; -}; -String STR_POOLCOLL_BUL_LEVEL4S -{ - Text [ en-US ] = "List 4 Start" ; -}; -String STR_POOLCOLL_BUL_LEVEL4 -{ - Text [ en-US ] = "List 4" ; -}; -String STR_POOLCOLL_BUL_LEVEL4E -{ - Text [ en-US ] = "List 4 End" ; -}; -String STR_POOLCOLL_BUL_NONUM4 -{ - Text [ en-US ] = "List 4 Cont." ; -}; -String STR_POOLCOLL_BUL_LEVEL5S -{ - Text [ en-US ] = "List 5 Start" ; -}; -String STR_POOLCOLL_BUL_LEVEL5 -{ - Text [ en-US ] = "List 5" ; -}; -String STR_POOLCOLL_BUL_LEVEL5E -{ - Text [ en-US ] = "List 5 End" ; -}; -String STR_POOLCOLL_BUL_NONUM5 -{ - Text [ en-US ] = "List 5 Cont." ; -}; -String STR_POOLCOLL_HEADER -{ - Text [ en-US ] = "Header" ; -}; -String STR_POOLCOLL_HEADERL -{ - Text [ en-US ] = "Header Left" ; -}; -String STR_POOLCOLL_HEADERR -{ - Text [ en-US ] = "Header Right" ; -}; -String STR_POOLCOLL_FOOTER -{ - Text [ en-US ] = "Footer" ; -}; -String STR_POOLCOLL_FOOTERL -{ - Text [ en-US ] = "Footer Left" ; -}; -String STR_POOLCOLL_FOOTERR -{ - Text [ en-US ] = "Footer Right" ; -}; -String STR_POOLCOLL_TABLE -{ - Text [ en-US ] = "Table Contents" ; -}; -String STR_POOLCOLL_TABLE_HDLN -{ - Text [ en-US ] = "Table Heading" ; -}; -String STR_POOLCOLL_FRAME -{ - Text [ en-US ] = "Frame Contents" ; -}; -String STR_POOLCOLL_FOOTNOTE -{ - Text [ en-US ] = "Footnote" ; -}; -String STR_POOLCOLL_ENDNOTE -{ - Text [ en-US ] = "Endnote" ; -}; -String STR_POOLCOLL_LABEL -{ - Text [ en-US ] = "Caption" ; -}; -String STR_POOLCOLL_LABEL_ABB -{ - Text [ en-US ] = "Illustration" ; -}; -String STR_POOLCOLL_LABEL_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String STR_POOLCOLL_LABEL_FRAME -{ - Text [ en-US ] = "Text" ; -}; -String STR_POOLCOLL_LABEL_DRAWING -{ - Text [ en-US ] = "Drawing"; -}; -String STR_POOLCOLL_JAKETADRESS -{ - Text [ en-US ] = "Addressee" ; -}; -String STR_POOLCOLL_SENDADRESS -{ - Text [ en-US ] = "Sender" ; -}; -String STR_POOLCOLL_TOX_IDXH -{ - Text [ en-US ] = "Index Heading" ; -}; -String STR_POOLCOLL_TOX_IDX1 -{ - Text [ en-US ] = "Index 1" ; -}; -String STR_POOLCOLL_TOX_IDX2 -{ - Text [ en-US ] = "Index 2" ; -}; -String STR_POOLCOLL_TOX_IDX3 -{ - Text [ en-US ] = "Index 3" ; -}; -String STR_POOLCOLL_TOX_IDXBREAK -{ - Text [ en-US ] = "Index Separator" ; -}; -String STR_POOLCOLL_TOX_CNTNTH -{ - Text [ en-US ] = "Contents Heading" ; -}; -String STR_POOLCOLL_TOX_CNTNT1 -{ - Text [ en-US ] = "Contents 1" ; -}; -String STR_POOLCOLL_TOX_CNTNT2 -{ - Text [ en-US ] = "Contents 2" ; -}; -String STR_POOLCOLL_TOX_CNTNT3 -{ - Text [ en-US ] = "Contents 3" ; -}; -String STR_POOLCOLL_TOX_CNTNT4 -{ - Text [ en-US ] = "Contents 4" ; -}; -String STR_POOLCOLL_TOX_CNTNT5 -{ - Text [ en-US ] = "Contents 5" ; -}; -String STR_POOLCOLL_TOX_CNTNT6 -{ - Text [ en-US ] = "Contents 6" ; -}; -String STR_POOLCOLL_TOX_CNTNT7 -{ - Text [ en-US ] = "Contents 7" ; -}; -String STR_POOLCOLL_TOX_CNTNT8 -{ - Text [ en-US ] = "Contents 8" ; -}; -String STR_POOLCOLL_TOX_CNTNT9 -{ - Text [ en-US ] = "Contents 9" ; -}; -String STR_POOLCOLL_TOX_CNTNT10 -{ - Text [ en-US ] = "Contents 10" ; -}; -String STR_POOLCOLL_TOX_USERH -{ - Text [ en-US ] = "User Index Heading" ; -}; -String STR_POOLCOLL_TOX_USER1 -{ - Text [ en-US ] = "User Index 1" ; -}; -String STR_POOLCOLL_TOX_USER2 -{ - Text [ en-US ] = "User Index 2" ; -}; -String STR_POOLCOLL_TOX_USER3 -{ - Text [ en-US ] = "User Index 3" ; -}; -String STR_POOLCOLL_TOX_USER4 -{ - Text [ en-US ] = "User Index 4" ; -}; -String STR_POOLCOLL_TOX_USER5 -{ - Text [ en-US ] = "User Index 5" ; -}; -String STR_POOLCOLL_TOX_USER6 -{ - Text [ en-US ] = "User Index 6" ; -}; -String STR_POOLCOLL_TOX_USER7 -{ - Text [ en-US ] = "User Index 7" ; -}; -String STR_POOLCOLL_TOX_USER8 -{ - Text [ en-US ] = "User Index 8" ; -}; -String STR_POOLCOLL_TOX_USER9 -{ - Text [ en-US ] = "User Index 9" ; -}; -String STR_POOLCOLL_TOX_USER10 -{ - Text [ en-US ] = "User Index 10" ; -}; -String STR_POOLCOLL_TOX_CITATION -{ - Text [ en-US ] = "Citation" ; -}; -String STR_POOLCOLL_TOX_ILLUSH -{ - Text [ en-US ] = "Illustration Index Heading"; -}; -String STR_POOLCOLL_TOX_ILLUS1 -{ - Text [ en-US ] = "Illustration Index 1"; -}; -String STR_POOLCOLL_TOX_OBJECTH -{ - Text [ en-US ] = "Object Index Heading"; -}; -String STR_POOLCOLL_TOX_OBJECT1 -{ - Text [ en-US ] = "Object Index 1"; -}; -String STR_POOLCOLL_TOX_TABLESH -{ - Text [ en-US ] = "Table Index Heading"; -}; -String STR_POOLCOLL_TOX_TABLES1 -{ - Text [ en-US ] = "Table Index 1"; -}; -String STR_POOLCOLL_TOX_AUTHORITIESH -{ - Text [ en-US ] = "Bibliography Heading"; -}; -String STR_POOLCOLL_TOX_AUTHORITIES1 -{ - Text [ en-US ] = "Bibliography 1"; -}; - -String STR_POOLCOLL_DOC_TITEL -{ - Text [ en-US ] = "Title" ; - Text [ x-comment ] = "Document title style, not to be confused with Heading style" ; -}; -String STR_POOLCOLL_DOC_SUBTITEL -{ - Text [ en-US ] = "Subtitle" ; -}; -String STR_POOLCOLL_HTML_BLOCKQUOTE -{ - Text [ en-US ] = "Quotations" ; -}; -String STR_POOLCOLL_HTML_PRE -{ - Text [ en-US ] = "Preformatted Text" ; -}; -String STR_POOLCOLL_HTML_HR -{ - Text [ en-US ] = "Horizontal Line" ; -}; -String STR_POOLCOLL_HTML_DD -{ - Text [ en-US ] = "List Contents" ; -}; -String STR_POOLCOLL_HTML_DT -{ - Text [ en-US ] = "List Heading" ; -}; -//page style names -String STR_POOLPAGE_STANDARD -{ - Text [ en-US ] = "Default Style" ; -}; -String STR_POOLPAGE_FIRST -{ - Text [ en-US ] = "First Page" ; -}; -String STR_POOLPAGE_LEFT -{ - Text [ en-US ] = "Left Page" ; -}; -String STR_POOLPAGE_RIGHT -{ - Text [ en-US ] = "Right Page" ; -}; -String STR_POOLPAGE_JAKET -{ - Text [ en-US ] = "Envelope" ; -}; -String STR_POOLPAGE_REGISTER -{ - Text [ en-US ] = "Index" ; -}; -String STR_POOLPAGE_HTML -{ - Text [ en-US ] = "HTML" ; -}; -String STR_POOLPAGE_FOOTNOTE -{ - Text [ en-US ] = "Footnote" ; -}; -String STR_POOLPAGE_ENDNOTE -{ - Text [ en-US ] = "Endnote" ; -}; - -// Numbering rules - -String STR_POOLNUMRULE_NUM1 -{ - Text [ en-US ] = "Numbering 1" ; -}; -String STR_POOLNUMRULE_NUM2 -{ - Text [ en-US ] = "Numbering 2" ; -}; -String STR_POOLNUMRULE_NUM3 -{ - Text [ en-US ] = "Numbering 3" ; -}; -String STR_POOLNUMRULE_NUM4 -{ - Text [ en-US ] = "Numbering 4" ; -}; -String STR_POOLNUMRULE_NUM5 -{ - Text [ en-US ] = "Numbering 5" ; -}; -String STR_POOLNUMRULE_BUL1 -{ - Text [ en-US ] = "List 1" ; -}; -String STR_POOLNUMRULE_BUL2 -{ - Text [ en-US ] = "List 2" ; -}; -String STR_POOLNUMRULE_BUL3 -{ - Text [ en-US ] = "List 3" ; -}; -String STR_POOLNUMRULE_BUL4 -{ - Text [ en-US ] = "List 4" ; -}; -String STR_POOLNUMRULE_BUL5 -{ - Text [ en-US ] = "List 5" ; -}; - -String STR_POOLCHR_RUBYTEXT -{ - Text [ en-US ] = "Rubies"; -}; -String STR_COLUMN_VALUESET_ITEM0 -{ - Text [ en-US ] = "1 column"; -}; -String STR_COLUMN_VALUESET_ITEM1 -{ - Text [ en-US ] = "2 columns with equal size"; -}; -String STR_COLUMN_VALUESET_ITEM2 -{ - Text [ en-US ] = "3 columns with equal size"; -}; -String STR_COLUMN_VALUESET_ITEM3 -{ - Text [ en-US ] = "2 columns with different size (left > right)"; -}; -String STR_COLUMN_VALUESET_ITEM4 -{ - Text [ en-US ] = "2 columns with different size (left < right)"; -}; -String STR_POOLCHR_VERT_NUM -{ - Text [ en-US ] = "Vertical Numbering Symbols"; -}; - -// Table styles - -String STR_TABSTYLE_DEFAULT -{ - Text [ en-US ] = "Default Style"; -}; -String STR_TABSTYLE_3D -{ - Text [ en-US ] = "3D"; -}; -String STR_TABSTYLE_BLACK1 -{ - Text [ en-US ] = "Black 1"; -}; -String STR_TABSTYLE_BLACK2 -{ - Text [ en-US ] = "Black 2"; -}; -String STR_TABSTYLE_BLUE -{ - Text [ en-US ] = "Blue"; -}; -String STR_TABSTYLE_BROWN -{ - Text [ en-US ] = "Brown"; -}; -String STR_TABSTYLE_CURRENCY -{ - Text [ en-US ] = "Currency"; -}; -String STR_TABSTYLE_CURRENCY_3D -{ - Text [ en-US ] = "Currency 3D"; -}; -String STR_TABSTYLE_CURRENCY_GRAY -{ - Text [ en-US ] = "Currency Gray"; -}; -String STR_TABSTYLE_CURRENCY_LAVENDER -{ - Text [ en-US ] = "Currency Lavender"; -}; -String STR_TABSTYLE_CURRENCY_TURQUOISE -{ - Text [ en-US ] = "Currency Turquoise"; -}; -String STR_TABSTYLE_GRAY -{ - Text [ en-US ] = "Gray"; -}; -String STR_TABSTYLE_GREEN -{ - Text [ en-US ] = "Green"; -}; -String STR_TABSTYLE_LAVENDER -{ - Text [ en-US ] = "Lavender"; -}; -String STR_TABSTYLE_RED -{ - Text [ en-US ] = "Red"; -}; -String STR_TABSTYLE_TURQUOISE -{ - Text [ en-US ] = "Turquoise"; -}; -String STR_TABSTYLE_YELLOW -{ - Text [ en-US ] = "Yellow"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index c5002b382f33..e9b4fbb226de 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -20,8 +20,7 @@ #include <swtypes.hxx> #include <globals.hrc> -#include <utlui.hrc> -#include <../../uibase/utlui/unotools.hrc> +#include <strings.hrc> #include <unoprnms.hxx> #include <osl/diagnose.h> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src deleted file mode 100644 index c8d54c7a109d..000000000000 --- a/sw/source/ui/utlui/utlui.src +++ /dev/null @@ -1,253 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "globals.hrc" -#include "utlui.hrc" -#include "helpid.h" -#include "comcore.hrc" - -StringArray RID_SHELLRES_AUTOFMTSTRS -{ - ItemList [ en-US ] = - { - < "Remove empty paragraphs" ; > ; - < "Use replacement table" ; > ; - < "Correct TWo INitial CApitals" ; > ; - < "Capitalize first letter of sentences" ; > ; - < "Replace \"standard\" quotes with %1 \bcustom%2 quotes" ; > ; - < "Replace Custom Styles" ; > ; - < "Bullets replaced"; > ; - < "Automatic _underline_"; > ; - < "Automatic *bold*"; > ; - < "Replace 1/2 ... with ½ ..." ; > ; - < "URL recognition" ; > ; - < "Replace dashes" ; > ; - < "Replace 1st... with 1^st..." ; > ; - < "Combine single line paragraphs"; > ; - < "Set \"Text body\" Style"; > ; - < "Set \"Text body indent\" Style"; > ; - < "Set \"Hanging indent\" Style"; > ; - < "Set \"Text body indent\" Style"; > ; - < "Set \"Heading $(ARG1)\" Style"; > ; - < "Set \"Bullet\" or \"Numbering\" Style"; > ; - < "Combine paragraphs"; > ; - < "Add non breaking space"; > ; - }; -}; - -// Miscellaneous - -String STR_EVENT_OBJECT_SELECT -{ - Text [ en-US ] = "Click object" ; -}; -String STR_EVENT_START_INS_GLOSSARY -{ - Text [ en-US ] = "Before inserting AutoText"; -}; -String STR_EVENT_END_INS_GLOSSARY -{ - Text [ en-US ] = "After inserting AutoText"; -}; -String STR_EVENT_MOUSEOVER_OBJECT -{ - Text [ en-US ] = "Mouse over object" ; -}; -String STR_EVENT_MOUSECLICK_OBJECT -{ - Text [ en-US ] = "Trigger hyperlink" ; -}; -String STR_EVENT_MOUSEOUT_OBJECT -{ - Text [ en-US ] = "Mouse leaves object" ; -}; -String STR_EVENT_IMAGE_LOAD -{ - Text [ en-US ] = "Image loaded successfully" ; -}; -String STR_EVENT_IMAGE_ABORT -{ - Text [ en-US ] = "Image loading terminated" ; -}; -String STR_EVENT_IMAGE_ERROR -{ - Text [ en-US ] = "Could not load image" ; -}; -String STR_EVENT_FRM_KEYINPUT_A -{ - Text [ en-US ] = "Input of alphanumeric characters" ; -}; -String STR_EVENT_FRM_KEYINPUT_NOA -{ - Text [ en-US ] = "Input of non-alphanumeric characters" ; -}; -String STR_EVENT_FRM_RESIZE -{ - Text [ en-US ] = "Resize frame" ; -}; -String STR_EVENT_FRM_MOVE -{ - Text [ en-US ] = "Move frame" ; -}; -String STR_CONTENT_TYPE_OUTLINE -{ - Text [ en-US ] = "Headings" ; -}; -String STR_CONTENT_TYPE_TABLE -{ - Text [ en-US ] = "Tables" ; -}; -String STR_CONTENT_TYPE_FRAME -{ - Text [ en-US ] = "Text frames" ; -}; -String STR_CONTENT_TYPE_GRAPHIC -{ - Text [ en-US ] = "Images" ; -}; -String STR_CONTENT_TYPE_OLE -{ - Text [ en-US ] = "OLE objects" ; -}; -String STR_CONTENT_TYPE_BOOKMARK -{ - Text [ en-US ] = "Bookmarks" ; -}; -String STR_CONTENT_TYPE_REGION -{ - Text [ en-US ] = "Sections" ; -}; -String STR_CONTENT_TYPE_URLFIELD -{ - Text [ en-US ] = "Hyperlinks" ; -}; -String STR_CONTENT_TYPE_REFERENCE -{ - Text [ en-US ] = "References" ; -}; -String STR_CONTENT_TYPE_INDEX -{ - Text [ en-US ] = "Indexes" ; -}; -String STR_CONTENT_TYPE_DRAWOBJECT -{ - Text [ en-US ] = "Drawing objects" ; -}; -String STR_CONTENT_TYPE_POSTIT -{ - Text [ en-US ] = "Comments" ; -}; -String STR_IDXEXAMPLE_IDXTXT_HEADING1 -{ - Text [ en-US ] = "Heading 1" ; -}; -String STR_IDXEXAMPLE_IDXTXT_ENTRY1 -{ - Text [ en-US ] = "This is the content from the first chapter. This is a user directory entry." ; -}; -String STR_IDXEXAMPLE_IDXTXT_HEADING11 -{ - Text [ en-US ] = "Heading 1.1" ; -}; -String STR_IDXEXAMPLE_IDXTXT_ENTRY11 -{ - Text [ en-US ] = "This is the content from chapter 1.1. This is the entry for the table of contents." ; -}; -String STR_IDXEXAMPLE_IDXTXT_HEADING12 -{ - Text [ en-US ] = "Heading 1.2" ; -}; -String STR_IDXEXAMPLE_IDXTXT_ENTRY12 -{ - Text [ en-US ] = "This is the content from chapter 1.2. This keyword is a main entry." ; -}; -String STR_IDXEXAMPLE_IDXTXT_TABLE1 -{ - Text [ en-US ] = "Table 1: This is table 1" ; -}; -String STR_IDXEXAMPLE_IDXTXT_IMAGE1 -{ - Text [ en-US ] = "Image 1: This is image 1" ; -}; -String STR_CONTENT_TYPE_SINGLE_OUTLINE -{ - Text [ en-US ] = "Heading" ; -}; -String STR_CONTENT_TYPE_SINGLE_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String STR_CONTENT_TYPE_SINGLE_FRAME -{ - Text [ en-US ] = "Text frame" ; -}; -String STR_CONTENT_TYPE_SINGLE_GRAPHIC -{ - Text [ en-US ] = "Image" ; -}; -String STR_CONTENT_TYPE_SINGLE_OLE -{ - Text [ en-US ] = "OLE object" ; -}; -String STR_CONTENT_TYPE_SINGLE_BOOKMARK -{ - Text [ en-US ] = "Bookmark" ; -}; -String STR_CONTENT_TYPE_SINGLE_REGION -{ - Text [ en-US ] = "Section" ; -}; -String STR_CONTENT_TYPE_SINGLE_URLFIELD -{ - Text [ en-US ] = "Hyperlink" ; -}; -String STR_CONTENT_TYPE_SINGLE_REFERENCE -{ - Text [ en-US ] = "Reference" ; -}; -String STR_CONTENT_TYPE_SINGLE_INDEX -{ - Text [ en-US ] = "Index" ; -}; -String STR_CONTENT_TYPE_SINGLE_POSTIT -{ - Text [ en-US ] = "Comment" ; -}; -String STR_CONTENT_TYPE_SINGLE_DRAWOBJECT -{ - Text [ en-US ] = "Draw object" ; -}; -String STR_DEFINE_NUMBERFORMAT -{ - Text [ en-US ] = "Additional formats..." ; -}; -String RID_STR_SYSTEM -{ - Text [ en-US ] = "[System]"; -}; -String STR_MULT_INTERACT_HYPH_WARN -{ - Text [ en-US ] = "The interactive hyphenation is already active\nin a different document"; -}; -String STR_HYPH_TITLE -{ - Text [ en-US ] = "Hyphenation"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src deleted file mode 100644 index 9e3730b94d4a..000000000000 --- a/sw/source/ui/web/web.src +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svx/svxids.hrc> -#include "globals.hrc" -#include "cmdid.h" -#include "web.hrc" -#include "helpid.h" -#include "cfgid.h" - -String STR_HUMAN_SWWEBDOC_NAME -{ - Text [ en-US ] = "HTML" ; -}; -String STR_WRITER_WEBDOC_FULLTYPE -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION HTML Document"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |