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/uibase | |
| 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/uibase')
145 files changed, 995 insertions, 3370 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index de15a21570a6..0f863537e58b 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -63,9 +63,8 @@ #include <cmdid.h> #include <globals.hrc> #include <app.hrc> -#include <poolfmt.hrc> +#include <strings.hrc> #include "swabstdlg.hxx" -#include "envelp.hrc" #include "envimg.hxx" #include <appenv.hxx> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 7df4f04e4677..40982c913be0 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -113,7 +113,7 @@ using namespace ::com::sun::star; #include "swslots.hxx" #include <cfgid.h> -#include <shells.hrc> +#include <strings.hrc> SFX_IMPL_INTERFACE(SwModule, SfxModule) diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index e463f6fef4db..1c4baa115dd9 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -66,9 +66,8 @@ #include <poolfmt.hxx> #include <app.hrc> -#include <poolfmt.hrc> +#include <strings.hrc> #include "swabstdlg.hxx" -#include "envelp.hrc" #include <misc.hrc> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 714b20cac102..9a5304e6cf48 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -99,6 +99,7 @@ #include <helpid.h> #include <cmdid.h> #include <globals.hrc> +#include <strings.hrc> #include <app.hrc> #include <cfgid.h> diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index ab2e1f490ccc..0f33a225b974 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -105,7 +105,7 @@ #include <globals.h> #include <helpid.h> #include <app.hrc> -#include <poolfmt.hrc> +#include <strings.hrc> #include <globals.hrc> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> @@ -916,7 +916,7 @@ void SwDocShell::Execute(SfxRequest& rReq) uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker(); std::shared_ptr<const SfxFilter> pFlt; - sal_uInt16 nStrId; + const char* pStrId; if( bCreateHtml ) { @@ -924,14 +924,14 @@ void SwDocShell::Execute(SfxRequest& rReq) pFlt = SwIoSystem::GetFilterOfFormat( "HTML", SwWebDocShell::Factory().GetFilterContainer() ); - nStrId = STR_LOAD_HTML_DOC; + pStrId = STR_LOAD_HTML_DOC; } else { // for Global-documents we now only offer the current one. pFlt = SwGlobalDocShell::Factory().GetFilterContainer()-> GetFilter4Extension( "odm" ); - nStrId = STR_LOAD_GLOBAL_DOC; + pStrId = STR_LOAD_GLOBAL_DOC; } if( pFlt ) @@ -1008,7 +1008,7 @@ void SwDocShell::Execute(SfxRequest& rReq) OSL_FAIL("control access failed"); } - xFP->setTitle( SwResId( nStrId )); + xFP->setTitle(SwResId(pStrId)); SvtPathOptions aPathOpt; xFP->setDisplayDirectory( aPathOpt.GetWorkPath() ); if( ERRCODE_NONE == aDlgHelper.Execute()) diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 4419abf03cf2..abb574054460 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> -#include <svx/dialogs.hrc> #include <i18nlangtag/mslangid.hxx> #include <sot/storinfo.hxx> #include <sot/storage.hxx> diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index fb1a4328b12d..2d27a10a433f 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -52,6 +52,7 @@ #include <cmdid.h> #include <swstyle.h> #include <app.hrc> +#include <strings.hrc> #include <paratr.hxx> #include <SwStyleNameMapper.hxx> #include <svl/cjkoptions.hxx> diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx index 44e4b9b1c036..fbc3340990ff 100644 --- a/sw/source/uibase/app/mainwn.cxx +++ b/sw/source/uibase/app/mainwn.cxx @@ -19,7 +19,6 @@ #include <mdiexp.hxx> #include <sfx2/progress.hxx> -#include <tools/resid.hxx> #include <docsh.hxx> #include <swmodule.hxx> #include "swtypes.hxx" @@ -46,7 +45,7 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell ) return nullptr; } -void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, +void StartProgress( const char* pMessResId, long nStartValue, long nEndValue, SwDocShell *pDocShell ) { if( !SW_MOD()->IsEmbeddedLoadSave() ) @@ -64,7 +63,7 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue, { pProgress = new SwProgress; pProgress->pProgress = new SfxProgress( pDocShell, - SwResId(nMessResId), + SwResId(pMessResId), nEndValue - nStartValue ); pProgress->nStartCount = 1; pProgress->pDocShell = pDocShell; @@ -117,13 +116,13 @@ void EndProgress( SwDocShell *pDocShell ) } } -void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell ) +void SetProgressText(const char* pId, SwDocShell *pDocShell) { if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() ) { SwProgress *pProgress = lcl_SwFindProgress( pDocShell ); if ( pProgress ) - pProgress->pProgress->SetStateText( 0, SwResId(nId) ); + pProgress->pProgress->SetStateText(0, SwResId(pId)); } } diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx index af1e91322a80..6017d3e17d90 100644 --- a/sw/source/uibase/app/swdll.cxx +++ b/sw/source/uibase/app/swdll.cxx @@ -22,7 +22,7 @@ #include <svx/svdobj.hxx> -#include "globdoc.hrc" +#include "strings.hrc" #include <swdll.hxx> #include <wdocsh.hxx> diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 4d03053de05e..2c6e0bc5d856 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -58,6 +58,7 @@ #include <doc.hxx> #include <cmdid.h> #include <app.hrc> +#include <strings.hrc> #include "helpid.h" #include <IDocumentLayoutAccess.hxx> diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 41b2712d87fb..0da9c3a8bff0 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -24,6 +24,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> #include <svtools/ehdl.hxx> +#include <tools/resmgr.hxx> #include <svx/ParaLineSpacingPopup.hxx> #include <svx/TextCharacterSpacingPopup.hxx> #include <svx/TextUnderlinePopup.hxx> @@ -125,9 +126,10 @@ #include <navsh.hxx> #include <app.hrc> +#include <error.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <svx/xmlsecctrl.hxx> -ResMgr *pSwResMgr = nullptr; bool g_bNoInterrupt = false; #include <sfx2/app.hxx> @@ -144,7 +146,7 @@ using namespace ::com::sun::star::uno; SwModule::SwModule( SfxObjectFactory* pWebFact, SfxObjectFactory* pFact, SfxObjectFactory* pGlobalFact ) - : SfxModule( ResMgr::CreateResMgr( "sw" ), {pWebFact, pFact, pGlobalFact} ), + : SfxModule( Translate::Create("sw", Application::GetSettings().GetUILanguageTag()), {pWebFact, pFact, pGlobalFact} ), m_pModuleConfig(nullptr), m_pUsrPref(nullptr), m_pWebUsrPref(nullptr), @@ -168,12 +170,11 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, m_pXSelection( nullptr ) { SetName( "StarWriter" ); - pSwResMgr = GetResMgr(); SvxErrorHandler::ensure(); m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL, ErrCode(ERRCODE_AREA_SW), ErrCode(ERRCODE_AREA_SW_END), - pSwResMgr ); + &GetResLocale() ); m_pModuleConfig = new SwModuleOptions; @@ -193,6 +194,12 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, GetColorConfig(); } } + +OUString SwResId(const char* pId) +{ + return Translate::get(pId, SW_MOD()->GetResLocale()); +} + uno::Reference< scanner::XScannerManager2 > const & SwModule::GetScannerManager() { @@ -405,32 +412,32 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SwResId(STR_PARAGRAPHSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PARA)), - ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr))); + RID_PARAGRAPHSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, SwResId(STR_CHARACTERSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)), - ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr))); + RID_CHARACTERSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, SwResId(STR_FRAMESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)), - ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr))); + RID_FRAMESTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, SwResId(STR_PAGESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), - ResId(RID_PAGESTYLEFAMILY, *pSwResMgr))); + RID_PAGESTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SwResId(STR_LISTSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_LIST)), - ResId(RID_LISTSTYLEFAMILY, *pSwResMgr))); + RID_LISTSTYLEFAMILY, GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, SwResId(STR_TABLESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)), - ResId(RID_TABLESTYLEFAMILY, *pSwResMgr))); + RID_TABLESTYLEFAMILY, GetResLocale())); return pStyleFamilies; } diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 3b78f4d064ae..24c79ddc2c79 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -27,7 +27,6 @@ #include <sfx2/docfile.hxx> #include <svl/itemiter.hxx> -#include <tools/resid.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> #include <poolfmt.hxx> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index fc71c762dc18..60aeb83f28b5 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -81,7 +81,7 @@ #include <swunohelper.hxx> #include <dbui.hrc> #include <globals.hrc> -#include <statstr.hrc> +#include <strings.hrc> #include <mmconfigitem.hxx> #include <sfx2/request.hxx> #include <hintids.hxx> @@ -123,7 +123,6 @@ #include <sal/log.hxx> #include <swabstdlg.hxx> #include <fmthdft.hxx> -#include <envelp.hrc> #include <vector> #include <unomid.h> #include <section.hxx> diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 7b7ce0362c0b..2641bfb9bd03 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -41,7 +41,7 @@ #include <svtools/treelistentry.hxx> #include <helpid.h> -#include <utlui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <unomid.h> diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src deleted file mode 100644 index 067a85b5c932..000000000000 --- a/sw/source/uibase/dbui/mailmergechildwindow.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 "dbui.hrc" -#include "helpid.h" -#include <cmdid.h> - -String ST_CONTINUE -{ - Text[ en-US ] = "~Continue"; -}; - -String ST_TASK -{ - Text[ en-US ] = "Task"; -}; - -String ST_STATUS -{ - Text[ en-US ] = "Status"; -}; - -String ST_SENDINGTO -{ - Text[ en-US ] = "Sending to: %1"; -}; - -String ST_COMPLETED -{ - Text[ en-US ] = "Successfully sent"; -}; - -String ST_FAILED -{ - Text[ en-US ] = "Sending failed"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 006ef49eabac..000e76a3a76b 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -41,6 +41,7 @@ #include <sfx2/passwd.hxx> #include <dbui.hrc> +#include <strings.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -463,7 +464,7 @@ OUString SwAddressPreview::FillData( rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); const OUString* pAssignment = aAssignment.getConstArray(); - const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rDefHeaders = rConfigItem.GetDefaultAddressHeaders(); OUString sAddress(rAddress); OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">"; @@ -473,7 +474,7 @@ OUString SwAddressPreview::FillData( OUString sCountryColumn; if( bSpecialReplacementForCountry ) { - sCountryColumn = rDefHeaders.GetString(MM_PART_COUNTRY); + sCountryColumn = rDefHeaders[MM_PART_COUNTRY].first; Sequence< OUString> aSpecialAssignment = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); if(aSpecialAssignment.getLength() > MM_PART_COUNTRY && aSpecialAssignment[MM_PART_COUNTRY].getLength()) @@ -492,10 +493,10 @@ OUString SwAddressPreview::FillData( //find the appropriate assignment OUString sConvertedColumn = aItem.sText; for(sal_uInt32 nColumn = 0; - nColumn < rDefHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength()); + nColumn < rDefHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength()); ++nColumn) { - if (rDefHeaders.GetString(nColumn) == aItem.sText && + if (rDefHeaders[nColumn].first == aItem.sText && !pAssignment[nColumn].isEmpty()) { sConvertedColumn = pAssignment[nColumn]; diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 8a4a10f7a2eb..e1ad415c34db 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <dbui.hrc> +#include <strings.hrc> #include <mmconfigitem.hxx> #include <swmodule.hxx> #include <view.hxx> diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 2adab839408d..2f66526a67b0 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -135,7 +135,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem bool m_bIsEMailSupported; - ResStringArray m_AddressHeaderSA; + std::vector<std::pair<OUString, int>> m_AddressHeaderSA; //these addresses are not stored in the configuration std::vector< SwDocMergeInfo > m_aMergeInfos; @@ -200,12 +200,16 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : m_bIsAuthentication(false), m_bIsEMailSupported(false), - m_AddressHeaderSA(ResId(SA_ADDRESS_HEADER, *pSwResMgr)), m_bUserSettingWereOverwritten(false), m_bIsAddressBlock_LastUserSetting(false), m_bIsGreetingLineInMail_LastUserSetting(false), m_bIsGreetingLine_LastUserSetting(false) { + for (size_t i = 0; i < SAL_N_ELEMENTS(SA_ADDRESS_HEADER); ++i) + { + m_AddressHeaderSA.push_back(std::make_pair(SwResId(SA_ADDRESS_HEADER[i].first), SA_ADDRESS_HEADER[i].second)); + } + const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); @@ -378,20 +382,20 @@ static OUString lcl_CreateNodeName(Sequence<OUString>& rAssignments ) return sNewName; } -static void lcl_ConvertToNumbers(OUString& rBlock, const ResStringArray& rHeaders ) +static void lcl_ConvertToNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders ) { //convert the strings used for UI to numbers used for the configuration OUString sBlock(rBlock.replaceAll("\n", "\\n")); - for(sal_uInt32 i = 0; i < rHeaders.Count(); ++i) + for (size_t i = 0; i < rHeaders.size(); ++i) { - OUString sHeader = "<" + rHeaders.GetString( i ) + ">"; + OUString sHeader = "<" + rHeaders[i].first + ">"; OUString sReplace = "<" + OUStringLiteral1('0' + i) + ">"; sBlock = sBlock.replaceAll(sHeader, sReplace); } rBlock = sBlock; } -static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHeaders) +static void lcl_ConvertFromNumbers(OUString& rBlock, const std::vector<std::pair<OUString, int>>& rHeaders) { //convert the numbers used for the configuration to strings used for UI to numbers //doesn't use ReplaceAll to prevent expansion of numbers inside of the headers @@ -409,8 +413,8 @@ static void lcl_ConvertFromNumbers(OUString& rBlock, const ResStringArray& rHead { sBlock += "<"; sal_uInt16 nHeader = cChar - '0'; - if(nHeader < rHeaders.Count()) - sBlock += rHeaders.GetString( nHeader ); + if(nHeader < rHeaders.size()) + sBlock += rHeaders[nHeader].first; sBlock += ">"; } else @@ -737,7 +741,7 @@ void SwMailMergeConfigItem::Commit() m_pImpl->Commit(); } -const ResStringArray& SwMailMergeConfigItem::GetDefaultAddressHeaders() const +const std::vector<std::pair<OUString, int>>& SwMailMergeConfigItem::GetDefaultAddressHeaders() const { return m_pImpl->m_AddressHeaderSA; } @@ -1162,8 +1166,8 @@ OUString SwMailMergeConfigItem::GetAssignedColumn(sal_uInt32 nColumn) const Sequence< OUString> aAssignment = GetColumnAssignment( m_pImpl->m_aDBData ); if(aAssignment.getLength() > sal::static_int_cast< sal_Int32, sal_uInt32>(nColumn) && !aAssignment[nColumn].isEmpty()) sRet = aAssignment[nColumn]; - else if(nColumn < m_pImpl->m_AddressHeaderSA.Count()) - sRet = m_pImpl->m_AddressHeaderSA.GetString(nColumn); + else if(nColumn < m_pImpl->m_AddressHeaderSA.size()) + sRet = m_pImpl->m_AddressHeaderSA[nColumn].first; return sRet; } @@ -1206,7 +1210,7 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const return false; uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns(); - const ResStringArray& rHeaders = GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders(); Sequence< OUString> aAssignment = GetColumnAssignment( GetCurrentDBData() ); const OUString* pAssignment = aAssignment.getConstArray(); @@ -1222,10 +1226,10 @@ bool SwMailMergeConfigItem::IsAddressFieldsAssigned() const { OUString sConvertedColumn = aItem.sText; for(sal_uInt32 nColumn = 0; - nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength()); + nColumn < rHeaders.size() && nColumn < sal_uInt32(aAssignment.getLength()); ++nColumn) { - if (rHeaders.GetString(nColumn) == aItem.sText && + if (rHeaders[nColumn].first == aItem.sText && !pAssignment[nColumn].isEmpty()) { sConvertedColumn = pAssignment[nColumn]; @@ -1254,7 +1258,7 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const uno::Reference< XColumnsSupplier > xColsSupp( xResultSet, UNO_QUERY ); if(!xColsSupp.is()) return false; - const ResStringArray& rHeaders = GetDefaultAddressHeaders(); + const std::vector<std::pair<OUString, int>>& rHeaders = GetDefaultAddressHeaders(); uno::Reference<container::XNameAccess> xCols = xColsSupp->getColumns(); Sequence< OUString> aAssignment = @@ -1281,10 +1285,10 @@ bool SwMailMergeConfigItem::IsGreetingFieldsAssigned() const { OUString sConvertedColumn = aItem.sText; for(sal_uInt32 nColumn = 0; - nColumn < rHeaders.Count() && nColumn < sal_uInt32(aAssignment.getLength()); + nColumn < rHeaders.size() && nColumn < 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/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index f04020dabfbb..df1c4368a893 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -50,6 +50,7 @@ #include <drawbase.hxx> #include <unotextrange.hxx> #include <dialog.hrc> +#include <strings.hrc> #include <cmdid.h> using namespace ::com::sun::star; diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index 6335665e2881..fd6777ab77b5 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -47,8 +47,7 @@ #include <shellio.hxx> #include <helpid.h> #include <cmdid.h> -#include <regionsw.hrc> -#include <comcore.hrc> +#include <strings.hrc> #include <globals.hrc> #include <sfx2/bindings.hxx> #include <sfx2/htmlmode.hxx> diff --git a/sw/source/uibase/dialog/regionsw.hrc b/sw/source/uibase/dialog/regionsw.hrc deleted file mode 100644 index fba4caf793c2..000000000000 --- a/sw/source/uibase/dialog/regionsw.hrc +++ /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 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC -#define INCLUDED_SW_SOURCE_UIBASE_DIALOG_REGIONSW_HRC - -#include "dialog.hrc" - -/* global resources */ - -#define STR_QUERY_CONNECT (RC_REGIONSW_BEGIN+10) -#define STR_WRONG_PASSWORD (RC_REGIONSW_BEGIN+11) -#define STR_WRONG_PASSWD_REPEAT (RC_REGIONSW_BEGIN+12) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src deleted file mode 100644 index 5692e71cb70a..000000000000 --- a/sw/source/uibase/dialog/regionsw.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 "regionsw.hrc" -#include "cmdid.h" -#include "globals.hrc" -#include "helpid.h" - -String STR_QUERY_CONNECT -{ - Text[ en-US ] = "A file connection will delete the contents of the current section. Connect anyway?" ; -}; - -String STR_WRONG_PASSWORD -{ - Text [ en-US ] = "The password entered is invalid." ; -}; - -String STR_WRONG_PASSWD_REPEAT -{ - Text [ en-US ] = "The password has not been set." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 71b5c12b1a66..c674f397b1c3 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -44,7 +44,7 @@ #include <swdtflvr.hxx> #include <docsh.hxx> -#include <dochdl.hrc> +#include <strings.hrc> #include <swerror.h> #include <frmmgr.hxx> #include <vcl/layout.hxx> diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index be48f76e0df7..47ef669f8012 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -107,8 +107,7 @@ #include <swerror.h> #include <SwCapObjType.hxx> #include <cmdid.h> -#include <dochdl.hrc> -#include <comcore.hrc> +#include <strings.hrc> #include <sot/stg.hxx> #include <svx/svditer.hxx> #include <editeng/eeitem.hxx> @@ -1613,7 +1612,7 @@ SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh ) bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg ) { - sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR; + const char* pResId = STR_CLPBRD_FORMAT_ERROR; bool bRet = false; MSE40HTMLClipFormatObj aMSE40ClpObj; @@ -1684,10 +1683,10 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, SwReader aReader( *pStream, aEmptyOUStr, OUString(), *rSh.GetCursor() ); rSh.SaveTableBoxContent( &rInsPos ); if( aReader.Read( *pRead ).IsError() ) - nResId = STR_ERROR_CLPBRD_READ; + pResId = STR_ERROR_CLPBRD_READ; else { - nResId = 0; + pResId = nullptr; bRet = true; } @@ -1696,15 +1695,15 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, rSh.CallChgLnk(); } else - nResId = STR_CLPBRD_FORMAT_ERROR; + pResId = STR_CLPBRD_FORMAT_ERROR; // Exist a SvMemoryStream? (data in the OUString and xStrm is empty) if( pStream && !xStrm.is() ) delete pStream; - if( bMsg && nResId ) + if (bMsg && pResId) { - ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(nResId), VclMessageType::Info)->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(pResId), VclMessageType::Info)->Execute(); } return bRet; } @@ -2895,19 +2894,19 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat if( pClipboard ) { aDesc = pClipboard->m_aObjDesc; - sal_uInt16 nResId; + const char* pResId; if( pClipboard->m_eBufferType & TransferBufferType::Document ) - nResId = STR_PRIVATETEXT; + pResId = STR_PRIVATETEXT; else if( pClipboard->m_eBufferType & TransferBufferType::Graphic ) - nResId = STR_PRIVATEGRAPHIC; + pResId = STR_PRIVATEGRAPHIC; else if( pClipboard->m_eBufferType == TransferBufferType::Ole ) - nResId = STR_PRIVATEOLE; + pResId = STR_PRIVATEOLE; else - nResId = 0; + pResId = nullptr; - if( nResId ) + if (pResId) { - if( STR_PRIVATEOLE == nResId || STR_PRIVATEGRAPHIC == nResId ) + if (strcmp(STR_PRIVATEOLE, pResId) == 0 || strcmp(STR_PRIVATEGRAPHIC, pResId) == 0) { // add SotClipboardFormatId::EMBED_SOURCE to the formats. This // format display then the private format name. @@ -2916,7 +2915,7 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat aFormats.insert( aFormats.begin(), aFlavorEx ); } pDlg->SetObjName( pClipboard->m_aObjDesc.maClassName, - SwResId( nResId ) ); + SwResId(pResId) ); pDlg->Insert( SotClipboardFormatId::EMBED_SOURCE, aEmptyOUStr ); } } @@ -2961,19 +2960,19 @@ void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh, SwTransferable *pClipboard = GetSwTransferable( rData ); if( pClipboard ) { - sal_uInt16 nResId; + const char* pResId; if( pClipboard->m_eBufferType & TransferBufferType::Document ) - nResId = STR_PRIVATETEXT; + pResId = STR_PRIVATETEXT; else if( pClipboard->m_eBufferType & TransferBufferType::Graphic ) - nResId = STR_PRIVATEGRAPHIC; + pResId = STR_PRIVATEGRAPHIC; else if( pClipboard->m_eBufferType == TransferBufferType::Ole ) - nResId = STR_PRIVATEOLE; + pResId = STR_PRIVATEOLE; else - nResId = 0; + pResId = nullptr; - if( nResId ) - rToFill.AddClipbrdFormat( SotClipboardFormatId::EMBED_SOURCE, - SwResId( nResId ) ); + if (pResId) + rToFill.AddClipbrdFormat(SotClipboardFormatId::EMBED_SOURCE, + SwResId(pResId)); } else { diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 1969ce7f9128..c3cc960961c2 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -19,9 +19,8 @@ #include <AnnotationMenuButton.hxx> -#include <annotation.hrc> #include <app.hrc> -#include <access.hrc> +#include <strings.hrc> #include <unotools/useroptions.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index f20db12ab9a9..63b5c9e26296 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -22,7 +22,7 @@ #include <AnnotationMenuButton.hxx> #include <PostItMgr.hxx> -#include <annotation.hrc> +#include <strings.hrc> #include <cmdid.h> #include <vcl/menu.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 0738fccd92d8..a43d402e3add 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -33,10 +33,9 @@ #include <ShadowOverlayObject.hxx> #include <OverlayRanges.hxx> -#include <annotation.hrc> -#include <docvw.hrc> +#include <strings.hrc> #include <app.hrc> -#include <access.hrc> +#include <strings.hrc> #include <viewopt.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 9d567d207236..38c0df3a7077 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -8,9 +8,9 @@ */ #include <app.hrc> -#include <docvw.hrc> +#include <strings.hrc> #include <globals.hrc> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <cmdid.h> #include <DashedLine.hxx> diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index fa1c78afe3af..02b5cfcf349f 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -8,7 +8,7 @@ */ #include <globals.hrc> -#include <utlui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <cmdid.h> diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 1c23d54cb857..e55c14a343db 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -57,8 +57,8 @@ #include <unotools/datetime.hxx> #include <swmodule.hxx> -#include <annotation.hrc> -#include <utlui.hrc> +#include <strings.hrc> +#include <strings.hrc> #include "cmdid.h" #include <sfx2/request.hxx> diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index c38b243a5880..6f518ffaa2c8 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -27,7 +27,7 @@ #include <edtwin.hxx> #include <cmdid.h> -#include <docvw.hrc> +#include <strings.hrc> #include <unotools/securityoptions.hxx> @@ -111,19 +111,19 @@ void SidebarTextControl::LoseFocus() void SidebarTextControl::RequestHelp(const HelpEvent &rEvt) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( mrSidebarWin.GetLayoutStatus() ) { - case SwPostItHelper::INSERTED: nResId = STR_REDLINE_INSERT; break; - case SwPostItHelper::DELETED: nResId = STR_REDLINE_DELETE; break; - default: nResId = 0; + case SwPostItHelper::INSERTED: pResId = STR_REDLINE_INSERT; break; + case SwPostItHelper::DELETED: pResId = STR_REDLINE_DELETE; break; + default: pResId = nullptr; } SwContentAtPos aContentAtPos( IsAttrAtPos::Redline ); - if ( nResId && + if ( pResId && mrDocView.GetWrtShell().GetContentAtPos( mrSidebarWin.GetAnchorPos(), aContentAtPos ) ) { - OUString sText = SwResId( nResId ) + ": " + + OUString sText = SwResId(pResId) + ": " + aContentAtPos.aFnd.pRedl->GetAuthorString() + " - " + GetAppLangDateTimeString( aContentAtPos.aFnd.pRedl->GetTimeStamp() ); Help::ShowQuickHelp( this,PixelToLogic(tools::Rectangle(rEvt.GetMousePosPixel(),Size(50,10))),sText); diff --git a/sw/source/uibase/docvw/annotation.hrc b/sw/source/uibase/docvw/annotation.hrc deleted file mode 100644 index 9e1b8265c756..000000000000 --- a/sw/source/uibase/docvw/annotation.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATION_HRC - -#include "rcid.hrc" - -#define STR_DELETE_ALL_NOTES (RC_ANNOTATION_BEGIN + 3) -#define STR_DELETE_AUTHOR_NOTES (RC_ANNOTATION_BEGIN + 4) - -#define STR_NODATE (RC_ANNOTATION_BEGIN + 5) -#define STR_NOAUTHOR (RC_ANNOTATION_BEGIN + 6) - -#define STR_REPLY (RC_ANNOTATION_BEGIN + 7) -#define STR_FORMAT_ALL_NOTES (RC_ANNOTATION_BEGIN + 8) - -#define ANNOTATION_ACT_END STR_REPLY -#if ANNOTATION_ACT_END > RC_ANNOTATION_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc deleted file mode 100644 index f98e300356fa..000000000000 --- a/sw/source/uibase/docvw/docvw.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC -#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_DOCVW_HRC - -#include "rcid.hrc" - -#define STR_REDLINE_INSERT (RC_DOCVW_BEGIN + 9) -#define STR_REDLINE_DELETE (RC_DOCVW_BEGIN + 10) -#define STR_REDLINE_FORMAT (RC_DOCVW_BEGIN + 11) -#define STR_REDLINE_TABLE (RC_DOCVW_BEGIN + 12) -#define STR_REDLINE_FMTCOLL (RC_DOCVW_BEGIN + 13) -#define STR_REDLINE_PARAGRAPH_FORMAT (RC_DOCVW_BEGIN + 14) -#define STR_REDLINE_TABLE_ROW_INSERT (RC_DOCVW_BEGIN + 15) -#define STR_REDLINE_TABLE_ROW_DELETE (RC_DOCVW_BEGIN + 16) -#define STR_REDLINE_TABLE_CELL_INSERT (RC_DOCVW_BEGIN + 17) -#define STR_REDLINE_TABLE_CELL_DELETE (RC_DOCVW_BEGIN + 18) -#define STR_ENDNOTE (RC_DOCVW_BEGIN + 19) -#define STR_FTNNOTE (RC_DOCVW_BEGIN + 20) - -#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 21) -#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 22) -#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 23) -#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 24) -#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 25) - -#define STR_SMARTTAG_CLICK (RC_DOCVW_BEGIN + 26) - -#define STR_HEADER_TITLE (RC_DOCVW_BEGIN + 27) -#define STR_FOOTER_TITLE (RC_DOCVW_BEGIN + 28) -#define STR_DELETE_HEADER (RC_DOCVW_BEGIN + 29) -#define STR_FORMAT_HEADER (RC_DOCVW_BEGIN + 30) -#define STR_DELETE_FOOTER (RC_DOCVW_BEGIN + 31) -#define STR_FORMAT_FOOTER (RC_DOCVW_BEGIN + 32) -#define STR_FIRST_HEADER_TITLE (RC_DOCVW_BEGIN + 33) -#define STR_LEFT_HEADER_TITLE (RC_DOCVW_BEGIN + 34) -#define STR_RIGHT_HEADER_TITLE (RC_DOCVW_BEGIN + 35) -#define STR_FIRST_FOOTER_TITLE (RC_DOCVW_BEGIN + 36) -#define STR_LEFT_FOOTER_TITLE (RC_DOCVW_BEGIN + 37) -#define STR_RIGHT_FOOTER_TITLE (RC_DOCVW_BEGIN + 38) - -#define DOCVW_ACT_END STR_RIGHT_FOOTER_TITLE - -#if DOCVW_ACT_END > RC_DOCVW_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src deleted file mode 100644 index 75f8738ac6c3..000000000000 --- a/sw/source/uibase/docvw/docvw.src +++ /dev/null @@ -1,159 +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 "docvw.hrc" -#include "cmdid.h" -#include "helpid.h" - -String STR_REDLINE_INSERT -{ - Text [ en-US ] = "Inserted" ; -}; -String STR_REDLINE_DELETE -{ - Text [ en-US ] = "Deleted" ; -}; -String STR_REDLINE_FORMAT -{ - Text [ en-US ] = "Formatted" ; -}; -String STR_REDLINE_TABLE -{ - Text [ en-US ] = "Table changed" ; -}; -String STR_REDLINE_FMTCOLL -{ - Text [ en-US ] = "Applied Paragraph Styles"; -}; -String STR_REDLINE_PARAGRAPH_FORMAT -{ - Text [ en-US ] = "Paragraph formatting changed"; -}; -String STR_REDLINE_TABLE_ROW_INSERT -{ - Text [ en-US ] = "Row Inserted"; -}; -String STR_REDLINE_TABLE_ROW_DELETE -{ - Text [ en-US ] = "Row Deleted"; -}; -String STR_REDLINE_TABLE_CELL_INSERT -{ - Text [ en-US ] = "Cell Inserted"; -}; -String STR_REDLINE_TABLE_CELL_DELETE -{ - Text [ en-US ] = "Cell Deleted"; -}; -String STR_ENDNOTE -{ - Text [ en-US ] = "Endnote: " ; -}; -String STR_FTNNOTE -{ - Text [ en-US ] = "Footnote: " ; -}; - -String STR_TABLE_COL_ADJUST -{ - Text [ en-US ] = "Adjust table column" ; -}; -String STR_TABLE_ROW_ADJUST -{ - Text [ en-US ] = "Adjust table row" ; -}; -String STR_TABLE_SELECT_ALL -{ - Text [ en-US ] = "Select whole table" ; -}; -String STR_TABLE_SELECT_ROW -{ - Text [ en-US ] = "Select table row" ; -}; -String STR_TABLE_SELECT_COL -{ - Text [ en-US ] = "Select table column" ; -}; - -String STR_SMARTTAG_CLICK -{ - Text [ en-US ] = "%s-click to open Smart Tag menu" ; -}; - -String STR_HEADER_TITLE -{ - Text [ en-US ] = "Header (%1)" ; -}; - -String STR_FIRST_HEADER_TITLE -{ - Text [ en-US ] = "First Page Header (%1)" ; -}; - -String STR_LEFT_HEADER_TITLE -{ - Text [ en-US ] = "Left Page Header (%1)" ; -}; - -String STR_RIGHT_HEADER_TITLE -{ - Text [ en-US ] = "Right Page Header (%1)" ; -}; - -String STR_FOOTER_TITLE -{ - Text [ en-US ] = "Footer (%1)" ; -}; - -String STR_FIRST_FOOTER_TITLE -{ - Text [ en-US ] = "First Page Footer (%1)" ; -}; - -String STR_LEFT_FOOTER_TITLE -{ - Text [ en-US ] = "Left Page Footer (%1)" ; -}; - -String STR_RIGHT_FOOTER_TITLE -{ - Text [ en-US ] = "Right Page Footer (%1)" ; -}; - -String STR_DELETE_HEADER -{ - Text [ en-US ] = "Delete Header..." ; -}; - -String STR_FORMAT_HEADER -{ - Text [ en-US ] = "Format Header..." ; -}; - -String STR_DELETE_FOOTER -{ - Text [ en-US ] = "Delete Footer..." ; -}; - -String STR_FORMAT_FOOTER -{ - Text [ en-US ] = "Format Footer..." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 7a6dc4ab5bce..33a7ddeba68b 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -125,7 +125,7 @@ #include <helpid.h> #include <cmdid.h> -#include <docvw.hrc> +#include <strings.hrc> #include <uitool.hxx> #include <fmtfollowtextflow.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 04152ea8efce..276c27441d35 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -56,8 +56,8 @@ #include <txttxmrk.hxx> #include <uitool.hxx> #include <viewopt.hxx> -#include <docvw.hrc> -#include <utlui.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <PostItMgr.hxx> #include <fmtfld.hxx> @@ -67,25 +67,25 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( rRedl.GetType() ) { - case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERT; break; - case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETE; break; - case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break; - case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break; - case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break; - case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: nResId = STR_REDLINE_PARAGRAPH_FORMAT; break; - case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: nResId = STR_REDLINE_TABLE_ROW_INSERT; break; - case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: nResId = STR_REDLINE_TABLE_ROW_DELETE; break; - case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: nResId = STR_REDLINE_TABLE_CELL_INSERT; break; - case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: nResId = STR_REDLINE_TABLE_CELL_DELETE; break; + case nsRedlineType_t::REDLINE_INSERT: pResId = STR_REDLINE_INSERT; break; + case nsRedlineType_t::REDLINE_DELETE: pResId = STR_REDLINE_DELETE; break; + case nsRedlineType_t::REDLINE_FORMAT: pResId = STR_REDLINE_FORMAT; break; + case nsRedlineType_t::REDLINE_TABLE: pResId = STR_REDLINE_TABLE; break; + case nsRedlineType_t::REDLINE_FMTCOLL: pResId = STR_REDLINE_FMTCOLL; break; + case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: pResId = STR_REDLINE_PARAGRAPH_FORMAT; break; + case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: pResId = STR_REDLINE_TABLE_ROW_INSERT; break; + case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: pResId = STR_REDLINE_TABLE_ROW_DELETE; break; + case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: pResId = STR_REDLINE_TABLE_CELL_INSERT; break; + case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: pResId = STR_REDLINE_TABLE_CELL_DELETE; break; } OUStringBuffer sBuf; - if( nResId ) + if (pResId) { - sBuf.append(SwResId(nResId)); + sBuf.append(SwResId(pResId)); sBuf.append(": "); sBuf.append(rRedl.GetAuthorString()); sBuf.append(" - "); @@ -393,37 +393,37 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) if( bContinue ) { SwTab nTabCols = rSh.WhichMouseTabCol(aPos); - sal_uInt16 nTabRes = 0; + const char* pTabRes = nullptr; switch(nTabCols) { case SwTab::COL_HORI: case SwTab::COL_VERT: - nTabRes = STR_TABLE_COL_ADJUST; + pTabRes = STR_TABLE_COL_ADJUST; break; case SwTab::ROW_HORI: case SwTab::ROW_VERT: - nTabRes = STR_TABLE_ROW_ADJUST; + pTabRes = STR_TABLE_ROW_ADJUST; break; // #i32329# Enhanced table selection case SwTab::SEL_HORI: case SwTab::SEL_HORI_RTL: case SwTab::SEL_VERT: - nTabRes = STR_TABLE_SELECT_ALL; + pTabRes = STR_TABLE_SELECT_ALL; break; case SwTab::ROWSEL_HORI: case SwTab::ROWSEL_HORI_RTL: case SwTab::ROWSEL_VERT: - nTabRes = STR_TABLE_SELECT_ROW; + pTabRes = STR_TABLE_SELECT_ROW; break; case SwTab::COLSEL_HORI: case SwTab::COLSEL_VERT: - nTabRes = STR_TABLE_SELECT_COL; + pTabRes = STR_TABLE_SELECT_COL; break; case SwTab::COL_NONE: break; // prevent compiler warning } - if(nTabRes) + if (pTabRes) { - sText = SwResId(nTabRes); + sText = SwResId(pTabRes); Size aTextSize( GetTextWidth(sText), GetTextHeight()); tools::Rectangle aRect(rEvt.GetMousePosPixel(), aTextSize); OUString sDisplayText(ClipLongToolTip(sText)); diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 64f90004230e..591e655f6d7c 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -45,7 +45,7 @@ #include <cmdid.h> #include <helpid.h> -#include <docvw.hrc> +#include <strings.hrc> using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index 56fbc75cae0e..0ee6d59a50ef 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -21,7 +21,6 @@ #include <comphelper/string.hxx> #include <o3tl/any.hxx> #include <tools/stream.hxx> -#include <tools/resid.hxx> #include <sfx2/app.hxx> #include <editeng/paperinf.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -29,9 +28,9 @@ #include <swmodule.hxx> #include <swtypes.hxx> #include <envimg.hxx> +#include "strings.hrc" #include <cmdid.h> -#include <envelp.hrc> #include <unomid.h> diff --git a/sw/source/uibase/envelp/label.hrc b/sw/source/uibase/envelp/label.hrc deleted file mode 100644 index d91422e73a6e..000000000000 --- a/sw/source/uibase/envelp/label.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC -#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC - -#include "envelp.hrc" - -// global resources ******************************************************** -#define STR_CUSTOM (RC_LABEL_BEGIN + 1) - -// overflow check ******************************************************** - -#define LABEL_ACT_END STR_CUSTOM - -#if LABEL_ACT_END > RC_LABEL_END -#error Resource-Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index ceeb44caf3d8..b95ff4100e23 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -21,7 +21,6 @@ #include <o3tl/any.hxx> #include <tools/stream.hxx> -#include <tools/resid.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/useroptions.hxx> #include <swmodule.hxx> diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 1237d50a3076..51b3f157e3b2 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -24,7 +24,7 @@ #include "swmodule.hxx" #include "view.hxx" #include "edtwin.hxx" -#include "label.hrc" +#include "strings.hrc" #include "syncbtn.hxx" #include "swtypes.hxx" diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index f540d076c1a1..729d3c9cbcf5 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -35,12 +35,15 @@ #include <comphelper/string.hxx> #include <editeng/unolingu.hxx> #include <unotools/localedatawrapper.hxx> +#include <tools/resary.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/app.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> +#include <svx/strarray.hxx> #include <basic/basmgr.hxx> #include <editeng/langitem.hxx> #include <svl/macitem.hxx> @@ -74,6 +77,7 @@ #include <fldmgr.hxx> #include <flddropdown.hxx> #include <fldui.hrc> +#include <strings.hrc> #include <tox.hxx> #include <misc.hrc> #include <cnttab.hxx> @@ -136,70 +140,214 @@ static const sal_uInt16 VF_COUNT = 1; // { 0 } static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD } static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT } +static const char* FLD_EU_ARY[] = +{ + FLD_EU_FIRMA, + FLD_EU_VORNAME, + FLD_EU_NAME, + FLD_EU_ABK, + FLD_EU_STRASSE, + FLD_EU_LAND, + FLD_EU_PLZ, + FLD_EU_ORT, + FLD_EU_TITEL, + FLD_EU_POS, + FLD_EU_TELPRIV, + FLD_EU_TELFIRMA, + FLD_EU_FAX, + FLD_EU_EMAIL, + FLD_EU_STATE +}; + +static const char* FMT_AUTHOR_ARY[] = +{ + FMT_AUTHOR_NAME, + FMT_AUTHOR_SCUT +}; + +static const char* FLD_DATE_ARY[] = +{ + FLD_DATE_FIX, + FLD_DATE_STD, +}; + +static const char* FLD_TIME_ARY[] = +{ + FLD_TIME_FIX, + FLD_TIME_STD +}; + +static const char* FMT_NUM_ARY[] = +{ + FMT_NUM_ABC, + FMT_NUM_SABC, + FMT_NUM_ABC_N, + FMT_NUM_SABC_N, + FMT_NUM_ROMAN, + FMT_NUM_SROMAN, + FMT_NUM_ARABIC, + FMT_NUM_PAGEDESC, + FMT_NUM_PAGESPECIAL +}; + +static const char* FMT_FF_ARY[] = +{ + FMT_FF_NAME, + FMT_FF_PATHNAME, + FMT_FF_PATH, + FMT_FF_NAME_NOEXT, + FMT_FF_UI_NAME, + FMT_FF_UI_RANGE +}; + +static const char* FLD_STAT_ARY[] = +{ + FLD_STAT_PAGE, + FLD_STAT_PARA, + FLD_STAT_WORD, + FLD_STAT_CHAR, + FLD_STAT_TABLE, + FLD_STAT_GRF, + FLD_STAT_OBJ +}; + +static const char* FMT_CHAPTER_ARY[] = +{ + FMT_CHAPTER_NO, + FMT_CHAPTER_NAME, + FMT_CHAPTER_NAMENO, + FMT_CHAPTER_NO_NOSEPARATOR +}; + +static const char* FLD_INPUT_ARY[] = +{ + FLD_INPUT_TEXT +}; + +static const char* FMT_MARK_ARY[] = +{ + FMT_MARK_TEXT, + FMT_MARK_TABLE, + FMT_MARK_FRAME, + FMT_MARK_GRAFIC, + FMT_MARK_OLE +}; + +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 +}; + +static const char* FMT_DBFLD_ARY[] = +{ + FMT_DBFLD_DB, + FMT_DBFLD_SYS +}; + +static const char* FMT_SETVAR_ARY[] = +{ + FMT_SETVAR_SYS, + FMT_SETVAR_TEXT +}; + +static const char* FMT_GETVAR_ARY[] = +{ + FMT_GETVAR_TEXT, + FMT_GETVAR_NAME +}; + +static const char* FMT_DDE_ARY[] = +{ + FMT_DDE_NORMAL, + FMT_DDE_HOT +}; + +static const char* FLD_PAGEREF_ARY[] = +{ + FLD_PAGEREF_OFF, + FLD_PAGEREF_ON +}; + +static const char* FMT_USERVAR_ARY[] = +{ + FMT_USERVAR_TEXT, + FMT_USERVAR_CMD +}; + // field types and subtypes struct SwFieldPack { - sal_uInt16 nTypeId; + sal_uInt16 nTypeId; - sal_uInt16 nSubTypeStart; - sal_uInt16 nSubTypeEnd; + const char** pSubTypeResIds; + size_t nSubTypeLength; - sal_uLong nFormatBegin; - sal_uLong nFormatEnd; + const char** pFormatResIds; + size_t nFormatLength; }; // strings and formats static const SwFieldPack aSwFields[] = { // Document - { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, - { TYP_AUTHORFLD, 0, 0, FMT_AUTHOR_BEGIN, FMT_AUTHOR_END }, - { TYP_DATEFLD, FLD_DATE_BEGIN, FLD_DATE_END, 0, 0 }, - { TYP_TIMEFLD, FLD_TIME_BEGIN, FLD_TIME_END, 0, 0 }, - { TYP_PAGENUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_NEXTPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_PREVPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END }, - { TYP_FILENAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, - { TYP_DOCSTATFLD, FLD_STAT_BEGIN, FLD_STAT_END, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - - { TYP_CHAPTERFLD, 0, 0, FMT_CHAPTER_BEGIN, FMT_CHAPTER_END }, - { TYP_TEMPLNAMEFLD, 0, 0, FMT_FF_BEGIN, FMT_FF_END }, + { TYP_EXTUSERFLD, FLD_EU_ARY, SAL_N_ELEMENTS(FLD_EU_ARY), nullptr, 0 }, + { TYP_AUTHORFLD, nullptr, 0, FMT_AUTHOR_ARY, SAL_N_ELEMENTS(FMT_AUTHOR_ARY) }, + { TYP_DATEFLD, FLD_DATE_ARY, SAL_N_ELEMENTS(FLD_DATE_ARY), nullptr, 0 }, + { TYP_TIMEFLD, FLD_TIME_ARY, SAL_N_ELEMENTS(FLD_TIME_ARY), nullptr, 0 }, + { TYP_PAGENUMBERFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) -1 }, + { TYP_NEXTPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) }, + { TYP_PREVPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) }, + { TYP_FILENAMEFLD, nullptr, 0, FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) }, + { TYP_DOCSTATFLD, FLD_STAT_ARY, SAL_N_ELEMENTS(FLD_STAT_ARY), FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) -1 }, + + { TYP_CHAPTERFLD, nullptr, 0, FMT_CHAPTER_ARY, SAL_N_ELEMENTS(FMT_CHAPTER_ARY) }, + { TYP_TEMPLNAMEFLD, nullptr, 0, FMT_FF_ARY, SAL_N_ELEMENTS(FMT_FF_ARY) }, // Functions - { TYP_CONDTXTFLD, 0, 0, 0, 0 }, - { TYP_DROPDOWN, 0, 0, 0, 0 }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_MACROFLD, 0, 0, 0, 0 }, - { TYP_JUMPEDITFLD, 0, 0, FMT_MARK_BEGIN, FMT_MARK_END }, - { TYP_COMBINED_CHARS, 0, 0, 0, 0 }, - { TYP_HIDDENTXTFLD, 0, 0, 0, 0 }, - { TYP_HIDDENPARAFLD, 0, 0, 0, 0 }, + { TYP_CONDTXTFLD, nullptr, 0, nullptr, 0 }, + { TYP_DROPDOWN, nullptr, 0, nullptr, 0 }, + { TYP_INPUTFLD, FLD_INPUT_ARY, SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 }, + { TYP_MACROFLD, nullptr, 0, nullptr, 0 }, + { TYP_JUMPEDITFLD, nullptr, 0, FMT_MARK_ARY, SAL_N_ELEMENTS(FMT_MARK_ARY) }, + { TYP_COMBINED_CHARS, nullptr, 0, nullptr, 0 }, + { TYP_HIDDENTXTFLD, nullptr, 0, nullptr, 0 }, + { TYP_HIDDENPARAFLD, nullptr, 0, nullptr, 0 }, // Cross-References - { TYP_SETREFFLD, 0, 0, 0, 0 }, - { TYP_GETREFFLD, 0, 0, FMT_REF_BEGIN, FMT_REF_END }, + { TYP_SETREFFLD, nullptr, 0, nullptr, 0 }, + { TYP_GETREFFLD, nullptr, 0, FMT_REF_ARY, SAL_N_ELEMENTS(FMT_REF_ARY) }, // DocInformation - { TYP_DOCINFOFLD, 0, 0, FMT_REG_BEGIN, FMT_REG_END }, + { TYP_DOCINFOFLD, nullptr, 0, FMT_REF_ARY, SAL_N_ELEMENTS(FMT_REF_ARY) }, // Database - { TYP_DBFLD, 0, 0, FMT_DBFLD_BEGIN, FMT_DBFLD_END }, - { TYP_DBNEXTSETFLD, 0, 0, 0, 0 }, - { TYP_DBNUMSETFLD, 0, 0, 0, 0 }, - { TYP_DBSETNUMBERFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_DBNAMEFLD, 0, 0, 0, 0 }, + { TYP_DBFLD, nullptr, 0, FMT_DBFLD_ARY, SAL_N_ELEMENTS(FMT_DBFLD_ARY) }, + { TYP_DBNEXTSETFLD, nullptr, 0, nullptr, 0 }, + { TYP_DBNUMSETFLD, nullptr, 0, nullptr, 0 }, + { TYP_DBSETNUMBERFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 }, + { TYP_DBNAMEFLD, nullptr, 0, nullptr, 0 }, // Variables - { TYP_SETFLD, 0, 0, FMT_SETVAR_BEGIN, FMT_SETVAR_END }, - - { TYP_GETFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_DDEFLD, 0, 0, FMT_DDE_BEGIN, FMT_DDE_END }, - { TYP_FORMELFLD, 0, 0, FMT_GETVAR_BEGIN, FMT_GETVAR_END }, - { TYP_INPUTFLD, FLD_INPUT_BEGIN, FLD_INPUT_END, 0, 0 }, - { TYP_SEQFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-2 }, - { TYP_SETREFPAGEFLD, FLD_PAGEREF_BEGIN, FLD_PAGEREF_END,0, 0 }, - { TYP_GETREFPAGEFLD, 0, 0, FMT_NUM_BEGIN, FMT_NUM_END-1 }, - { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } + { TYP_SETFLD, nullptr, 0, FMT_SETVAR_ARY, SAL_N_ELEMENTS(FMT_SETVAR_ARY) }, + + { TYP_GETFLD, nullptr, 0, FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) }, + { TYP_DDEFLD, nullptr, 0, FMT_DDE_ARY, SAL_N_ELEMENTS(FMT_DDE_ARY) }, + { TYP_FORMELFLD, nullptr, 0, FMT_GETVAR_ARY, SAL_N_ELEMENTS(FMT_GETVAR_ARY) }, + { TYP_INPUTFLD, FLD_INPUT_ARY, SAL_N_ELEMENTS(FLD_INPUT_ARY), nullptr, 0 }, + { TYP_SEQFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 2 }, + { TYP_SETREFPAGEFLD, FLD_PAGEREF_ARY, SAL_N_ELEMENTS(FLD_PAGEREF_ARY),nullptr, 0 }, + { TYP_GETREFPAGEFLD, nullptr, 0, FMT_NUM_ARY, SAL_N_ELEMENTS(FMT_NUM_ARY) - 1 }, + { TYP_USERFLD, nullptr, 0, FMT_USERVAR_ARY, SAL_N_ELEMENTS(FMT_USERVAR_ARY) } }; // access to the shell @@ -442,7 +590,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) } case TYP_INPUTFLD: { - rToFill.push_back(SwResId(aSwFields[nPos].nSubTypeStart)); + rToFill.push_back(SwResId(aSwFields[nPos].pSubTypeResIds[0])); SAL_FALLTHROUGH; // move on at generic types } case TYP_DDEFLD: @@ -497,7 +645,7 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) if (nTypeId == TYP_DOCINFOFLD) nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN; else - nCount = aSwFields[nPos].nSubTypeEnd - aSwFields[nPos].nSubTypeStart; + nCount = aSwFields[nPos].nSubTypeLength; for(sal_uInt16 i = 0; i < nCount; ++i) { @@ -505,12 +653,12 @@ void SwFieldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) if (nTypeId == TYP_DOCINFOFLD) { if ( i == DI_CUSTOM ) - sNew = SwResId( STR_CUSTOM ); + sNew = SwResId(STR_CUSTOM_FIELD); else sNew = SwViewShell::GetShellRes()->aDocInfoLst[i]; } else - sNew = SwResId(aSwFields[nPos].nSubTypeStart + i); + sNew = SwResId(aSwFields[nPos].pSubTypeResIds[i]); rToFill.push_back(sNew); } @@ -528,45 +676,46 @@ sal_uInt16 SwFieldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bHtmlMode) const { const sal_uInt16 nPos = GetPos(nTypeId); - if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD)) + if (nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD)) return 0; - sal_uLong nStart = aSwFields[nPos].nFormatBegin; - sal_uLong nEnd = aSwFields[nPos].nFormatEnd; + sal_uInt16 nCount = aSwFields[nPos].nFormatLength; if (nTypeId == TYP_FILENAMEFLD) - nEnd -= 2; // no range or template - - switch(nStart) + nCount -= 2; // no range or template + + const char** pStart = aSwFields[nPos].pFormatResIds; + if (!pStart) + return nCount; + + if (strcmp(*pStart, FMT_GETVAR_ARY[0]) == 0 || strcmp(*pStart, FMT_SETVAR_ARY[0]) == 0) + return VF_COUNT; + else if (strcmp(*pStart, FMT_USERVAR_ARY[0]) == 0) + return VF_USR_COUNT; + else if (strcmp(*pStart, FMT_DBFLD_ARY[0]) == 0) + return VF_DB_COUNT; + else if (strcmp(*pStart, FMT_NUM_ARY[0]) == 0) { - case FMT_GETVAR_BEGIN: - case FMT_SETVAR_BEGIN: return VF_COUNT; - case FMT_USERVAR_BEGIN: return VF_USR_COUNT; - case FMT_DBFLD_BEGIN: return VF_DB_COUNT; - case FMT_NUM_BEGIN: + GetNumberingInfo(); + if(xNumberingInfo.is()) { - sal_uInt16 nCount = (sal_uInt16)(nEnd - nStart); - GetNumberingInfo(); - if(xNumberingInfo.is()) + Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); + const sal_Int16* pTypes = aTypes.getConstArray(); + for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) { - Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); - const sal_Int16* pTypes = aTypes.getConstArray(); - for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) + sal_Int16 nCurrent = pTypes[nType]; + //skip all values below or equal to CHARS_LOWER_LETTER_N + if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) { - sal_Int16 nCurrent = pTypes[nType]; - //skip all values below or equal to CHARS_LOWER_LETTER_N - if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) - { - // #i28073# it's not necessarily a sorted sequence - ++nCount; - } + // #i28073# it's not necessarily a sorted sequence + ++nCount; } } - return nCount; } - + return nCount; } - return (sal_uInt16)(nEnd - nStart); + + return nCount; } } @@ -576,42 +725,39 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); const sal_uInt16 nPos = GetPos(nTypeId); - if(nPos == USHRT_MAX) + if (nPos == USHRT_MAX) return OUString(); - sal_uLong nStart; - - nStart = aSwFields[nPos].nFormatBegin; + const char** pStart = aSwFields[nPos].pFormatResIds; + if (!pStart) + return OUString(); if (TYP_AUTHORFLD == nTypeId|| TYP_FILENAMEFLD == nTypeId) nFormatId &= ~FF_FIXED; // mask out Fixed-Flag - if((nStart + nFormatId) < aSwFields[nPos].nFormatEnd) - return SwResId((sal_uInt16)(nStart + nFormatId)); + if (nFormatId < aSwFields[nPos].nFormatLength) + return SwResId(pStart[nFormatId]); OUString aRet; - if( FMT_NUM_BEGIN == nStart) + if (strcmp(*pStart, FMT_NUM_ARY[0])) { - if(xNumberingInfo.is()) + if (xNumberingInfo.is()) { - ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR())); - Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); const sal_Int16* pTypes = aTypes.getConstArray(); - sal_Int32 nOffset = aSwFields[nPos].nFormatEnd - nStart; sal_Int32 nValidEntry = 0; - for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) + for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) { sal_Int16 nCurrent = pTypes[nType]; if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N && (nCurrent != (NumberingType::BITMAP | LINK_TOKEN))) { - if(nValidEntry == ((sal_Int32)nFormatId) - nOffset) + if (nValidEntry == ((sal_Int32)nFormatId)) { - sal_uInt32 n = aNames.FindIndex(pTypes[nType]); + sal_uInt32 n = SvxNumberingTypeTable::FindIndex(pTypes[nType]); if (n != RESARRAY_INDEX_NOTFOUND) { - aRet = aNames.GetString(n); + aRet = SvxNumberingTypeTable::GetString(n); } else { @@ -634,74 +780,80 @@ sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) cons sal_uInt16 nId = (sal_uInt16)nFormatId; switch( nTypeId ) { - case TYP_DOCINFOFLD: - switch( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId ) + case TYP_DOCINFOFLD: { - case FMT_REG_AUTHOR: nId = DI_SUB_AUTHOR; break; - case FMT_REG_TIME: nId = DI_SUB_TIME; break; - case FMT_REG_DATE: nId = DI_SUB_DATE; break; + const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]); + if (sId == FMT_REG_AUTHOR) + nId = DI_SUB_AUTHOR; + else if (sId == FMT_REG_TIME) + nId = DI_SUB_TIME; + else if (sId == FMT_REG_DATE) + nId = DI_SUB_DATE; + break; } - break; - - case TYP_PAGENUMBERFLD: - case TYP_NEXTPAGEFLD: - case TYP_PREVPAGEFLD: - case TYP_DOCSTATFLD: - case TYP_DBSETNUMBERFLD: - case TYP_SEQFLD: - case TYP_GETREFPAGEFLD: - { - sal_uInt16 nPos = GetPos( nTypeId ); - sal_uLong nBegin = aSwFields[ nPos ].nFormatBegin; - sal_uLong nEnd = aSwFields[nPos].nFormatEnd; - if((nBegin + nFormatId) < nEnd) + case TYP_PAGENUMBERFLD: + case TYP_NEXTPAGEFLD: + case TYP_PREVPAGEFLD: + case TYP_DOCSTATFLD: + case TYP_DBSETNUMBERFLD: + case TYP_SEQFLD: + case TYP_GETREFPAGEFLD: { - switch( nBegin + nFormatId ) + sal_uInt16 nPos = GetPos(nTypeId); + if (nFormatId < aSwFields[nPos].nFormatLength) { - case FMT_NUM_ABC: nId = SVX_NUM_CHARS_UPPER_LETTER; break; - case FMT_NUM_SABC: nId = SVX_NUM_CHARS_LOWER_LETTER; break; - case FMT_NUM_ROMAN: nId = SVX_NUM_ROMAN_UPPER; break; - case FMT_NUM_SROMAN: nId = SVX_NUM_ROMAN_LOWER; break; - case FMT_NUM_ARABIC: nId = SVX_NUM_ARABIC; break; - case FMT_NUM_PAGEDESC: nId = SVX_NUM_PAGEDESC; break; - case FMT_NUM_PAGESPECIAL: nId = SVX_NUM_CHAR_SPECIAL; break; - case FMT_NUM_ABC_N: nId = SVX_NUM_CHARS_UPPER_LETTER_N; break; - case FMT_NUM_SABC_N: nId = SVX_NUM_CHARS_LOWER_LETTER_N; break; + const OString sId(aSwFields[nPos].pFormatResIds[nFormatId]); + if (sId == FMT_NUM_ABC) + nId = SVX_NUM_CHARS_UPPER_LETTER; + else if (sId == FMT_NUM_SABC) + nId = SVX_NUM_CHARS_LOWER_LETTER; + else if (sId == FMT_NUM_ROMAN) + nId = SVX_NUM_ROMAN_UPPER; + else if (sId == FMT_NUM_SROMAN) + nId = SVX_NUM_ROMAN_LOWER; + else if (sId == FMT_NUM_ARABIC) + nId = SVX_NUM_ARABIC; + else if (sId == FMT_NUM_PAGEDESC) + nId = SVX_NUM_PAGEDESC; + else if (sId == FMT_NUM_PAGESPECIAL) + nId = SVX_NUM_CHAR_SPECIAL; + else if (sId == FMT_NUM_ABC_N) + nId = SVX_NUM_CHARS_UPPER_LETTER_N; + else if (sId == FMT_NUM_SABC_N) + nId = SVX_NUM_CHARS_LOWER_LETTER_N; } - } - else if(xNumberingInfo.is()) - { - Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); - const sal_Int16* pTypes = aTypes.getConstArray(); - sal_Int32 nOffset = nEnd - nBegin; - sal_Int32 nValidEntry = 0; - for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) + else if (xNumberingInfo.is()) { - sal_Int16 nCurrent = pTypes[nType]; - if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) + Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); + const sal_Int16* pTypes = aTypes.getConstArray(); + sal_Int32 nValidEntry = 0; + for (sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) { - if(nValidEntry == ((sal_Int32)nFormatId) - nOffset) + sal_Int16 nCurrent = pTypes[nType]; + if (nCurrent > NumberingType::CHARS_LOWER_LETTER_N) { - nId = pTypes[nType]; - break; + if (nValidEntry == ((sal_Int32)nFormatId)) + { + nId = pTypes[nType]; + break; + } + ++nValidEntry; } - ++nValidEntry; } } + break; } - } - break; - case TYP_DDEFLD: - switch ( aSwFields[ GetPos( nTypeId ) ].nFormatBegin + nFormatId ) + case TYP_DDEFLD: { - case FMT_DDE_NORMAL: nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL); break; - case FMT_DDE_HOT: nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS); break; + const OString sId(aSwFields[GetPos(nTypeId)].pFormatResIds[nFormatId]); + if (sId == FMT_DDE_NORMAL) + nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ONCALL); + else if (sId == FMT_DDE_HOT) + nId = static_cast<sal_uInt16>(SfxLinkUpdateMode::ALWAYS); + break; } - break; } - return nId; - } // Traveling @@ -1558,7 +1710,8 @@ LanguageType SwFieldMgr::GetCurrLanguage() const void SwFieldType::GetFieldName_() { - static const sal_uInt16 coFieldNms[] = { + static const char* coFieldNms[] = + { FLD_DATE_STD, FLD_TIME_STD, STR_FILENAMEFLD, @@ -1602,15 +1755,15 @@ void SwFieldType::GetFieldName_() STR_AUTHORITY, STR_COMBINED_CHARS, STR_DROPDOWN, - STR_CUSTOM + STR_CUSTOM_FIELD }; // insert infos for fields SwFieldType::s_pFieldNames = new std::vector<OUString>; SwFieldType::s_pFieldNames->reserve(SAL_N_ELEMENTS(coFieldNms)); - for(sal_uInt16 i : coFieldNms) + for (const char* id : coFieldNms) { - const OUString aTmp(SwResId( i )); + const OUString aTmp(SwResId(id)); SwFieldType::s_pFieldNames->push_back(MnemonicGenerator::EraseAllMnemonicChars( aTmp )); } } diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx index f18c6c367e99..2eca08044016 100644 --- a/sw/source/uibase/globdoc/globdoc.cxx +++ b/sw/source/uibase/globdoc/globdoc.cxx @@ -25,7 +25,7 @@ #include "swtypes.hxx" #include "shellio.hxx" #include "globdoc.hxx" -#include "globdoc.hrc" +#include "strings.hrc" #include "cfgid.h" // Description: Register all filters diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc deleted file mode 100644 index c337f0f63191..000000000000 --- a/sw/source/uibase/inc/app.hrc +++ /dev/null @@ -1,107 +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_UIBASE_INC_APP_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_APP_HRC - -#include "rcid.hrc" - -#define STR_CANTCREATE (RC_APP_BEGIN + 4) -#define STR_CANTOPEN (RC_APP_BEGIN + 5) - -#define STR_VERSION (RC_APP_BEGIN + 14) - -// Strings for regions in the configuration -#define STR_PAGEOFFSET (RC_APP_BEGIN + 74) -#define STR_PAGEBREAK (RC_APP_BEGIN + 75) -#define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) -#define STR_WESTERN_FONT (RC_APP_BEGIN + 77) -#define STR_CJK_FONT (RC_APP_BEGIN + 78) -#define STR_DELETE_NOTE_AUTHOR (RC_APP_BEGIN + 79) -#define STR_HIDE_NOTE_AUTHOR (RC_APP_BEGIN + 80) - -#define STR_ENV_TITLE (RC_APP_BEGIN + 91) -#define STR_LAB_TITLE (RC_APP_BEGIN + 92) - -#define STR_HUMAN_SWDOC_NAME (RC_APP_BEGIN + 93) - -#define RID_SW_ERRHDL (RC_APP_BEGIN + 95) - -#define STR_FDLG_TEMPLATE_NAME (RC_APP_BEGIN + 2) - -#define STR_WRITER_DOCUMENT_FULLTYPE (RC_APP_BEGIN + 100) -#define STR_CONVERT_TEXT_TABLE (RC_APP_BEGIN + 101) -#define STR_ABSTRACT_TITLE (RC_APP_BEGIN + 102) -#define STR_OUTLINE_NUMBERING (RC_APP_BEGIN + 104) -#define STR_FDLG_OUTLINE_LEVEL (RC_APP_BEGIN + 105) -#define STR_FDLG_STYLE (RC_APP_BEGIN + 106) - -// Status bar strings -#define STR_STATUSBAR_WORDCOUNT_NO_SELECTION (RC_APP_BEGIN + 110) -#define STR_STATUSBAR_WORDCOUNT (RC_APP_BEGIN + 111) - -#define STR_ADD_AUTOFORMAT_TITLE (RC_APP_BEGIN + 112) -#define STR_ADD_AUTOFORMAT_LABEL (RC_APP_BEGIN + 113) -#define STR_DEL_AUTOFORMAT_TITLE (RC_APP_BEGIN + 114) -#define STR_DEL_AUTOFORMAT_MSG (RC_APP_BEGIN + 115) -#define STR_RENAME_AUTOFORMAT_TITLE (RC_APP_BEGIN + 116) -#define STR_BTN_AUTOFORMAT_CLOSE (RC_APP_BEGIN + 117) -#define STR_INVALID_AUTOFORMAT_NAME (RC_APP_BEGIN + 118) -#define STR_JAN (RC_APP_BEGIN + 119) -#define STR_FEB (RC_APP_BEGIN + 120) -#define STR_MAR (RC_APP_BEGIN + 121) -#define STR_NORTH (RC_APP_BEGIN + 122) -#define STR_MID (RC_APP_BEGIN + 123) -#define STR_SOUTH (RC_APP_BEGIN + 124) -#define STR_SUM (RC_APP_BEGIN + 125) -#define STR_NUMERIC (RC_APP_BEGIN + 126) -#define STR_COL (RC_APP_BEGIN + 127) -#define STR_ROW (RC_APP_BEGIN + 128) -#define STR_AUTHMRK_EDIT (RC_APP_BEGIN + 130) -#define STR_AUTHMRK_INSERT (RC_APP_BEGIN + 131) -#define STR_CAPTION_TABLE (RC_APP_BEGIN + 133) -#define STR_CAPTION_FRAME (RC_APP_BEGIN + 134) -#define STR_CAPTION_GRAPHIC (RC_APP_BEGIN + 135) -#define STR_CAPTION_OLE (RC_APP_BEGIN + 136) -#define STR_ERR_TABLE_MERGE (RC_APP_BEGIN + 137) -#define STR_WRONG_TABLENAME (RC_APP_BEGIN + 138) -#define STR_SRTERR (RC_APP_BEGIN + 139) - -#define STR_PARAGRAPHSTYLEFAMILY (RC_APP_BEGIN + 140) -#define STR_CHARACTERSTYLEFAMILY (RC_APP_BEGIN + 141) -#define STR_FRAMESTYLEFAMILY (RC_APP_BEGIN + 142) -#define STR_PAGESTYLEFAMILY (RC_APP_BEGIN + 143) -#define STR_LISTSTYLEFAMILY (RC_APP_BEGIN + 144) -#define STR_TABLESTYLEFAMILY (RC_APP_BEGIN + 145) -#define RID_PARAGRAPHSTYLEFAMILY (RC_APP_BEGIN + 146) -#define RID_CHARACTERSTYLEFAMILY (RC_APP_BEGIN + 147) -#define RID_FRAMESTYLEFAMILY (RC_APP_BEGIN + 148) -#define RID_PAGESTYLEFAMILY (RC_APP_BEGIN + 149) -#define RID_LISTSTYLEFAMILY (RC_APP_BEGIN + 150) -#define RID_TABLESTYLEFAMILY (RC_APP_BEGIN + 151) - -#define APP_ACT_END RID_TABLESTYLEFAMILY - -#if APP_ACT_END > RC_APP_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx index d9c63a78ba03..504edf633605 100644 --- a/sw/source/uibase/inc/cnttab.hxx +++ b/sw/source/uibase/inc/cnttab.hxx @@ -30,7 +30,6 @@ #include "tox.hxx" #include <toxmgr.hxx> #include <svx/checklbx.hxx> -#include <tools/resary.hxx> #include <svtools/treelistbox.hxx> #include <vcl/menubtn.hxx> #include <svx/langbox.hxx> @@ -64,18 +63,6 @@ struct CurTOXType CurTOXType (TOXTypes t) : eType (t), nIndex (0) {}; }; -class SwOLENames -{ - ResStringArray aNamesAry; -public: - SwOLENames(const ResId& rResId) - : aNamesAry(rResId) - { - } - - ResStringArray& GetNames() { return aNamesAry;} -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/dialmgr.hxx b/sw/source/uibase/inc/dialmgr.hxx deleted file mode 100644 index 91695bdeb4a7..000000000000 --- a/sw/source/uibase/inc/dialmgr.hxx +++ /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 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX - -#include <tools/resid.hxx> - -struct SwDialogsResMgr -{ - static ResMgr* GetResMgr(); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 9aa04255aab4..aa7d0916a047 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -89,9 +89,6 @@ class SwFramePage: public SfxTabPage // example VclPtr<SvxSwFrameExample> m_pExampleWN; - //'string provider' - SvxSwFramePosString m_aFramePosString; - bool m_bAtHorzPosModified; bool m_bAtVertPosModified; @@ -166,7 +163,7 @@ class SwFramePage: public SfxTabPage const sal_Int16 _nRel, ListBox& _rLB, FixedText& _rFT ); - sal_Int32 GetMapPos( const FrameMap *pMap, ListBox &rAlignLB ); + static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox &rAlignLB); static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); static sal_Int16 GetRelation(FrameMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchor(); diff --git a/sw/source/uibase/inc/frmui.hrc b/sw/source/uibase/inc/frmui.hrc index 22fff4967fd8..6d8fbf133db1 100644 --- a/sw/source/uibase/inc/frmui.hrc +++ b/sw/source/uibase/inc/frmui.hrc @@ -25,29 +25,8 @@ #define DLG_COLUMN (RC_FRMDLG_BEGIN + 4) -#define STR_FRMUI_BORDER (RC_FRMDLG_BEGIN + 16) -#define STR_FRMUI_PATTERN (RC_FRMDLG_BEGIN + 17) - #define MN_BACKGROUND (RC_FRMDLG_BEGIN + 27) -#define STR_FRMDLG_BEGIN (RC_FRMDLG_BEGIN + 31) - -#define STR_COLUMN (STR_FRMDLG_BEGIN + 17) - -#define STR_OLE_INSERT (STR_FRMDLG_BEGIN + 45) -#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46) -#define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47) - -#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50) -#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51) -#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52) - -#define FRMDLG_ACT_END STR_LINE_CENTER - -#if FRMDLG_ACT_END > RC_FRMDLG_END -#error Resource-Id Ueberlauf in #file, #line -#endif - #endif // FRMUI_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/globdoc.hrc b/sw/source/uibase/inc/globdoc.hrc deleted file mode 100644 index 7be2d6b210a5..000000000000 --- a/sw/source/uibase/inc/globdoc.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOBDOC_HRC - -#include "rcid.hrc" - -#define STR_HUMAN_SWGLOBDOC_NAME (RC_GLOBDOC_BEGIN + 2) -#define STR_WRITER_GLOBALDOC_FULLTYPE (RC_GLOBDOC_BEGIN + 5) - -#define GLOBDOC_ACT_END STR_WRITER_GLOBALDOC_FULLTYPE - -#if GLOBDOC_ACT_END > RC_GLOBDOC_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc index cfa41471db6f..c9189e5ac191 100644 --- a/sw/source/uibase/inc/misc.hrc +++ b/sw/source/uibase/inc/misc.hrc @@ -26,29 +26,6 @@ #define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 29) -#define STR_DOUBLE_SHORTNAME (RC_MISC_BEGIN + 30) -#define STR_QUERY_DELETE (RC_MISC_BEGIN + 31) -#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32) -#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33) -#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34) - -#define STR_GLOSSARY (RC_MISC_BEGIN + 43) -#define STR_CHANGE_START (RC_MISC_BEGIN + 44) -#define STR_CHANGE_END (RC_MISC_BEGIN + 45) -#define STR_SAVE_GLOSSARY (RC_MISC_BEGIN + 46) - -#define STR_MY_AUTOTEXT (RC_MISC_BEGIN + 64) - -#define STR_COMMENTS_LABEL (RC_MISC_BEGIN + 65) -#define STR_SHOW_COMMENTS (RC_MISC_BEGIN + 66) -#define STR_HIDE_COMMENTS (RC_MISC_BEGIN + 67) - -#define MISC_ACT_END STR_HIDE_COMMENTS - -#if MISC_ACT_END > RC_MISC_END -#error Resource-Id Ueberlauf in #file, #line -#endif - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx index 84b78faa9323..0e86af95eed2 100644 --- a/sw/source/uibase/inc/mmconfigitem.hxx +++ b/sw/source/uibase/inc/mmconfigitem.hxx @@ -22,9 +22,9 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/view/XSelectionChangeListener.hpp> -#include <tools/resary.hxx> #include <memory> #include <set> +#include <vector> #include <swdbdata.hxx> #include "swdllapi.h" #include "sharedconnection.hxx" @@ -77,7 +77,7 @@ public: void Commit(); - const ResStringArray& GetDefaultAddressHeaders() const; + const std::vector<std::pair<OUString, int>>& GetDefaultAddressHeaders() const; void SetCurrentConnection( css::uno::Reference< css::sdbc::XDataSource> const & xSource, diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 484c7f6318f0..b530f4557a30 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -35,6 +35,14 @@ class SwFieldMgr; class SvTreeListEntry; class SwWrtShell; +class SwFieldUnitTable +{ +public: + static OUString GetString(sal_uInt32 i); + static sal_uInt32 Count(); + static FieldUnit GetValue(sal_uInt32 i); +}; + class SwLoadOptPage : public SfxTabPage { private: diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc deleted file mode 100644 index 5a51a490e99e..000000000000 --- a/sw/source/uibase/inc/ribbar.hrc +++ /dev/null @@ -1,100 +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_UIBASE_INC_RIBBAR_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_RIBBAR_HRC - -#include "rcid.hrc" - -#define STR_TBL_FORMULA (RC_RIBBAR_BEGIN +8) - -#define ST_TBL (RC_RIBBAR_BEGIN + 14) -#define ST_FRM (RC_RIBBAR_BEGIN + 15) -#define ST_PGE (RC_RIBBAR_BEGIN + 16) -#define ST_DRW (RC_RIBBAR_BEGIN + 17) -#define ST_CTRL (RC_RIBBAR_BEGIN + 18) -#define ST_REG (RC_RIBBAR_BEGIN + 19) -#define ST_BKM (RC_RIBBAR_BEGIN + 20) -#define ST_GRF (RC_RIBBAR_BEGIN + 21) -#define ST_OLE (RC_RIBBAR_BEGIN + 22) -#define ST_OUTL (RC_RIBBAR_BEGIN + 23) -#define ST_SEL (RC_RIBBAR_BEGIN + 24) -#define ST_FTN (RC_RIBBAR_BEGIN + 25) -#define ST_MARK (RC_RIBBAR_BEGIN + 26) -#define ST_POSTIT (RC_RIBBAR_BEGIN + 27) -#define ST_SRCH_REP (RC_RIBBAR_BEGIN + 28) -#define ST_INDEX_ENTRY (RC_RIBBAR_BEGIN + 29) -#define ST_TABLE_FORMULA (RC_RIBBAR_BEGIN + 30) -#define ST_TABLE_FORMULA_ERROR (RC_RIBBAR_BEGIN + 31) -#define STR_FORMULA_CALC (RC_RIBBAR_BEGIN + 32) -#define STR_FORMULA_CANCEL (RC_RIBBAR_BEGIN + 33) -#define STR_FORMULA_APPLY (RC_RIBBAR_BEGIN + 34) - -#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 35) - -#define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0) -#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1) -#define STR_IMGBTN_TBL_DOWN (STR_IMGBTN_START + 2) -#define STR_IMGBTN_FRM_DOWN (STR_IMGBTN_START + 3) -#define STR_IMGBTN_PGE_DOWN (STR_IMGBTN_START + 4) -#define STR_IMGBTN_DRW_DOWN (STR_IMGBTN_START + 5) -#define STR_IMGBTN_CTRL_DOWN (STR_IMGBTN_START + 6) -#define STR_IMGBTN_REG_DOWN (STR_IMGBTN_START + 7) -#define STR_IMGBTN_BKM_DOWN (STR_IMGBTN_START + 8) -#define STR_IMGBTN_GRF_DOWN (STR_IMGBTN_START + 9) -#define STR_IMGBTN_OLE_DOWN (STR_IMGBTN_START +10) -#define STR_IMGBTN_OUTL_DOWN (STR_IMGBTN_START +11) -#define STR_IMGBTN_SEL_DOWN (STR_IMGBTN_START +12) -#define STR_IMGBTN_FTN_DOWN (STR_IMGBTN_START +13) -#define STR_IMGBTN_MARK_DOWN (STR_IMGBTN_START +14) -#define STR_IMGBTN_POSTIT_DOWN (STR_IMGBTN_START +15) -#define STR_IMGBTN_SRCH_REP_DOWN (STR_IMGBTN_START +16) -#define STR_IMGBTN_INDEX_ENTRY_DOWN (STR_IMGBTN_START +17) -#define STR_IMGBTN_TBLFML_DOWN (STR_IMGBTN_START +18) -#define STR_IMGBTN_TBLFML_ERR_DOWN (STR_IMGBTN_START +19) - -#define STR_IMGBTN_NEXT_UP (STR_IMGBTN_START +20) -#define STR_IMGBTN_PREV_UP (STR_IMGBTN_START +21) -#define STR_IMGBTN_TBL_UP (STR_IMGBTN_START +22) -#define STR_IMGBTN_FRM_UP (STR_IMGBTN_START +23) -#define STR_IMGBTN_PGE_UP (STR_IMGBTN_START +24) -#define STR_IMGBTN_DRW_UP (STR_IMGBTN_START +25) -#define STR_IMGBTN_CTRL_UP (STR_IMGBTN_START +26) -#define STR_IMGBTN_REG_UP (STR_IMGBTN_START +27) -#define STR_IMGBTN_BKM_UP (STR_IMGBTN_START +28) -#define STR_IMGBTN_GRF_UP (STR_IMGBTN_START +29) -#define STR_IMGBTN_OLE_UP (STR_IMGBTN_START +30) -#define STR_IMGBTN_OUTL_UP (STR_IMGBTN_START +31) -#define STR_IMGBTN_SEL_UP (STR_IMGBTN_START +32) -#define STR_IMGBTN_FTN_UP (STR_IMGBTN_START +33) -#define STR_IMGBTN_MARK_UP (STR_IMGBTN_START +34) -#define STR_IMGBTN_POSTIT_UP (STR_IMGBTN_START +35) -#define STR_IMGBTN_SRCH_REP_UP (STR_IMGBTN_START +36) -#define STR_IMGBTN_INDEX_ENTRY_UP (STR_IMGBTN_START +37) -#define STR_IMGBTN_TBLFML_UP (STR_IMGBTN_START +38) -#define STR_IMGBTN_TBLFML_ERR_UP (STR_IMGBTN_START +39) - -#define RC_RIBBAR_ACT_END STR_IMGBTN_TBLFML_ERR_UP - -#if RC_RIBBAR_ACT_END > RC_RIBBAR_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/shells.hrc b/sw/source/uibase/inc/shells.hrc deleted file mode 100644 index 80a4b0118a01..000000000000 --- a/sw/source/uibase/inc/shells.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SHELLS_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_SHELLS_HRC - -#include "rcid.hrc" - -#define STR_GRFILTER_OPENERROR (RC_SHELLS_BEGIN + 1) -#define STR_GRFILTER_IOERROR (RC_SHELLS_BEGIN + 2) -#define STR_GRFILTER_FORMATERROR (RC_SHELLS_BEGIN + 3) -#define STR_GRFILTER_VERSIONERROR (RC_SHELLS_BEGIN + 4) -#define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5) -#define STR_GRFILTER_TOOBIG (RC_SHELLS_BEGIN + 6) -#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7) -#define STR_REDLINE_COMMENT (RC_SHELLS_BEGIN + 11) -#define STR_REDLINE_INSERTED (RC_SHELLS_BEGIN + 12) -#define STR_REDLINE_DELETED (RC_SHELLS_BEGIN + 13) -#define STR_REDLINE_FMTCOLLSET (RC_SHELLS_BEGIN + 14) - -#define STR_SWBG_PARAGRAPH (RC_SHELLS_BEGIN + 37) -#define STR_SWBG_GRAPHIC (RC_SHELLS_BEGIN + 38) -#define STR_SWBG_OLE (RC_SHELLS_BEGIN + 39) -#define STR_SWBG_FRAME (RC_SHELLS_BEGIN + 40) -#define STR_SWBG_TABLE (RC_SHELLS_BEGIN + 41) -#define STR_SWBG_TABLE_ROW (RC_SHELLS_BEGIN + 42) -#define STR_SWBG_TABLE_CELL (RC_SHELLS_BEGIN + 43) -#define STR_SWBG_PAGE (RC_SHELLS_BEGIN + 44) -#define STR_SWBG_HEADER (RC_SHELLS_BEGIN + 45) -#define STR_SWBG_FOOTER (RC_SHELLS_BEGIN + 46) - - -#define STR_REDLINE_FORMATED (RC_SHELLS_BEGIN + 50) -#define STR_REDLINE_TABLECHG (RC_SHELLS_BEGIN + 51) - -#define STR_REDLINE_TITLE (RC_SHELLS_BEGIN + 52) -#define STR_REDLINE_MSG (RC_SHELLS_BEGIN + 53) -#define STR_REDLINE_ACCEPT_ALL (RC_SHELLS_BEGIN + 54) -#define STR_REDLINE_REJECT_ALL (RC_SHELLS_BEGIN + 55) -#define STR_REDLINE_EDIT (RC_SHELLS_BEGIN + 56) -#define STR_REDLINE_AUTOFMT (RC_SHELLS_BEGIN + 57) - -#define SHELLS_ACT_END STR_REDLINE_AUTOFMT - -#if SHELLS_ACT_END > RC_SHELLS_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index a74362bf8135..e3a9f29e3729 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX -#include <tools/resary.hxx> - class SwWrtShell; class SwFormat; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 632520ac0b0b..248985073902 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -175,7 +175,6 @@ class SwTOXSelectTabPage : public SfxTabPage VclPtr<MenuButton> m_pAutoMarkPB; // object only - SwOLENames aFromNames; VclPtr<SvxCheckListBox> m_pFromObjCLB; VclPtr<VclContainer> m_pFromObjFrame; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index f6bd26548917..adface937008 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -29,7 +29,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <tools/resary.hxx> #include "swdllapi.h" class SwOneExampleFrame; @@ -65,7 +64,6 @@ class SW_DLLPUBLIC SwOneExampleFrame Idle m_aLoadedIdle; Link<SwOneExampleFrame&,void> m_aInitializedLink; - ResStringArray m_aMenuRes; OUString m_sArgumentURL; SwView* m_pModuleView; diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc deleted file mode 100644 index 45b611814616..000000000000 --- a/sw/source/uibase/inc/utlui.hrc +++ /dev/null @@ -1,200 +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_UIBASE_INC_UTLUI_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_UTLUI_HRC - -#include "rcid.hrc" - -#define RID_STR_SYSTEM (RC_UTLUI_BEGIN + 2) - -// Strings in NumberFormatter-Listbox -#define STR_DEFINE_NUMBERFORMAT (RC_UTLUI_BEGIN + 4) - -// names of content types (RC_UTLUI_BEGIN + 7) -#define STR_CONTENT_TYPE_FIRST (RC_UTLUI_BEGIN + 8) -#define STR_CONTENT_TYPE_OUTLINE STR_CONTENT_TYPE_FIRST -#define STR_CONTENT_TYPE_TABLE (RC_UTLUI_BEGIN + 9) -#define STR_CONTENT_TYPE_FRAME (RC_UTLUI_BEGIN + 10) -#define STR_CONTENT_TYPE_GRAPHIC (RC_UTLUI_BEGIN + 11) -#define STR_CONTENT_TYPE_OLE (RC_UTLUI_BEGIN + 12) -#define STR_CONTENT_TYPE_BOOKMARK (RC_UTLUI_BEGIN + 13) -#define STR_CONTENT_TYPE_REGION (RC_UTLUI_BEGIN + 14) -#define STR_CONTENT_TYPE_URLFIELD (RC_UTLUI_BEGIN + 15) -#define STR_CONTENT_TYPE_REFERENCE (RC_UTLUI_BEGIN + 16) -#define STR_CONTENT_TYPE_INDEX (RC_UTLUI_BEGIN + 17) -#define STR_CONTENT_TYPE_POSTIT (RC_UTLUI_BEGIN + 18) -#define STR_CONTENT_TYPE_DRAWOBJECT (RC_UTLUI_BEGIN + 19) -// Statusbar: Word count/Viewlayout/Page count -#define STR_WORDCOUNT_HINT (RC_UTLUI_BEGIN + 20) -#define STR_VIEWLAYOUT_ONE (RC_UTLUI_BEGIN + 21) -#define STR_VIEWLAYOUT_MULTI (RC_UTLUI_BEGIN + 22) -#define STR_VIEWLAYOUT_BOOK (RC_UTLUI_BEGIN + 23) -#define STR_BOOKCTRL_HINT (RC_UTLUI_BEGIN + 24) -#define STR_BOOKCTRL_HINT_EXTENDED (RC_UTLUI_BEGIN + 25) -#define STR_TMPLCTRL_HINT (RC_UTLUI_BEGIN + 26) -#define STR_CONTENT_END (RC_UTLUI_BEGIN + 26) - -#define STR_CONTENT_TYPE_SINGLE_FIRST (STR_CONTENT_END + 1) -#define STR_CONTENT_TYPE_SINGLE_OUTLINE (STR_CONTENT_TYPE_SINGLE_FIRST + 0) -#define STR_CONTENT_TYPE_SINGLE_TABLE (STR_CONTENT_TYPE_SINGLE_FIRST + 1) -#define STR_CONTENT_TYPE_SINGLE_FRAME (STR_CONTENT_TYPE_SINGLE_FIRST + 2) -#define STR_CONTENT_TYPE_SINGLE_GRAPHIC (STR_CONTENT_TYPE_SINGLE_FIRST + 3) -#define STR_CONTENT_TYPE_SINGLE_OLE (STR_CONTENT_TYPE_SINGLE_FIRST + 4) -#define STR_CONTENT_TYPE_SINGLE_BOOKMARK (STR_CONTENT_TYPE_SINGLE_FIRST + 5) -#define STR_CONTENT_TYPE_SINGLE_REGION (STR_CONTENT_TYPE_SINGLE_FIRST + 6) -#define STR_CONTENT_TYPE_SINGLE_URLFIELD (STR_CONTENT_TYPE_SINGLE_FIRST + 7) -#define STR_CONTENT_TYPE_SINGLE_REFERENCE (STR_CONTENT_TYPE_SINGLE_FIRST + 8) -#define STR_CONTENT_TYPE_SINGLE_INDEX (STR_CONTENT_TYPE_SINGLE_FIRST + 9) -#define STR_CONTENT_TYPE_SINGLE_POSTIT (STR_CONTENT_TYPE_SINGLE_FIRST + 10) -#define STR_CONTENT_TYPE_SINGLE_DRAWOBJECT (STR_CONTENT_TYPE_SINGLE_FIRST + 11) -#define STR_CONTENT_SINGLE_END STR_CONTENT_TYPE_SINGLE_DRAWOBJECT - -#define FLD_DOCINFO_BEGIN (STR_CONTENT_SINGLE_END + 1) -#define FLD_DOCINFO_TITEL FLD_DOCINFO_BEGIN -#define FLD_DOCINFO_THEMA (FLD_DOCINFO_BEGIN + 1) -#define FLD_DOCINFO_KEYS (FLD_DOCINFO_BEGIN + 2) -#define FLD_DOCINFO_COMMENT (FLD_DOCINFO_BEGIN + 3) -#define FLD_DOCINFO_CREATE (FLD_DOCINFO_BEGIN + 4) -#define FLD_DOCINFO_CHANGE (FLD_DOCINFO_BEGIN + 5) -#define FLD_DOCINFO_PRINT (FLD_DOCINFO_BEGIN + 6) -#define FLD_DOCINFO_DOCNO (FLD_DOCINFO_BEGIN + 7) -#define FLD_DOCINFO_EDIT (FLD_DOCINFO_BEGIN + 8) -#define FLD_DOCINFO_END (FLD_DOCINFO_BEGIN + 9) - -#define STR_SERVICE_UNAVAILABLE (FLD_DOCINFO_END + 1) - -#define STR_AUTH_TYPE_START (FLD_DOCINFO_END + 2) -#define STR_AUTH_TYPE_ARTICLE (STR_AUTH_TYPE_START + 0) -#define STR_AUTH_TYPE_BOOK (STR_AUTH_TYPE_START + 1) -#define STR_AUTH_TYPE_BOOKLET (STR_AUTH_TYPE_START + 2) -#define STR_AUTH_TYPE_CONFERENCE (STR_AUTH_TYPE_START + 3) -#define STR_AUTH_TYPE_INBOOK (STR_AUTH_TYPE_START + 4) -#define STR_AUTH_TYPE_INCOLLECTION (STR_AUTH_TYPE_START + 5) -#define STR_AUTH_TYPE_INPROCEEDINGS (STR_AUTH_TYPE_START + 6) -#define STR_AUTH_TYPE_JOURNAL (STR_AUTH_TYPE_START + 7) -#define STR_AUTH_TYPE_MANUAL (STR_AUTH_TYPE_START + 8) -#define STR_AUTH_TYPE_MASTERSTHESIS (STR_AUTH_TYPE_START + 9) -#define STR_AUTH_TYPE_MISC (STR_AUTH_TYPE_START + 10) -#define STR_AUTH_TYPE_PHDTHESIS (STR_AUTH_TYPE_START + 11) -#define STR_AUTH_TYPE_PROCEEDINGS (STR_AUTH_TYPE_START + 12) -#define STR_AUTH_TYPE_TECHREPORT (STR_AUTH_TYPE_START + 13) -#define STR_AUTH_TYPE_UNPUBLISHED (STR_AUTH_TYPE_START + 14) -#define STR_AUTH_TYPE_EMAIL (STR_AUTH_TYPE_START + 15) -#define STR_AUTH_TYPE_WWW (STR_AUTH_TYPE_START + 16) -#define STR_AUTH_TYPE_CUSTOM1 (STR_AUTH_TYPE_START + 17) -#define STR_AUTH_TYPE_CUSTOM2 (STR_AUTH_TYPE_START + 18) -#define STR_AUTH_TYPE_CUSTOM3 (STR_AUTH_TYPE_START + 19) -#define STR_AUTH_TYPE_CUSTOM4 (STR_AUTH_TYPE_START + 20) -#define STR_AUTH_TYPE_CUSTOM5 (STR_AUTH_TYPE_START + 21) -#define STR_AUTH_TYPE_END (STR_AUTH_TYPE_CUSTOM5) - -#define STR_AUTH_FIELD_START (STR_AUTH_TYPE_END + 1) -#define STR_AUTH_FIELD_IDENTIFIER (STR_AUTH_FIELD_START + 0) -#define STR_AUTH_FIELD_AUTHORITY_TYPE (STR_AUTH_FIELD_START + 1) -#define STR_AUTH_FIELD_ADDRESS (STR_AUTH_FIELD_START + 2) -#define STR_AUTH_FIELD_ANNOTE (STR_AUTH_FIELD_START + 3) -#define STR_AUTH_FIELD_AUTHOR (STR_AUTH_FIELD_START + 4) -#define STR_AUTH_FIELD_BOOKTITLE (STR_AUTH_FIELD_START + 5) -#define STR_AUTH_FIELD_CHAPTER (STR_AUTH_FIELD_START + 6) -#define STR_AUTH_FIELD_EDITION (STR_AUTH_FIELD_START + 7) -#define STR_AUTH_FIELD_EDITOR (STR_AUTH_FIELD_START + 8) -#define STR_AUTH_FIELD_HOWPUBLISHED (STR_AUTH_FIELD_START + 9) -#define STR_AUTH_FIELD_INSTITUTION (STR_AUTH_FIELD_START + 10) -#define STR_AUTH_FIELD_JOURNAL (STR_AUTH_FIELD_START + 11) -#define STR_AUTH_FIELD_MONTH (STR_AUTH_FIELD_START + 12) -#define STR_AUTH_FIELD_NOTE (STR_AUTH_FIELD_START + 13) -#define STR_AUTH_FIELD_NUMBER (STR_AUTH_FIELD_START + 14) -#define STR_AUTH_FIELD_ORGANIZATIONS (STR_AUTH_FIELD_START + 15) -#define STR_AUTH_FIELD_PAGES (STR_AUTH_FIELD_START + 16) -#define STR_AUTH_FIELD_PUBLISHER (STR_AUTH_FIELD_START + 17) -#define STR_AUTH_FIELD_SCHOOL (STR_AUTH_FIELD_START + 18) -#define STR_AUTH_FIELD_SERIES (STR_AUTH_FIELD_START + 19) -#define STR_AUTH_FIELD_TITLE (STR_AUTH_FIELD_START + 20) -#define STR_AUTH_FIELD_TYPE (STR_AUTH_FIELD_START + 21) -#define STR_AUTH_FIELD_VOLUME (STR_AUTH_FIELD_START + 22) -#define STR_AUTH_FIELD_YEAR (STR_AUTH_FIELD_START + 23) -#define STR_AUTH_FIELD_URL (STR_AUTH_FIELD_START + 24) -#define STR_AUTH_FIELD_CUSTOM1 (STR_AUTH_FIELD_START + 25) -#define STR_AUTH_FIELD_CUSTOM2 (STR_AUTH_FIELD_START + 26) -#define STR_AUTH_FIELD_CUSTOM3 (STR_AUTH_FIELD_START + 27) -#define STR_AUTH_FIELD_CUSTOM4 (STR_AUTH_FIELD_START + 28) -#define STR_AUTH_FIELD_CUSTOM5 (STR_AUTH_FIELD_START + 29) -#define STR_AUTH_FIELD_ISBN (STR_AUTH_FIELD_START + 30) -#define STR_AUTH_FIELD_END (STR_AUTH_FIELD_ISBN) - -#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1) - -#define UTLUI_ACT_END RES_FRMEX_MENU - -#if UTLUI_ACT_END > RC_UTLUI_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#define STR_IDXEXAMPLE_IDXTXT_BEGIN RC_IDXTXT_BEGIN -#define STR_IDXEXAMPLE_IDXTXT_HEADING1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 1) -#define STR_IDXEXAMPLE_IDXTXT_ENTRY1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 2) -#define STR_IDXEXAMPLE_IDXTXT_HEADING11 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 3) -#define STR_IDXEXAMPLE_IDXTXT_ENTRY11 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 4) -#define STR_IDXEXAMPLE_IDXTXT_HEADING12 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 5) -#define STR_IDXEXAMPLE_IDXTXT_ENTRY12 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 6) -#define STR_IDXEXAMPLE_IDXTXT_TABLE1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 7) -#define STR_IDXEXAMPLE_IDXTXT_IMAGE1 (STR_IDXEXAMPLE_IDXTXT_BEGIN + 8) -#define STR_IDXEXAMPLE_IDXTXT_END STR_IDXEXAMPLE_IDXTXT_IMAGE1 - -#define RID_SW_SHELLRES_BEGIN (STR_IDXEXAMPLE_IDXTXT_IMAGE1 + 1) -#define STR_POSTIT_PAGE (RID_SW_SHELLRES_BEGIN + 1) -#define STR_POSTIT_AUTHOR (RID_SW_SHELLRES_BEGIN + 2) -#define STR_CALC_SYNTAX (RID_SW_SHELLRES_BEGIN + 3) -#define STR_CALC_ZERODIV (RID_SW_SHELLRES_BEGIN + 4) -#define STR_CALC_BRACK (RID_SW_SHELLRES_BEGIN + 5) -#define STR_CALC_POW (RID_SW_SHELLRES_BEGIN + 6) -// empty -#define STR_CALC_OVERFLOW (RID_SW_SHELLRES_BEGIN + 8) -// empty -#define STR_CALC_DEFAULT (RID_SW_SHELLRES_BEGIN + 10) -#define STR_CALC_ERROR (RID_SW_SHELLRES_BEGIN + 11) -// empty -#define STR_TEMPLATE_NONE (RID_SW_SHELLRES_BEGIN + 15) -#define STR_POSTIT_LINE (RID_SW_SHELLRES_BEGIN + 16) -#define STR_FIELD_FIXED (RID_SW_SHELLRES_BEGIN + 17) -#define STR_TOI (RID_SW_SHELLRES_BEGIN + 18) -#define STR_TOU (RID_SW_SHELLRES_BEGIN + 19) -#define STR_TOC (RID_SW_SHELLRES_BEGIN + 20) -#define STR_TOX_ILL (RID_SW_SHELLRES_BEGIN + 21) -#define STR_TOX_OBJ (RID_SW_SHELLRES_BEGIN + 22) -#define STR_TOX_TBL (RID_SW_SHELLRES_BEGIN + 23) -#define STR_TOX_AUTH (RID_SW_SHELLRES_BEGIN + 24) -#define STR_PAGEDESC_NAME (RID_SW_SHELLRES_BEGIN + 25) -#define STR_PAGEDESC_FIRSTNAME (RID_SW_SHELLRES_BEGIN + 26) -#define STR_PAGEDESC_FOLLOWNAME (RID_SW_SHELLRES_BEGIN + 27) -#define STR_LINK_CTRL_CLICK (RID_SW_SHELLRES_BEGIN + 28) -#define STR_LINK_CLICK (RID_SW_SHELLRES_BEGIN + 29) -#define STR_GETREFFLD_REFITEMNOTFOUND (RID_SW_SHELLRES_BEGIN + 30) -#define STR_DURATION_FORMAT (RID_SW_SHELLRES_BEGIN + 31) -#define STR_TOX_CITATION (RID_SW_SHELLRES_BEGIN + 32) -#define RID_SW_SHELLRES_END STR_TOX_CITATION - -#if STR_IDXEXAMPLE_IDXTXT_END > RID_SW_SHELLRES_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/web.hrc b/sw/source/uibase/inc/web.hrc deleted file mode 100644 index 7f8b46f90f93..000000000000 --- a/sw/source/uibase/inc/web.hrc +++ /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 . - */ - -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WEB_HRC -#define INCLUDED_SW_SOURCE_UIBASE_INC_WEB_HRC - -#include "rcid.hrc" - -#define STR_HUMAN_SWWEBDOC_NAME (RC_WEB_BEGIN + 4) -#define STR_WRITER_WEBDOC_FULLTYPE (RC_WEB_BEGIN + 12) - -#define WEB_ACT_END STR_WRITER_WEBDOC_FULLTYPE - -#if WEB_ACT_END > RC_WEB_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index c8c2a8adde65..da4506b7e53d 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -39,7 +39,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> diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index a86628f57d44..ea1b73e65a12 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -31,6 +31,7 @@ #include "hyp.hxx" #include "mdiexp.hxx" #include "olmenu.hrc" +#include "strings.hrc" #include <unomid.h> diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 629a89e5b4b5..8c5afcad5918 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -20,7 +20,7 @@ #include "SwRewriter.hxx" #include "chrdlg.hrc" #include "cmdid.h" -#include "comcore.hrc" +#include "strings.hrc" #include "doc.hxx" #include "docsh.hxx" #include "edtwin.hxx" diff --git a/sw/source/uibase/lingu/olmenu.hrc b/sw/source/uibase/lingu/olmenu.hrc index 79f8373c897f..03581e402b72 100644 --- a/sw/source/uibase/lingu/olmenu.hrc +++ b/sw/source/uibase/lingu/olmenu.hrc @@ -22,13 +22,6 @@ #include "rcid.hrc" -#define STR_HYP_OK (RC_LINGU_BEGIN + 3) -#define STR_LANGSTATUS_NONE (RC_LINGU_BEGIN + 6) -#define STR_LANGSTATUS_MORE (RC_LINGU_BEGIN + 7) -#define STR_IGNORE_SELECTION (RC_LINGU_BEGIN + 8) -#define STR_RESET_TO_DEFAULT_LANGUAGE (RC_LINGU_BEGIN + 9) -#define STR_EXPLANATION_LINK (RC_LINGU_BEGIN + 10) - //! Don't change these values. You may break context menu modifying extensions! #define MN_IGNORE_SELECTION 201 #define MN_SHORT_COMMENT 208 diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src deleted file mode 100644 index ab73066c88e9..000000000000 --- a/sw/source/uibase/lingu/olmenu.src +++ /dev/null @@ -1,50 +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 "olmenu.hrc" -#include "cmdid.h" -#include "helpid.h" - -String STR_HYP_OK -{ - Text [ en-US ] = "Hyphenation completed" ; -}; -String STR_LANGSTATUS_NONE -{ - Text [ en-US ] = "None (Do not check spelling)" ; -}; -String STR_RESET_TO_DEFAULT_LANGUAGE -{ - Text [ en-US ] = "Reset to Default Language" ; -}; -String STR_LANGSTATUS_MORE -{ - Text [ en-US ] = "More..." ; -}; -String STR_IGNORE_SELECTION -{ - Text [ en-US ] = "~Ignore" ; -}; -String STR_EXPLANATION_LINK -{ - Text [ en-US ] = "Explanations..." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 6e678dd00bab..256afaa29a01 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -46,6 +46,7 @@ #include <cmdid.h> #include <swerror.h> #include <misc.hrc> +#include <strings.hrc> #define SwWebGlosDocShell #define SwGlosDocShell diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 38f836e9ea88..58ada01cda4d 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -29,6 +29,7 @@ #include <editeng/numitem.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strarray.hxx> #include <unomid.h> @@ -89,10 +90,10 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) pTypes = aTypes.getConstArray(); } } - ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR())); - for(size_t i = 0; i < aNames.Count(); i++) + + for(size_t i = 0; i < SvxNumberingTypeTable::Count(); i++) { - sal_IntPtr nValue = aNames.GetValue(i); + sal_IntPtr nValue = SvxNumberingTypeTable::GetValue(i); bool bInsert = true; sal_Int32 nPos = LISTBOX_APPEND; switch(nValue) @@ -138,7 +139,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) } if(bInsert) { - sal_Int32 nEntry = InsertEntry(aNames.GetString(i), nPos); + sal_Int32 nEntry = InsertEntry(SvxNumberingTypeTable::GetString(i), nPos); SetEntryData( nEntry, reinterpret_cast<void*>(nValue) ); } } diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 71306a2d9432..350b5f0e6ebf 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -36,10 +36,10 @@ #include <helpid.h> #include <cmdid.h> #include <misc.hrc> -#include <shells.hrc> +#include <strings.hrc> // -> #111827# -#include <comcore.hrc> +#include <strings.hrc> #include <swundo.hxx> #include <SwRewriter.hxx> // <- #111827# @@ -1093,27 +1093,27 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, SvSimpleTable*, void) pDlg->HideAuthor(); - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( rRedline.GetType() ) { case nsRedlineType_t::REDLINE_INSERT: - nResId = STR_REDLINE_INSERTED; + pResId = STR_REDLINE_INSERTED; break; case nsRedlineType_t::REDLINE_DELETE: - nResId = STR_REDLINE_DELETED; + pResId = STR_REDLINE_DELETED; break; case nsRedlineType_t::REDLINE_FORMAT: case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: - nResId = STR_REDLINE_FORMATED; + pResId = STR_REDLINE_FORMATED; break; case nsRedlineType_t::REDLINE_TABLE: - nResId = STR_REDLINE_TABLECHG; + pResId = STR_REDLINE_TABLECHG; break; default:;//prevent warning } OUString sTitle(SwResId(STR_REDLINE_COMMENT)); - if( nResId ) - sTitle += SwResId( nResId ); + if (pResId) + sTitle += SwResId(pResId); pDlg->SetText(sTitle); SwViewShell::SetCareWin(pDlg->GetWindow()); diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 83d49b785c2e..6f1f6f3190ec 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -24,6 +24,7 @@ #include <vcl/window.hxx> #include <vcl/settings.hxx> #include "misc.hrc" +#include "strings.hrc" #define CONTROL_BORDER_WIDTH 1 @@ -256,12 +257,12 @@ void SwCommentRuler::Update() void SwCommentRuler::UpdateCommentHelpText() { - int nTooltipResId; + const char* pTooltipResId; if ( mpViewShell->GetPostItMgr()->ShowNotes() ) - nTooltipResId = STR_HIDE_COMMENTS; + pTooltipResId = STR_HIDE_COMMENTS; else - nTooltipResId = STR_SHOW_COMMENTS; - SetQuickHelpText( SwResId( nTooltipResId ) ); + pTooltipResId = STR_SHOW_COMMENTS; + SetQuickHelpText(SwResId(pTooltipResId)); } // TODO Make Ruler return its central rectangle instead of margins. diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index f4a1078a6b99..1831acac18d1 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -36,7 +36,7 @@ #include "swmodule.hxx" #include "swundo.hxx" #include <SwRewriter.hxx> -#include "comcore.hrc" +#include "strings.hrc" using namespace ::com::sun::star; diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 36df87eac29d..b7b89547aba9 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -42,14 +42,13 @@ #include "cellatr.hxx" #include "edtwin.hxx" #include "helpid.h" -#include "access.hrc" +#include "strings.hrc" #include "bitmaps.hlst" // Only for the UpdateRange: Delete the box in which the stacked cursor is positioned. #include "pam.hxx" #include "swundo.hxx" -#include "ribbar.hrc" #include "dbui.hrc" #include <IDocumentContentOperations.hxx> diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src deleted file mode 100644 index 8f57dfb894d3..000000000000 --- a/sw/source/uibase/ribbar/inputwin.src +++ /dev/null @@ -1,63 +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 . - */ -/* HelpID resource file */ -/* HelpID resource file */ - -#include "cmdid.h" -#include "helpid.h" -#include "globals.hrc" -#include "ribbar.hrc" -#include "access.hrc" - -String STR_FORMULA_CALC -{ - Text [ en-US ] = "Functions" ; -}; - -String STR_FORMULA_CANCEL -{ - Text [ en-US ] = "Cancel" ; -}; - -String STR_FORMULA_APPLY -{ - Text [ en-US ] = "Apply" ; -}; - -String STR_ACCESS_FORMULA_TOOLBAR -{ - Text [ en-US ] = "Formula Tool Bar" ; -}; - -String STR_ACCESS_FORMULA_TYPE -{ - Text [ en-US ] = "Formula Type" ; -}; - -String STR_ACCESS_FORMULA_TEXT -{ - Text [ en-US ] = "Formula Text" ; -}; - -String STR_TBL_FORMULA -{ - Text [ en-US ] = "Text Formula" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index c9090674893b..d6c7d3c8643d 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -34,7 +34,7 @@ #include <glosdoc.hxx> #include <gloslst.hxx> #include <workctrl.hxx> -#include <ribbar.hrc> +#include <strings.hrc> #include <cmdid.h> #include <helpid.h> #include <wrtsh.hxx> @@ -48,6 +48,7 @@ #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include "bitmaps.hlst" // Size check @@ -234,6 +235,77 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] = HID_NID_NEXT }; +static const char* aNavigationStrIds[ NAVI_ENTRIES ] = +{ + // -- first line + ST_TBL, + ST_FRM, + ST_GRF, + ST_OLE, + ST_PGE, + ST_OUTL, + ST_MARK, + ST_DRW, + ST_CTRL, + STR_IMGBTN_PGE_UP, + // -- second line + ST_REG, + ST_BKM, + ST_SEL, + ST_FTN, + ST_POSTIT, + ST_SRCH_REP, + ST_INDEX_ENTRY, + ST_TABLE_FORMULA, + ST_TABLE_FORMULA_ERROR, + STR_IMGBTN_PGE_DOWN +}; + +// these are global strings +static const char* STR_IMGBTN_ARY[] = +{ + nullptr, + nullptr, + STR_IMGBTN_TBL_DOWN, + STR_IMGBTN_FRM_DOWN, + STR_IMGBTN_PGE_DOWN, + STR_IMGBTN_DRW_DOWN, + STR_IMGBTN_CTRL_DOWN, + STR_IMGBTN_REG_DOWN, + STR_IMGBTN_BKM_DOWN, + STR_IMGBTN_GRF_DOWN, + STR_IMGBTN_OLE_DOWN, + STR_IMGBTN_OUTL_DOWN, + STR_IMGBTN_SEL_DOWN, + STR_IMGBTN_FTN_DOWN, + STR_IMGBTN_MARK_DOWN, + STR_IMGBTN_POSTIT_DOWN, + STR_IMGBTN_SRCH_REP_DOWN, + STR_IMGBTN_INDEX_ENTRY_DOWN, + STR_IMGBTN_TBLFML_DOWN, + STR_IMGBTN_TBLFML_ERR_DOWN, + nullptr, + nullptr, + STR_IMGBTN_TBL_UP, + STR_IMGBTN_FRM_UP, + STR_IMGBTN_PGE_UP, + STR_IMGBTN_DRW_UP, + STR_IMGBTN_CTRL_UP, + STR_IMGBTN_REG_UP, + STR_IMGBTN_BKM_UP, + STR_IMGBTN_GRF_UP, + STR_IMGBTN_OLE_UP, + STR_IMGBTN_OUTL_UP, + STR_IMGBTN_SEL_UP, + STR_IMGBTN_FTN_UP, + STR_IMGBTN_MARK_UP, + STR_IMGBTN_POSTIT_UP, + STR_IMGBTN_SRCH_REP_UP, + STR_IMGBTN_INDEX_ENTRY_UP, + STR_IMGBTN_TBLFML_UP, + STR_IMGBTN_TBLFML_ERR_UP +}; + SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent) : SfxPopupWindow(nId, pParent, "FloatingNavigation", "modules/swriter/ui/floatingnavigation.ui", rFrame) @@ -249,34 +321,22 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& for( i = 0; i < NID_COUNT; i++) { sal_uInt16 nNaviId = aNavigationInsertIds[i]; - OUString sText; - ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE; - if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId)) - { - // -2, there's no string for Next/Prev - sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START; - sText = SwResId(nResStr); + ToolBoxItemBits nTbxBits = ToolBoxItemBits::NONE; + if ((NID_PREV != nNaviId) && (NID_NEXT != nNaviId)) nTbxBits = ToolBoxItemBits::CHECKABLE; - } - else - { - if (nNaviId == NID_PREV) - sText = SwResId(STR_IMGBTN_PGE_UP); - else if (nNaviId == NID_NEXT) - sText = SwResId(STR_IMGBTN_PGE_DOWN); - } - m_pToolBox->InsertItem(nNaviId, Image(BitmapEx(aNavigationImgIds[i])), - sText, nTbxBits); + SwResId(aNavigationStrIds[i]), nTbxBits); m_pToolBox->SetHelpId(nNaviId, aNavigationHelpIds[i]); } m_pToolBox->InsertBreak(NID_COUNT/2); - // these are global strings - for( i = 0; i < 2 * NID_COUNT; i++) + for (i = 0; i < SAL_N_ELEMENTS(STR_IMGBTN_ARY); ++i) { - sQuickHelp[i] = SwResId(STR_IMGBTN_START + i); + const char* id = STR_IMGBTN_ARY[i]; + if (!id) + continue; + sQuickHelp[i] = SwResId(id); } sal_uInt16 nItemId = SwView::GetMoveType(); @@ -354,11 +414,11 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt ) OUString SwScrollNaviPopup::GetToolTip(bool bNext) { - sal_uInt16 nResId = STR_IMGBTN_START; - nResId += SwView::GetMoveType() - NID_START; - if(!bNext) + sal_uInt16 nResId = SwView::GetMoveType(); + if (!bNext) nResId += NID_COUNT; - return SwResId(nResId); + const char* id = STR_IMGBTN_ARY[nResId]; + return id ? SwResId(id): OUString(); } class SwZoomBox_Impl : public ComboBox @@ -387,18 +447,17 @@ SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot) SetHelpId(HID_PVIEW_ZOOM_LB); SetSizePixel(LogicToPixel(Size(30, 86), MapUnit::MapAppFont)); EnableAutocomplete( false ); - sal_uInt16 aZoomValues[] = + const char* aZoomValues[] = { RID_SVXSTR_ZOOM_25 , RID_SVXSTR_ZOOM_50 , RID_SVXSTR_ZOOM_75 , RID_SVXSTR_ZOOM_100 , RID_SVXSTR_ZOOM_150 , RID_SVXSTR_ZOOM_200 , RID_SVXSTR_ZOOM_WHOLE_PAGE, RID_SVXSTR_ZOOM_PAGE_WIDTH , RID_SVXSTR_ZOOM_OPTIMAL_VIEW }; - for(sal_uInt16 aZoomValue : aZoomValues) + for(const char* pZoomValue : aZoomValues) { - OUString sEntry = SvxResId( aZoomValue ); + OUString sEntry = SvxResId(pZoomValue); InsertEntry(sEntry); } - } void SwZoomBox_Impl::Select() diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src deleted file mode 100644 index 3e1d2236db26..000000000000 --- a/sw/source/uibase/ribbar/workctrl.src +++ /dev/null @@ -1,261 +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 "ribbar.hrc" -#include "helpid.h" -#include "cmdid.h" - -String ST_TBL -{ - Text [ en-US ] = "Table" ; -}; -String ST_FRM -{ - Text [ en-US ] = "Text Frame" ; -}; -String ST_PGE -{ - Text [ en-US ] = "Page" ; -}; -String ST_DRW -{ - Text [ en-US ] = "Drawing" ; -}; -String ST_CTRL -{ - Text [ en-US ] = "Control" ; -}; -String ST_REG -{ - Text [ en-US ] = "Section" ; -}; -String ST_BKM -{ - Text [ en-US ] = "Bookmark" ; -}; -String ST_GRF -{ - Text [ en-US ] = "Graphics" ; -}; -String ST_OLE -{ - Text [ en-US ] = "OLE object" ; -}; -String ST_OUTL -{ - Text [ en-US ] = "Headings" ; -}; -String ST_SEL -{ - Text [ en-US ] = "Selection" ; -}; -String ST_FTN -{ - Text [ en-US ] = "Footnote" ; -}; -String ST_MARK -{ - Text [ en-US ] = "Reminder" ; -}; -String ST_POSTIT -{ - Text [ en-US ] = "Comment" ; -}; -String ST_SRCH_REP -{ - Text [ en-US ] = "Repeat search" ; -}; -String ST_INDEX_ENTRY -{ - Text [ en-US ] = "Index entry"; -}; -String ST_TABLE_FORMULA -{ - Text [ en-US ] = "Table formula"; -}; -String ST_TABLE_FORMULA_ERROR -{ - Text [ en-US ] = "Wrong table formula"; -}; - -// Strings for the quickhelp of the View-PgUp/Down-Buttons - -String STR_IMGBTN_NEXT_DOWN -{ - Text = "" ; -}; -String STR_IMGBTN_PREV_DOWN -{ - Text = "" ; -}; -String STR_IMGBTN_TBL_DOWN -{ - Text [ en-US ] = "Next table" ; -}; -String STR_IMGBTN_FRM_DOWN -{ - Text [ en-US ] = "Next text frame" ; -}; -String STR_IMGBTN_PGE_DOWN -{ - Text [ en-US ] = "Next page" ; -}; -String STR_IMGBTN_DRW_DOWN -{ - Text [ en-US ] = "Next drawing" ; -}; -String STR_IMGBTN_CTRL_DOWN -{ - Text [ en-US ] = "Next control" ; -}; -String STR_IMGBTN_REG_DOWN -{ - Text [ en-US ] = "Next section" ; -}; -String STR_IMGBTN_BKM_DOWN -{ - Text [ en-US ] = "Next bookmark" ; -}; -String STR_IMGBTN_GRF_DOWN -{ - Text [ en-US ] = "Next graphic" ; -}; -String STR_IMGBTN_OLE_DOWN -{ - Text [ en-US ] = "Next OLE object" ; -}; -String STR_IMGBTN_OUTL_DOWN -{ - Text [ en-US ] = "Next heading" ; -}; -String STR_IMGBTN_SEL_DOWN -{ - Text [ en-US ] = "Next selection" ; -}; -String STR_IMGBTN_FTN_DOWN -{ - Text [ en-US ] = "Next footnote" ; -}; -String STR_IMGBTN_MARK_DOWN -{ - Text [ en-US ] = "Next Reminder" ; -}; -String STR_IMGBTN_POSTIT_DOWN -{ - Text [ en-US ] = "Next Comment" ; -}; -String STR_IMGBTN_SRCH_REP_DOWN -{ - Text [ en-US ] = "Continue search forward" ; -}; -String STR_IMGBTN_INDEX_ENTRY_DOWN -{ - Text [ en-US ] = "Next index entry"; -}; -String STR_IMGBTN_NEXT_UP -{ - Text = "" ; -}; -String STR_IMGBTN_PREV_UP -{ - Text = "" ; -}; -String STR_IMGBTN_TBL_UP -{ - Text [ en-US ] = "Previous table" ; -}; -String STR_IMGBTN_FRM_UP -{ - Text [ en-US ] = "Previous text frame" ; -}; -String STR_IMGBTN_PGE_UP -{ - Text [ en-US ] = "Previous page" ; -}; -String STR_IMGBTN_DRW_UP -{ - Text [ en-US ] = "Previous drawing" ; -}; -String STR_IMGBTN_CTRL_UP -{ - Text [ en-US ] = "Previous control" ; -}; -String STR_IMGBTN_REG_UP -{ - Text [ en-US ] = "Previous section" ; -}; -String STR_IMGBTN_BKM_UP -{ - Text [ en-US ] = "Previous bookmark" ; -}; -String STR_IMGBTN_GRF_UP -{ - Text [ en-US ] = "Previous graphic" ; -}; -String STR_IMGBTN_OLE_UP -{ - Text [ en-US ] = "Previous OLE object" ; -}; -String STR_IMGBTN_OUTL_UP -{ - Text [ en-US ] = "Previous heading" ; -}; -String STR_IMGBTN_SEL_UP -{ - Text [ en-US ] = "Previous selection" ; -}; -String STR_IMGBTN_FTN_UP -{ - Text [ en-US ] = "Previous footnote" ; -}; -String STR_IMGBTN_MARK_UP -{ - Text [ en-US ] = "Previous Reminder" ; -}; -String STR_IMGBTN_POSTIT_UP -{ - Text [ en-US ] = "Previous Comment" ; -}; -String STR_IMGBTN_SRCH_REP_UP -{ - Text [ en-US ] = "Continue search backwards" ; -}; -String STR_IMGBTN_INDEX_ENTRY_UP -{ - Text [ en-US ] = "Previous index entry"; -}; -String STR_IMGBTN_TBLFML_UP -{ - Text [ en-US ] = "Previous table formula"; -}; -String STR_IMGBTN_TBLFML_DOWN -{ - Text [ en-US ] = "Next table formula"; -}; -String STR_IMGBTN_TBLFML_ERR_UP -{ - Text [ en-US ] = "Previous faulty table formula"; -}; -String STR_IMGBTN_TBLFML_ERR_DOWN -{ - Text [ en-US ] = "Next faulty table formula"; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 2b432510ae08..bd55da92d18d 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -88,7 +88,7 @@ #include <cmdid.h> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <breakit.hxx> #include "annotsh.hxx" #include "view.hxx" diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 5ef7c73dd101..e5196985f47f 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -87,8 +87,8 @@ #include <swwait.hxx> #include <cmdid.h> #include <globals.hrc> -#include <shells.hrc> -#include <statstr.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <globals.h> #include <unotxdoc.hxx> #include <fmtinfmt.hxx> @@ -103,7 +103,7 @@ #include <instable.hxx> #include <svx/fmshell.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> #include <unomid.h> #include <svx/galleryitem.hxx> #include <com/sun/star/gallery/GalleryItemType.hpp> diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index 5be7208b3383..a3ef6109fece 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -35,7 +35,7 @@ #include "globals.hrc" #include "drawbase.hxx" #include "beziersh.hxx" -#include "shells.hrc" +#include "strings.hrc" #define SwBezierShell #include <sfx2/msg.hxx> #include "swslots.hxx" diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 8a9b33502201..41c3e0627c0d 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -55,7 +55,7 @@ #include "cmdid.h" #include "globals.hrc" #include "helpid.h" -#include "shells.hrc" +#include "strings.hrc" #include "drwbassh.hxx" #include "drawsh.hxx" diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index e56af623a61d..f9eeee21e137 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -40,7 +40,7 @@ #include "cmdid.h" #include "globals.hrc" #include "helpid.h" -#include "shells.hrc" +#include "strings.hrc" #include "drwbassh.hxx" #include "drformsh.hxx" #include <svl/urihelper.hxx> diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index 4c31ff70f659..b9a0b3bf3bdb 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -49,7 +49,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/svditer.hxx> -#include <shells.hrc> +#include <strings.hrc> #define SwDrawBaseShell #include <sfx2/msg.hxx> #include <swslots.hxx> diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index aaf8c256861d..6744d94b2494 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -84,7 +84,7 @@ #include <langhelper.hxx> #include <chrdlgmodes.hxx> #include <pardlg.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <string.h> #include <swdtflvr.hxx> #include <swmodule.hxx> diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 9117bb622cf8..b7ae1f342e66 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -56,7 +56,7 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #define SwDrawTextShell #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 81ef6cf89e75..1e5bab8a6c78 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -73,7 +73,7 @@ #include <cmdid.h> #include <cfgitems.hxx> #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include "swabstdlg.hxx" #include "misc.hrc" @@ -771,16 +771,16 @@ void SwFrameShell::GetState(SfxItemSet& rSet) { case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: - sNewLabel = SwResId(STR_TOP_BASE); + sNewLabel = SwResId(STR_FRMUI_TOP_BASE); break; case SID_OBJECT_ALIGN_MIDDLE : case FN_FRAME_ALIGN_VERT_CENTER: - sNewLabel = SwResId(STR_CENTER_BASE); + sNewLabel = SwResId(STR_FRMUI_CENTER_BASE); break; case SID_OBJECT_ALIGN_DOWN : case FN_FRAME_ALIGN_VERT_BOTTOM: if(!bHtmlMode) - sNewLabel = SwResId(STR_BOTTOM_BASE); + sNewLabel = SwResId(STR_FRMUI_BOTTOM_BASE); else rSet.DisableItem( nWhich ); break; diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 5a7fa6afcc82..d52e03d489bd 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -63,7 +63,7 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <svx/extedit.hxx> #include <svx/graphichelper.hxx> #include <doc.hxx> diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 9c96068e8290..c5eec11bec03 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -24,7 +24,7 @@ #include <textsh.hxx> #include <viewopt.hxx> #include <swundo.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <caption.hxx> #include <vcl/graphicfilter.hxx> #include <sfx2/htmlmode.hxx> @@ -40,7 +40,7 @@ #include <svx/svdpagv.hxx> #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> -#include <poolfmt.hrc> +#include <strings.hrc> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> @@ -50,7 +50,7 @@ // -> #111827# #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> // <- #111827# using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx index e0020792b613..2e6127ba6522 100644 --- a/sw/source/uibase/shells/listsh.cxx +++ b/sw/source/uibase/shells/listsh.cxx @@ -38,7 +38,7 @@ #include "frmatr.hxx" #include "helpid.h" #include "globals.hrc" -#include "shells.hrc" +#include "strings.hrc" #include "uinums.hxx" #include "listsh.hxx" #include "poolfmt.hxx" diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index f040a234db90..1e67a043dd40 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -54,7 +54,7 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <sfx2/objface.hxx> #include <vcl/EnumContext.hxx> diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index 073f22a7820c..abba5d41c97b 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -22,7 +22,7 @@ #include "helpid.h" #include "globals.hrc" #include "navsh.hxx" -#include "shells.hrc" +#include "strings.hrc" #define SwNavigationShell #include "swslots.hxx" #include <unomid.h> diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx index 9fe17add5af6..5fec60d3f947 100644 --- a/sw/source/uibase/shells/olesh.cxx +++ b/sw/source/uibase/shells/olesh.cxx @@ -30,7 +30,7 @@ #include <olesh.hxx> #include <cmdid.h> -#include <shells.hrc> +#include <strings.hrc> #define SwOleShell #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index b39292ede61c..4c7046985101 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -73,7 +73,7 @@ #include <app.hrc> #include <dialog.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <cmdid.h> #include <globals.hrc> #include <helpid.h> diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index 73da9c9b145f..da6a3621576c 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -32,7 +32,7 @@ #include <swundo.hxx> #include <basesh.hxx> -#include <poolfmt.hrc> +#include <strings.hrc> #include <docsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 40fbf5a0b5dc..16408fe5e708 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -59,7 +59,7 @@ #include <fldmgr.hxx> #include <uitool.hxx> #include <cmdid.h> -#include <shells.hrc> +#include <strings.hrc> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" @@ -80,30 +80,30 @@ static OUString lcl_BuildTitleWithRedline( const SwRangeRedline *pRedline ) { const OUString sTitle(SwResId(STR_REDLINE_COMMENT)); - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( pRedline->GetType() ) { case nsRedlineType_t::REDLINE_INSERT: - nResId = STR_REDLINE_INSERTED; + pResId = STR_REDLINE_INSERTED; break; case nsRedlineType_t::REDLINE_DELETE: - nResId = STR_REDLINE_DELETED; + pResId = STR_REDLINE_DELETED; break; case nsRedlineType_t::REDLINE_FORMAT: case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: - nResId = STR_REDLINE_FORMATED; + pResId = STR_REDLINE_FORMATED; break; case nsRedlineType_t::REDLINE_TABLE: - nResId = STR_REDLINE_TABLECHG; + pResId = STR_REDLINE_TABLECHG; break; case nsRedlineType_t::REDLINE_FMTCOLL: - nResId = STR_REDLINE_FMTCOLLSET; + pResId = STR_REDLINE_FMTCOLLSET; break; default: return sTitle; } - return sTitle + SwResId( nResId ); + return sTitle + SwResId(pResId); } void SwTextShell::ExecField(SfxRequest &rReq) diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2fb8186ac545..cea962a2408e 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -87,7 +87,7 @@ #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> -#include <shells.hrc> +#include <strings.hrc> #include <swerror.h> #include <unochart.hxx> @@ -98,7 +98,7 @@ #include <vcl/EnumContext.hxx> #include <swslots.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> using namespace ::com::sun::star; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 508c50232003..84f5aff3bb62 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -82,9 +82,9 @@ #include <redlndlg.hxx> #include "fldmgr.hxx" #include <globals.hrc> -#include <shells.hrc> +#include <strings.hrc> #include <app.hrc> -#include <web.hrc> +#include <strings.hrc> #include "paratr.hxx" #include <vcl/svapp.hxx> #include <sfx2/app.hxx> @@ -112,7 +112,7 @@ #include <svx/nbdtmgfact.hxx> #include <svx/nbdtmg.hxx> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> #include <svx/svdmodel.hxx> #include <svx/drawitem.hxx> #include <numrule.hxx> diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index e3200b5e6890..3e76669345a1 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -47,7 +47,7 @@ #include "swtypes.hxx" #include "cmdid.h" #include "swevent.hxx" -#include "shells.hrc" +#include "strings.hrc" #include "textsh.hxx" #include "swabstdlg.hxx" #include "dbui.hrc" diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 647a733d93cd..9dd36e3a21e0 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -53,7 +53,7 @@ #include <cmdid.h> #include <globals.h> -#include <shells.hrc> +#include <strings.hrc> #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "outline.hxx" diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index ec6a18a66948..b5c2930463fc 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -23,7 +23,7 @@ #include <cstdlib> #include "PageMarginControl.hxx" -#include "PropertyPanel.hrc" +#include "strings.hrc" #include <editeng/sizeitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/uibase/sidebar/PropertyPanel.hrc b/sw/source/uibase/sidebar/PropertyPanel.hrc deleted file mode 100644 index c705574d2051..000000000000 --- a/sw/source/uibase/sidebar/PropertyPanel.hrc +++ /dev/null @@ -1,33 +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_UIBASE_SIDEBAR_PROPERTYPANEL_HRC -#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PROPERTYPANEL_HRC - -#include "rcid.hrc" - -#define STR_MARGIN_TOOLTIP_LEFT (RC_PROPERTYPANEL_BEGIN + 1) -#define STR_MARGIN_TOOLTIP_RIGHT (RC_PROPERTYPANEL_BEGIN + 2) -#define STR_MARGIN_TOOLTIP_INNER (RC_PROPERTYPANEL_BEGIN + 3) -#define STR_MARGIN_TOOLTIP_OUTER (RC_PROPERTYPANEL_BEGIN + 4) -#define STR_MARGIN_TOOLTIP_TOP (RC_PROPERTYPANEL_BEGIN + 5) -#define STR_MARGIN_TOOLTIP_BOT (RC_PROPERTYPANEL_BEGIN + 6) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 588fce60b723..101ef4ab5606 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -67,7 +67,7 @@ #include <helpid.h> #include <cmdid.h> #include <globals.hrc> -#include <view.hrc> +#include <strings.hrc> #define SwPagePreview #include <sfx2/msg.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0dd88e045083..531fa4a25640 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -38,7 +38,7 @@ #include <svl/whiter.hxx> #include <unotools/saveopt.hxx> #include <svtools/transfer.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svx/svxids.hrc> #include <svtools/htmlcfg.hxx> @@ -73,9 +73,9 @@ #include <cmdid.h> #include <helpid.h> #include <globals.hrc> -#include <shells.hrc> -#include <web.hrc> -#include <view.hrc> +#include <strings.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <sfx2/filedlghelper.hxx> diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx index f3f951669ca9..df09349063b0 100644 --- a/sw/source/uibase/uiview/uivwimp.cxx +++ b/sw/source/uibase/uiview/uivwimp.cxx @@ -43,7 +43,7 @@ #include <edtwin.hxx> #include <mmconfigitem.hxx> -#include <view.hrc> +#include <strings.hrc> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index da2bf45e39f5..400a14d4d1ff 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -86,8 +86,8 @@ #include <barcfg.hxx> #include <pview.hxx> #include <swdtflvr.hxx> -#include <view.hrc> -#include <globdoc.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <frmui.hrc> #include <cfgitems.hxx> #include <prtopt.hxx> diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc deleted file mode 100644 index a79adcc9aaf4..000000000000 --- a/sw/source/uibase/uiview/view.hrc +++ /dev/null @@ -1,60 +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_UIBASE_UIVIEW_VIEW_HRC -#define INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEW_HRC - -#include "rcid.hrc" - -// STR - -#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) -#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) - -#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) - -#define STR_NB_REPLACED (RC_VIEW_BEGIN + 20) -#define STR_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21) - -#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22) -#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23) -#define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24) - -#define STR_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25) - -#define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32) -#define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33) - -#define STR_SAVEACOPY_SRC (RC_VIEW_BEGIN + 34) - -#define STR_ERR_NO_FAX (RC_VIEW_BEGIN + 36) -#define STR_ERR_SRCSTREAM (RC_VIEW_BEGIN + 37) - -#define STR_QUERY_SPECIAL_FORCED (RC_VIEW_BEGIN + 38) - -// Overflow checking - -#define VIEW_ACT_END STR_EDIT_FOOTNOTE - -#if VIEW_ACT_END > RC_VIEW_END -#error Resource-Id Ueberlauf in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src deleted file mode 100644 index 165f5898c1af..000000000000 --- a/sw/source/uibase/uiview/view.src +++ /dev/null @@ -1,88 +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 "view.hrc" -#include "shells.hrc" -#include "globals.hrc" -#include "helpid.h" -#include "cmdid.h" - -String STR_QUERY_SPECIAL_FORCED -{ - Text [ en-US ] = "Check special regions is deactivated. Check anyway?" ; -}; -String STR_NO_MERGE_ENTRY -{ - Text [ en-US ] = "Could not merge documents." ; -}; -String STR_ERR_SRCSTREAM -{ - Text [ en-US ] = "The source cannot be loaded." ; -}; -String STR_ERR_NO_FAX -{ - Text [ en-US ] = "No fax printer has been set under Tools/Options/%1/Print." ; -}; -String STR_WEBOPTIONS -{ - Text [ en-US ] = "HTML document"; -}; -String STR_TEXTOPTIONS -{ - Text [ en-US ] = "Text document"; -}; -String STR_SCAN_NOSOURCE -{ - Text [ en-US ] = "Source not specified." ; -}; -String STR_NUM_LEVEL -{ - Text [ en-US ] = "Level " ; -}; -String STR_NUM_OUTLINE -{ - Text [ en-US ] = "Outline "; -}; -String STR_EDIT_FOOTNOTE -{ - Text [ en-US ] = "Edit Footnote/Endnote" ; -}; -String STR_NB_REPLACED -{ - Text [ en-US ] = "Search key replaced XX times." ; -}; -String STR_SRCVIEW_ROW -{ - Text [ en-US ] = "Row " ; -}; -String STR_SRCVIEW_COL -{ - Text [ en-US ] = "Column " ; -}; -String STR_SAVEAS_SRC -{ - Text [ en-US ] = "~Export source..." ; -}; -String STR_SAVEACOPY_SRC -{ - Text [ en-US ] = "~Export copy of source..." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 18cdea0f2c0a..4ee436e9e47f 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -54,7 +54,7 @@ #include "cmdid.h" #include "globdoc.hxx" #include "wview.hxx" -#include "shells.hrc" +#include "strings.hrc" #define SwView #define Text diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 654716b85172..b663f884c55a 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -106,14 +106,14 @@ #include <tabsh.hxx> #include <listsh.hxx> #include <cmdid.h> -#include <comcore.hrc> -#include <poolfmt.hrc> -#include <statstr.hrc> +#include <strings.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <swerror.h> #include <globals.hrc> -#include <shells.hrc> -#include <web.hrc> -#include <view.hrc> +#include <strings.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <app.hrc> #include <fmtclds.hxx> #include <helpid.h> @@ -132,7 +132,6 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" -#include <envelp.hrc> #include <fmthdft.hxx> #include <svx/ofaitem.hxx> #include <unomid.h> @@ -467,27 +466,27 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) rSh.SetFrameFormat( pFormat ); } - sal_uInt32 nResId(0); + const char* pResId(nullptr); if( nError == ERRCODE_GRFILTER_OPENERROR ) - nResId = STR_GRFILTER_OPENERROR; + pResId = STR_GRFILTER_OPENERROR; else if( nError == ERRCODE_GRFILTER_IOERROR ) - nResId = STR_GRFILTER_IOERROR; + pResId = STR_GRFILTER_IOERROR; else if( nError ==ERRCODE_GRFILTER_FORMATERROR ) - nResId = STR_GRFILTER_FORMATERROR; + pResId = STR_GRFILTER_FORMATERROR; else if( nError ==ERRCODE_GRFILTER_VERSIONERROR ) - nResId = STR_GRFILTER_VERSIONERROR; + pResId = STR_GRFILTER_VERSIONERROR; else if( nError ==ERRCODE_GRFILTER_FILTERERROR ) - nResId = STR_GRFILTER_FILTERERROR; + pResId = STR_GRFILTER_FILTERERROR; else if( nError ==ERRCODE_GRFILTER_TOOBIG ) - nResId = STR_GRFILTER_TOOBIG; + pResId = STR_GRFILTER_TOOBIG; rSh.EndAction(); rSh.UnlockPaint(); - if( nResId ) + if (pResId) { if( bShowError ) { - ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId( nResId ), VclMessageType::Info); + ScopedVclPtrInstance< MessageDialog > aInfoBox( GetWindow(), SwResId(pResId), VclMessageType::Info); aInfoBox->Execute(); } rReq.Ignore(); diff --git a/sw/source/uibase/uiview/viewcoll.cxx b/sw/source/uibase/uiview/viewcoll.cxx index 4380835251e5..0269604c6b97 100644 --- a/sw/source/uibase/uiview/viewcoll.cxx +++ b/sw/source/uibase/uiview/viewcoll.cxx @@ -24,7 +24,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> -#include <rsc/rscsfx.hxx> +#include <svl/style.hxx> #include "view.hxx" #include "wrtsh.hxx" diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 1c632ad6793a..77a528e20498 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -39,7 +39,7 @@ #include "frmui.hrc" #include "misc.hrc" -#include "view.hrc" +#include "strings.hrc" #include <memory> diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 35a6e34e765b..6f320809d07e 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -59,8 +59,8 @@ #include <vcl/lstbox.hxx> #include <cmdid.h> #include <globals.hrc> -#include <comcore.hrc> -#include <view.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <hhcwrp.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> @@ -426,7 +426,7 @@ void SwView::HyphenateDocument() } SfxErrorContext aContext( ERRCTX_SVX_LINGU_HYPHENATION, OUString(), m_pEditWin, - RID_SVXERRCTX, &DIALOG_MGR() ); + getRID_SVXERRCTX(), &SvxResLocale() ); Reference< XHyphenator > xHyph( ::GetHyphenator() ); if (!xHyph.is()) @@ -548,7 +548,7 @@ void SwView::StartThesaurus() return; SfxErrorContext aContext( ERRCTX_SVX_LINGU_THESAURUS, OUString(), m_pEditWin, - RID_SVXERRCTX, &DIALOG_MGR() ); + getRID_SVXERRCTX(), &SvxResLocale() ); // Determine language LanguageType eLang = m_pWrtShell->GetCurLang(); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 82b2369df284..a141815d6cc7 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -45,8 +45,8 @@ #include <wview.hxx> #include <cmdid.h> -#include <view.hrc> -#include <ribbar.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <helpid.h> #include <globals.hrc> diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index f73ea02ddca5..7be7a7aae6f4 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -57,7 +57,7 @@ #include <IDocumentDeviceAccess.hxx> #include <globals.hrc> -#include <view.hrc> +#include <strings.hrc> #include <app.hrc> #include <swwrtshitem.hxx> #include "swabstdlg.hxx" @@ -177,8 +177,8 @@ void SwView::ExecutePrint(SfxRequest& rReq) else { ScopedVclPtrInstance< MessageDialog > aInfoBox(&GetEditWin(), SwResId(STR_ERR_NO_FAX), VclMessageType::Info); - sal_uInt16 nResNo = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS; - aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(nResNo))); + const char* pResId = bWeb ? STR_WEBOPTIONS : STR_TEXTOPTIONS; + aInfoBox->set_primary_text(aInfoBox->get_primary_text().replaceFirst("%1", SwResId(pResId))); aInfoBox->Execute(); SfxUInt16Item aDefPage(SID_SW_EDITOPTIONS, TP_OPTPRINT_PAGE); GetViewFrame()->GetDispatcher()->ExecuteList(SID_SW_EDITOPTIONS, diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 0c08d996dd27..f27f9bfa6f28 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -61,9 +61,9 @@ #include <comphelper/lok.hxx> #include <comphelper/string.hxx> -#include <view.hrc> +#include <strings.hrc> #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 83fd4ba778ba..aca79a13c678 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -102,7 +102,7 @@ #include <docstat.hxx> #include <modcfg.hxx> #include <ndtxt.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <swcont.hxx> #include <unodefaults.hxx> diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx index 0d6ba76eb06f..f2077c883be9 100644 --- a/sw/source/uibase/utlui/attrdesc.cxx +++ b/sw/source/uibase/utlui/attrdesc.cxx @@ -52,7 +52,7 @@ #include <charfmt.hxx> #include <fmtcol.hxx> #include <tox.hxx> -#include <attrdesc.hrc> +#include <strings.hrc> #include <fmtftntx.hxx> #include <fmtfollowtextflow.hxx> #include <libxml/xmlwriter.h> @@ -182,8 +182,8 @@ bool SwRegisterItem::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - const sal_uInt16 nId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; - rText = SwResId( nId ); + const char* pId = GetValue() ? STR_REGISTER_ON : STR_REGISTER_OFF; + rText = SwResId(pId); return true; } @@ -213,8 +213,8 @@ bool SwParaConnectBorderItem::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - const sal_uInt16 nId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; - rText = SwResId( nId ); + const char* pId = GetValue() ? STR_CONNECT_BORDER_ON : STR_CONNECT_BORDER_OFF; + rText = SwResId(pId); return true; } @@ -242,9 +242,9 @@ bool SwFormatFrameSize::GetPresentation } if ( ATT_VAR_SIZE != GetHeightSizeType() ) { - const sal_uInt16 nId = ATT_FIX_SIZE == m_eFrameHeightType ? + const char* pId = ATT_FIX_SIZE == m_eFrameHeightType ? STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT; - rText = rText + ", " + SwResId( nId ) + " "; + rText = rText + ", " + SwResId(pId) + " "; if ( GetHeightPercent() ) { rText = rText + unicode::formatPercent(GetHeightPercent(), @@ -271,8 +271,8 @@ bool SwFormatHeader::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - const sal_uInt16 nId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER; - rText = SwResId( nId ); + const char* pId = GetHeaderFormat() ? STR_HEADER : STR_NO_HEADER; + rText = SwResId(pId); return true; } @@ -288,8 +288,8 @@ bool SwFormatFooter::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - const sal_uInt16 nId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER; - rText = SwResId( nId ); + const char* pId = GetFooterFormat() ? STR_FOOTER : STR_NO_FOOTER; + rText = SwResId(pId); return true; } @@ -302,31 +302,31 @@ bool SwFormatSurround::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( (css::text::WrapTextMode)GetValue() ) { case css::text::WrapTextMode_NONE: - nId = STR_SURROUND_NONE; + pId = STR_SURROUND_NONE; break; case css::text::WrapTextMode_THROUGH: - nId = STR_SURROUND_THROUGH; + pId = STR_SURROUND_THROUGH; break; case css::text::WrapTextMode_PARALLEL: - nId = STR_SURROUND_PARALLEL; + pId = STR_SURROUND_PARALLEL; break; case css::text::WrapTextMode_DYNAMIC: - nId = STR_SURROUND_IDEAL; + pId = STR_SURROUND_IDEAL; break; case css::text::WrapTextMode_LEFT: - nId = STR_SURROUND_LEFT; + pId = STR_SURROUND_LEFT; break; case css::text::WrapTextMode_RIGHT: - nId = STR_SURROUND_RIGHT; + pId = STR_SURROUND_RIGHT; break; default:;//prevent warning } - if ( nId ) - rText = SwResId( nId ); + if (pId) + rText = SwResId(pId); if ( IsAnchorOnly() ) { @@ -346,7 +346,7 @@ bool SwFormatVertOrient::GetPresentation const IntlWrapper* pIntl ) const { - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( GetVertOrient() ) { case text::VertOrientation::NONE: @@ -357,27 +357,27 @@ bool SwFormatVertOrient::GetPresentation } break; case text::VertOrientation::TOP: - nId = STR_VERT_TOP; + pId = STR_VERT_TOP; break; case text::VertOrientation::CENTER: - nId = STR_VERT_CENTER; + pId = STR_VERT_CENTER; break; case text::VertOrientation::BOTTOM: - nId = STR_VERT_BOTTOM; + pId = STR_VERT_BOTTOM; break; case text::VertOrientation::LINE_TOP: - nId = STR_LINE_TOP; + pId = STR_LINE_TOP; break; case text::VertOrientation::LINE_CENTER: - nId = STR_LINE_CENTER; + pId = STR_LINE_CENTER; break; case text::VertOrientation::LINE_BOTTOM: - nId = STR_LINE_BOTTOM; + pId = STR_LINE_BOTTOM; break; default:;//prevent warning } - if ( nId ) - rText += SwResId( nId ); + if (pId) + rText += SwResId(pId); return true; } @@ -392,7 +392,7 @@ bool SwFormatHoriOrient::GetPresentation const IntlWrapper* pIntl ) const { - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( GetHoriOrient() ) { case text::HoriOrientation::NONE: @@ -403,27 +403,27 @@ bool SwFormatHoriOrient::GetPresentation } break; case text::HoriOrientation::RIGHT: - nId = STR_HORI_RIGHT; + pId = STR_HORI_RIGHT; break; case text::HoriOrientation::CENTER: - nId = STR_HORI_CENTER; + pId = STR_HORI_CENTER; break; case text::HoriOrientation::LEFT: - nId = STR_HORI_LEFT; + pId = STR_HORI_LEFT; break; case text::HoriOrientation::INSIDE: - nId = STR_HORI_INSIDE; + pId = STR_HORI_INSIDE; break; case text::HoriOrientation::OUTSIDE: - nId = STR_HORI_OUTSIDE; + pId = STR_HORI_OUTSIDE; break; case text::HoriOrientation::FULL: - nId = STR_HORI_FULL; + pId = STR_HORI_FULL; break; default:;//prevent warning } - if ( nId ) - rText += SwResId( nId ); + if (pId) + rText += SwResId(pId); return true; } @@ -438,22 +438,22 @@ bool SwFormatAnchor::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( GetAnchorId() ) { case RndStdIds::FLY_AT_PARA: - nId = STR_FLY_AT_PARA; + pId = STR_FLY_AT_PARA; break; case RndStdIds::FLY_AS_CHAR: - nId = STR_FLY_AS_CHAR; + pId = STR_FLY_AS_CHAR; break; case RndStdIds::FLY_AT_PAGE: - nId = STR_FLY_AT_PAGE; + pId = STR_FLY_AT_PAGE; break; default:;//prevent warning } - if ( nId ) - rText += SwResId( nId ); + if (pId) + rText += SwResId(pId); return true; } @@ -646,22 +646,22 @@ bool SwTextGridItem::GetPresentation const IntlWrapper* /*pIntl*/ ) const { - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( GetGridType() ) { case GRID_NONE : - nId = STR_GRID_NONE; + pId = STR_GRID_NONE; break; case GRID_LINES_ONLY : - nId = STR_GRID_LINES_ONLY; + pId = STR_GRID_LINES_ONLY; break; case GRID_LINES_CHARS : - nId = STR_GRID_LINES_CHARS; + pId = STR_GRID_LINES_CHARS; break; } - if ( nId ) - rText += SwResId( nId ); + if (pId) + rText += SwResId(pId); return true; } @@ -683,18 +683,18 @@ bool SwMirrorGrf::GetPresentation( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper* /*pIntl*/ ) const { - sal_uInt16 nId; + const char* pId; switch( GetValue() ) { - case MirrorGraph::Dont: nId = STR_NO_MIRROR; break; - case MirrorGraph::Vertical: nId = STR_VERT_MIRROR; break; - case MirrorGraph::Horizontal: nId = STR_HORI_MIRROR; break; - case MirrorGraph::Both: nId = STR_BOTH_MIRROR; break; - default: nId = 0; break; + case MirrorGraph::Dont: pId = STR_NO_MIRROR; break; + case MirrorGraph::Vertical: pId = STR_VERT_MIRROR; break; + case MirrorGraph::Horizontal: pId = STR_HORI_MIRROR; break; + case MirrorGraph::Both: pId = STR_BOTH_MIRROR; break; + default: pId = nullptr; break; } - if ( nId ) + if (pId) { - rText = SwResId( nId ); + rText = SwResId(pId); if (bGrfToggle) rText += SwResId( STR_MIRROR_TOGGLE ); } @@ -745,16 +745,16 @@ bool SwChannelGrf::GetPresentation( { if( SfxItemPresentation::Complete == ePres ) { - sal_uInt16 nId; + const char* pId; switch ( Which() ) { - case RES_GRFATR_CHANNELR: nId = STR_CHANNELR; break; - case RES_GRFATR_CHANNELG: nId = STR_CHANNELG; break; - case RES_GRFATR_CHANNELB: nId = STR_CHANNELB; break; - default: nId = 0; break; + case RES_GRFATR_CHANNELR: pId = STR_CHANNELR; break; + case RES_GRFATR_CHANNELG: pId = STR_CHANNELG; break; + case RES_GRFATR_CHANNELB: pId = STR_CHANNELB; break; + default: pId = nullptr; break; } - if( nId ) - rText = SwResId( nId ); + if (pId) + rText = SwResId(pId); else if( rText.getLength() ) rText.clear(); } @@ -785,8 +785,8 @@ bool SwInvertGrf::GetPresentation( rText.clear(); if( SfxItemPresentation::Complete == ePres ) { - const sal_uInt16 nId = GetValue() ? STR_INVERT : STR_INVERT_NOT; - rText = SwResId( nId ); + const char* pId = GetValue() ? STR_INVERT : STR_INVERT_NOT; + rText = SwResId(pId); } return true; } @@ -811,16 +811,16 @@ bool SwDrawModeGrf::GetPresentation( rText.clear(); if( SfxItemPresentation::Complete == ePres ) { - sal_uInt16 nId; + const char* pId; switch ( GetValue() ) { - case GraphicDrawMode::Greys: nId = STR_DRAWMODE_GREY; break; - case GraphicDrawMode::Mono: nId = STR_DRAWMODE_BLACKWHITE; break; - case GraphicDrawMode::Watermark: nId = STR_DRAWMODE_WATERMARK; break; - default: nId = STR_DRAWMODE_STD; break; + case GraphicDrawMode::Greys: pId = STR_DRAWMODE_GREY; break; + case GraphicDrawMode::Mono: pId = STR_DRAWMODE_BLACKWHITE; break; + case GraphicDrawMode::Watermark: pId = STR_DRAWMODE_WATERMARK; break; + default: pId = STR_DRAWMODE_STD; break; } - rText = SwResId( STR_DRAWMODE ) + SwResId( nId ); + rText = SwResId( STR_DRAWMODE ) + SwResId(pId); } return true; } @@ -834,8 +834,8 @@ bool SwFormatFollowTextFlow::GetPresentation( SfxItemPresentation ePres, rText.clear(); if( SfxItemPresentation::Complete == ePres ) { - const sal_uInt16 nId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW; - rText = SwResId( nId ); + const char* pId = GetValue() ? STR_FOLLOW_TEXT_FLOW : STR_DONT_FOLLOW_TEXT_FLOW; + rText = SwResId(pId); } return true; } diff --git a/sw/source/uibase/utlui/attrdesc.hrc b/sw/source/uibase/utlui/attrdesc.hrc deleted file mode 100644 index 861f8215adb4..000000000000 --- a/sw/source/uibase/utlui/attrdesc.hrc +++ /dev/null @@ -1,112 +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_UIBASE_UTLUI_ATTRDESC_HRC -#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_ATTRDESC_HRC - -#include "rcid.hrc" - -#define STR_DROP_OVER (RC_ATTR_BEGIN + 1) -#define STR_DROP_LINES (RC_ATTR_BEGIN + 2) -#define STR_NO_DROP_LINES (RC_ATTR_BEGIN + 3) -#define STR_NO_PAGEDESC (RC_ATTR_BEGIN + 4) -#define STR_NO_MIRROR (RC_ATTR_BEGIN + 5) -#define STR_VERT_MIRROR (RC_ATTR_BEGIN + 6) -#define STR_HORI_MIRROR (RC_ATTR_BEGIN + 7) -#define STR_BOTH_MIRROR (RC_ATTR_BEGIN + 8) -#define STR_CHARFMT (RC_ATTR_BEGIN + 9) -#define STR_NO_CHARFMT (RC_ATTR_BEGIN + 10) -#define STR_FOOTER (RC_ATTR_BEGIN + 11) -#define STR_NO_FOOTER (RC_ATTR_BEGIN + 12) -#define STR_HEADER (RC_ATTR_BEGIN + 13) -#define STR_NO_HEADER (RC_ATTR_BEGIN + 14) -#define STR_SURROUND_NONE (RC_ATTR_BEGIN + 15) -#define STR_SURROUND_THROUGH (RC_ATTR_BEGIN + 16) -#define STR_SURROUND_PARALLEL (RC_ATTR_BEGIN + 17) -#define STR_SURROUND_LEFT (RC_ATTR_BEGIN + 19) -#define STR_SURROUND_RIGHT (RC_ATTR_BEGIN + 20) -#define STR_FRM_WIDTH (RC_ATTR_BEGIN + 23) -#define STR_FRM_FIXEDHEIGHT (RC_ATTR_BEGIN + 24) -#define STR_FRM_MINHEIGHT (RC_ATTR_BEGIN + 25) -#define STR_FLY_AT_PARA (RC_ATTR_BEGIN + 26) -#define STR_FLY_AS_CHAR (RC_ATTR_BEGIN + 27) -#define STR_FLY_AT_PAGE (RC_ATTR_BEGIN + 28) -#define STR_POS_X (RC_ATTR_BEGIN + 29) -#define STR_POS_Y (RC_ATTR_BEGIN + 30) -#define STR_VERT_TOP (RC_ATTR_BEGIN + 31) -#define STR_VERT_CENTER (RC_ATTR_BEGIN + 32) -#define STR_VERT_BOTTOM (RC_ATTR_BEGIN + 33) -#define STR_HORI_RIGHT (RC_ATTR_BEGIN + 34) -#define STR_HORI_CENTER (RC_ATTR_BEGIN + 35) -#define STR_HORI_LEFT (RC_ATTR_BEGIN + 36) -#define STR_HORI_INSIDE (RC_ATTR_BEGIN + 37) -#define STR_HORI_OUTSIDE (RC_ATTR_BEGIN + 38) -#define STR_HORI_FULL (RC_ATTR_BEGIN + 39) -#define STR_COLUMNS (RC_ATTR_BEGIN + 40) -#define STR_LINE_WIDTH (RC_ATTR_BEGIN + 41) -#define STR_MAX_FTN_HEIGHT (RC_ATTR_BEGIN + 42) -#define STR_SURROUND_IDEAL (RC_ATTR_BEGIN + 43) -#define STR_LINE_TOP (RC_ATTR_BEGIN + 44) -#define STR_LINE_CENTER (RC_ATTR_BEGIN + 45) -#define STR_LINE_BOTTOM (RC_ATTR_BEGIN + 46) -#define STR_REGISTER_ON (RC_ATTR_BEGIN + 47) -#define STR_REGISTER_OFF (RC_ATTR_BEGIN + 48) -#define STR_SURROUND_ANCHORONLY (RC_ATTR_BEGIN + 49) -#define STR_EDIT_IN_READONLY (RC_ATTR_BEGIN + 50) -#define STR_LAYOUT_SPLIT (RC_ATTR_BEGIN + 51) -#define STR_NUMRULE_ON (RC_ATTR_BEGIN + 52) -#define STR_NUMRULE_OFF (RC_ATTR_BEGIN + 53) -#define STR_CONNECT1 (RC_ATTR_BEGIN + 54) -#define STR_CONNECT2 (RC_ATTR_BEGIN + 55) -#define STR_MIRROR_TOGGLE (RC_ATTR_BEGIN + 56) -#define STR_LINECOUNT (RC_ATTR_BEGIN + 57) -#define STR_DONTLINECOUNT (RC_ATTR_BEGIN + 58) -#define STR_LINCOUNT_START (RC_ATTR_BEGIN + 59) -#define STR_LUMINANCE (RC_ATTR_BEGIN + 60) -#define STR_CHANNELR (RC_ATTR_BEGIN + 61) -#define STR_CHANNELG (RC_ATTR_BEGIN + 62) -#define STR_CHANNELB (RC_ATTR_BEGIN + 63) -#define STR_CONTRAST (RC_ATTR_BEGIN + 64) -#define STR_GAMMA (RC_ATTR_BEGIN + 65) -#define STR_TRANSPARENCY (RC_ATTR_BEGIN + 66) -#define STR_INVERT (RC_ATTR_BEGIN + 67) -#define STR_INVERT_NOT (RC_ATTR_BEGIN + 68) -#define STR_DRAWMODE (RC_ATTR_BEGIN + 69) -#define STR_DRAWMODE_STD (RC_ATTR_BEGIN + 70) -#define STR_DRAWMODE_GREY (RC_ATTR_BEGIN + 71) -#define STR_DRAWMODE_BLACKWHITE (RC_ATTR_BEGIN + 72) -#define STR_DRAWMODE_WATERMARK (RC_ATTR_BEGIN + 73) -#define STR_ROTATION (RC_ATTR_BEGIN + 74) -#define STR_GRID_NONE (RC_ATTR_BEGIN + 75) -#define STR_GRID_LINES_ONLY (RC_ATTR_BEGIN + 76) -#define STR_GRID_LINES_CHARS (RC_ATTR_BEGIN + 77) -#define STR_FOLLOW_TEXT_FLOW (RC_ATTR_BEGIN + 78) -#define STR_DONT_FOLLOW_TEXT_FLOW (RC_ATTR_BEGIN + 79) -#define STR_CONNECT_BORDER_ON (RC_ATTR_BEGIN + 80) -#define STR_CONNECT_BORDER_OFF (RC_ATTR_BEGIN + 81) - -#define ATTR_ACT_END STR_CONNECT_BORDER_OFF - -#if ATTR_ACT_END > RC_ATTR_END -#error Resource-Id overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/attrdesc.src b/sw/source/uibase/utlui/attrdesc.src deleted file mode 100644 index 3bc55fa38e37..000000000000 --- a/sw/source/uibase/utlui/attrdesc.src +++ /dev/null @@ -1,351 +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 "attrdesc.hrc" - -// Strings for textual attributes. - -String STR_DROP_OVER -{ - Text [ en-US ] = "Drop Caps over" ; -}; -String STR_DROP_LINES -{ - Text [ en-US ] = "rows" ; -}; -String STR_NO_DROP_LINES -{ - Text [ en-US ] = "No Drop Caps" ; -}; -String STR_NO_PAGEDESC -{ - Text [ en-US ] = "No page break" ; -}; -String STR_NO_MIRROR -{ - Text [ en-US ] = "Don't mirror" ; -}; -String STR_VERT_MIRROR -{ - Text [ en-US ] = "Flip vertically" ; -}; -String STR_HORI_MIRROR -{ - Text [ en-US ] = "Flip horizontal" ; -}; -String STR_BOTH_MIRROR -{ - Text [ en-US ] = "Horizontal and Vertical Flip" ; -}; -String STR_MIRROR_TOGGLE -{ - Text [ en-US ] = "+ mirror horizontal on even pages" ; -}; -String STR_CHARFMT -{ - Text [ en-US ] = "Character Style" ; -}; -String STR_NO_CHARFMT -{ - Text [ en-US ] = "No Character Style" ; -}; -String STR_FOOTER -{ - Text [ en-US ] = "Footer" ; -}; -String STR_NO_FOOTER -{ - Text [ en-US ] = "No footer" ; -}; -String STR_HEADER -{ - Text [ en-US ] = "Header" ; -}; -String STR_NO_HEADER -{ - Text [ en-US ] = "No header" ; -}; -String STR_SURROUND_IDEAL -{ - Text [ en-US ] = "Optimal wrap" ; -}; -String STR_SURROUND_NONE -{ - Text [ en-US ] = "No wrap" ; -}; -String STR_SURROUND_THROUGH -{ - Text [ en-US ] = "Through" ; -}; -String STR_SURROUND_PARALLEL -{ - Text [ en-US ] = "Parallel wrap" ; -}; -String STR_SURROUND_LEFT -{ - Text [ en-US ] = "Left wrap" ; -}; -String STR_SURROUND_RIGHT -{ - Text [ en-US ] = "Right wrap" ; -}; -String STR_SURROUND_ANCHORONLY -{ - Text [ en-US ] = "(Anchor only)" ; -}; -String STR_FRM_WIDTH -{ - Text [ en-US ] = "Width:" ; -}; -String STR_FRM_FIXEDHEIGHT -{ - Text [ en-US ] = "Fixed height:" ; -}; -String STR_FRM_MINHEIGHT -{ - Text [ en-US ] = "Min. height:" ; -}; -String STR_FLY_AT_PARA -{ - Text [ en-US ] = "to paragraph" ; -}; -String STR_FLY_AS_CHAR -{ - Text [ en-US ] = "to character" ; -}; -String STR_FLY_AT_PAGE -{ - Text [ en-US ] = "to page" ; -}; -String STR_POS_X -{ - Text [ en-US ] = "X Coordinate:" ; -}; -String STR_POS_Y -{ - Text [ en-US ] = "Y Coordinate:" ; -}; -String STR_VERT_TOP -{ - Text [ en-US ] = "at top" ; -}; -String STR_VERT_CENTER -{ - Text [ en-US ] = "Centered vertically" ; -}; -String STR_VERT_BOTTOM -{ - Text [ en-US ] = "at bottom" ; -}; -String STR_LINE_TOP -{ - Text [ en-US ] = "Top of line" ; -}; -String STR_LINE_CENTER -{ - Text [ en-US ] = "Line centered" ; -}; -String STR_LINE_BOTTOM -{ - Text [ en-US ] = "Bottom of line" ; -}; -String STR_REGISTER_ON -{ - Text [ en-US ] = "Register-true" ; -}; -String STR_REGISTER_OFF -{ - Text [ en-US ] = "Not register-true" ; -}; -String STR_HORI_RIGHT -{ - Text [ en-US ] = "at the right" ; -}; -String STR_HORI_CENTER -{ - Text [ en-US ] = "Centered horizontally" ; -}; -String STR_HORI_LEFT -{ - Text [ en-US ] = "at the left" ; -}; -String STR_HORI_INSIDE -{ - Text [ en-US ] = "inside" ; -}; -String STR_HORI_OUTSIDE -{ - Text [ en-US ] = "outside" ; -}; -String STR_HORI_FULL -{ - Text [ en-US ] = "Full width" ; -}; -String STR_COLUMNS -{ - Text [ en-US ] = "Columns" ; -}; -String STR_LINE_WIDTH -{ - Text [ en-US ] = "Separator Width:" ; -}; -String STR_MAX_FTN_HEIGHT -{ - Text [ en-US ] = "Max. footnote area:" ; -}; -String STR_EDIT_IN_READONLY -{ - Text [ en-US ] = "Editable in read-only document" ; -}; -String STR_LAYOUT_SPLIT -{ - Text [ en-US ] = "Split" ; -}; -String STR_NUMRULE_ON -{ - Text [ en-US ] = "Numbering" ; -}; -String STR_NUMRULE_OFF -{ - Text [ en-US ] = "no numbering" ; -}; -String STR_CONNECT1 -{ - Text [ en-US ] = "linked to " ; -}; -String STR_CONNECT2 -{ - Text [ en-US ] = "and " ; -}; -String STR_LINECOUNT -{ - Text [ en-US ] = "Count lines" ; -}; -String STR_DONTLINECOUNT -{ - Text [ en-US ] = "don't count lines" ; -}; -String STR_LINCOUNT_START -{ - Text [ en-US ] = "restart line count with: " ; -}; - -String STR_LUMINANCE -{ - Text [ en-US ] = "Brightness: "; -}; - -String STR_CHANNELR -{ - Text [ en-US ] = "Red: "; -}; - -String STR_CHANNELG -{ - Text [ en-US ] = "Green: "; -}; - -String STR_CHANNELB -{ - Text [ en-US ] = "Blue: "; -}; - -String STR_CONTRAST -{ - Text [ en-US ] = "Contrast: "; -}; - -String STR_GAMMA -{ - Text [ en-US ] = "Gamma: "; -}; - -String STR_TRANSPARENCY -{ - Text [ en-US ] = "Transparency: "; -}; - -String STR_INVERT -{ - Text [ en-US ] = "Invert"; -}; -String STR_INVERT_NOT -{ - Text [ en-US ] = "do not invert"; -}; - -String STR_DRAWMODE -{ - Text [ en-US ] = "Graphics mode: "; -}; - -String STR_DRAWMODE_STD -{ - Text [ en-US ] = "Standard"; -}; -String STR_DRAWMODE_GREY -{ - Text [ en-US ] = "Grayscales"; -}; -String STR_DRAWMODE_BLACKWHITE -{ - Text [ en-US ] = "Black & White"; -}; -String STR_DRAWMODE_WATERMARK -{ - Text [ en-US ] = "Watermark"; -}; -String STR_ROTATION -{ - Text [ en-US ] = "Rotation"; -}; - -String STR_GRID_NONE -{ - Text [ en-US ] = "No grid"; -}; - -String STR_GRID_LINES_ONLY -{ - Text [ en-US ] = "Grid (lines only)"; -}; - -String STR_GRID_LINES_CHARS -{ - Text [ en-US ] = "Grid (lines and characters)"; -}; -String STR_FOLLOW_TEXT_FLOW -{ - Text [ en-US ] = "Follow text flow"; -}; -String STR_DONT_FOLLOW_TEXT_FLOW -{ - Text [ en-US ] = "Do not follow text flow"; -}; -String STR_CONNECT_BORDER_ON -{ - Text [ en-US ] = "Merge borders"; -}; -String STR_CONNECT_BORDER_OFF -{ - Text [ en-US ] = "Do not merge borders"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/bookctrl.cxx b/sw/source/uibase/utlui/bookctrl.cxx index 620bd42a8d3b..98d5de5488be 100644 --- a/sw/source/uibase/utlui/bookctrl.cxx +++ b/sw/source/uibase/utlui/bookctrl.cxx @@ -19,7 +19,7 @@ #include "hintids.hxx" #include <swtypes.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include <svl/intitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 20c6ee6c028b..9d369a8eabe8 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -57,9 +57,9 @@ #include <unotxvw.hxx> #include <cmdid.h> #include <helpid.h> -#include <utlui.hrc> +#include <strings.hrc> #include <misc.hrc> -#include <comcore.hrc> +#include <strings.hrc> #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> @@ -215,12 +215,44 @@ SwTOXBaseContent::~SwTOXBaseContent() { } +static const char* STR_CONTENT_TYPE_ARY[] = +{ + STR_CONTENT_TYPE_OUTLINE, + STR_CONTENT_TYPE_TABLE, + STR_CONTENT_TYPE_FRAME, + STR_CONTENT_TYPE_GRAPHIC, + STR_CONTENT_TYPE_OLE, + STR_CONTENT_TYPE_BOOKMARK, + STR_CONTENT_TYPE_REGION, + STR_CONTENT_TYPE_URLFIELD, + STR_CONTENT_TYPE_REFERENCE, + STR_CONTENT_TYPE_INDEX, + STR_CONTENT_TYPE_POSTIT, + STR_CONTENT_TYPE_DRAWOBJECT +}; + +static const char* STR_CONTENT_TYPE_SINGLE_ARY[] = +{ + STR_CONTENT_TYPE_SINGLE_OUTLINE, + STR_CONTENT_TYPE_SINGLE_TABLE, + STR_CONTENT_TYPE_SINGLE_FRAME, + STR_CONTENT_TYPE_SINGLE_GRAPHIC, + STR_CONTENT_TYPE_SINGLE_OLE, + STR_CONTENT_TYPE_SINGLE_BOOKMARK, + STR_CONTENT_TYPE_SINGLE_REGION, + STR_CONTENT_TYPE_SINGLE_URLFIELD, + STR_CONTENT_TYPE_SINGLE_REFERENCE, + STR_CONTENT_TYPE_SINGLE_INDEX, + STR_CONTENT_TYPE_SINGLE_POSTIT, + STR_CONTENT_TYPE_SINGLE_DRAWOBJECT +}; + SwContentType::SwContentType(SwWrtShell* pShell, ContentTypeId nType, sal_uInt8 nLevel) : SwTypeNumber(CTYPE_CTT), pWrtShell(pShell), pMember(nullptr), - sContentTypeName(SwResId(STR_CONTENT_TYPE_FIRST + (int)nType)), - sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_FIRST + (int)nType)), + sContentTypeName(SwResId(STR_CONTENT_TYPE_ARY[(int)nType])), + sSingleContentTypeName(SwResId(STR_CONTENT_TYPE_SINGLE_ARY[(int)nType])), nMemberCount(0), nContentType(nType), nOutlineLevel(nLevel), @@ -767,6 +799,38 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) } +enum STR_CONTEXT_IDX +{ + IDX_STR_OUTLINE_LEVEL = 0, + IDX_STR_DRAGMODE = 1, + IDX_STR_HYPERLINK = 2, + IDX_STR_LINK_REGION = 3, + IDX_STR_COPY_REGION = 4, + IDX_STR_DISPLAY = 5, + IDX_STR_ACTIVE_VIEW = 6, + IDX_STR_HIDDEN = 7, + IDX_STR_ACTIVE = 8, + IDX_STR_INACTIVE = 9, + IDX_STR_EDIT_ENTRY = 10, + IDX_STR_DELETE_ENTRY = 11 +}; + +static const char* STR_CONTEXT_ARY[] = +{ + STR_OUTLINE_LEVEL, + STR_DRAGMODE, + STR_HYPERLINK, + STR_LINK_REGION, + STR_COPY_REGION, + STR_DISPLAY, + STR_ACTIVE_VIEW, + STR_HIDDEN, + STR_ACTIVE, + STR_INACTIVE, + STR_EDIT_ENTRY, + STR_DELETE_ENTRY +}; + SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog) : SvTreeListBox(pParent) , m_xDialog(pDialog) @@ -810,7 +874,7 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog) } for (int i = 0; i < CONTEXT_COUNT; ++i) { - m_aContextStrings[i] = SwResId(i+STR_CONTEXT_FIRST); + m_aContextStrings[i] = SwResId(STR_CONTEXT_ARY[i]); } m_nActiveBlock = m_pConfig->GetActiveBlock(); m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate)); @@ -1110,7 +1174,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() for(int i=0; i < 3; ++i) { pSubPop2->InsertItem(i + 201, m_aContextStrings[ - STR_HYPERLINK - STR_CONTEXT_FIRST + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); + IDX_STR_HYPERLINK + i], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); } pSubPop2->CheckItem(201 + static_cast<int>(GetParentWindow()->GetRegionDropMode())); // Insert the list of the open files @@ -1123,7 +1187,7 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() if(pView == pActiveView) { sInsert += "("; - sInsert += m_aContextStrings[ STR_ACTIVE - STR_CONTEXT_FIRST]; + sInsert += m_aContextStrings[IDX_STR_ACTIVE]; sInsert += ")"; } pSubPop3->InsertItem(nId, sInsert, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); @@ -1132,12 +1196,12 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() pView = SwModule::GetNextView(pView); nId++; } - pSubPop3->InsertItem(nId++, m_aContextStrings[STR_ACTIVE_VIEW - STR_CONTEXT_FIRST], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); + pSubPop3->InsertItem(nId++, m_aContextStrings[IDX_STR_ACTIVE_VIEW], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); if(m_pHiddenShell) { OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle(); sHiddenEntry += " ( "; - sHiddenEntry += m_aContextStrings[ STR_HIDDEN - STR_CONTEXT_FIRST]; + sHiddenEntry += m_aContextStrings[IDX_STR_HIDDEN]; sHiddenEntry += " )"; pSubPop3->InsertItem(nId, sHiddenEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); } @@ -1147,9 +1211,9 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() else if (State::HIDDEN == m_eState) pSubPop3->CheckItem( nId ); - pPop->InsertItem( 1, m_aContextStrings[STR_OUTLINE_LEVEL - STR_CONTEXT_FIRST]); - pPop->InsertItem(2, m_aContextStrings[STR_DRAGMODE - STR_CONTEXT_FIRST]); - pPop->InsertItem(3, m_aContextStrings[STR_DISPLAY - STR_CONTEXT_FIRST]); + pPop->InsertItem( 1, m_aContextStrings[IDX_STR_OUTLINE_LEVEL]); + pPop->InsertItem(2, m_aContextStrings[IDX_STR_DRAGMODE]); + pPop->InsertItem(3, m_aContextStrings[IDX_STR_DISPLAY]); // Now edit SvTreeListEntry* pEntry = nullptr; // Edit only if the shown content is coming from the current view. @@ -1185,38 +1249,38 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pEntry->GetUserData())->GetTOXBase(); if(!pBase->IsTOXBaseInReadonly()) - pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]); pSubPop4->InsertItem(405, m_sReadonlyIdx); pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase)); - pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]); } else if(ContentTypeId::TABLE == nContentType && !bReadonly) { bSubPop4 = true; - pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]); pSubPop4->InsertItem(404, m_sUnprotTable); bool bFull = false; OUString sTableName = static_cast<SwContent*>(pEntry->GetUserData())->GetName(); bool bProt = m_pActiveShell->HasTableAnyProtection( &sTableName, &bFull ); pSubPop4->EnableItem(403, !bFull ); pSubPop4->EnableItem(404, bProt ); - pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]); } else if(bEditable || bDeletable) { if(bEditable && bDeletable) { - pSubPop4->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]); - pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]); + pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]); bSubPop4 = true; } else if(bEditable) - pPop->InsertItem(403, m_aContextStrings[STR_EDIT_ENTRY - STR_CONTEXT_FIRST]); + pPop->InsertItem(403, m_aContextStrings[IDX_STR_EDIT_ENTRY]); else if(bDeletable) { - pSubPop4->InsertItem(501, m_aContextStrings[STR_DELETE_ENTRY - STR_CONTEXT_FIRST]); + pSubPop4->InsertItem(501, m_aContextStrings[IDX_STR_DELETE_ENTRY]); } } //Rename object diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 8e750f9cb53e..0413ec2e0fb0 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -53,8 +53,8 @@ #include <cmdid.h> #include <helpid.h> -#include <utlui.hrc> -#include <comcore.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <globals.hrc> #include "bitmaps.hlst" #include "swabstdlg.hxx" @@ -134,6 +134,42 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& bValid = false; } +enum GLOBAL_CONTEXT_IDX +{ + IDX_STR_UPDATE = 0, + IDX_STR_EDIT_CONTENT = 1, + IDX_STR_EDIT_INSERT = 2, + IDX_STR_INDEX = 3, + IDX_STR_FILE = 4, + IDX_STR_NEW_FILE = 5, + IDX_STR_INSERT_TEXT = 6, + IDX_STR_DELETE = 7, + IDX_STR_UPDATE_SEL = 8, + IDX_STR_UPDATE_INDEX = 9, + IDX_STR_UPDATE_LINK = 10, + IDX_STR_UPDATE_ALL = 11, + IDX_STR_BROKEN_LINK = 12, + IDX_STR_EDIT_LINK = 13 +}; + +static const char* GLOBAL_CONTEXT_ARY[] = +{ + STR_UPDATE, + STR_EDIT_CONTENT, + STR_EDIT_INSERT, + STR_INDEX, + STR_FILE, + STR_NEW_FILE, + STR_INSERT_TEXT, + STR_DELETE, + STR_UPDATE_SEL, + STR_UPDATE_INDEX, + STR_UPDATE_LINK, + STR_UPDATE_ALL, + STR_BROKEN_LINK, + STR_EDIT_LINK +}; + SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog) : SvTreeListBox(pParent) , m_xDialog(pDialog) @@ -153,9 +189,9 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog) m_aUpdateTimer.SetTimeout(GLOBAL_UPDATE_TIMEOUT); m_aUpdateTimer.SetInvokeHandler(LINK(this, SwGlobalTree, Timeout)); m_aUpdateTimer.Start(); - for(sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++) + for (sal_uInt16 i = 0; i < GLOBAL_CONTEXT_COUNT; i++) { - m_aContextStrings[i] = SwResId(i+ STR_GLOBAL_CONTEXT_FIRST); + m_aContextStrings[i] = SwResId(GLOBAL_CONTEXT_ARY[i]); } SetHelpId(HID_NAVIGATOR_GLOB_TREELIST); SelectHdl(); @@ -334,33 +370,33 @@ VclPtr<PopupMenu> SwGlobalTree::CreateContextMenu() for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { - pSubPop2->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); + pSubPop2->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] ); pSubPop2->SetHelpId(i, aHelpForMenu[i]); } pSubPop2->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel)); - pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST]); + pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, m_aContextStrings[IDX_STR_INDEX]); pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]); - pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[STR_FILE - STR_GLOBAL_CONTEXT_FIRST]); + pSubPop1->InsertItem(CTX_INSERT_FILE, m_aContextStrings[IDX_STR_FILE]); pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]); - pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[STR_NEW_FILE - STR_GLOBAL_CONTEXT_FIRST]); + pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, m_aContextStrings[IDX_STR_NEW_FILE]); pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]); - pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST]); + pSubPop1->InsertItem(CTX_INSERT_TEXT, m_aContextStrings[IDX_STR_INSERT_TEXT]); pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]); - pPop->InsertItem(CTX_UPDATE, m_aContextStrings[STR_UPDATE - STR_GLOBAL_CONTEXT_FIRST]); + pPop->InsertItem(CTX_UPDATE, m_aContextStrings[IDX_STR_UPDATE]); pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]); - pPop->InsertItem(CTX_EDIT, m_aContextStrings[STR_EDIT_CONTENT - STR_GLOBAL_CONTEXT_FIRST]); + pPop->InsertItem(CTX_EDIT, m_aContextStrings[IDX_STR_EDIT_CONTENT]); pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]); if(nEnableFlags&MenuEnableFlags::EditLink) { - pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[STR_EDIT_LINK - STR_GLOBAL_CONTEXT_FIRST]); + pPop->InsertItem(CTX_EDIT_LINK, m_aContextStrings[IDX_STR_EDIT_LINK]); pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]); } - pPop->InsertItem(CTX_INSERT, m_aContextStrings[STR_EDIT_INSERT - STR_GLOBAL_CONTEXT_FIRST]); + pPop->InsertItem(CTX_INSERT, m_aContextStrings[IDX_STR_EDIT_INSERT]); pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]); pPop->InsertSeparator() ; - pPop->InsertItem(CTX_DELETE, m_aContextStrings[STR_DELETE - STR_GLOBAL_CONTEXT_FIRST]); + pPop->InsertItem(CTX_DELETE, m_aContextStrings[IDX_STR_DELETE]); pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]); //disabling if applicable @@ -389,7 +425,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox) ScopedVclPtrInstance<PopupMenu> pMenu; for (sal_uInt16 i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; ++i) { - pMenu->InsertItem( i, m_aContextStrings[STR_INDEX - STR_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] ); + pMenu->InsertItem( i, m_aContextStrings[IDX_STR_INDEX + i - CTX_INSERT_ANY_INDEX] ); pMenu->SetHelpId(i, aHelpForMenu[i] ); } pMenu->EnableItem(CTX_INSERT_ANY_INDEX, bool(nEnableFlags & MenuEnableFlags::InsertIdx )); @@ -407,7 +443,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox) ScopedVclPtrInstance<PopupMenu> pMenu; for (sal_uInt16 i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { - pMenu->InsertItem( i, m_aContextStrings[STR_UPDATE_SEL - STR_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); + pMenu->InsertItem( i, m_aContextStrings[IDX_STR_UPDATE_SEL + i - CTX_UPDATE_SEL] ); pMenu->SetHelpId(i, aHelpForMenu[i] ); } pMenu->EnableItem(CTX_UPDATE_SEL, bool(nEnableFlags & MenuEnableFlags::UpdateSel)); @@ -470,7 +506,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) const SwSection* pSect = pCont->GetSection(); OUString sEntry = pSect->GetLinkFileName().getToken(0, sfx2::cTokenSeparator); if(!pSect->IsConnectFlag()) - sEntry = m_aContextStrings[STR_BROKEN_LINK - STR_GLOBAL_CONTEXT_FIRST] + sEntry; + sEntry = m_aContextStrings[IDX_STR_BROKEN_LINK] + sEntry; Point aEntryPos = GetEntryPosition( pEntry ); aEntryPos.X() = GetTabPos( pEntry, pTab ); @@ -660,7 +696,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) { case GLBLDOC_UNKNOWN: { - sEntry = m_aContextStrings[STR_INSERT_TEXT - STR_GLOBAL_CONTEXT_FIRST]; + sEntry = m_aContextStrings[IDX_STR_INSERT_TEXT]; } break; case GLBLDOC_TOXBASE: diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 6f4f39f5c5b7..ea1d0205a67d 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -36,7 +36,7 @@ #include <vector> -#include <utlui.hrc> +#include <strings.hrc> #define STRING_DELIM (char)0x0A #define GLOS_TIMEOUT 30000 // update every 30 seconds diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx index a64892fea6bf..97be35568e0c 100644 --- a/sw/source/uibase/utlui/initui.cxx +++ b/sw/source/uibase/utlui/initui.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <tools/resary.hxx> #include <unotools/localedatawrapper.hxx> #include <viewsh.hxx> #include <initui.hxx> @@ -28,9 +27,9 @@ #include <fldbas.hxx> #include <glosdoc.hxx> #include <gloslst.hxx> - -#include <utlui.hrc> #include <comcore.hrc> +#include <strings.hrc> +#include <utlui.hrc> #include <authfld.hxx> #include <dbmgr.hxx> #include <unotools/syslocale.hxx> @@ -173,6 +172,19 @@ void InitUI() SwEditWin::InitStaticData(); } +static const char* FLD_DOCINFO_ARY[] = +{ + FLD_DOCINFO_TITEL, + FLD_DOCINFO_THEMA, + FLD_DOCINFO_KEYS, + FLD_DOCINFO_COMMENT, + FLD_DOCINFO_CREATE, + FLD_DOCINFO_CHANGE, + FLD_DOCINFO_PRINT, + FLD_DOCINFO_DOCNO, + FLD_DOCINFO_EDIT +}; + ShellResource::ShellResource() : aPostItAuthor( SwResId( STR_POSTIT_AUTHOR ) ), aPostItPage( SwResId( STR_POSTIT_PAGE ) ), @@ -207,8 +219,6 @@ ShellResource::ShellResource() sPageDescFollowName( SwResId(STR_PAGEDESC_FOLLOWNAME)), sPageDescName( SwResId(STR_PAGEDESC_NAME)) { - const sal_uInt16 nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN; - vcl::KeyCode aCode( KEY_SPACE ); vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 ); OUString aModStr( aModifiedCode.GetName() ); @@ -216,8 +226,8 @@ ShellResource::ShellResource() aModStr = aModStr.replaceAll("+", ""); aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr); - for(sal_uInt16 i = 0; i < nCount; ++i) - aDocInfoLst.push_back(SwResId(FLD_DOCINFO_BEGIN + i)); + for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_DOCINFO_ARY); ++i) + aDocInfoLst.push_back(SwResId(FLD_DOCINFO_ARY[i])); } OUString ShellResource::GetPageDescName(sal_uInt16 nNo, PageNameMode eMode) @@ -266,11 +276,10 @@ void ShellResource::GetAutoFormatNameLst_() const pAutoFormatNameLst.reset( new std::vector<OUString> ); pAutoFormatNameLst->reserve(STR_AUTOFMTREDL_END); - ResStringArray aStringArray(ResId(RID_SHELLRES_AUTOFMTSTRS, *pSwResMgr)); - assert(aStringArray.Count() == STR_AUTOFMTREDL_END); + assert(SAL_N_ELEMENTS(RID_SHELLRES_AUTOFMTSTRS) == STR_AUTOFMTREDL_END); for (sal_uInt16 n = 0; n < STR_AUTOFMTREDL_END; ++n) { - OUString p(aStringArray.GetString(n)); + OUString p(SwResId(RID_SHELLRES_AUTOFMTSTRS[n])); if (STR_AUTOFMTREDL_TYPO == n) { const SvtSysLocale aSysLocale; @@ -282,26 +291,90 @@ void ShellResource::GetAutoFormatNameLst_() const } } +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 + }; +} + OUString SwAuthorityFieldType::GetAuthFieldName(ToxAuthorityField eType) { if(!pAuthFieldNameList) { pAuthFieldNameList = new std::vector<OUString>; pAuthFieldNameList->reserve(AUTH_FIELD_END); - for(sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) - pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_START + i)); + for (sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i) + pAuthFieldNameList->push_back(SwResId(STR_AUTH_FIELD_ARY[i])); } return (*pAuthFieldNameList)[static_cast< sal_uInt16 >(eType)]; } +static const char* STR_AUTH_TYPE_ARY[] = +{ + STR_AUTH_TYPE_ARTICLE, + STR_AUTH_TYPE_BOOK, + STR_AUTH_TYPE_BOOKLET, + STR_AUTH_TYPE_CONFERENCE, + STR_AUTH_TYPE_INBOOK, + STR_AUTH_TYPE_INCOLLECTION, + STR_AUTH_TYPE_INPROCEEDINGS, + STR_AUTH_TYPE_JOURNAL, + STR_AUTH_TYPE_MANUAL, + STR_AUTH_TYPE_MASTERSTHESIS, + STR_AUTH_TYPE_MISC, + STR_AUTH_TYPE_PHDTHESIS, + STR_AUTH_TYPE_PROCEEDINGS, + STR_AUTH_TYPE_TECHREPORT, + STR_AUTH_TYPE_UNPUBLISHED, + STR_AUTH_TYPE_EMAIL, + STR_AUTH_TYPE_WWW, + STR_AUTH_TYPE_CUSTOM1, + STR_AUTH_TYPE_CUSTOM2, + STR_AUTH_TYPE_CUSTOM3, + STR_AUTH_TYPE_CUSTOM4, + STR_AUTH_TYPE_CUSTOM5 +}; + OUString SwAuthorityFieldType::GetAuthTypeName(ToxAuthorityType eType) { if(!pAuthFieldTypeList) { pAuthFieldTypeList = new std::vector<OUString>; pAuthFieldTypeList->reserve(AUTH_TYPE_END); - for(sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i) - pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_START + i)); + for (sal_uInt16 i = 0; i < AUTH_TYPE_END; ++i) + pAuthFieldTypeList->push_back(SwResId(STR_AUTH_TYPE_ARY[i])); } return (*pAuthFieldTypeList)[static_cast< sal_uInt16 >(eType)]; } diff --git a/sw/source/uibase/utlui/initui.src b/sw/source/uibase/utlui/initui.src deleted file mode 100644 index 05899f35bb92..000000000000 --- a/sw/source/uibase/utlui/initui.src +++ /dev/null @@ -1,394 +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" - -// Error calculator - -String STR_POSTIT_PAGE -{ - Text [ en-US ] = "Page" ; -}; -String STR_POSTIT_LINE -{ - Text [ en-US ] = "Line" ; -}; -String STR_POSTIT_AUTHOR -{ - Text [ en-US ] = "Author" ; -}; -String STR_CALC_SYNTAX -{ - Text [ en-US ] = "** Syntax Error **" ; -}; -String STR_CALC_ZERODIV -{ - Text [ en-US ] = "** Division by zero **" ; -}; -String STR_CALC_BRACK -{ - Text [ en-US ] = "** Wrong use of brackets **" ; -}; -String STR_CALC_POW -{ - Text [ en-US ] = "** Square function overflow **" ; -}; -String STR_CALC_OVERFLOW -{ - Text [ en-US ] = "** Overflow **" ; -}; -String STR_CALC_DEFAULT -{ - Text [ en-US ] = "** Error **" ; -}; -String STR_CALC_ERROR -{ - Text [ en-US ] = "** Expression is faulty **" ; -}; -String STR_GETREFFLD_REFITEMNOTFOUND -{ - Text [ en-US ] = "Error: Reference source not found" ; -}; -String STR_TEMPLATE_NONE -{ - Text [ en-US ] = "None" ; -}; -String STR_FIELD_FIXED -{ - Text [ en-US ] = "(fixed)" ; -}; -String STR_DURATION_FORMAT -{ - Text [en-US] = " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"; -}; -String STR_TOI -{ - Text [ en-US ] = "Alphabetical Index" ; -}; - -String STR_TOU -{ - Text [ en-US ] = "User-Defined" ; -}; - -String STR_TOC -{ - Text [ en-US ] = "Table of Contents" ; -}; - -String STR_TOX_AUTH -{ - Text [ en-US ] = "Bibliography"; -}; - -String STR_TOX_CITATION -{ - Text [ en-US ] = "Citation"; -}; - -String STR_TOX_TBL -{ - Text [ en-US ] = "Index of Tables"; -}; -String STR_TOX_OBJ -{ - Text [ en-US ] = "Table of Objects"; -}; -String STR_TOX_ILL -{ - Text [ en-US ] = "Illustration Index"; -}; -String STR_LINK_CTRL_CLICK -{ - Text [ en-US ] = "%s-Click to follow link"; -}; -String STR_LINK_CLICK -{ - Text [ en-US ] = "Click to follow link"; -}; - - // SubType DocInfo - -String FLD_DOCINFO_TITEL -{ - Text [ en-US ] = "Title" ; -}; -String FLD_DOCINFO_THEMA -{ - Text [ en-US ] = "Subject" ; -}; -String FLD_DOCINFO_KEYS -{ - Text [ en-US ] = "Keywords" ; -}; -String FLD_DOCINFO_COMMENT -{ - Text [ en-US ] = "Comments" ; -}; -String FLD_DOCINFO_CREATE -{ - Text [ en-US ] = "Created" ; -}; -String FLD_DOCINFO_CHANGE -{ - Text [ en-US ] = "Modified" ; -}; -String FLD_DOCINFO_PRINT -{ - Text [ en-US ] = "Last printed" ; -}; -String FLD_DOCINFO_DOCNO -{ - Text [ en-US ] = "Revision number" ; -}; -String FLD_DOCINFO_EDIT -{ - Text [ en-US ] = "Total editing time" ; -}; - -String STR_PAGEDESC_NAME -{ - Text [ en-US ] = "Convert $(ARG1)"; -}; -String STR_PAGEDESC_FIRSTNAME -{ - Text [ en-US ] = "First convert $(ARG1)"; -}; -String STR_PAGEDESC_FOLLOWNAME -{ - Text [ en-US ] = "Next convert $(ARG1)"; -}; - -String STR_AUTH_TYPE_ARTICLE -{ - Text [ en-US ] = "Article"; -}; -String STR_AUTH_TYPE_BOOK -{ - Text [ en-US ] = "Book"; -}; -String STR_AUTH_TYPE_BOOKLET -{ - Text [ en-US ] = "Brochures"; -}; -String STR_AUTH_TYPE_CONFERENCE -{ - Text [ en-US ] = "Conference proceedings"; -}; -String STR_AUTH_TYPE_INBOOK -{ - Text [ en-US ] = "Book excerpt"; -}; -String STR_AUTH_TYPE_INCOLLECTION -{ - Text [ en-US ] = "Book excerpt with title"; -}; -String STR_AUTH_TYPE_INPROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings"; -}; -String STR_AUTH_TYPE_JOURNAL -{ - Text [ en-US ] = "Journal"; -}; -String STR_AUTH_TYPE_MANUAL -{ - Text [ en-US ] = "Techn. documentation"; -}; -String STR_AUTH_TYPE_MASTERSTHESIS -{ - Text [ en-US ] = "Thesis"; -}; -String STR_AUTH_TYPE_MISC -{ - Text [ en-US ] = "Miscellaneous"; -}; -String STR_AUTH_TYPE_PHDTHESIS -{ - Text [ en-US ] = "Dissertation"; -}; -String STR_AUTH_TYPE_PROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings"; -}; -String STR_AUTH_TYPE_TECHREPORT -{ - Text [ en-US ] = "Research report"; -}; -String STR_AUTH_TYPE_UNPUBLISHED -{ - Text [ en-US ] = "Unpublished"; -}; -String STR_AUTH_TYPE_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; -String STR_AUTH_TYPE_WWW -{ - Text [ en-US ] = "WWW document"; -}; -String STR_AUTH_TYPE_CUSTOM1 -{ - Text [ en-US ] = "User-defined1"; -}; -String STR_AUTH_TYPE_CUSTOM2 -{ - Text [ en-US ] = "User-defined2"; -}; -String STR_AUTH_TYPE_CUSTOM3 -{ - Text [ en-US ] = "User-defined3"; -}; -String STR_AUTH_TYPE_CUSTOM4 -{ - Text [ en-US ] = "User-defined4"; -}; -String STR_AUTH_TYPE_CUSTOM5 -{ - Text [ en-US ] = "User-defined5"; -}; - -String STR_AUTH_FIELD_IDENTIFIER -{ - Text [ en-US ] = "Short name"; -}; -String STR_AUTH_FIELD_AUTHORITY_TYPE -{ - Text [ en-US ] = "Type"; -}; -String STR_AUTH_FIELD_ADDRESS -{ - Text [ en-US ] = "Address"; -}; -String STR_AUTH_FIELD_ANNOTE -{ - Text [ en-US ] = "Annotation"; -}; -String STR_AUTH_FIELD_AUTHOR -{ - Text [ en-US ] = "Author(s)"; -}; -String STR_AUTH_FIELD_BOOKTITLE -{ - Text [ en-US ] = "Book title"; -}; -String STR_AUTH_FIELD_CHAPTER -{ - Text [ en-US ] = "Chapter"; -}; -String STR_AUTH_FIELD_EDITION -{ - Text [ en-US ] = "Edition"; -}; -String STR_AUTH_FIELD_EDITOR -{ - Text [ en-US ] = "Editor"; -}; -String STR_AUTH_FIELD_HOWPUBLISHED -{ - Text [ en-US ] = "Publication type"; -}; -String STR_AUTH_FIELD_INSTITUTION -{ - Text [ en-US ] = "Institution"; -}; -String STR_AUTH_FIELD_JOURNAL -{ - Text [ en-US ] = "Journal"; -}; -String STR_AUTH_FIELD_MONTH -{ - Text [ en-US ] = "Month"; -}; -String STR_AUTH_FIELD_NOTE -{ - Text [ en-US ] = "Note"; -}; -String STR_AUTH_FIELD_NUMBER -{ - Text [ en-US ] = "Number"; -}; -String STR_AUTH_FIELD_ORGANIZATIONS -{ - Text [ en-US ] = "Organization"; -}; -String STR_AUTH_FIELD_PAGES -{ - Text [ en-US ] = "Page(s)"; -}; -String STR_AUTH_FIELD_PUBLISHER -{ - Text [ en-US ] = "Publisher"; -}; -String STR_AUTH_FIELD_SCHOOL -{ - Text [ en-US ] = "University"; -}; -String STR_AUTH_FIELD_SERIES -{ - Text [ en-US ] = "Series"; -}; -String STR_AUTH_FIELD_TITLE -{ - Text [ en-US ] = "Title"; -}; -String STR_AUTH_FIELD_TYPE -{ - Text [ en-US ] = "Type of report"; -}; -String STR_AUTH_FIELD_VOLUME -{ - Text [ en-US ] = "Volume"; -}; -String STR_AUTH_FIELD_YEAR -{ - Text [ en-US ] = "Year"; -}; -String STR_AUTH_FIELD_URL -{ - Text [ en-US ] = "URL"; -}; -String STR_AUTH_FIELD_CUSTOM1 -{ - Text [ en-US ] = "User-defined1"; -}; -String STR_AUTH_FIELD_CUSTOM2 -{ - Text [ en-US ] = "User-defined2"; -}; -String STR_AUTH_FIELD_CUSTOM3 -{ - Text [ en-US ] = "User-defined3"; -}; -String STR_AUTH_FIELD_CUSTOM4 -{ - Text [ en-US ] = "User-defined4"; -}; -String STR_AUTH_FIELD_CUSTOM5 -{ - Text [ en-US ] = "User-defined5"; -}; -String STR_AUTH_FIELD_ISBN -{ - Text [ en-US ] = "ISBN"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 8675c490610e..63ba6dd99860 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -49,10 +49,8 @@ #include <sfx2/app.hxx> #include <cmdid.h> #include <helpid.h> -#include <ribbar.hrc> -#include <utlui.hrc> -#include "access.hrc" +#include "strings.hrc" #include "globals.hrc" #include "bitmaps.hlst" @@ -582,6 +580,13 @@ void SwNavigationPI::ZoomIn() m_aContentToolBox->CheckItem(m_aContentToolBox->GetItemId("listbox"), false); } +enum StatusIndex +{ + IDX_STR_HIDDEN = 0, + IDX_STR_ACTIVE = 1, + IDX_STR_INACTIVE = 2 +}; + SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, vcl::Window* pParent) : PanelLayout(pParent, "NavigatorPanel", "modules/swriter/ui/navigatorpanel.ui", nullptr) @@ -651,10 +656,27 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, m_aContentToolBox->HideItem(m_aContentToolBox->GetItemId("toggle")); } + const char* REGIONNAME_ARY[] = + { + STR_HYPERLINK, + STR_LINK_REGION, + STR_COPY_REGION + }; + + const char* REGIONMODE_ARY[] = + { + STR_HIDDEN, + STR_ACTIVE, + STR_INACTIVE + }; + + static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == SAL_N_ELEMENTS(REGIONMODE_ARY), "### unexpected size!"); + static_assert(SAL_N_ELEMENTS(REGIONNAME_ARY) == static_cast<sal_uInt16>(RegionMode::EMBEDDED) + 1, "### unexpected size!"); + for (sal_uInt16 i = 0; i <= static_cast<sal_uInt16>(RegionMode::EMBEDDED); ++i) { - m_aContextArr[i] = SwResId(STR_HYPERLINK + i); - m_aStatusArr[i] = SwResId(STR_STATUS_FIRST + i); + m_aContextArr[i] = SwResId(REGIONNAME_ARY[i]); + m_aStatusArr[i] = SwResId(REGIONMODE_ARY[i]); } m_aStatusArr[3] = SwResId(STR_ACTIVE_VIEW); @@ -931,10 +953,10 @@ void SwNavigationPI::UpdateListBox() if (pView == pActView) { nAct = nCount; - sEntry += m_aStatusArr[STR_ACTIVE - STR_STATUS_FIRST]; + sEntry += m_aStatusArr[IDX_STR_ACTIVE]; } else - sEntry += m_aStatusArr[STR_INACTIVE - STR_STATUS_FIRST]; + sEntry += m_aStatusArr[IDX_STR_INACTIVE]; sEntry += ")"; m_aDocListBox->InsertEntry(sEntry); @@ -953,7 +975,7 @@ void SwNavigationPI::UpdateListBox() OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView(). GetDocShell()->GetTitle(); sEntry += " ("; - sEntry += m_aStatusArr[STR_HIDDEN - STR_STATUS_FIRST]; + sEntry += m_aStatusArr[IDX_STR_HIDDEN]; sEntry += ")"; m_aDocListBox->InsertEntry(sEntry); bDisable = false; diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src deleted file mode 100644 index 29d820afd1ec..000000000000 --- a/sw/source/uibase/utlui/navipi.src +++ /dev/null @@ -1,171 +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 "cmdid.h" -#include "globals.hrc" -#include "utlui.hrc" -#include "helpid.h" -#include "access.hrc" - -String STR_ACCESS_TL_GLOBAL -{ - Text [ en-US ] = "Global View"; -}; -String STR_ACCESS_TL_CONTENT -{ - Text [ en-US ] = "Content Navigation View"; -}; -String STR_OUTLINE_LEVEL -{ - Text [ en-US ] = "Outline Level" ; -}; -String STR_DRAGMODE -{ - Text [ en-US ] = "Drag Mode" ; -}; -String STR_HYPERLINK -{ - Text [ en-US ] = "Insert as Hyperlink" ; -}; -String STR_LINK_REGION -{ - Text [ en-US ] = "Insert as Link" ; -}; -String STR_COPY_REGION -{ - Text [ en-US ] = "Insert as Copy" ; -}; -String STR_DISPLAY -{ - Text [ en-US ] = "Display" ; -}; -String STR_ACTIVE_VIEW -{ - Text [ en-US ] = "Active Window" ; -}; -String STR_HIDDEN -{ - Text [ en-US ] = "hidden" ; -}; -String STR_ACTIVE -{ - Text [ en-US ] = "active" ; -}; -String STR_INACTIVE -{ - Text [ en-US ] = "inactive" ; -}; -String STR_EDIT_ENTRY -{ - Text [ en-US ] = "Edit..." ; -}; -String STR_UPDATE -{ - Text [ en-US ] = "~Update" ; -}; -String STR_EDIT_CONTENT -{ - Text [ en-US ] = "Edit" ; -}; -String STR_EDIT_LINK -{ - Text [ en-US ] = "Edit link"; -}; -String STR_EDIT_INSERT -{ - Text [ en-US ] = "Insert" ; -}; -String STR_INDEX -{ - Text [ en-US ] = "~Index"; -}; -String STR_FILE -{ - Text [ en-US ] = "File" ; -}; -String STR_NEW_FILE -{ - Text [ en-US ] = "New Document" ; -}; -String STR_INSERT_TEXT -{ - Text [ en-US ] = "Text" ; -}; -String STR_DELETE -{ - Text [ en-US ] = "Delete" ; -}; -String STR_DELETE_ENTRY -{ - Text [ en-US ] = "~Delete" ; -}; -String STR_UPDATE_SEL -{ - Text [ en-US ] = "Selection" ; -}; -String STR_UPDATE_INDEX -{ - Text [ en-US ] = "Indexes" ; -}; -String STR_UPDATE_LINK -{ - Text [ en-US ] = "Links" ; -}; -String STR_UPDATE_ALL -{ - Text [ en-US ] = "All" ; -}; -String STR_REMOVE_INDEX -{ - Text [ en-US ] = "~Remove Index" ; -}; -String STR_REMOVE_TBL_PROTECTION -{ - Text [ en-US ] = "~Unprotect" ; -}; -String STR_INVISIBLE -{ - Text [ en-US ] = "hidden"; -}; -String STR_BROKEN_LINK -{ - Text [ en-US ] = "File not found: "; -}; -String STR_RENAME -{ - Text [ en-US ] = "~Rename"; -}; -String STR_READONLY_IDX -{ - Text [ en-US ] = "Read-~only"; -}; -String STR_POSTIT_SHOW -{ - Text [ en-US ] = "Show All"; -}; -String STR_POSTIT_HIDE -{ - Text [ en-US ] = "Hide All"; -}; -String STR_POSTIT_DELETE -{ - Text [ en-US ] = "Delete All"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index 47aaa7b5fa7e..0d70c3498b4d 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -36,7 +36,7 @@ #include <view.hxx> #include <wrtsh.hxx> #include <numfmtlb.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include "swabstdlg.hxx" #include "dialog.hrc" #include <unomid.h> diff --git a/sw/source/uibase/utlui/statusbar.src b/sw/source/uibase/utlui/statusbar.src deleted file mode 100644 index 558da31c838a..000000000000 --- a/sw/source/uibase/utlui/statusbar.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/. - */ - -#include <utlui.hrc> - -String STR_WORDCOUNT_HINT -{ - Text [ en-US ] = "Word and character count. Click to open Word Count dialog."; -}; -String STR_VIEWLAYOUT_ONE -{ - Text [ en-US ] = "Single-page view"; -}; - -String STR_VIEWLAYOUT_MULTI -{ - Text [ en-US ] = "Multiple-page view"; -}; - -String STR_VIEWLAYOUT_BOOK -{ - Text [ en-US ] = "Book view"; -}; -String STR_BOOKCTRL_HINT -{ - Text [ en-US ] = "Page number in document. Click to open Navigator window or right-click for bookmark list."; -}; -String STR_BOOKCTRL_HINT_EXTENDED -{ - Text [ en-US ] = "Page number in document (Page number on printed document). Click to open Navigator window."; -}; -String STR_TMPLCTRL_HINT -{ - Text [ en-US ] = "Page Style. Right-click to change style or click to open Style dialog."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index f0ba0f192bd6..eadc0895fe41 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -24,7 +24,7 @@ #include <vcl/status.hxx> #include <swtypes.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include "wrtsh.hxx" #include "view.hxx" diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index e7656572ed60..ad4fefb2167c 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -24,8 +24,7 @@ #include "cmdid.h" #include "uiitems.hxx" -#include "utlui.hrc" -#include "attrdesc.hrc" +#include "strings.hrc" #include <unomid.h> #include <numrule.hxx> diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 5202958bb997..425ac1e75609 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -69,7 +69,7 @@ #include <cmdid.h> #include <globals.hrc> -#include <utlui.hrc> +#include <strings.hrc> #include <doc.hxx> #include <docary.hxx> #include <charfmt.hxx> diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 92660f8c2fc8..852211444930 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -21,8 +21,7 @@ #include <globals.hrc> #include <misc.hrc> -#include <utlui.hrc> -#include <unotools.hrc> +#include <strings.hrc> #include <unotools.hxx> #include <unoprnms.hxx> #include <i18nutil/unicode.hxx> @@ -67,7 +66,6 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, const OUString* pURL ) : m_aTopWindow(VclPtr<SwFrameCtrlWindow>::Create(&rWin, this)), m_aLoadedIdle("sw uibase SwOneExampleFrame Loaded"), - m_aMenuRes(ResId(RES_FRMEX_MENU, *pSwResMgr)), m_pModuleView(SW_MOD()->GetView()), m_nStyleFlags(nFlags), m_bIsInitialized(false), @@ -448,14 +446,14 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) { ScopedVclPtrInstance<PopupMenu> aPop; - aPop->InsertItem(ITEM_UP, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_UP))); - aPop->InsertItem(ITEM_DOWN, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_DOWN))); + aPop->InsertItem(ITEM_UP, SwResId(STR_MENU_UP)); + aPop->InsertItem(ITEM_DOWN, SwResId(STR_MENU_DOWN)); Link<Menu*,bool> aSelLk = LINK(this, SwOneExampleFrame, PopupHdl ); aPop->SetSelectHdl(aSelLk); if(EX_SHOW_ONLINE_LAYOUT == m_nStyleFlags) { - aPop->InsertItem(ITEM_ZOOM, m_aMenuRes.GetString(m_aMenuRes.FindIndex(ST_MENU_ZOOM))); + aPop->InsertItem(ITEM_ZOOM, SwResId(STR_MENU_ZOOM)); uno::Reference< view::XViewSettingsSupplier > xSettings(m_xController, uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xViewProps = xSettings->getViewSettings(); diff --git a/sw/source/uibase/utlui/unotools.hrc b/sw/source/uibase/utlui/unotools.hrc deleted file mode 100644 index a4caaab0a186..000000000000 --- a/sw/source/uibase/utlui/unotools.hrc +++ /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 . - */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC -#define INCLUDED_SW_SOURCE_UIBASE_UTLUI_UNOTOOLS_HRC - -#define ST_MENU_ZOOM 1 -#define ST_MENU_UP 2 -#define ST_MENU_DOWN 3 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/unotools.src b/sw/source/uibase/utlui/unotools.src deleted file mode 100644 index 0ae74dd0b6da..000000000000 --- a/sw/source/uibase/utlui/unotools.src +++ /dev/null @@ -1,39 +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 "unotools.hrc" -#include <utlui.hrc> -#include <globals.hrc> -#include <helpid.h> - -String STR_SERVICE_UNAVAILABLE -{ - Text [ en-US ] = "The following service is not available: "; -}; - -StringArray RES_FRMEX_MENU -{ - ItemList [ en-US ] = - { - < "~Zoom" ; ST_MENU_ZOOM; > ; - < "~Upwards" ; ST_MENU_UP; > ; - < "Do~wnwards" ; ST_MENU_DOWN; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/utlui/viewlayoutctrl.cxx b/sw/source/uibase/utlui/viewlayoutctrl.cxx index abda424dbf8f..106a7083f5d3 100644 --- a/sw/source/uibase/utlui/viewlayoutctrl.cxx +++ b/sw/source/uibase/utlui/viewlayoutctrl.cxx @@ -23,7 +23,7 @@ #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <svx/viewlayoutitem.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <swtypes.hxx> diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx b/sw/source/uibase/utlui/wordcountctrl.cxx index 559fded1dcfa..9d59c7dc5c13 100644 --- a/sw/source/uibase/utlui/wordcountctrl.cxx +++ b/sw/source/uibase/utlui/wordcountctrl.cxx @@ -8,7 +8,7 @@ */ #include <swtypes.hxx> -#include <utlui.hrc> +#include <strings.hrc> #include "wordcountctrl.hxx" #include <svl/stritem.hxx> diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx index c0574d174213..c03fd4d6c22a 100644 --- a/sw/source/uibase/web/wdocsh.cxx +++ b/sw/source/uibase/web/wdocsh.cxx @@ -31,7 +31,7 @@ #include "shellio.hxx" #include "wdocsh.hxx" -#include "web.hrc" +#include "strings.hrc" #include <sfx2/request.hxx> // needed for -fsanitize=function visibility of typeinfo for functions of diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx index 6c6d883c6610..5e7451f5eb80 100644 --- a/sw/source/uibase/web/wformsh.cxx +++ b/sw/source/uibase/web/wformsh.cxx @@ -29,8 +29,8 @@ #include "cmdid.h" #include "wformsh.hxx" #include "globals.hrc" -#include "web.hrc" -#include "shells.hrc" +#include "strings.hrc" +#include "strings.hrc" #include <sfx2/request.hxx> // needed for -fsanitize=function visibility of typeinfo for functions of diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx index 05b84404f8d0..16f78c3bf234 100644 --- a/sw/source/uibase/web/wfrmsh.cxx +++ b/sw/source/uibase/web/wfrmsh.cxx @@ -26,8 +26,8 @@ #include "view.hxx" #include "wfrmsh.hxx" #include "globals.hrc" -#include "shells.hrc" -#include "web.hrc" +#include "strings.hrc" +#include "strings.hrc" #include <sfx2/request.hxx> // needed for -fsanitize=function visibility of typeinfo for functions of diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx index 6959a2599dab..7db82aae2457 100644 --- a/sw/source/uibase/web/wgrfsh.cxx +++ b/sw/source/uibase/web/wgrfsh.cxx @@ -29,9 +29,9 @@ #include "swmodule.hxx" #include "uitool.hxx" #include "docsh.hxx" -#include "shells.hrc" +#include "strings.hrc" #include "globals.hrc" -#include "web.hrc" +#include "strings.hrc" #include "wgrfsh.hxx" #include <sfx2/request.hxx> diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx index 57a698ba949f..7e4c4c2fffd1 100644 --- a/sw/source/uibase/web/wlistsh.cxx +++ b/sw/source/uibase/web/wlistsh.cxx @@ -27,7 +27,7 @@ #include "wrtsh.hxx" #include "swmodule.hxx" #include "globals.hrc" -#include "shells.hrc" +#include "strings.hrc" #include "uinums.hxx" #include "wlistsh.hxx" diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx index 6e4b7a44a58c..0382a898e6d6 100644 --- a/sw/source/uibase/web/wolesh.cxx +++ b/sw/source/uibase/web/wolesh.cxx @@ -26,8 +26,8 @@ #include "view.hxx" #include "helpid.h" #include "globals.hrc" -#include "web.hrc" -#include "shells.hrc" +#include "strings.hrc" +#include "strings.hrc" #include "wolesh.hxx" #include "cmdid.h" diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx index feae57da5d2d..499fd907244a 100644 --- a/sw/source/uibase/web/wtabsh.cxx +++ b/sw/source/uibase/web/wtabsh.cxx @@ -27,7 +27,7 @@ #include "globals.hrc" #include "uitool.hxx" #include "helpid.h" -#include "shells.hrc" +#include "strings.hrc" #include "table.hrc" #include "wrtsh.hxx" #include "wtabsh.hxx" diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx index 5a5e47a963ea..c7c102811907 100644 --- a/sw/source/uibase/web/wtextsh.cxx +++ b/sw/source/uibase/web/wtextsh.cxx @@ -30,8 +30,8 @@ #include "wtextsh.hxx" #include "basesh.hxx" #include "globals.hrc" -#include "shells.hrc" -#include "web.hrc" +#include "strings.hrc" +#include "strings.hrc" #include <unomid.h> diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 869f2e5ae82f..a1297d62bde4 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -57,8 +57,8 @@ #include <wview.hxx> #include <wdocsh.hxx> -#include <web.hrc> -#include <shells.hrc> +#include <strings.hrc> +#include <strings.hrc> #include <sfx2/request.hxx> // needed for -fsanitize=function visibility of typeinfo for functions of diff --git a/sw/source/uibase/wrtsh/wrtsh.src b/sw/source/uibase/wrtsh/wrtsh.src deleted file mode 100644 index 3b605ff7f224..000000000000 --- a/sw/source/uibase/wrtsh/wrtsh.src +++ /dev/null @@ -1,21 +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 "wrtsh.hrc" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 42cf14b8385c..9be63a7ca364 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -93,7 +93,7 @@ // -> #111827# #include <SwRewriter.hxx> -#include <comcore.hrc> +#include <strings.hrc> // <- #111827# #include <toolkit/helper/vclunohelper.hxx> diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx index 2b904b5858f0..dec13a188e5c 100644 --- a/sw/source/uibase/wrtsh/wrtundo.cxx +++ b/sw/source/uibase/wrtsh/wrtundo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/resid.hxx> #include <sfx2/app.hxx> #include <svl/slstitm.hxx> #include <wrtsh.hxx> @@ -25,7 +24,7 @@ #include <IDocumentUndoRedo.hxx> #include <swdtflvr.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <wrtsh.hrc> #include <sfx2/sfx.hrc> @@ -97,21 +96,21 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt ) OUString SwWrtShell::GetDoString( DoType eDoType ) const { OUString aUndoStr; - sal_uInt16 nResStr = STR_UNDO; + const char* pResStr = STR_UNDO; switch( eDoType ) { case UNDO: - nResStr = STR_UNDO; + pResStr = STR_UNDO; (void)GetLastUndoInfo(&aUndoStr, nullptr, &m_rView); break; case REDO: - nResStr = STR_REDO; + pResStr = STR_REDO; (void)GetFirstRedoInfo(&aUndoStr, nullptr, &m_rView); break; default:;//prevent warning } - return SvtResId(nResStr) + aUndoStr; + return SvtResId(pResStr) + aUndoStr; } void SwWrtShell::GetDoStrings( DoType eDoType, SfxStringListItem& rStrs ) const |