diff options
Diffstat (limited to 'basctl/source/basicide')
27 files changed, 49 insertions, 596 deletions
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index b048169038a0..9ce006ac6532 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <basidesh.hrc> +#include <strings.hrc> #include <basidesh.hxx> #include <basicbox.hxx> @@ -25,7 +25,6 @@ #include "localizationmgr.hxx" #include "managelang.hxx" -#include "dlgresid.hrc" #include <sfx2/dispatch.hxx> #include <svtools/langtab.hxx> diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx index ffc960cea598..7dcee5a16420 100644 --- a/basctl/source/basicide/basicmod.hxx +++ b/basctl/source/basicide/basicmod.hxx @@ -29,9 +29,10 @@ namespace basctl class Module : public SfxModule { public: - Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) : - SfxModule( pMgr, {pObjFact} ) - { } + Module(const std::locale& rResLocale, SfxObjectFactory *pObjFact) + : SfxModule(rResLocale, {pObjFact}) + { + } }; } // namespace basctl diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src deleted file mode 100644 index 7eb01d2ea2cc..000000000000 --- a/basctl/source/basicide/basicprint.src +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <basidesh.hrc> - -String RID_STR_PRINTDLG_RANGE -{ - Text [ en-US ] = "Print range"; -}; -String RID_STR_PRINTDLG_ALLPAGES -{ - Text [ en-US ] = "All ~Pages"; -}; -String RID_STR_PRINTDLG_PAGES -{ - Text [ en-US ] = "Pa~ges"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index f6f2b5a9649e..1e51245735b1 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -19,11 +19,10 @@ #include "basicrenderable.hxx" #include "bastypes.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include <toolkit/awt/vclxdevice.hxx> #include <tools/multisel.hxx> -#include <tools/resary.hxx> #include <cppuhelper/compbase.hxx> #include <comphelper/propertysequence.hxx> diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index e40583f82e80..b8bfd80a0970 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -26,7 +26,7 @@ #include "officecfg/Office/BasicIDE.hxx" #include "helpid.hrc" -#include <basidesh.hrc> +#include <strings.hrc> #include <basic/basmgr.hxx> #include <basic/basrdll.hxx> @@ -47,6 +47,7 @@ #include <svl/srchitem.hxx> #include <svl/visitem.hxx> #include <svl/whiter.hxx> +#include <svx/svxids.hrc> #include <vcl/xtextedt.hxx> #include <vcl/settings.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -134,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, if( bOutput ) { - OUString aPageStr = " [" + OUString(IDEResId(RID_STR_PAGE)) + " " + OUString::number( nCurPage ) + "]"; + OUString aPageStr = " [" + IDEResId(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]"; pPrinter->DrawText( aPos, aPageStr ); } } @@ -1066,11 +1067,11 @@ void ModulWindow::GetState( SfxItemSet &rSet ) if ( pView ) { TextSelection aSel = pView->GetSelection(); - OUString aPos = OUString( IDEResId( RID_STR_LINE ) ) + + OUString aPos = IDEResId( RID_STR_LINE ) + " " + OUString::number(aSel.GetEnd().GetPara()+1) + ", " + - OUString( IDEResId( RID_STR_COLUMN ) ) + + IDEResId( RID_STR_COLUMN ) + " " + OUString::number(aSel.GetEnd().GetIndex()+1); SfxStringItem aItem( SID_BASICIDE_STAT_POS, aPos ); @@ -1302,7 +1303,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() { case script::ModuleType::DOCUMENT: { - aLibSubName = OUString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ); + aLibSubName = IDEResId( RID_STR_DOCUMENT_OBJECTS ); uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); if( xLib.is() ) { @@ -1316,13 +1317,13 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() break; } case script::ModuleType::FORM: - aLibSubName = OUString( IDEResId( RID_STR_USERFORMS ) ); + aLibSubName = IDEResId( RID_STR_USERFORMS ); break; case script::ModuleType::NORMAL: - aLibSubName = OUString( IDEResId( RID_STR_NORMAL_MODULES ) ); + aLibSubName = IDEResId( RID_STR_NORMAL_MODULES ); break; case script::ModuleType::CLASS: - aLibSubName = OUString( IDEResId( RID_STR_CLASS_MODULES ) ); + aLibSubName = IDEResId( RID_STR_CLASS_MODULES ); break; } } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bfc655b9bb30..330feefdfd8c 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -22,7 +22,7 @@ #include <cassert> #include "helpid.hrc" -#include <basidesh.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include "baside2.hxx" @@ -39,6 +39,7 @@ #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <svl/urihelper.hxx> +#include <svx/svxids.hrc> #include <vcl/xtextedt.hxx> #include <vcl/txtattr.hxx> #include <vcl/settings.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index d42b183eaa54..4fe135056e02 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "accessibledialogwindow.hxx" @@ -46,6 +46,7 @@ #include <svl/visitem.hxx> #include <svl/whiter.hxx> #include <svx/svdundo.hxx> +#include <svx/svxids.hrc> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <vcl/layout.hxx> diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 2a015cc7cce2..000a43cdeecc 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -18,7 +18,7 @@ */ #include <memory> -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "baside2.hxx" @@ -41,6 +41,7 @@ #include <sfx2/minfitem.hxx> #include <sfx2/printer.hxx> #include <sfx2/request.hxx> +#include <svx/svxids.hrc> #include <svl/aeitem.hxx> #include <svl/intitem.hxx> #include <svl/srchitem.hxx> diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 82c4e1a261c1..1de2e0564747 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/frame/XTitle.hpp> -#include <basidesh.hrc> +#include <strings.hrc> #include <baside2.hxx> #include <basdoc.hxx> #include <vcl/xtextedt.hxx> @@ -108,7 +108,7 @@ void Shell::SetMDITitle() DocumentSignature aCurSignature( m_aCurDocument ); if ( aCurSignature.getScriptingSignatureState() == SignatureState::OK ) { - aTitle += " " + OUString(IDEResId(RID_STR_SIGNED)) + " "; + aTitle += " " + IDEResId(RID_STR_SIGNED) + " "; } SfxViewFrame* pViewFrame = GetViewFrame(); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index e9d2f5b0acda..8ef3742d6222 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -21,7 +21,8 @@ #include <tools/diagnose_ex.h> #include <basic/basmgr.hxx> -#include <basidesh.hrc> +#include <svx/svxids.hrc> +#include "strings.hrc" #include "baside2.hxx" #include "baside3.hxx" #include <basdoc.hxx> diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src deleted file mode 100644 index 3986ae749737..000000000000 --- a/basctl/source/basicide/basidesh.src +++ /dev/null @@ -1,343 +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 <basidesh.hrc> -#include <helpid.hrc> -#include "dlgresid.hrc" - -String RID_STR_FILTER_ALLFILES -{ - Text [ en-US ] = "<All>" ; -}; -String RID_STR_NOMODULE -{ - Text [ en-US ] = "< No Module >" ; -}; -String RID_STR_WRONGPASSWORD -{ - Text [ en-US ] = "Incorrect Password" ; -}; -String RID_STR_NOLIBINSTORAGE -{ - Text [ en-US ] = "The file does not contain any BASIC libraries" ; -}; -String RID_STR_BADSBXNAME -{ - Text [ en-US ] = "Invalid Name" ; -}; -String RID_STR_LIBNAMETOLONG -{ - Text [ en-US ] = "A library name can have up to 30 characters."; -}; -String RID_STR_ERRORCHOOSEMACRO -{ - Text [ en-US ] = "Macros from other documents are not accessible."; -}; -String RID_STR_LIBISREADONLY -{ - Text [ en-US ] = "This library is read-only."; -}; -String RID_STR_REPLACELIB -{ - Text [ en-US ] = "'XX' cannot be replaced."; -}; -String RID_STR_IMPORTNOTPOSSIBLE -{ - Text [ en-US ] = "'XX' cannot be added."; -}; -String RID_STR_NOIMPORT -{ - Text [ en-US ] = "'XX' was not added."; -}; -String RID_STR_ENTERPASSWORD -{ - Text [ en-US ] = "Enter password for 'XX'"; -}; -String RID_STR_SBXNAMEALLREADYUSED -{ - Text [ en-US ] = "Name already exists" ; -}; -String RID_STR_SIGNED -{ - Text [ en-US ] = "(Signed)" ; -}; -String RID_STR_SBXNAMEALLREADYUSED2 -{ - Text [ en-US ] = "Object with same name already exists" ; -}; -String RID_STR_CANNOTRUNMACRO -{ - Text [ en-US ] = "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings." ; -}; -String RID_STR_SEARCHNOTFOUND -{ - Text [ en-US ] = "Search key not found" ; -}; -String RID_STR_SEARCHFROMSTART -{ - Text [ en-US ] = "Search to last module complete. Continue at first module?" ; -}; -String RID_STR_SEARCHREPLACES -{ - Text [ en-US ] = "Search key replaced XX times" ; -}; -String RID_STR_COULDNTREAD -{ - Text [ en-US ] = "The file could not be read" ; -}; -String RID_STR_COULDNTWRITE -{ - Text [ en-US ] = "The file could not be saved" ; -}; -String RID_STR_CANNOTCHANGENAMESTDLIB -{ - Text [ en-US ] = "The name of the default library cannot be changed." ; -}; -String RID_STR_GENERATESOURCE -{ - Text [ en-US ] = "Generating source" ; -}; -String RID_STR_FILENAME -{ - Text [ en-US ] = "File name:" ; -}; -String RID_STR_APPENDLIBS -{ - Text [ en-US ] = "Import Libraries" ; -}; -String RID_STR_QUERYDELMACRO -{ - Text [ en-US ] = "Do you want to delete the macro XX?" ; -}; -String RID_STR_QUERYDELDIALOG -{ - Text [ en-US ] = "Do you want to delete the XX dialog?" ; -}; -String RID_STR_QUERYDELLIB -{ - Text [ en-US ] = "Do you want to delete the XX library?" ; -}; -String RID_STR_QUERYDELLIBREF -{ - Text [ en-US ] = "Do you want to delete the reference to the XX library?" ; -}; -String RID_STR_QUERYDELMODULE -{ - Text [ en-US ] = "Do you want to delete the XX module?" ; -}; -String RID_STR_BASIC -{ - Text [ en-US ] = "BASIC" ; -}; -String RID_STR_LINE -{ - // Abbreviation for 'line' - Text [ en-US ] = "Ln" ; -}; -String RID_STR_COLUMN -{ - // Abbreviation for 'column' - Text [ en-US ] = "Col" ; -}; -String RID_STR_CANNOTCLOSE -{ - Text [ en-US ] = "The window cannot be closed while BASIC is running." ; -}; -String RID_STR_REPLACESTDLIB -{ - Text [ en-US ] = "The default library cannot be replaced." ; -}; -String RID_STR_REFNOTPOSSIBLE -{ - Text [ en-US ] = "Reference to 'XX' not possible." ; -}; -String RID_STR_WATCHNAME -{ - Text [ en-US ] = "Watch" ; -}; -String RID_STR_WATCHVARIABLE -{ - Text [ en-US ] = "Variable" ; -}; -String RID_STR_WATCHVALUE -{ - Text [ en-US ] = "Value" ; -}; -String RID_STR_WATCHTYPE -{ - Text [ en-US ] = "Type" ; -}; -String RID_STR_STACKNAME -{ - Text [ en-US ] = "Call Stack" ; -}; -String RID_STR_STDDIALOGNAME -{ - Text [ en-US ] = "Dialog" ; -}; -String RID_STR_NEWLIB -{ - Text [ en-US ] = "New Library" ; -}; -String RID_STR_NEWMOD -{ - Text [ en-US ] = "New Module" ; -}; -String RID_STR_NEWDLG -{ - Text [ en-US ] = "New Dialog" ; -}; -String RID_STR_ALL -{ - Text [ en-US ] = "All" ; -}; -String RID_STR_PAGE -{ - Text [ en-US ] = "Page" ; -}; -String RID_STR_WILLSTOPPRG -{ - Text [ en-US ] = "You will have to restart the program after this edit.\nContinue?" ; -}; -String RID_STR_SEARCHALLMODULES -{ - Text [ en-US ] = "Do you want to replace the text in all active modules?" ; -}; - -String RID_STR_REMOVEWATCH -{ - Text [ en-US ] = "Watch:" ; -}; - -String RID_STR_STACK -{ - Text [ en-US ] = "Calls: " ; -}; - -String RID_STR_USERMACROS -{ - Text [ en-US ] = "My Macros" ; -}; - -String RID_STR_USERDIALOGS -{ - Text [ en-US ] = "My Dialogs" ; -}; - -String RID_STR_USERMACROSDIALOGS -{ - Text [ en-US ] = "My Macros & Dialogs" ; -}; - -String RID_STR_SHAREMACROS -{ - Text [ en-US ] = "%PRODUCTNAME Macros" ; -}; - -String RID_STR_SHAREDIALOGS -{ - Text [ en-US ] = "%PRODUCTNAME Dialogs" ; -}; - -String RID_STR_SHAREMACROSDIALOGS -{ - Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ; -}; - -String RID_STR_REMOVEWATCHTIP -{ - Text [ en-US ] = "Remove Watch" ; -}; - -String RID_STR_QUERYREPLACEMACRO -{ - Text [ en-US ] = "Do you want to overwrite the XX macro?" ; -}; - -String RID_STR_TRANSLATION_NOTLOCALIZED -{ - Text [ en-US ] = "<Not localized>" ; -}; - -String RID_STR_TRANSLATION_DEFAULT -{ - Text [ en-US ] = "[Default Language]" ; -}; - -String RID_STR_DOCUMENT_OBJECTS -{ - Text [ en-US ] = "Document Objects" ; -}; - -String RID_STR_USERFORMS -{ - Text [ en-US ] = "Forms" ; -}; - -String RID_STR_NORMAL_MODULES -{ - Text [ en-US ] = "Modules" ; -}; - -String RID_STR_CLASS_MODULES -{ - Text [ en-US ] = "Class Modules" ; -}; - -String RID_STR_DLGIMP_CLASH_RENAME -{ - Text [ en-US ] = "Rename" ; -}; - -String RID_STR_DLGIMP_CLASH_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; - -String RID_STR_DLGIMP_CLASH_TITLE -{ - Text [ en-US ] = "Dialog Import - Name already used" ; -}; - -String RID_STR_DLGIMP_CLASH_TEXT -{ - Text [ en-US ] = "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n " ; -}; - -String RID_STR_DLGIMP_MISMATCH_ADD -{ - Text [ en-US ] = "Add" ; -}; - -String RID_STR_DLGIMP_MISMATCH_OMIT -{ - Text [ en-US ] = "Omit" ; -}; - -String RID_STR_DLGIMP_MISMATCH_TITLE -{ - Text [ en-US ] = "Dialog Import - Language Mismatch" ; -}; - -String RID_STR_DLGIMP_MISMATCH_TEXT -{ - Text [ en-US ] = "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 13b84b029ff0..f9ee4ffb6400 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -21,7 +21,7 @@ #include "iderdll2.hxx" #include "macrodlg.hxx" #include "moduldlg.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include "baside2.hxx" #include <com/sun/star/document/XScriptInvocationContext.hpp> diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 48edafe675e4..4b4128cab931 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -25,7 +25,7 @@ #include <iderdll.hxx> #include <iderdll2.hxx> #include <basdoc.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include <baside2.hxx> #include <baside3.hxx> diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 56ff853e79a2..f85b8ce5a113 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -20,7 +20,7 @@ #include <bastypes.hxx> #include <bastype2.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include <bitmaps.hlst> #include <iderid.hxx> #include <o3tl/make_unique.hxx> diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index cf588e5d18bd..56c1ae7d2d96 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -20,7 +20,7 @@ #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> #include <bastype2.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include "bitmaps.hlst" #include <bastypes.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 9750d2490b00..27f852cd7b46 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "baside2.hxx" @@ -707,13 +707,12 @@ LibInfo::Item::Item ( LibInfo::Item::~Item () { } -bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent ) +bool QueryDel(const OUString& rName, const OUString &rStr, vcl::Window* pParent) { - OUString aQuery(rId); OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); aNameBuf.insert(0, '\''); - aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear()); + OUString aQuery = rStr.replaceAll("XX", aNameBuf.makeStringAndClear()); ScopedVclPtrInstance< MessageDialog > aQueryBox(pParent, aQuery, VclMessageType::Question, VclButtonsType::YesNo); return ( aQueryBox->Execute() == RET_YES ); } diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index fc890c3aee0f..0773338a8537 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -25,13 +25,15 @@ #include <iderdll2.hxx> #include <iderid.hxx> #include <basidesh.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include <basdoc.hxx> #include <basicmod.hxx> #include <svl/srchitem.hxx> +#include <svx/svxids.hrc> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> +#include <tools/resmgr.hxx> #include <vcl/settings.hxx> #include <o3tl/make_unique.hxx> @@ -103,10 +105,10 @@ ExtraData* GetExtraData() return nullptr; } - -IDEResId::IDEResId( sal_uInt16 nId ): - ResId(nId, *SfxApplication::GetModule(SfxToolsModule::Basic)->GetResMgr()) -{ } +OUString IDEResId(const char *pId) +{ + return Translate::get(pId, SfxApplication::GetModule(SfxToolsModule::Basic)->GetResLocale()); +} namespace { @@ -116,10 +118,9 @@ Dll::Dll () : { SfxObjectFactory& rFactory = DocShell::Factory(); - ResMgr* pMgr = ResMgr::CreateResMgr( - "basctl", Application::GetSettings().GetUILanguageTag()); + std::locale loc = Translate::Create("basctl", Application::GetSettings().GetUILanguageTag()); - auto pModule = o3tl::make_unique<Module>( pMgr, &rFactory ); + auto pModule = o3tl::make_unique<Module>(loc, &rFactory); SfxModule* pMod = pModule.get(); SfxApplication::SetModule(SfxToolsModule::Basic, std::move(pModule)); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index f5a593b2bde9..0b02ee3b903c 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -19,9 +19,8 @@ #include <macrodlg.hxx> -#include <macrodlg.hrc> #include <basidesh.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include <iderdll.hxx> #include <iderdll2.hxx> diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc deleted file mode 100644 index b61af05c4731..000000000000 --- a/basctl/source/basicide/macrodlg.hrc +++ /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 BASCTL_MACRODLG_HRC -#define BASCTL_MACRODLG_HRC - - -#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 ) -#define RID_STR_BTNNEW ( RID_BASICIDE_START + 52 ) -#define RID_STR_CHOOSE ( RID_BASICIDE_START + 53 ) -#define RID_STR_RUN ( RID_BASICIDE_START + 54 ) -#define RID_STR_RECORD ( RID_BASICIDE_START + 56 ) - -#endif // BASCTL_MACRODLG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src deleted file mode 100644 index f9ff3de552bd..000000000000 --- a/basctl/source/basicide/macrodlg.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <macrodlg.hrc> -#include <basidesh.hrc> -String RID_STR_BTNDEL -{ - Text [ en-US ] = "~Delete" ; -}; -String RID_STR_BTNNEW -{ - Text [ en-US ] = "~New" ; -}; -String RID_STR_CHOOSE -{ - Text [ en-US ] = "Choose" ; -}; -String RID_STR_RUN -{ - Text [ en-US ] = "Run" ; -}; -String RID_STR_RECORD -{ - Text [ en-US ] = "~Save" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 897771d895ea..778c38e5e96c 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -20,7 +20,7 @@ #include <moduldlg.hxx> #include <basidesh.hxx> -#include <basidesh.hrc> +#include <strings.hrc> #include <bitmaps.hlst> #include <iderdll.hxx> #include <iderdll2.hxx> @@ -883,7 +883,7 @@ void LibPage::InsertLib() ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) { OUString aErrStr( IDEResId(RID_STR_REPLACELIB) ); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_LIBISREADONLY)); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + IDEResId(RID_STR_LIBISREADONLY); ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute(); continue; } @@ -898,7 +898,7 @@ void LibPage::InsertLib() aErrStr = IDEResId(RID_STR_REFNOTPOSSIBLE); else aErrStr = IDEResId(RID_STR_IMPORTNOTPOSSIBLE); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_SBXNAMEALLREADYUSED)); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" +IDEResId(RID_STR_SBXNAMEALLREADYUSED); ScopedVclPtrInstance<MessageDialog>(this, aErrStr)->Execute(); continue; } diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index c5e5a54380d2..81b7a6e79868 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> -#include "basidesh.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "moduldlg.hxx" @@ -942,7 +942,7 @@ void LibDialog::dispose() void LibDialog::SetStorageName( const OUString& rName ) { - OUString aName = OUString(IDEResId(RID_STR_FILENAME)) + rName; + OUString aName = IDEResId(RID_STR_FILENAME) + rName; m_pStorageFrame->set_label(aName); } diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src deleted file mode 100644 index 5f1a23ce7699..000000000000 --- a/basctl/source/basicide/moduldlg.src +++ /dev/null @@ -1,37 +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 <basidesh.hrc> - -String RID_STR_EXPORTPACKAGE -{ - Text [ en-US ] = "Export library as extension"; -}; - -String RID_STR_EXPORTBASIC -{ - Text [ en-US ] = "Export as BASIC library"; -}; - -String RID_STR_PACKAGE_BUNDLE -{ - Text [ en-US ] = "Extension"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 31fe7a1c9208..292ff3bf000c 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "objdlg.hrc" +#include "strings.hrc" #include "objdlg.hxx" #include "helpid.hrc" diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc deleted file mode 100644 index 8b8a969fc165..000000000000 --- a/basctl/source/basicide/objdlg.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef BASCTL_OBJDLG_HRC -#define BASCTL_OBJDLG_HRC - -#include <svl/solar.hrc> - -#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 ) -#define RID_STR_TLB_MACROS ( RID_BASICIDE_START + 71 ) - -#endif // BASCTL_OBJDLG_HRR - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src deleted file mode 100644 index d66422c95a81..000000000000 --- a/basctl/source/basicide/objdlg.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <objdlg.hrc> - -String RID_BASICIDE_OBJCAT -{ - Text [en-US] = "Object Catalog"; -}; - -String RID_STR_TLB_MACROS -{ - Text [ en-US ] = "Objects Tree"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index f5fed7d1ad59..9078948e4d2b 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -20,7 +20,7 @@ #include <memory> #include "scriptdocument.hxx" #include "basobj.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include "iderid.hxx" #include "dlgeddef.hxx" #include "doceventnotifier.hxx" |