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 /cui/source/options | |
| parent | osl: Unix pipe converted from OSL_ASSERT to assert/SAL_WARNs (diff) | |
| download | core-00657aef09d854c74fb426a935a3e8b1fc390bb0.tar.gz core-00657aef09d854c74fb426a935a3e8b1fc390bb0.zip | |
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 'cui/source/options')
27 files changed, 153 insertions, 958 deletions
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 8a2e95793b16..4e8666cdac1a 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -22,6 +22,7 @@ #include "cfgchart.hxx" #include <dialmgr.hxx> #include <cuires.hrc> +#include <strings.hrc> #define ROW_COLOR_COUNT 12 diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 850a05d8d2c2..ae3a2538d386 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -25,6 +25,7 @@ #include <svl/eitem.hxx> #include <cuires.hrc> #include "helpid.hrc" +#include <strings.hrc> #include <dialmgr.hxx> using ::svt::EditBrowseBox; diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src deleted file mode 100644 index 5f441079f37f..000000000000 --- a/cui/source/options/connpooloptions.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 <cuires.hrc> - -String RID_SVXSTR_DRIVER_NAME -{ - Text [ en-US ] = "Driver name"; -}; -String RID_SVXSTR_POOLED_FLAG -{ - Text [ en-US ] = "Pool"; -}; -String RID_SVXSTR_POOL_TIMEOUT -{ - Text [ en-US ] = "Timeout"; -}; -String RID_SVXSTR_YES -{ - Text [ en-US ] = "Yes"; -}; -String RID_SVXSTR_NO -{ - Text [ en-US ] = "No"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index ce2a4a94dd4b..df307e814396 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -25,6 +25,7 @@ #include <svtools/editbrowsebox.hxx> #include "svtools/treelistentry.hxx" #include <cuires.hrc> +#include <strings.hrc> #include <bitmaps.hlst> #include <vcl/field.hxx> #include <vcl/layout.hxx> @@ -442,5 +443,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src deleted file mode 100644 index 7362be056d51..000000000000 --- a/cui/source/options/dbregister.src +++ /dev/null @@ -1,32 +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 <cuires.hrc> - -String RID_SVXSTR_TYPE -{ - Text [ en-US ] = "Registered name" ; -}; - -String RID_SVXSTR_PATH -{ - Text [ en-US ] = "Database file" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index eacfc0319f80..6bb15f5b3aae 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <comphelper/processfactory.hxx> #include <cuires.hrc> +#include <strings.hrc> #include <svl/filenotation.hxx> #include <vcl/layout.hxx> #include <ucbhelper/content.hxx> diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src deleted file mode 100644 index 6e93f0c373fa..000000000000 --- a/cui/source/options/doclinkdialog.src +++ /dev/null @@ -1,42 +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 <cuires.hrc> - -String STR_LINKEDDOC_DOESNOTEXIST -{ - Text [ en-US ] = "The file\n$file$\ndoes not exist."; -}; - -String STR_LINKEDDOC_NO_SYSTEM_FILE -{ - Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system."; -}; - -String STR_NAME_CONFLICT -{ - Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name."; -}; - -String RID_SVXSTR_QUERY_DELETE_CONFIRM -{ - Text [ en-US ] = "Do you want to delete the entry?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src deleted file mode 100644 index f5ae78182f52..000000000000 --- a/cui/source/options/optchart.src +++ /dev/null @@ -1,32 +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 <cuires.hrc> -#include "helpid.hrc" - -// tab page for setting the default colors used for new charts - -String RID_SVXSTR_DIAGRAM_ROW -{ - // $(ROW) can be a number or the caption of the row in quotes - - Text [ en-US ] = "Data Series $(ROW)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 33ea45e806c0..1a64c728eddb 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -39,6 +39,7 @@ #include <dialmgr.hxx> #include "optcolor.hxx" #include <cuires.hrc> +#include <strings.hrc> #include <svx/dlgutil.hxx> using namespace ::com::sun::star; @@ -283,7 +284,6 @@ private: // ctor for default groups // rParent: parent window (ColorConfigWindow_Impl) // eGroup: which group is this? -// rResMgr: resource manager ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) : m_pText(pText) { diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src deleted file mode 100644 index 2a9af27e71b1..000000000000 --- a/cui/source/options/optcolor.src +++ /dev/null @@ -1,41 +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 <sfx2/sfx.hrc> -#include "helpid.hrc" -#include <cuires.hrc> - -String RID_SVXSTR_COLOR_CONFIG_DELETE -{ - Text [ en-US ] = "Do you really want to delete the color scheme?" ; -}; -String RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE -{ - Text [ en-US ] = "Color Scheme Deletion" ; -}; -String RID_SVXSTR_COLOR_CONFIG_SAVE1 -{ - Text [ en-US ] = "Save scheme" ; -}; -String RID_SVXSTR_COLOR_CONFIG_SAVE2 -{ - Text [ en-US ] = "Name of color scheme" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index a8beb91cfa46..9f0f8bd434a4 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -34,6 +34,7 @@ #include <linguistic/misc.hxx> #include <cuires.hrc> +#include <strings.hrc> #include "optdict.hxx" #include <dialmgr.hxx> #include <svx/svxerr.hxx> @@ -177,7 +178,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) xNewDic = nullptr; // error: couldn't create new dictionary SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(), - this, RID_SVXERRCTX, &DIALOG_MGR() ); + this, getRID_SVXERRCTX(), &SvxResLocale() ); ErrorHandler::HandleError( *new StringErrorInfo( ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) ); EndDialog(); diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src deleted file mode 100644 index eeae6311835a..000000000000 --- a/cui/source/options/optdict.src +++ /dev/null @@ -1,38 +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 "helpid.hrc" -#include <cuires.hrc> - -String RID_SVXSTR_OPT_DOUBLE_DICTS -{ - Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ; -}; - -String STR_MODIFY -{ - Text [ en-US ] = "~Replace" ; -}; - -String RID_SVXSTR_CONFIRM_SET_LANGUAGE -{ - Text [ en-US ] = "Do you want to change the '%1' dictionary language?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8723c18e77be..6964977d3a39 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -23,6 +23,7 @@ #include "optfltr.hxx" #include <cuires.hrc> #include "helpid.hrc" +#include "strings.hrc" #include <dialmgr.hxx> #include "svtools/svlbitm.hxx" diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src deleted file mode 100644 index 41b378c05342..000000000000 --- a/cui/source/options/optfltr.src +++ /dev/null @@ -1,51 +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 <cuires.hrc> - -String RID_SVXSTR_HEADER1 -{ - Text [ en-US ] = "[L]"; -}; -String RID_SVXSTR_HEADER2 -{ - Text [ en-US ] = "[S]"; -}; -String RID_SVXSTR_CHG_MATH -{ - Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse"; -}; -String RID_SVXSTR_CHG_WRITER -{ - Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse"; -}; -String RID_SVXSTR_CHG_CALC -{ - Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse"; -}; -String RID_SVXSTR_CHG_IMPRESS -{ - Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse"; -}; -String RID_SVXSTR_CHG_SMARTART -{ - Text [ en-US ] = "SmartArt to %PRODUCTNAME shapes or reverse"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index c28e7aecc901..db2ff453dbd4 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -54,6 +54,7 @@ #include <svx/ofaitem.hxx> #include <sfx2/htmlmode.hxx> #include <svx/svxids.hrc> +#include <strings.hrc> #include <com/sun/star/security/DocumentDigitalSignatures.hpp> diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src deleted file mode 100644 index e1a9ee0f7800..000000000000 --- a/cui/source/options/optinet2.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 <sfx2/sfx.hrc> -#include "helpid.hrc" -#include <cuires.hrc> - -String RID_SVXSTR_OPT_PROXYPORTS -{ - Text [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is 65535."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 732c616df0c5..8141a5b4ccc0 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -33,6 +33,7 @@ #include <cuires.hrc> #include "helpid.hrc" +#include <strings.hrc> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src deleted file mode 100644 index f4e931a9fbd8..000000000000 --- a/cui/source/options/optjava.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 <cuires.hrc> -#include "helpid.hrc" - -String RID_SVXSTR_JRE_NOT_RECOGNIZED -{ - Text [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ; -}; - -String RID_SVXSTR_JRE_FAILED_VERSION -{ - Text [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ; -}; - -String RID_SVXSTR_OPTIONS_RESTART -{ - Text [ en-US ] = "Please restart %PRODUCTNAME now so the new or modified values can take effect." ; -}; - -String RID_SVXSTR_JAVA_START_PARAM -{ - Text [ en-US ] = "Edit Parameter" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index a67c458e43ec..1c85f8469c07 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -58,6 +58,7 @@ #include <dialmgr.hxx> #include <cuires.hrc> #include "helpid.hrc" +#include <strings.hrc> #include <ucbhelper/content.hxx> diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src deleted file mode 100644 index 084f3a902de6..000000000000 --- a/cui/source/options/optlingu.src +++ /dev/null @@ -1,87 +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 "helpid.hrc" - -#include <svtools/controldims.hrc> -#include <sfx2/sfx.hrc> -#include <cuires.hrc> - -String RID_SVXSTR_SPELL -{ - Text [ en-US ] = "Spelling"; -}; - -String RID_SVXSTR_HYPH -{ - Text [ en-US ] = "Hyphenation"; -}; - -String RID_SVXSTR_THES -{ - Text [ en-US ] = "Thesaurus"; -}; - -String RID_SVXSTR_GRAMMAR -{ - Text [ en-US ] = "Grammar"; -}; - -String RID_SVXSTR_CAPITAL_WORDS -{ - Text [ en-US ] = "Check uppercase words"; -}; -String RID_SVXSTR_WORDS_WITH_DIGITS -{ - Text [ en-US ] = "Check words with numbers "; -}; -String RID_SVXSTR_SPELL_SPECIAL -{ - Text [ en-US ] = "Check special regions"; -}; -String RID_SVXSTR_SPELL_AUTO -{ - Text [ en-US ] = "Check spelling as you type"; -}; -String RID_SVXSTR_GRAMMAR_AUTO -{ - Text [ en-US ] = "Check grammar as you type"; -}; -String RID_SVXSTR_NUM_MIN_WORDLEN -{ - Text [ en-US ] = "Minimal number of characters for hyphenation: "; -}; -String RID_SVXSTR_NUM_PRE_BREAK -{ - Text [ en-US ] = "Characters before line break: "; -}; -String RID_SVXSTR_NUM_POST_BREAK -{ - Text [ en-US ] = "Characters after line break: "; -}; -String RID_SVXSTR_HYPH_AUTO -{ - Text [ en-US ] = "Hyphenate without inquiry"; -}; -String RID_SVXSTR_HYPH_SPECIAL -{ - Text [ en-US ] = "Hyphenate special regions"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index b99cd7f04767..0fb1e1a172ee 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/util/XChangesBatch.hpp> #include <cuires.hrc> +#include <strings.hrc> #include <dialmgr.hxx> #include "optopencl.hxx" #include <svtools/treelistentry.hxx> diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index ab292153757f..08b0243a6f02 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -36,6 +36,7 @@ #include <dialmgr.hxx> #include <cuires.hrc> #include "helpid.hrc" +#include "strings.hrc" #include <comphelper/configuration.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -276,7 +277,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) return true; } - void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); @@ -292,51 +292,74 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) continue; + const char* pId = nullptr; + switch (i) { case SvtPathOptions::PATH_AUTOCORRECT: + pId = RID_SVXSTR_KEY_AUTOCORRECT_DIR; + break; case SvtPathOptions::PATH_AUTOTEXT: + pId = RID_SVXSTR_KEY_GLOSSARY_PATH; + break; case SvtPathOptions::PATH_BACKUP: + pId = RID_SVXSTR_KEY_BACKUP_PATH; + break; case SvtPathOptions::PATH_GALLERY: + pId = RID_SVXSTR_KEY_GALLERY_DIR; + break; case SvtPathOptions::PATH_GRAPHIC: + pId = RID_SVXSTR_KEY_GRAPHICS_PATH; + break; case SvtPathOptions::PATH_TEMP: + pId = RID_SVXSTR_KEY_TEMP_PATH; + break; case SvtPathOptions::PATH_TEMPLATE: + pId = RID_SVXSTR_KEY_TEMPLATE_PATH; + break; case SvtPathOptions::PATH_DICTIONARY: + pId = RID_SVXSTR_KEY_DICTIONARY_PATH; + break; case SvtPathOptions::PATH_CLASSIFICATION: + pId = RID_SVXSTR_KEY_CLASSIFICATION_PATH; + break; #if OSL_DEBUG_LEVEL > 1 case SvtPathOptions::PATH_LINGUISTIC: + pId = RID_SVXSTR_KEY_LINGUISTIC_DIR; + break; #endif case SvtPathOptions::PATH_WORK: + pId = RID_SVXSTR_KEY_WORK_PATH; + break; + } + + if (pId) + { + OUString aStr(CuiResId(pId)); + + nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); + aStr += "\t"; + OUString sInternal, sUser, sWritable; + bool bReadOnly = false; + GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); + OUString sTmpPath = sUser; + if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) + sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER); + sTmpPath += sWritable; + const OUString aValue = Convert_Impl( sTmpPath ); + nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue)); + aStr += aValue; + SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); + if ( bReadOnly ) { - sal_uInt32 nId = RID_SVXSTR_PATH_NAME_START + i; - if (i == SvtPathOptions::PATH_CLASSIFICATION) - // RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly. - nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH; - OUString aStr(CuiResId(nId)); - - nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); - aStr += "\t"; - OUString sInternal, sUser, sWritable; - bool bReadOnly = false; - GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); - OUString sTmpPath = sUser; - if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) - sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER); - sTmpPath += sWritable; - const OUString aValue = Convert_Impl( sTmpPath ); - nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue)); - aStr += aValue; - SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); - if ( bReadOnly ) - { - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); - } - PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); - pPathImpl->sUserPath = sUser; - pPathImpl->sWritablePath = sWritable; - pEntry->SetUserData( pPathImpl ); + pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); } + PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); + pPathImpl->sUserPath = sUser; + pPathImpl->sWritablePath = sWritable; + pEntry->SetUserData( pPathImpl ); } + } long aTabs[] = {3, 0, 0, 0}; diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src deleted file mode 100644 index 8eae97173416..000000000000 --- a/cui/source/options/optpath.src +++ /dev/null @@ -1,120 +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 <cuires.hrc> -#include <sfx2/sfx.hrc> -#include "helpid.hrc" - -String RID_SVXSTR_KEY_CONFIG_DIR -{ - Text [ en-US ] = "Configuration" ; -}; -String RID_SVXSTR_KEY_WORK_PATH -{ - Text [ en-US ] = "My Documents" ; -}; -String RID_SVXSTR_KEY_GRAPHICS_PATH -{ - Text [ en-US ] = "Images" ; -}; -String RID_SVXSTR_KEY_BITMAP_PATH -{ - Text [ en-US ] = "Icons" ; -}; -String RID_SVXSTR_KEY_BASIC_PATH -{ - Text = "BASIC" ; -}; -String RID_SVXSTR_KEY_PALETTE_PATH -{ - Text [ en-US ] = "Palettes" ; -}; -String RID_SVXSTR_KEY_BACKUP_PATH -{ - Text [ en-US ] = "Backups" ; -}; -String RID_SVXSTR_KEY_MODULES_PATH -{ - Text [ en-US ] = "Modules" ; -}; -String RID_SVXSTR_KEY_TEMPLATE_PATH -{ - Text [ en-US ] = "Templates" ; -}; -String RID_SVXSTR_KEY_GLOSSARY_PATH -{ - Text [ en-US ] = "AutoText"; -}; -String RID_SVXSTR_KEY_DICTIONARY_PATH -{ - Text [ en-US ] = "Dictionaries" ; -}; -String RID_SVXSTR_KEY_HELP_DIR -{ - Text [ en-US ] = "Help" ; -}; -String RID_SVXSTR_KEY_GALLERY_DIR -{ - Text [ en-US ] = "Gallery" ; -}; -String RID_SVXSTR_KEY_STORAGE_DIR -{ - Text [ en-US ] = "Message Storage" ; -}; -String RID_SVXSTR_KEY_TEMP_PATH -{ - Text [ en-US ] = "Temporary files"; -}; -String RID_SVXSTR_KEY_PLUGINS_PATH -{ - Text [ en-US ] = "Plug-ins"; -}; -String RID_SVXSTR_KEY_FAVORITES_DIR -{ - Text [ en-US ] = "Folder Bookmarks"; -}; -String RID_SVXSTR_KEY_FILTER_PATH -{ - Text [ en-US ] = "Filters"; -}; -String RID_SVXSTR_KEY_ADDINS_PATH -{ - Text [ en-US ] = "Add-ins"; -}; -String RID_SVXSTR_KEY_USERCONFIG_PATH -{ - Text [ en-US ] = "User Configuration"; -}; -String RID_SVXSTR_KEY_USERDICTIONARY_DIR -{ - Text [ en-US ] = "User-defined dictionaries"; -}; -String RID_SVXSTR_KEY_CLASSIFICATION_PATH -{ - Text [ en-US ] = "Classification" ; -}; -String RID_SVXSTR_KEY_AUTOCORRECT_DIR -{ - Text [ en-US ] = "AutoCorrect"; -}; -String RID_SVXSTR_KEY_LINGUISTIC_DIR -{ - Text [ en-US ] = "Writing aids"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 66f663d68fb4..9594e6c644c0 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -29,6 +29,8 @@ #include <vcl/mnemonic.hxx> #include <dialmgr.hxx> #include "cuires.hrc" +#include "strings.hrc" +#include "personalization.hrc" #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> @@ -36,7 +38,6 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include "ucbhelper/content.hxx" #include <comphelper/simplefileaccessinteraction.hxx> -#include <tools/resary.hxx> #define MAX_RESULTS 9 @@ -58,11 +59,10 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) get( m_vSearchSuggestions[4], "suggestion5" ); get( m_vSearchSuggestions[5], "suggestion6" ); - ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR())); - assert(aCategoriesArr.Count() >= CATEGORYCOUNT); + assert(SAL_N_ELEMENTS(RID_SVXSTR_PERSONA_CATEGORIES) >= CATEGORYCOUNT); for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i) { - m_vSearchSuggestions[i]->SetText( aCategoriesArr.GetString(i) ); + m_vSearchSuggestions[i]->SetText(CuiResId(RID_SVXSTR_PERSONA_CATEGORIES[i])); m_vSearchSuggestions[i]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); } @@ -127,7 +127,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) /* * English category names should be used for search. * These strings should be in sync with the strings of - * RID_SVXSTR_PERSONA_CATEGORIES in personalization.src + * RID_SVXSTR_PERSONA_CATEGORIES in personalization.hrc */ static const OUStringLiteral vSuggestionCategories[] = {"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"}; diff --git a/cui/source/options/personalization.src b/cui/source/options/personalization.src deleted file mode 100644 index 5886a61c7464..000000000000 --- a/cui/source/options/personalization.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 <cuires.hrc> - -String RID_SVXSTR_SELECTEDPERSONA -{ - Text [ en-US ] = "Selected Theme: "; -}; - -String RID_SVXSTR_SEARCHING -{ - Text [ en-US ] = "Searching, please wait..."; -}; - -String RID_SVXSTR_SEARCHERROR -{ - Text [ en-US ] = "Cannot open %1, please try again later."; -}; - -String RID_SVXSTR_NORESULTS -{ - Text [ en-US ] = "No results found."; -}; - -String RID_SVXSTR_APPLYPERSONA -{ - Text [ en-US ] = "Applying Theme..."; -}; - -/* - * This string array must have exactly the same content - * and the same order as the m_vSuggestionCategories array - * in personalization.cxx file. - */ -StringArray RID_SVXSTR_PERSONA_CATEGORIES -{ - ItemList [en-US]= - { - < "LibreOffice" ; > ; - < "Abstract" ; > ; - < "Color" ; > ; - < "Music" ; > ; - < "Nature" ; > ; - < "Solid" ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 97681f0259da..685d2a49e2a0 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -20,11 +20,13 @@ #include <memory> #include <config_features.h> +#include <svx/dialogs.hrc> + #include "cuires.hrc" +#include "strings.hrc" +#include "treeopt.hrc" #include "helpid.hrc" -#include <svx/dialogs.hrc> - #include "cfgchart.hxx" #include "connpoolconfig.hxx" #include "connpooloptions.hxx" @@ -145,8 +147,6 @@ struct ModuleToGroupNameMap_Impl sal_uInt16 m_nNodeId; }; -static OfaPageResource* pPageRes = nullptr; - static ModuleToGroupNameMap_Impl ModuleMap[] = { { "ProductName", OUString(), SID_GENERAL_OPTIONS }, @@ -199,23 +199,20 @@ static OUString getGroupName( const OUString& rModule, bool bForced ) if ( sGroupName.isEmpty() && bForced ) { - if ( !pPageRes ) - pPageRes = new OfaPageResource; - if ( rModule == "Writer" ) - sGroupName = pPageRes->GetTextArray().GetString(0); + sGroupName = CuiResId(SID_SW_EDITOPTIONS_RES[0].first); else if ( rModule == "WriterWeb" ) - sGroupName = pPageRes->GetHTMLArray().GetString(0); + sGroupName = CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first); else if ( rModule == "Calc" ) - sGroupName = pPageRes->GetCalcArray().GetString(0); + sGroupName = CuiResId(SID_SC_EDITOPTIONS_RES[0].first); else if ( rModule == "Impress" ) - sGroupName = pPageRes->GetImpressArray().GetString(0); + sGroupName = CuiResId(SID_SD_EDITOPTIONS_RES[0].first); else if ( rModule == "Draw" ) - sGroupName = pPageRes->GetDrawArray().GetString(0); + sGroupName = CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first); else if ( rModule == "Math" ) - sGroupName = pPageRes->GetStarMathArray().GetString(0); + sGroupName = CuiResId(SID_SM_EDITOPTIONS_RES[0].first); else if ( rModule == "Base" ) - sGroupName = pPageRes->GetDatasourcesArray().GetString(0); + sGroupName = CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first); } return sGroupName; } @@ -337,7 +334,7 @@ struct OptionsMapping_Impl static OptionsMapping_Impl const OptionsMap_Impl[] = { // GROUP PAGE PAGE-ID - { "ProductName", nullptr, SID_GENERAL_OPTIONS }, + { "ProductName", nullptr, SID_GENERAL_OPTIONS }, { "ProductName", "UserData", RID_SFXPAGE_GENERAL }, { "ProductName", "General", OFA_TP_MISC }, { "ProductName", "Memory", OFA_TP_MEMORY }, @@ -352,21 +349,21 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA }, { "ProductName", "BasicIDEOptions", RID_SVXPAGE_BASICIDE_OPTIONS }, { "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE }, - { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS }, + { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS }, { "LanguageSettings", "Languages", OFA_TP_LANGUAGES }, { "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU }, { "LanguageSettings", "SearchingInJapanese", RID_SVXPAGE_JSEARCH_OPTIONS }, { "LanguageSettings", "AsianLayout", RID_SVXPAGE_ASIAN_LAYOUT }, { "LanguageSettings", "ComplexTextLayout", RID_SVXPAGE_OPTIONS_CTL }, - { "Internet", nullptr, SID_INET_DLG }, + { "Internet", nullptr, SID_INET_DLG }, { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY }, { "Internet", "Email", RID_SVXPAGE_INET_MAIL }, - { "LoadSave", nullptr, SID_FILTER_DLG }, + { "LoadSave", nullptr, SID_FILTER_DLG }, { "LoadSave", "General", RID_SFXPAGE_SAVE }, { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE }, { "LoadSave", "MicrosoftOffice", RID_OFAPAGE_MSFILTEROPT2 }, { "LoadSave", "HTMLCompatibility", RID_OFAPAGE_HTMLOPT }, - { "Writer", nullptr, SID_SW_EDITOPTIONS }, + { "Writer", nullptr, SID_SW_EDITOPTIONS }, { "Writer", "General", RID_SW_TP_OPTLOAD_PAGE }, { "Writer", "View", RID_SW_TP_CONTENT_OPT }, { "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR }, @@ -381,16 +378,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE }, { "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE }, { "Writer", "MailMerge", RID_SW_TP_MAILCONFIG }, - { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS }, + { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS }, { "WriterWeb", "View", RID_SW_TP_HTML_CONTENT_OPT }, { "WriterWeb", "FormattingAids", RID_SW_TP_HTML_OPTSHDWCRSR }, { "WriterWeb", "Grid", RID_SW_TP_HTML_OPTGRID_PAGE }, { "WriterWeb", "Print", RID_SW_TP_HTML_OPTPRINT_PAGE }, { "WriterWeb", "Table", RID_SW_TP_HTML_OPTTABLE_PAGE }, { "WriterWeb", "Background", RID_SW_TP_BACKGROUND }, - { "Math", nullptr, SID_SM_EDITOPTIONS }, + { "Math", nullptr, SID_SM_EDITOPTIONS }, { "Math", "Settings", SID_SM_TP_PRINTOPTIONS }, - { "Calc", nullptr, SID_SC_EDITOPTIONS }, + { "Calc", nullptr, SID_SC_EDITOPTIONS }, { "Calc", "General", SID_SC_TP_LAYOUT }, { "Calc", "View", SID_SC_TP_CONTENT }, { "Calc", "Calculate", SID_SC_TP_CALC }, @@ -400,22 +397,22 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY }, { "Calc", "Grid", SID_SC_TP_GRID }, { "Calc", "Print", RID_SC_TP_PRINT }, - { "Impress", nullptr, SID_SD_EDITOPTIONS }, + { "Impress", nullptr, SID_SD_EDITOPTIONS }, { "Impress", "General", SID_SI_TP_MISC }, { "Impress", "View", SID_SI_TP_CONTENTS }, { "Impress", "Grid", SID_SI_TP_SNAP }, { "Impress", "Print", SID_SI_TP_PRINT }, - { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS }, + { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS }, { "Draw", "General", SID_SD_TP_MISC }, { "Draw", "View", SID_SD_TP_CONTENTS }, { "Draw", "Grid", SID_SD_TP_SNAP }, { "Draw", "Print", SID_SD_TP_PRINT }, - { "Charts", nullptr, SID_SCH_EDITOPTIONS }, + { "Charts", nullptr, SID_SCH_EDITOPTIONS }, { "Charts", "DefaultColors", RID_OPTPAGE_CHART_DEFCOLORS }, - { "Base", nullptr, SID_SB_STARBASEOPTIONS }, + { "Base", nullptr, SID_SB_STARBASEOPTIONS }, { "Base", "Connections", SID_SB_CONNECTIONPOOLING }, { "Base", "Databases", SID_SB_DBREGISTEROPTIONS }, - { nullptr, nullptr, 0 } + { nullptr, nullptr, 0 } }; static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) @@ -1098,22 +1095,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pBox->SetHelpId(sHelpId); } -OfaPageResource::OfaPageResource() : - aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())), - aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())), - aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())), - aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())), - aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())), - aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())), - aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())), - aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())), - aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())), - aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())), - aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())), - aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR())) -{ -} - std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) { Reference< XLinguProperties > xProp( LinguMgr::GetLinguPropertySet() ); @@ -1447,7 +1428,6 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { - OfaPageResource aDlgResource; sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; @@ -1456,15 +1436,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // %PRODUCTNAME options if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray(); - setGroupName( "ProductName", rGeneralArray.GetString(0) ); - nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr, SID_GENERAL_OPTIONS ); - sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() ); + setGroupName("ProductName", CuiResId(SID_GENERAL_OPTIONS_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS ); + const sal_uInt16 nEnd = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_GENERAL_OPTIONS_RES)); - for ( sal_uInt16 i = 1; i < nEnd; ++i ) + for (sal_uInt16 i = 1; i < nEnd; ++i) { - OUString sNewTitle = rGeneralArray.GetString(i); - nPageId = (sal_uInt16)rGeneralArray.GetValue(i); + OUString sNewTitle = CuiResId(SID_GENERAL_OPTIONS_RES[i].first); + nPageId = SID_GENERAL_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -1498,14 +1477,13 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Load and Save options if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) ) { - ResStringArray& rFilterArray = aDlgResource.GetFilterArray(); - setGroupName( "LoadSave", rFilterArray.GetString(0) ); - nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr, SID_FILTER_DLG ); - for ( sal_uInt32 i = 1; i < rFilterArray.Count(); ++i ) + setGroupName( "LoadSave", CuiResId(SID_FILTER_DLG_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_FILTER_DLG_RES); ++i ) { - nPageId = (sal_uInt16)rFilterArray.GetValue(i); + nPageId = (sal_uInt16)SID_FILTER_DLG_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rFilterArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_FILTER_DLG_RES[i].first), nGroup ); } } @@ -1513,22 +1491,20 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) SvtLanguageOptions aLanguageOptions; if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rLangArray = aDlgResource.GetLangArray(); - setGroupName( "LanguageSettings", rLangArray.GetString(0) ); - nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); - for ( sal_uInt32 i = 1; i < rLangArray.Count(); ++i ) + setGroupName("LanguageSettings", CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); + for (sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_LANGUAGE_OPTIONS_RES); ++i) { - nPageId = (sal_uInt16)rLangArray.GetValue(i); + nPageId = (sal_uInt16)SID_LANGUAGE_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nPageId || aLanguageOptions.IsJapaneseFindEnabled() ) && ( RID_SVXPAGE_ASIAN_LAYOUT != nPageId || aLanguageOptions.IsAsianTypographyEnabled() ) && ( RID_SVXPAGE_OPTIONS_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) ) - AddTabPage( nPageId, rLangArray.GetString(i), nGroup ); + AddTabPage(nPageId, CuiResId(SID_LANGUAGE_OPTIONS_RES[i].first), nGroup); } } - OUString aFactory = getCurrentFactory_Impl( _xFrame ); DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" ); @@ -1537,7 +1513,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) { // text document - ResStringArray& rTextArray = aDlgResource.GetTextArray(); if ( aFactory == "com.sun.star.text.TextDocument" || aFactory == "com.sun.star.text.WebDocument" || aFactory == "com.sun.star.text.GlobalDocument" ) @@ -1546,19 +1521,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { if ( aFactory == "com.sun.star.text.WebDocument" ) - setGroupName( "WriterWeb", rTextArray.GetString(0) ); + setGroupName( "WriterWeb", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); else - setGroupName( "Writer", rTextArray.GetString(0) ); - nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rTextArray.Count(); ++i ) + setGroupName( "Writer", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rTextArray.GetValue(i); + nPageId = (sal_uInt16)SID_SW_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) && ( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) && ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) ) - AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SW_EDITOPTIONS_RES[i].first), nGroup ); } #ifdef DBG_UTIL AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup ); @@ -1568,13 +1543,12 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // HTML documents if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray(); - nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); - for( sal_uInt32 i = 1; i < rHTMLArray.Count(); ++i ) + nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); + for( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_ONLINEOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rHTMLArray.GetValue(i); + nPageId = (sal_uInt16)SID_SW_ONLINEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup ); + AddTabPage(nPageId, CuiResId(SID_SW_ONLINEOPTIONS_RES[i].first), nGroup); } #ifdef DBG_UTIL AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup ); @@ -1590,18 +1564,17 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rCalcArray = aDlgResource.GetCalcArray(); SfxModule* pScMod = SfxApplication::GetModule( SfxToolsModule::Calc ); - setGroupName( "Calc", rCalcArray.GetString(0) ); - nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rCalcArray.Count() ); + setGroupName( "Calc", CuiResId(SID_SC_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS ); + const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SC_EDITOPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rCalcArray.GetValue(i); + nPageId = (sal_uInt16)SID_SC_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SC_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1615,17 +1588,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rImpressArray = aDlgResource.GetImpressArray(); - setGroupName( "Impress", rImpressArray.GetString(0) ); - nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rImpressArray.Count() ); + setGroupName( "Impress", CuiResId(SID_SD_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); + const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_EDITOPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rImpressArray.GetValue(i); + nPageId = (sal_uInt16)SID_SD_EDITOPTIONS_RES[0].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rImpressArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SD_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1638,17 +1610,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rDrawArray = aDlgResource.GetDrawArray(); - setGroupName( "Draw", rDrawArray.GetString(0) ); - nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rDrawArray.Count() ); + setGroupName( "Draw", CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); + const sal_uInt16 nCount = static_cast<sal_uInt16>(SAL_N_ELEMENTS(SID_SD_GRAPHIC_OPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rDrawArray.GetValue(i); + nPageId = (sal_uInt16)SID_SD_GRAPHIC_OPTIONS_RES[0].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rDrawArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[i].first), nGroup ); } } } @@ -1661,15 +1632,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray(); SfxModule* pSmMod = SfxApplication::GetModule(SfxToolsModule::Math); - setGroupName( "Math", rStarMathArray.GetString(0) ); - nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rStarMathArray.Count(); ++i ) + setGroupName( "Math", CuiResId(SID_SM_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SM_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rStarMathArray.GetValue(i); + nPageId = (sal_uInt16)SID_SM_EDITOPTIONS_RES[0].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rStarMathArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SM_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1682,41 +1652,38 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) ) { - ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray(); - setGroupName( "Base", rDSArray.GetString(0) ); - nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); - for ( sal_uInt32 i = 1; i < rDSArray.Count(); ++i ) + setGroupName( "Base", CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SB_STARBASEOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rDSArray.GetValue(i); + nPageId = (sal_uInt16)SID_SB_STARBASEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rDSArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SB_STARBASEOPTIONS_RES[i].first), nGroup ); } } // Chart options (always installed and active) if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rChartArray = aDlgResource.GetChartArray(); - setGroupName( "Charts", rChartArray.GetString(0) ); - nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr, SID_SCH_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rChartArray.Count(); ++i ) + setGroupName( "Charts", CuiResId(SID_SCH_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SCH_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rChartArray.GetValue(i); + nPageId = (sal_uInt16)SID_SCH_EDITOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rChartArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SCH_EDITOPTIONS_RES[i].first), nGroup ); } } // Internet options if ( !lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) ) { - ResStringArray& rInetArray = aDlgResource.GetInetArray(); - setGroupName( "Internet", rInetArray.GetString(0) ); - nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr, SID_INET_DLG ); + setGroupName("Internet", CuiResId(SID_INET_DLG_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG ); - for ( sal_uInt32 i = 1; i < rInetArray.Count(); ++i ) + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_INET_DLG_RES); ++i ) { - nPageId = (sal_uInt16)rInetArray.GetValue(i); + nPageId = (sal_uInt16)SID_INET_DLG_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; #if defined(_WIN32) @@ -1724,13 +1691,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MAIL ) continue; #endif - AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_INET_DLG_RES[i].first), nGroup ); } } - -/*!!! - ActivateLastSelection(); - */ } bool isNodeActive( OptionsNode* pNode, Module* pModule ) diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src deleted file mode 100644 index 4301f793f543..000000000000 --- a/cui/source/options/treeopt.src +++ /dev/null @@ -1,177 +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 <cuires.hrc> -#include "helpid.hrc" -#include <svx/dialogs.hrc> - -StringArray SID_GENERAL_OPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME" ; 0; > ; - < "User Data" ; RID_SFXPAGE_GENERAL; > ; - < "General" ; OFA_TP_MISC; > ; - < "Memory" ; OFA_TP_MEMORY; > ; - < "View" ; OFA_TP_VIEW ; > ; - < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ; - < "Paths" ; RID_SFXPAGE_PATH; > ; - < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ; - < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ; - < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ; - < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ; - < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; - < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ; - < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ; - < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ; - < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ; - }; -}; -StringArray SID_LANGUAGE_OPTIONS -{ - ItemList [ en-US ] = - { - < "Language Settings" ; 0; > ; - < "Languages"; OFA_TP_LANGUAGES; > ; - < "Writing Aids" ; RID_SFXPAGE_LINGU; > ; - < "Searching in Japanese" ; RID_SVXPAGE_JSEARCH_OPTIONS; > ; - < "Asian Layout" ; RID_SVXPAGE_ASIAN_LAYOUT; > ; - < "Complex Text Layout" ; RID_SVXPAGE_OPTIONS_CTL; >; - }; -}; -StringArray SID_INET_DLG -{ - ItemList [ en-US ] = - { - < "Internet" ; 0; > ; - < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ; - < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ; - }; -}; -StringArray SID_SW_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Writer" ; 0; > ; - < "General" ; RID_SW_TP_OPTLOAD_PAGE ; > ; - < "View" ; RID_SW_TP_CONTENT_OPT ;> ; - < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ; - < "Grid" ; RID_SVXPAGE_GRID ; > ; - < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ; - < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ; - < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ; - < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; - < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; - < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ; - < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ; - < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ; - < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >; - }; -}; -StringArray SID_SW_ONLINEOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Writer/Web" ; 0; > ; - < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ; - < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ; - < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ; - < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; - < "Background" ; RID_SW_TP_BACKGROUND ; > ; - }; -}; -StringArray SID_SM_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Math" ; 0; > ; - < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ; - }; -}; -StringArray SID_SC_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Calc" ; 0; > ; - < "General" ; SID_SC_TP_LAYOUT ;> ; - < "Defaults" ; RID_SC_TP_DEFAULTS ;> ; - < "View" ; SID_SC_TP_CONTENT ;> ; - < "Calculate" ; SID_SC_TP_CALC ;> ; - < "Formula" ; SID_SC_TP_FORMULA ;> ; - < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ; - < "Changes" ; SID_SC_TP_CHANGES ;> ; - < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ; - < "Grid" ; SID_SC_TP_GRID ;> ; - < "Print" ; RID_SC_TP_PRINT ;> ; - }; -}; -StringArray SID_SD_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Impress" ; 0; > ; - < "General"; SID_SI_TP_MISC ; > ; - < "View" ; SID_SI_TP_CONTENTS ; > ; - < "Grid" ; SID_SI_TP_SNAP ; > ; - < "Print" ; SID_SI_TP_PRINT ; > ; - }; -}; -StringArray SID_SD_GRAPHIC_OPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Draw" ; 0; > ; - < "General" ; SID_SD_TP_MISC ; > ; - < "View" ; SID_SD_TP_CONTENTS ; > ; - < "Grid" ; SID_SD_TP_SNAP ; > ; - < "Print" ; SID_SD_TP_PRINT ; > ; - }; -}; -StringArray SID_SCH_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "Charts" ; 0; > ; - < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; - }; -}; -StringArray SID_FILTER_DLG -{ - ItemList [ en-US ] = - { - < "Load/Save" ; 0; > ; - < "General" ; RID_SFXPAGE_SAVE; > ; - < "VBA Properties" ; SID_OPTFILTER_MSOFFICE; > ; - < "Microsoft Office" ; RID_OFAPAGE_MSFILTEROPT2; > ; - < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ; - }; -}; -StringArray SID_SB_STARBASEOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Base" ; 0; > ; - < "Connections" ; SID_SB_CONNECTIONPOOLING; > ; - < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |