diff options
Diffstat (limited to 'svtools/source')
52 files changed, 225 insertions, 2637 deletions
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c4d94dc5a7dd..a6ad427d7bf0 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -24,12 +24,11 @@ #include <vcl/window.hxx> #include <vcl/edit.hxx> -#include <tools/resid.hxx> #include <vcl/spinfld.hxx> #include <vcl/settings.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include "bitmaps.hlst" #include <algorithm> diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 7b44cb4f69d2..7a5df2ad4614 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -45,10 +45,9 @@ namespace svtools { -ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits): - Window(pParent, WB_DIALOGCONTROL), - m_pEditWin( VclPtr<ExtMultiLineEdit>::Create(this, nBits) ), - m_xInfoTable(new SvtDocInfoTable_Impl) +ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits) + : Window(pParent, WB_DIALOGCONTROL) + , m_pEditWin( VclPtr<ExtMultiLineEdit>::Create(this, nBits) ) { m_pEditWin->SetLeftMargin(10); m_pEditWin->Show(); @@ -141,7 +140,7 @@ void ODocumentInfoPreview::insertEntry( void ODocumentInfoPreview::insertNonempty(long id, OUString const & value) { if (!value.isEmpty()) { - insertEntry(m_xInfoTable->GetString(id), value); + insertEntry(SvtDocInfoTable_Impl::GetString(id), value); } } @@ -157,7 +156,7 @@ void ODocumentInfoPreview::insertDateTime( OUStringBuffer buf(rLocaleWrapper.getDate(aToolsDT)); buf.append(", "); buf.append(rLocaleWrapper.getTime(aToolsDT)); - insertEntry(m_xInfoTable->GetString(id), buf.makeStringAndClear()); + insertEntry(SvtDocInfoTable_Impl::GetString(id), buf.makeStringAndClear()); } } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index a85e6d1d392d..c940a789b1ca 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -27,7 +27,7 @@ #include <svtools/imagemgr.hxx> #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include "bitmaps.hlst" #include <svtools/viewdataentry.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src deleted file mode 100644 index 73ab0a340842..000000000000 --- a/svtools/source/contnr/fileview.src +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -#include <svtools/helpid.hrc> - -// strings -------------------------------------------------------------------- - -String STR_SVT_FILEVIEW_COLUMN_TITLE -{ - Text [ en-US ] = "Name"; -}; - -String STR_SVT_FILEVIEW_COLUMN_SIZE -{ - Text [ en-US ] = "Size"; -}; - -String STR_SVT_FILEVIEW_COLUMN_DATE -{ - Text [ en-US ] = "Date modified"; -}; - -String STR_SVT_FILEVIEW_COLUMN_TYPE -{ - Text [ en-US ] = "Type"; -}; - -String STR_SVT_BYTES -{ - Text [ en-US ] = "Bytes" ; -}; - -String STR_SVT_KB -{ - Text [ en-US ] = "KB" ; -}; - -String STR_SVT_MB -{ - Text [ en-US ] = "MB" ; -}; - -String STR_SVT_GB -{ - Text [ en-US ] = "GB" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src deleted file mode 100644 index d486cb6e3eb7..000000000000 --- a/svtools/source/contnr/svcontnr.src +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> - -// descriptions of accessible objects - -String STR_SVT_ACC_DESC_TABLISTBOX -{ - Text [ en-US ] = "Row: %1, Column: %2"; -}; - -String STR_SVT_ACC_DESC_FILEVIEW -{ - Text [ en-US ] = ", Type: %1, URL: %2"; -}; - -String STR_SVT_ACC_DESC_FOLDER -{ - Text [ en-US ] = "Folder"; -}; - -String STR_SVT_ACC_DESC_FILE -{ - Text [ en-US ] = "File"; -}; - -String STR_SVT_ACC_EMPTY_FIELD -{ - Text [ en-US ] = "Empty Field"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 7d8e130b1db1..b0e3132596ff 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -34,7 +34,7 @@ #include <rtl/instance.hxx> #include <svtools/svtresid.hxx> #include <tools/wintypes.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include "bitmaps.hlst" #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 93fb4403e007..af846b52381c 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -22,7 +22,7 @@ #include <svtools/headbar.hxx> #include <svtools/svtresid.hxx> #include <svtools/svlbitm.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/treelistentry.hxx> #include <vcl/builderfactory.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index d88d0e134826..bd4433fd443b 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -17,25 +17,23 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include "templwin.hxx" +#include "templwin.hrc" -// class SvtDocInfoTable_Impl -------------------------------------------- -SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() - : ResStringArray(ResId(STRARY_SVT_DOCINFO, *SvtResMgr::GetResMgr())) - +namespace SvtDocInfoTable_Impl { -} - -OUString SvtDocInfoTable_Impl::GetString( long nId ) const -{ - sal_uInt32 nPos( FindIndex( nId ) ); - - if ( RESARRAY_INDEX_NOTFOUND != nPos ) - return ResStringArray::GetString( nPos ); + OUString GetString(int nId) + { + for (size_t i = 0; i < SAL_N_ELEMENTS(STRARY_SVT_DOCINFO); ++i) + { + if (STRARY_SVT_DOCINFO[i].second == nId) + return SvtResId(STRARY_SVT_DOCINFO[i].first); + } - return OUString(); + return OUString(); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc deleted file mode 100644 index 665a05779ca2..000000000000 --- a/svtools/source/contnr/templwin.hrc +++ /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 . - */ -#ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC -#define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC - -#define DI_TITLE 1 -#define DI_FROM 2 -#define DI_DATE 3 -#define DI_KEYWORDS 4 -#define DI_DESCRIPTION 5 -#define DI_MIMETYPE 6 -#define DI_MODIFIEDDATE 7 -#define DI_MODIFIEDBY 8 -#define DI_PRINTDATE 9 -#define DI_PRINTBY 10 -#define DI_THEME 11 -#define DI_SIZE 12 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index edbbb3beef83..066972b98d8f 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -19,14 +19,9 @@ #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX #define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX -#include <tools/resary.hxx> - -class SvtDocInfoTable_Impl : public ResStringArray +namespace SvtDocInfoTable_Impl { -public: - SvtDocInfoTable_Impl(); - - OUString GetString( long nId ) const; + OUString GetString(int nId); }; #endif // INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HXX diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src deleted file mode 100644 index 24e8ae991ece..000000000000 --- a/svtools/source/contnr/templwin.src +++ /dev/null @@ -1,44 +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 "templwin.hrc" -#include <svtools/controldims.hrc> -#include <svtools/helpid.hrc> -#include <svtools/svtools.hrc> - -StringArray STRARY_SVT_DOCINFO -{ - ItemList [ en-US ] = - { - < "Title" ; DI_TITLE ; > ; - < "By" ; DI_FROM ; > ; - < "Date" ; DI_DATE ; > ; - < "Keywords" ; DI_KEYWORDS ; > ; - < "Description" ; DI_DESCRIPTION ; > ; - < "Type" ; DI_MIMETYPE ; > ; - < "Modified on" ; DI_MODIFIEDDATE ; > ; - < "Modified by" ; DI_MODIFIEDBY ; > ; - < "Printed on" ; DI_PRINTDATE ; > ; - < "Printed by" ; DI_PRINTBY ; > ; - < "Subject" ; DI_THEME ; > ; - < "Size" ; DI_SIZE ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 5556d1006d00..f79174303bd5 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svtools/calendar.hxx> #include <memory> diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src deleted file mode 100644 index 21f0c6026a2a..000000000000 --- a/svtools/source/control/calendar.src +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -String STR_SVT_CALENDAR_DAY -{ - Text [ en-US ] = "Day" ; -}; -String STR_SVT_CALENDAR_WEEK -{ - Text [ en-US ] = "Week" ; -}; -String STR_SVT_CALENDAR_TODAY -{ - Text [ en-US ] = "Today" ; -}; -String STR_SVT_CALENDAR_NONE -{ - Text [ en-US ] = "None" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 5998eb47ffae..2b707859a62e 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -18,7 +18,7 @@ */ #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/collatorres.hxx> // implementation of the collator-algorithm-name translation diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 7bf29c78f604..0ef866caeb2a 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -33,7 +33,7 @@ #include <svtools/sampletext.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> #include <svtools/borderhelper.hxx> diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src deleted file mode 100644 index 4d04006cfbcd..000000000000 --- a/svtools/source/control/ctrlbox.src +++ /dev/null @@ -1,151 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svtools/svtools.hrc> - -/* - * resources for CollatorResource / CollatorResourceData resp. - */ - -String STR_SVT_COLLATE_ALPHANUMERIC -{ - /* alphanumeric sorting algorithm */ - Text [ en-US ] = "Alphanumeric"; -}; - -String STR_SVT_COLLATE_NORMAL -{ - /* default or normal sorting algorithm */ - Text [ en-US ] = "Normal"; -}; - -String STR_SVT_COLLATE_CHARSET -{ - /* default or normal sorting algorithm */ - Text [ en-US ] = "Character set"; -}; - -String STR_SVT_COLLATE_DICTIONARY -{ - /* german dictionary word order / sorting */ - Text [ en-US ] = "Dictionary"; -}; - -String STR_SVT_COLLATE_PINYIN -{ - /* chinese sorting algorithm */ - Text [ en-US ] = "Pinyin"; -}; - -String STR_SVT_COLLATE_STROKE -{ - /* chinese sorting algorithm */ - Text [ en-US ] = "Stroke"; -}; - -String STR_SVT_COLLATE_RADICAL -{ - /* chinese sorting algorithm */ - Text [ en-US ] = "Radical"; -}; - -String STR_SVT_COLLATE_UNICODE -{ - /* sorting according to the unicode code point of the character */ - Text [ en-US ] = "Unicode"; -}; - -String STR_SVT_COLLATE_ZHUYIN -{ - /* chinese sorting algorithm */ - Text [ en-US ] = "Zhuyin"; -}; - -String STR_SVT_COLLATE_PHONEBOOK -{ - /* phone book sorting algorithm. e.g. German */ - Text [ en-US ] = "Phone book"; -}; - -String STR_SVT_COLLATE_PHONETIC_F -{ - Text [ en-US ] = "Phonetic (alphanumeric first)"; -}; - -String STR_SVT_COLLATE_PHONETIC_L -{ - Text [ en-US ] = "Phonetic (alphanumeric last)"; -}; - -String STR_SVT_INDEXENTRY_ALPHANUMERIC -{ - /* alphanumeric indexentry algorithm */ - Text [ en-US ] = "Alphanumeric"; -}; - -String STR_SVT_INDEXENTRY_DICTIONARY -{ - /* korean dictionary indexentry algorithm */ - Text [ en-US ] = "Dictionary"; -}; - -String STR_SVT_INDEXENTRY_PINYIN -{ - /* chinese sorting algorithm */ - Text [ en-US ] = "Pinyin"; -}; - -String STR_SVT_INDEXENTRY_RADICAL -{ - /* chinese indexentry algorithm */ - Text [ en-US ] = "Radical"; -}; - -String STR_SVT_INDEXENTRY_STROKE -{ - /* chinese indexentry algorithm */ - Text [ en-US ] = "Stroke"; -}; - -String STR_SVT_INDEXENTRY_ZHUYIN -{ - /* chinese indexentry algorithm */ - Text [ en-US ] = "Zhuyin"; -}; - -String STR_SVT_INDEXENTRY_PHONETIC_FS -{ - Text [ en-US ] = "Phonetic (alphanumeric first, grouped by syllables)"; -}; - -String STR_SVT_INDEXENTRY_PHONETIC_FC -{ - Text [ en-US ] = "Phonetic (alphanumeric first, grouped by consonants)"; -}; - -String STR_SVT_INDEXENTRY_PHONETIC_LS -{ - Text [ en-US ] = "Phonetic (alphanumeric last, grouped by syllables)"; -}; - -String STR_SVT_INDEXENTRY_PHONETIC_LC -{ - Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index df8390db6a65..ad0e038dacc9 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -29,7 +29,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> #include <sal/macros.h> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svtools/ctrltool.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src deleted file mode 100644 index 5965f40ac15c..000000000000 --- a/svtools/source/control/ctrltool.src +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svtools/svtools.hrc> - -String STR_SVT_STYLE_LIGHT -{ - Text [ en-US ] = "Light" ; -}; - -String STR_SVT_STYLE_LIGHT_ITALIC -{ - Text [ en-US ] = "Light Italic" ; -}; - -String STR_SVT_STYLE_NORMAL -{ - Text [ en-US ] = "Regular" ; -}; - -String STR_SVT_STYLE_NORMAL_ITALIC -{ - Text [ en-US ] = "Italic" ; -}; - -String STR_SVT_STYLE_BOLD -{ - Text [ en-US ] = "Bold" ; -}; - -String STR_SVT_STYLE_BOLD_ITALIC -{ - Text [ en-US ] = "Bold Italic" ; -}; - -String STR_SVT_STYLE_BLACK -{ - Text [ en-US ] = "Black" ; -}; - -String STR_SVT_STYLE_BLACK_ITALIC -{ - Text [ en-US ] = "Black Italic" ; -}; - -String STR_SVT_STYLE_BOOK -{ - Text [ en-US ] = "Book" ; -}; - -String STR_SVT_STYLE_BOLD_OBLIQUE -{ - Text [ en-US ] = "Bold Oblique" ; -}; - -String STR_SVT_STYLE_CONDENSED -{ - Text [ en-US ] = "Condensed" ; -}; - -String STR_SVT_STYLE_CONDENSED_BOLD -{ - Text [ en-US ] = "Condensed Bold" ; -}; - -String STR_SVT_STYLE_CONDENSED_BOLD_ITALIC -{ - Text [ en-US ] = "Condensed Bold Italic" ; -}; - -String STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE -{ - Text [ en-US ] = "Condensed Bold Oblique" ; -}; - -String STR_SVT_STYLE_CONDENSED_ITALIC -{ - Text [ en-US ] = "Condensed Italic" ; -}; - -String STR_SVT_STYLE_CONDENSED_OBLIQUE -{ - Text [ en-US ] = "Condensed Oblique" ; -}; - -String STR_SVT_STYLE_EXTRALIGHT -{ - Text [ en-US ] = "ExtraLight" ; -}; - -String STR_SVT_STYLE_EXTRALIGHT_ITALIC -{ - Text [ en-US ] = "ExtraLight Italic" ; -}; - -String STR_SVT_STYLE_OBLIQUE -{ - Text [ en-US ] = "Oblique" ; -}; - -String STR_SVT_STYLE_SEMIBOLD -{ - Text [ en-US ] = "Semibold" ; -}; - -String STR_SVT_STYLE_SEMIBOLD_ITALIC -{ - Text [ en-US ] = "Semibold Italic" ; -}; - -String STR_SVT_FONTMAP_BOTH -{ - Text [ en-US ] = "The same font will be used on both your printer and your screen." ; -}; - -String STR_SVT_FONTMAP_PRINTERONLY -{ - Text [ en-US ] = "This is a printer font. The screen image may differ." ; -}; - -String STR_SVT_FONTMAP_STYLENOTAVAILABLE -{ - Text [ en-US ] = "This font style will be simulated or the closest matching style will be used."; -}; - -String STR_SVT_FONTMAP_NOTAVAILABLE -{ - Text [ en-US ] = "This font has not been installed. The closest available font will be used."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 7fc74b545618..ad2297325751 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -26,7 +26,7 @@ #include <svtools/svtresid.hxx> #include <tools/urlobj.hxx> #include <vcl/stdtext.hxx> -#include <filectrl.hrc> +#include <svtools/strings.hrc> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src deleted file mode 100644 index 357170c4ef1d..000000000000 --- a/svtools/source/control/filectrl.src +++ /dev/null @@ -1,47 +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 "filectrl.hrc" -String STR_FILECTRL_BUTTONTEXT -{ - Text [ en-US ] = "Browse..." ; -}; - -String STR_TABBAR_PUSHBUTTON_MOVET0HOME -{ - Text [ en-US ] = "Move To Home" ; -}; -String STR_TABBAR_PUSHBUTTON_MOVELEFT -{ - Text [ en-US ] = "Move Left" ; -}; -String STR_TABBAR_PUSHBUTTON_MOVERIGHT -{ - Text [ en-US ] = "Move Right" ; -}; -String STR_TABBAR_PUSHBUTTON_MOVETOEND -{ - Text [ en-US ] = "Move To End" ; -}; -String STR_TABBAR_PUSHBUTTON_ADDTAB -{ - Text [ en-US ] = "Add" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index d9040f909b63..cb8391f0aeeb 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -19,7 +19,7 @@ #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/indexentryres.hxx> // implementation of the indexentry-algorithm-name translation diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 3039ea74f74a..70b2897f7851 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -26,7 +26,7 @@ #include <svtools/ruler.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/colorcfg.hxx> #include <memory> diff --git a/svtools/source/control/ruler.src b/svtools/source/control/ruler.src deleted file mode 100644 index 2ca6d2d74b30..000000000000 --- a/svtools/source/control/ruler.src +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "svtools/svtools.hrc" - -String STR_SVT_ACC_RULER_HORZ_NAME -{ - Text[ en-US ] = "Horizontal Ruler"; -}; -String STR_SVT_ACC_RULER_VERT_NAME -{ - Text[ en-US ] = "Vertical Ruler"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 41ffdcd9319e..8d8bb6d9cdbd 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -30,9 +30,8 @@ #include <vcl/image.hxx> #include <vcl/settings.hxx> #include "svtaccessiblefactory.hxx" -#include <filectrl.hrc> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <limits> #include <utility> #include <vcl/idle.hxx> diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 031edde3755a..0c878a71dea1 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -13,7 +13,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <officecfg/Office/Common.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <vcl/msgbox.hxx> using namespace com::sun::star::uno; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 6262bcdee23b..3de2fc529302 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -21,7 +21,7 @@ #include <memory> #include <svtools/addresstemplate.hxx> #include "addresstemplate.hrc" -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/helpid.hrc> #include <svtools/svtresid.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src deleted file mode 100644 index 2044f18ff6a4..000000000000 --- a/svtools/source/dialogs/addresstemplate.src +++ /dev/null @@ -1,153 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -#include "addresstemplate.hrc" - -String STR_NO_FIELD_SELECTION -{ - Text [ en-US ] = "<none>"; -}; - -String STR_FIELD_COMPANY -{ - Text [ en-US ] = "Company"; -}; -String STR_FIELD_DEPARTMENT -{ - Text [ en-US ] = "Department"; -}; -String STR_FIELD_FIRSTNAME -{ - Text [ en-US ] = "First name"; -}; -String STR_FIELD_LASTNAME -{ - Text [ en-US ] = "Last name"; -}; -String STR_FIELD_STREET -{ - Text [ en-US ] = "Street"; -}; -String STR_FIELD_COUNTRY -{ - Text [ en-US ] = "Country"; -}; -String STR_FIELD_ZIPCODE -{ - Text [ en-US ] = "ZIP Code"; -}; -String STR_FIELD_CITY -{ - Text [ en-US ] = "City"; -}; -String STR_FIELD_TITLE -{ - Text [ en-US ] = "Title"; -}; -String STR_FIELD_POSITION -{ - Text [ en-US ] = "Position"; -}; -String STR_FIELD_ADDRFORM -{ - Text [ en-US ] = "Addr. Form"; -}; -String STR_FIELD_INITIALS -{ - Text [ en-US ] = "Initials"; -}; -String STR_FIELD_SALUTATION -{ - Text [ en-US ] = "Complimentary close"; -}; -String STR_FIELD_HOMETEL -{ - Text [ en-US ] = "Tel: Home"; -}; -String STR_FIELD_WORKTEL -{ - Text [ en-US ] = "Tel: Work"; -}; -String STR_FIELD_FAX -{ - Text [ en-US ] = "FAX"; -}; -String STR_FIELD_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; -String STR_FIELD_URL -{ - Text [ en-US ] = "URL"; -}; -String STR_FIELD_NOTE -{ - Text [ en-US ] = "Note"; -}; -String STR_FIELD_USER1 -{ - Text [ en-US ] = "User 1"; -}; -String STR_FIELD_USER2 -{ - Text [ en-US ] = "User 2"; -}; -String STR_FIELD_USER3 -{ - Text [ en-US ] = "User 3"; -}; -String STR_FIELD_USER4 -{ - Text [ en-US ] = "User 4"; -}; -String STR_FIELD_ID -{ - Text [ en-US ] = "ID"; -}; -String STR_FIELD_STATE -{ - Text [ en-US ] = "State"; -}; -String STR_FIELD_OFFICETEL -{ - Text [ en-US ] = "Tel: Office"; -}; -String STR_FIELD_PAGER -{ - Text [ en-US ] = "Pager"; -}; -String STR_FIELD_MOBILE -{ - Text [ en-US ] = "Mobile"; -}; -String STR_FIELD_TELOTHER -{ - Text [ en-US ] = "Tel: Other"; -}; -String STR_FIELD_CALENDAR -{ - Text [ en-US ] = "Calendar"; -}; -String STR_FIELD_INVITE -{ - Text [ en-US ] = "Invite"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src deleted file mode 100644 index 795da0e54362..000000000000 --- a/svtools/source/dialogs/filedlg2.src +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/filedlg2.hrc> -#include <svtools/svtools.hrc> - -String STR_FILEDLG_OPEN -{ - Text [ en-US ] = "Open" ; -}; -String STR_FILEDLG_TYPE -{ - Text [ en-US ] = "File ~type" ; -}; -String STR_FILEDLG_SAVE -{ - Text [ en-US ] = "Save" ; -}; - -String STR_SVT_DEFAULT_SERVICE_LABEL -{ - Text [ en-US ] = "$user$'s $service$" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src deleted file mode 100644 index 3ecaff7ac772..000000000000 --- a/svtools/source/dialogs/formats.src +++ /dev/null @@ -1,291 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/sores.hxx> - -String STR_FORMAT_STRING -{ - Text [ en-US ] = "Unformatted text" ; -}; -String STR_FORMAT_BITMAP -{ - Text [ en-US ] = "Bitmap"; -}; -String STR_FORMAT_GDIMETAFILE -{ - Text [ en-US ] = "GDI metafile"; -}; -String STR_FORMAT_RTF -{ - Text [ en-US ] = "Formatted text [RTF]" ; -}; -String STR_FORMAT_ID_RICHTEXT -{ - Text [ en-US ] = "Formatted text [Richtext]" ; -}; -String STR_FORMAT_ID_DRAWING -{ - Text [ en-US ] = "Drawing format"; -}; -String STR_FORMAT_ID_SVXB -{ - Text [ en-US ] = "SVXB (StarView bitmap/animation)"; -}; -String STR_FORMAT_ID_INTERNALLINK_STATE -{ - Text [ en-US ] = "Status Info from Svx Internal Link"; -}; -String STR_FORMAT_ID_SOLK -{ - Text [ en-US ] = "SOLK (%PRODUCTNAME Link)"; -}; -String STR_FORMAT_ID_NETSCAPE_BOOKMARK -{ - Text [ en-US ] = "Netscape Bookmark"; -}; -String STR_FORMAT_ID_STARSERVER -{ - Text [ en-US ] = "Star server format"; -}; -String STR_FORMAT_ID_STAROBJECT -{ - Text [ en-US ] = "Star object format"; -}; -String STR_FORMAT_ID_APPLETOBJECT -{ - Text [ en-US ] = "Applet object"; -}; -String STR_FORMAT_ID_PLUGIN_OBJECT -{ - Text [ en-US ] = "Plug-in object"; -}; -String STR_FORMAT_ID_STARWRITER_30 -{ - Text [ en-US ] = "StarWriter 3.0 object"; -}; -String STR_FORMAT_ID_STARWRITER_40 -{ - Text [ en-US ] = "StarWriter 4.0 object"; -}; -String STR_FORMAT_ID_STARWRITER_50 -{ - Text [ en-US ] = "StarWriter 5.0 object"; -}; -String STR_FORMAT_ID_STARWRITERWEB_40 -{ - Text [ en-US ] = "StarWriter/Web 4.0 object"; -}; -String STR_FORMAT_ID_STARWRITERWEB_50 -{ - Text [ en-US ] = "StarWriter/Web 5.0 object"; -}; -String STR_FORMAT_ID_STARWRITERGLOB_40 -{ - Text [ en-US ] = "StarWriter/Master 4.0 object"; -}; -String STR_FORMAT_ID_STARWRITERGLOB_50 -{ - Text [ en-US ] = "StarWriter/Master 5.0 object"; -}; -String STR_FORMAT_ID_STARDRAW -{ - Text [ en-US ] = "StarDraw object"; -}; -String STR_FORMAT_ID_STARDRAW_40 -{ - Text [ en-US ] = "StarDraw 4.0 object"; -}; -String STR_FORMAT_ID_STARIMPRESS_50 -{ - Text [ en-US ] = "StarImpress 5.0 object"; -}; -String STR_FORMAT_ID_STARDRAW_50 -{ - Text [ en-US ] = "StarDraw 5.0 object"; -}; -String STR_FORMAT_ID_STARCALC -{ - Text [ en-US ] = "StarCalc object"; -}; -String STR_FORMAT_ID_STARCALC_40 -{ - Text [ en-US ] = "StarCalc 4.0 object"; -}; -String STR_FORMAT_ID_STARCALC_50 -{ - Text [ en-US ] = "StarCalc 5.0 object"; -}; -String STR_FORMAT_ID_STARCHART -{ - Text [ en-US ] = "StarChart object"; -}; -String STR_FORMAT_ID_STARCHART_40 -{ - Text [ en-US ] = "StarChart 4.0 object"; -}; -String STR_FORMAT_ID_STARCHART_50 -{ - Text [ en-US ] = "StarChart 5.0 object"; -}; -String STR_FORMAT_ID_STARIMAGE -{ - Text [ en-US ] = "StarImage object"; -}; -String STR_FORMAT_ID_STARIMAGE_40 -{ - Text [ en-US ] = "StarImage 4.0 object"; -}; -String STR_FORMAT_ID_STARIMAGE_50 -{ - Text [ en-US ] = "StarImage 5.0 object"; -}; -String STR_FORMAT_ID_STARMATH -{ - Text [ en-US ] = "StarMath object"; -}; -String STR_FORMAT_ID_STARMATH_40 -{ - Text [ en-US ] = "StarMath 4.0 object"; -}; -String STR_FORMAT_ID_STARMATH_50 -{ - Text [ en-US ] = "StarMath 5.0 object"; -}; -String STR_FORMAT_ID_STAROBJECT_PAINTDOC -{ - Text [ en-US ] = "StarObject Paint object"; -}; -String STR_FORMAT_ID_HTML -{ - Text [ en-US ] = "HTML (HyperText Markup Language)"; -}; -String STR_FORMAT_ID_HTML_SIMPLE -{ - Text [ en-US ] = "HTML format"; -}; -String STR_FORMAT_ID_BIFF_5 -{ - Text [ en-US ] = "Biff5 (Microsoft Excel 5.0/95)"; -}; -String STR_FORMAT_ID_BIFF_8 -{ - Text [ en-US ] = "Biff8 (Microsoft Excel 97/2000/XP/2003)"; -}; -String STR_FORMAT_ID_SYLK -{ - Text [ en-US ] = "Sylk"; -}; -String STR_FORMAT_ID_LINK -{ - Text [ en-US ] = "DDE link" ; -}; -String STR_FORMAT_ID_DIF -{ - Text [ en-US ] = "DIF"; -}; -String STR_FORMAT_ID_MSWORD_DOC -{ - Text [ en-US ] = "Microsoft Word object"; -}; -String STR_FORMAT_ID_STAR_FRAMESET_DOC -{ - Text [ en-US ] = "StarFrameSet object"; -}; -String STR_FORMAT_ID_OFFICE_DOC -{ - Text [ en-US ] = "Office document object"; -}; -String STR_FORMAT_ID_NOTES_DOCINFO -{ - Text [ en-US ] = "Notes document info"; -}; -String STR_FORMAT_ID_SFX_DOC -{ - Text [ en-US ] = "Sfx document"; -}; -String STR_FORMAT_ID_STARCHARTDOCUMENT_50 -{ - Text [ en-US ] = "StarChart 5.0 object"; -}; -String STR_FORMAT_ID_GRAPHOBJ -{ - Text [ en-US ] = "Graphic object"; -}; -String STR_FORMAT_ID_STARWRITER_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Writer object"; -}; -String STR_FORMAT_ID_STARWRITERWEB_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Writer/Web object"; -}; -String STR_FORMAT_ID_STARWRITERGLOB_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Writer/Master object"; -}; -String STR_FORMAT_ID_STARDRAW_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Draw object"; -}; -String STR_FORMAT_ID_STARIMPRESS_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Impress object"; -}; -String STR_FORMAT_ID_STARCALC_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Calc object"; -}; -String STR_FORMAT_ID_STARCHART_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Chart object"; -}; -String STR_FORMAT_ID_STARMATH_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 Math object"; -}; -String STR_FORMAT_ID_WMF -{ - Text [ en-US ] = "Windows metafile"; -}; -String STR_FORMAT_ID_DBACCESS_QUERY -{ - Text [ en-US ] = "Data source object"; -}; -String STR_FORMAT_ID_DBACCESS_TABLE -{ - Text [ en-US ] = "Data source table"; -}; -String STR_FORMAT_ID_DBACCESS_COMMAND -{ - Text [ en-US ] = "SQL query"; -}; -String STR_FORMAT_ID_DIALOG_60 -{ - Text [ en-US ] = "OpenOffice.org 1.0 dialog"; -}; -String STR_FORMAT_ID_FILEGRPDESCRIPTOR -{ - Text [ en-US ] = "Link"; -}; -String STR_FORMAT_ID_HTML_NO_COMMENT -{ - Text [ en-US ] = "HTML format without comments"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 003656ca0b67..9aaa7dbf1871 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -18,7 +18,7 @@ */ #include <svtools/insdlg.hxx> -#include <svtools/sores.hxx> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <unotools/configmgr.hxx> @@ -193,7 +193,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId ) struct SotResourcePair { SotClipboardFormatId mnSotId; - sal_uInt16 mnResId; + const char* mpResId; }; static const SotResourcePair aSotResourcePairs[] = @@ -267,18 +267,18 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId ) { SotClipboardFormatId::RICHTEXT, STR_FORMAT_ID_RICHTEXT }, }; - sal_uInt16 nResId = 0; + const char* pResId = nullptr; sal_uInt32 const nCount = SAL_N_ELEMENTS( aSotResourcePairs ); - for( sal_uInt32 i = 0; ( i < nCount ) && !nResId; i++ ) + for (sal_uInt32 i = 0; ( i < nCount ) && !pResId; ++i) { if( aSotResourcePairs[ i ].mnSotId == nId ) - nResId = aSotResourcePairs[ i ].mnResId; + pResId = aSotResourcePairs[ i ].mpResId; } OUString aUIName; - if( nResId ) - aUIName = SvtResId( nResId ); + if (pResId) + aUIName = SvtResId(pResId); else aUIName = SotExchange::GetFormatName( nId ); diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 37d6cd901c6b..c3e76fb6fd40 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -18,7 +18,7 @@ */ #include <svtools/prnsetup.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <vcl/print.hxx> @@ -127,9 +127,9 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt } -static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId) +static OUString ImplPrnDlgAddResString(const OUString& rStr, const char* pResId) { - return ImplPrnDlgAddString(rStr, SvtResId(nResId)); + return ImplPrnDlgAddString(rStr, SvtResId(pResId)); } diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 5ccc4cdf60a1..661169dcad47 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -19,7 +19,7 @@ #include <svtools/roadmapwizard.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <roadmap.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src deleted file mode 100644 index f76a19ebb823..000000000000 --- a/svtools/source/dialogs/so3res.src +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "svtools/sores.hxx" -#include <svtools/soerr.hxx> - -#define S_MAX 0x7fff - -StringArray RID_SO_ERROR_HANDLER -{ - ItemList [ en-US ] = - { - < "General OLE error." ; - ERRCODE_SO_GENERALERROR&S_MAX ; >; - < "False." ; - ERRCODE_SO_FALSE&S_MAX ; >; - < "Data not available at this time." ; - ERRCODE_SO_PENDING&S_MAX ; >; - < "The action cannot be executed in the object's current state." ; - ERRCODE_SO_CANNOT_DOVERB_NOW & S_MAX ; >; - < "The object does not support any actions." ; - ERRCODE_SO_NOVERBS & S_MAX ; >; - < "Object does not support this action." ; - ERRCODE_SO_NOTIMPL & S_MAX ; >; - }; -}; - -StringArray RID_SO_ERRCTX -{ - ItemList [ en-US ] = - { - < "$(ERR) activating object" ; ERRCTX_SO_DOVERB ; >; - }; -}; - -String STR_ERROR_OBJNOCREATE -{ - Text [ en-US ] = "Object % could not be inserted." ; -}; -String STR_ERROR_OBJNOCREATE_FROM_FILE -{ - Text [ en-US ] = "Object from file % could not be inserted." ; -}; -String STR_ERROR_OBJNOCREATE_PLUGIN -{ - Text [ en-US ] = "Plug-in from document % could not be inserted." ; -}; -String STR_FURTHER_OBJECT -{ - Text [ en-US ] = "Further objects" ; -}; - -String STR_UNKNOWN_SOURCE -{ - Text [ en-US ] = "Unknown source" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index b6fec0147f4a..3317f5d81651 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -23,7 +23,7 @@ #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> namespace svt diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src deleted file mode 100644 index cfae2539b15b..000000000000 --- a/svtools/source/dialogs/wizardmachine.src +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> - -String STR_WIZDLG_FINISH -{ - Text [ en-US ] = "~Finish" ; -}; - -String STR_WIZDLG_NEXT -{ - Text [ en-US ] = "~Next >>"; -}; - -String STR_WIZDLG_PREVIOUS -{ - Text [ en-US ] = "<< Bac~k"; -}; - -String STR_WIZDLG_ROADMAP_TITLE -{ - Text [ en-US ] = "Steps"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index ca47490e3816..06f790ba4fca 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -22,7 +22,7 @@ #include <tools/fract.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/FilterConfigItem.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index d8df2c321c89..6c8f162da847 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -22,8 +22,6 @@ #include <vcl/metaact.hxx> #include <vcl/msgbox.hxx> #include <vcl/imagerepository.hxx> -#include <tools/rcid.h> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/fract.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index c56a8e73015f..dbb6bfc0160a 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -21,8 +21,6 @@ #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/metaact.hxx> -#include <tools/rcid.h> -#include <tools/resid.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svl/solar.hrc> #include <vcl/salbtype.hxx> diff --git a/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc deleted file mode 100644 index 75cf6ace23b7..000000000000 --- a/svtools/source/inc/filectrl.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_SVTOOLS_SOURCE_INC_FILECTRL_HRC -#define INCLUDED_SVTOOLS_SOURCE_INC_FILECTRL_HRC - -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! - -#define STR_TABBAR_PUSHBUTTON_MOVET0HOME (STR_FILECTRL_BUTTONTEXT + 1) -#define STR_TABBAR_PUSHBUTTON_MOVELEFT (STR_FILECTRL_BUTTONTEXT + 2) -#define STR_TABBAR_PUSHBUTTON_MOVERIGHT (STR_FILECTRL_BUTTONTEXT + 3) -#define STR_TABBAR_PUSHBUTTON_MOVETOEND (STR_FILECTRL_BUTTONTEXT + 4) -#define STR_TABBAR_PUSHBUTTON_ADDTAB (STR_FILECTRL_BUTTONTEXT + 5) - -#endif // INCLUDED_SVTOOLS_SOURCE_INC_FILECTRL_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src deleted file mode 100644 index 60d7c720ebeb..000000000000 --- a/svtools/source/java/javaerror.src +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> - -String STR_WARNING_JAVANOTFOUND -{ - Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; -}; - -String STR_WARNING_JAVANOTFOUND_MAC -{ - Text [ en-US ] ="%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME."; -}; - -String STR_WARNING_INVALIDJAVASETTINGS_MAC -{ - Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."; -}; - -String STR_WARNING_INVALIDJAVASETTINGS -{ - Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME."; -}; - -String STR_ERROR_JVMCREATIONFAILED_MAC -{ - Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced."; -}; - -String STR_ERROR_JVMCREATIONFAILED -{ - Text[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Advanced."; -}; - -String STR_WARNING_JAVANOTFOUND_TITLE -{ - Text[ en-US ] = "JRE Required" ; -}; - -String STR_WARNING_INVALIDJAVASETTINGS_TITLE -{ - Text[ en-US ] = "Select JRE"; -}; - -String STR_ERROR_JVMCREATIONFAILED_TITLE -{ - Text[ en-US ] = "JRE is Defective" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 74f78dc4bdc4..ba9625065663 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/svtools.hrc> -#include <tools/resid.hxx> +#include <svtools/strings.hrc> #include <com/sun/star/task/XInteractionContinuation.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> @@ -30,7 +29,6 @@ #include <comphelper/processfactory.hxx> #include <vcl/layout.hxx> #include <vcl/svapp.hxx> -#include <tools/rcid.h> #include <jvmfwk/framework.hxx> #include <svtools/restartdialog.hxx> diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index eb432c7ce2e7..a6be046e4647 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -17,18 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/rcid.h> -#include <tools/resary.hxx> +#include <tools/resmgr.hxx> #include <tools/wintypes.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <svtools/ehdl.hxx> +#include <svtools/soerr.hxx> #include <svtools/svtresid.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/sfxecode.hxx> #include <memory> +#include "errtxt.hrc" #include "strings.hxx" static DialogMask aWndFunc( @@ -138,26 +139,21 @@ static DialogMask aWndFunc( return nRet; } - -SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, ErrCode lStartP, ErrCode lEndP, ResMgr *pMgrP) : - - lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( nullptr ) - +SfxErrorHandler::SfxErrorHandler(const ErrMsgCode* pIdPs, ErrCode lStartP, ErrCode lEndP, const std::locale* pLocale) + : lStart(lStartP), lEnd(lEndP), pIds(pIdPs), pResLocale(pLocale) { ErrorRegistry::RegisterDisplay(&aWndFunc); - if( ! pMgr ) + if (!pResLocale) { - pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); - pFreeMgr.reset(pMgr); + xFreeLocale.reset(new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag()))); + pResLocale = xFreeLocale.get(); } } - SfxErrorHandler::~SfxErrorHandler() { } - bool SfxErrorHandler::CreateString(const ErrorInfo *pErr, OUString &rStr) const /* [Description] @@ -201,14 +197,13 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) */ { - std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() )); - if( pResMgr ) + std::locale loc(Translate::Create("svt", Application::GetSettings().GetUILanguageTag())); + for (const ErrMsgCode* pItem = getRID_ERRHDL(); pItem->second; ++pItem) { - ResStringArray aEr(ResId(RID_ERRHDL, *pResMgr)); - sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)lClassId); - if (nErrIdx != RESARRAY_INDEX_NOTFOUND) + if (sal_uInt32(pItem->second) == lClassId) { - rStr = aEr.GetString(nErrIdx); + rStr = Translate::get(pItem->first, loc); + break; } } } @@ -223,20 +218,18 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, OUString &rStr) const */ { - SolarMutexGuard aGuard; - bool bRet = false; rStr = RID_ERRHDL_CLASS; - ResStringArray aEr(ResId(nId, *pMgr)); - sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)(sal_uInt32)lErrId); - if (nErrIdx != RESARRAY_INDEX_NOTFOUND) + for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem) { - rStr = rStr.replaceAll("$(ERROR)", aEr.GetString(nErrIdx)); - bRet = true; + if (pItem->second == lErrId) + { + rStr = rStr.replaceAll("$(ERROR)", Translate::get(pItem->first, *pResLocale)); + bRet = true; + break; + } } - else - bRet = false; if( bRet ) { @@ -252,25 +245,24 @@ bool SfxErrorHandler::GetErrorString(ErrCode lErrId, OUString &rStr) const } SfxErrorContext::SfxErrorContext( - sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) -: ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) + sal_uInt16 nCtxIdP, vcl::Window *pWindow, const ErrMsgCode* pIdsP, const std::locale* pResLocaleP) +: ErrorContext(pWindow), nCtxId(nCtxIdP), pIds(pIdsP), pResLocale(pResLocaleP) { - if( nResId==USHRT_MAX ) - nResId=RID_ERRCTX; + if (!pIds) + pIds = getRID_ERRCTX(); } SfxErrorContext::SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, - sal_uInt16 nResIdP, ResMgr *pMgrP) -: ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP), + const ErrMsgCode* pIdsP, const std::locale* pResLocaleP) +: ErrorContext(pWindow), nCtxId(nCtxIdP), pIds(pIdsP), pResLocale(pResLocaleP), aArg1(aArg1P) { - if( nResId==USHRT_MAX ) - nResId=RID_ERRCTX; + if (!pIds) + pIds = getRID_ERRCTX(); } - bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr) /* [Description] @@ -280,43 +272,67 @@ bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr) { bool bRet = false; - ResMgr* pFreeMgr = nullptr; - if( ! pMgr ) + std::locale* pFreeLocale = nullptr; + if (!pResLocale) { - pFreeMgr = pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); + pFreeLocale = new std::locale(Translate::Create("svt", Application::GetSettings().GetUILanguageTag())); + pResLocale = pFreeLocale; } - if( pMgr ) + if (pResLocale) { - SolarMutexGuard aGuard; - - ResStringArray aTestEr(ResId(nResId, *pMgr)); - sal_uInt32 nErrIdx = aTestEr.FindIndex(nCtxId); - if (nErrIdx != RESARRAY_INDEX_NOTFOUND) - { - rStr = aTestEr.GetString(nErrIdx); - rStr = rStr.replaceAll("$(ARG1)", aArg1); - bRet = true; - } - else + for (const ErrMsgCode* pItem = pIds; pItem->second; ++pItem) { - SAL_WARN( "svtools.misc", "ErrorContext cannot find the resource" ); - bRet = false; + if (sal_uInt32(pItem->second) == nCtxId) + { + rStr = Translate::get(pItem->first, *pResLocale); + rStr = rStr.replaceAll("$(ARG1)", aArg1); + bRet = true; + break; + } } + SAL_WARN_IF(!bRet, "svtools.misc", "ErrorContext cannot find the resource"); + if ( bRet ) { sal_uInt16 nId = nErrId.IsWarning() ? ERRCTX_WARNING : ERRCTX_ERROR; - ResStringArray aEr(ResId(RID_ERRCTX, *pMgr)); - rStr = rStr.replaceAll("$(ERR)", aEr.GetString(nId)); + for (const ErrMsgCode* pItem = getRID_ERRCTX(); pItem->second; ++pItem) + { + if (sal_uInt32(pItem->second) == nId) + { + rStr = rStr.replaceAll("$(ERR)", Translate::get(pItem->first, *pResLocale)); + break; + } + } } } - if( pFreeMgr ) + if (pFreeLocale) { - delete pFreeMgr; - pMgr = nullptr; + delete pFreeLocale; + pResLocale = nullptr; } return bRet; } +const ErrMsgCode* getRID_ERRHDL() +{ + return RID_ERRHDL; +} + +const ErrMsgCode* getRID_ERRCTX() +{ + return RID_ERRCTX; +} + +const ErrMsgCode* getRID_SO_ERROR_HANDLER() +{ + return RID_SO_ERROR_HANDLER; +} + +const ErrMsgCode* getRID_SO_ERRCTX() +{ + return RID_SO_ERRCTX; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 45de241940df..68691df709d7 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -20,7 +20,7 @@ #include <svtools/embedhlp.hxx> #include <vcl/graphicfilter.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include "bitmaps.hlst" #include <svtools/svtresid.hxx> diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src deleted file mode 100644 index a84c5b32c9ab..000000000000 --- a/svtools/source/misc/errtxt.src +++ /dev/null @@ -1,132 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -#include <svtools/sfxecode.hxx> - -StringArray RID_ERRCTX -{ - ItemList [ en-US ] = - { - < "Error" ; ERRCTX_ERROR ; >; - < "Warning" ; ERRCTX_WARNING ; >; - < "$(ERR) loading the template $(ARG1)" ; ERRCTX_SFX_LOADTEMPLATE ; >; - < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEDOC ; >; - < "$(ERR) saving the document $(ARG1)"; ERRCTX_SFX_SAVEASDOC ; >; - < "$(ERR) displaying doc. information for document $(ARG1)" ; ERRCTX_SFX_DOCINFO ; >; - < "$(ERR) writing document $(ARG1) as template" ; ERRCTX_SFX_DOCTEMPLATE ; >; - < "$(ERR) copying or moving document contents" ; ERRCTX_SFX_MOVEORCOPYCONTENTS ; >; - < "$(ERR) starting the Document Manager" ; ERRCTX_SFX_DOCMANAGER ; >; - < "$(ERR) loading document $(ARG1)" ; ERRCTX_SFX_OPENDOC ; >; - < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOCDIRECT ; >; - < "$(ERR) creating a new document" ; ERRCTX_SFX_NEWDOC ; >; - < "$(ERR) expanding entry" ; ERRCTX_SFX_CREATEOBJSH ; >; - < "$(ERR) loading BASIC of document $(ARG1)" ; ERRCTX_SFX_LOADBASIC ; >; - < "$(ERR) searching for an address"; ERRCTX_SFX_SEARCHADDRESS ; >; - }; -}; - -StringArray RID_ERRHDL -{ - ItemList [ en-US ] = - { - < "Abort" ; ERRCODE_CLASS_ABORT ; >; - < "Nonexistent object" ; ERRCODE_CLASS_NOTEXISTS ; >; - < "Object already exists" ; ERRCODE_CLASS_ALREADYEXISTS ; >; - < "Object not accessible" ; ERRCODE_CLASS_ACCESS ; >; - < "Inadmissible path" ; ERRCODE_CLASS_PATH ; >; - < "Locking problem" ; ERRCODE_CLASS_LOCKING ; >; - < "Wrong parameter" ; ERRCODE_CLASS_PARAMETER ; >; - < "Resource exhausted" ; ERRCODE_CLASS_SPACE ; >; - < "Action not supported" ; ERRCODE_CLASS_NOTSUPPORTED ; >; - < "Read Error" ; ERRCODE_CLASS_READ ; >; - < "Write Error" ; ERRCODE_CLASS_WRITE ; >; - < "unknown" ; ERRCODE_CLASS_UNKNOWN ; >; - < "Version Incompatibility" ; ERRCODE_CLASS_VERSION ; >; - < "General Error" ; ERRCODE_CLASS_GENERAL ; >; - < "Incorrect format" ; ERRCODE_CLASS_FORMAT ; >; - < "Error creating object" ; ERRCODE_CLASS_CREATE ; >; - < "Inadmissible value or data type" ; ERRCODE_CLASS_SBX ; >; - < "BASIC runtime error" ; ERRCODE_CLASS_RUNTIME ; >; - < "BASIC syntax error" ; ERRCODE_CLASS_COMPILER ; >; - < "General Error" ; 1 ; >; - < "General input/output error." ; ERRCODE_IO_GENERAL ; >; - < "Invalid file name." ; ERRCODE_IO_MISPLACEDCHAR ; >; - < "Nonexistent file." ; ERRCODE_IO_NOTEXISTS ; >; - < "File already exists." ; ERRCODE_IO_ALREADYEXISTS ; >; - < "The object is not a directory." ; ERRCODE_IO_NOTADIRECTORY ; >; - < "The object is not a file." ; ERRCODE_IO_NOTAFILE ; >; - < "The specified device is invalid." ; ERRCODE_IO_INVALIDDEVICE ; >; - < "The object cannot be accessed\ndue to insufficient user rights." ; ERRCODE_IO_ACCESSDENIED ; >; - < "Sharing violation while accessing the object." ; ERRCODE_IO_LOCKVIOLATION ; >; - < "No more space on device." ; ERRCODE_IO_OUTOFSPACE ; >; - < "This operation cannot be run on\nfiles containing wildcards." ; ERRCODE_IO_ISWILDCARD ; >; - < "This operation is not supported on this operating system." ; ERRCODE_IO_NOTSUPPORTED ; >; - < "There are too many files open." ; ERRCODE_IO_TOOMANYOPENFILES ; >; - < "Data could not be read from the file." ; ERRCODE_IO_CANTREAD ; >; - < "The file could not be written." ; ERRCODE_IO_CANTWRITE ; >; - < "The operation could not be run due to insufficient memory." ; ERRCODE_IO_OUTOFMEMORY ; >; - < "The seek operation could not be run." ; ERRCODE_IO_CANTSEEK ; >; - < "The tell operation could not be run." ; ERRCODE_IO_CANTTELL ; >; - < "Incorrect file version." ; ERRCODE_IO_WRONGVERSION ; >; - < "Incorrect file format." ; ERRCODE_IO_WRONGFORMAT ; >; - < "The file name contains invalid characters." ; ERRCODE_IO_INVALIDCHAR ; >; - < "An unknown I/O error has occurred." ; ERRCODE_IO_UNKNOWN ; >; - < "An invalid attempt was made to access the file." ; ERRCODE_IO_INVALIDACCESS ; >; - < "The file could not be created." ; ERRCODE_IO_CANTCREATE ; >; - < "The operation was started under an invalid parameter." ; ERRCODE_IO_INVALIDPARAMETER ; >; - < "The operation on the file was aborted." ; ERRCODE_IO_ABORT ; >; - < "Path to the file does not exist." ; ERRCODE_IO_NOTEXISTSPATH ; >; - < "An object cannot be copied into itself." ; ERRCODE_IO_RECURSIVE ; >; - < "The specified template could not be found." ; ERRCODE_SFX_TEMPLATENOTFOUND ; >; - < "The file cannot be used as template." ; ERRCODE_SFX_NOTATEMPLATE ; >; - < "This document has already been opened for editing." ; ERRCODE_SFX_ALREADYOPEN ; >; - < "The wrong password has been entered." ; ERRCODE_SFX_WRONGPASSWORD ; >; - < "Error reading file." ; ERRCODE_SFX_DOLOADFAILED ; >; - < "The document was opened as read-only." ; ERRCODE_SFX_DOCUMENTREADONLY ; >; - < "General OLE Error." ; ERRCODE_SFX_OLEGENERAL ; >; - < "The host name $(ARG1) could not be resolved." ; ERRCODE_INET_NAME_RESOLVE ; >; - < "Could not establish Internet connection to $(ARG1)." ; ERRCODE_INET_CONNECT ; >; - < "Error reading data from the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_READ ; >; - < "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; ERRCODE_INET_WRITE ; >; - < "General Internet error has occurred." ; ERRCODE_INET_GENERAL ; >; - < "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; ERRCODE_INET_OFFLINE ; >; - < "The contents could not be created." ; ERRCODE_SFX_CANTCREATECONTENT ; >; - < "The file name is too long for the target file system." ; ERRCODE_IO_NAMETOOLONG ; >; - < "The input syntax is invalid." ; ERRCODE_SFX_INVALIDSYNTAX ; >; - < "The input syntax is invalid." ; ERRCODE_SFX_CANTCREATEFOLDER ; >; - < "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; ERRCODE_IO_NOTSTORABLEINBINARYFORMAT ; >; - < "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; ERRCODE_SFX_NOMOREDOCUMENTSALLOWED ; >; - < "Could not create backup copy." ; ERRCODE_SFX_CANTCREATEBACKUP ; >; - < "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; ERRCODE_SFX_MACROS_SUPPORT_DISABLED ; >; - < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC ; >; - < "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ; >; - < "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; ERRCODE_SFX_INCOMPLETE_ENCRYPTION ; >; - < "Invalid data length." ; ERRCODE_IO_INVALIDLENGTH ; >; - < "Function not possible: path contains current directory." ; ERRCODE_IO_CURRENTDIR ; >; - < "Function not possible: device (drive) not identical." ; ERRCODE_IO_NOTSAMEDEVICE ; >; - < "Device (drive) not ready." ; ERRCODE_IO_DEVICENOTREADY ; >; - < "Wrong checksum." ; ERRCODE_IO_BADCRC ; >; - < "Function not possible: write protected." ; ERRCODE_IO_WRITEPROTECTED ; >; - < "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ; >; - < "File format error found at $(ARG1)(row,col)."; ERRCODE_SFX_FORMAT_ROWCOL ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 85050af4f01c..31c80e9c50f2 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -34,13 +34,13 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> -#include <tools/rcid.h> #include <unotools/configmgr.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <vcl/lazydelete.hxx> #include "imagemgr.hrc" #include "bitmaps.hlst" +#include "strings.hxx" // globals ******************************************************************* @@ -51,7 +51,7 @@ struct SvtExtensionResIdMapping_Impl { const char* _pExt; bool _bExt; - sal_uInt16 _nStrId; + const char* pStrId; sal_uInt16 _nImgId; }; @@ -90,7 +90,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "jpg", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG }, { "lha", true, STR_DESCRIPTION_ARCHIVFILE, 0 }, #ifdef _WIN32 - { "lnk", false, 0, 0 }, + { "lnk", false, nullptr, 0 }, #endif { "log", true, STR_DESCRIPTION_LOGFILE, 0 }, { "lst", true, STR_DESCRIPTION_LOGFILE, 0 }, @@ -111,14 +111,14 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "pas", true, STR_DESCRIPTION_SOURCEFILE, 0 }, { "pcd", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD }, { "pct", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT }, - { "pict", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT }, + { "pict", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT }, { "pcx", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX }, { "pl", true, STR_DESCRIPTION_SOURCEFILE, 0 }, { "png", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PNG }, { "rar", true, STR_DESCRIPTION_ARCHIVFILE, 0 }, { "rtf", false, STR_DESCRIPTION_WORD_DOC, IMG_WRITER }, - { "sbl", false, 0, 0 }, - { "sch", false, 0, 0 }, + { "sbl", false, nullptr, 0 }, + { "sch", false, nullptr, 0 }, { "sda", false, STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW }, { "sdb", false, STR_DESCRIPTION_SDATABASE_DOC, IMG_DATABASE }, { "sdc", false, STR_DESCRIPTION_SCALC_DOC, IMG_CALC }, @@ -126,7 +126,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "sdp", false, STR_DESCRIPTION_SIMPRESS_DOC, 0 }, { "sds", false, STR_DESCRIPTION_SCHART_DOC, 0 }, { "sdw", false, STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER }, - { "sga", false, 0, 0 }, + { "sga", false, nullptr, 0 }, { "sgf", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGF }, { "sgl", false, STR_DESCRIPTION_GLOBALDOC, IMG_GLOBAL_DOC }, { "sgv", true, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGV }, @@ -169,7 +169,7 @@ static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] = { "pps", false, STR_DESCRIPTION_POWERPOINT_SHOW, IMG_IMPRESS }, { "pptx", false, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS }, { "oxt", false, STR_DESCRIPTION_EXTENSION, IMG_EXTENSION }, - { nullptr, false, 0, 0 } + { nullptr, false, nullptr, 0 } }; struct SvtFactory2ExtensionMapping_Impl @@ -412,50 +412,49 @@ static sal_uInt16 GetImageId_Impl( const INetURLObject& rObject, bool bDetectFol return nImage; } -static sal_uInt16 GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt ) +static const char* GetDescriptionId_Impl( const OUString& rExtension, bool& rbShowExt ) { - sal_uInt16 nId = 0; + const char* pId = nullptr; sal_Int32 nIndex = GetIndexOfExtension_Impl( rExtension ); if ( nIndex != NO_INDEX ) { - nId = ExtensionMap_Impl[ nIndex ]._nStrId; + pId = ExtensionMap_Impl[ nIndex ].pStrId; rbShowExt = ExtensionMap_Impl[ nIndex ]._bExt; } - return nId; + return pId; } static OUString GetDescriptionByFactory_Impl( const OUString& rFactory ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; if ( rFactory.startsWithIgnoreAsciiCase( "swriter" ) ) - nResId = STR_DESCRIPTION_FACTORY_WRITER; + pResId = STR_DESCRIPTION_FACTORY_WRITER; else if ( rFactory.startsWithIgnoreAsciiCase( "scalc" ) ) - nResId = STR_DESCRIPTION_FACTORY_CALC; + pResId = STR_DESCRIPTION_FACTORY_CALC; else if ( rFactory.startsWithIgnoreAsciiCase( "simpress" ) ) - nResId = STR_DESCRIPTION_FACTORY_IMPRESS; + pResId = STR_DESCRIPTION_FACTORY_IMPRESS; else if ( rFactory.startsWithIgnoreAsciiCase( "sdraw" ) ) - nResId = STR_DESCRIPTION_FACTORY_DRAW; + pResId = STR_DESCRIPTION_FACTORY_DRAW; else if ( rFactory.startsWithIgnoreAsciiCase( "swriter/web" ) ) - nResId = STR_DESCRIPTION_FACTORY_WRITERWEB; + pResId = STR_DESCRIPTION_FACTORY_WRITERWEB; else if ( rFactory.startsWithIgnoreAsciiCase( "swriter/globaldocument" ) ) - nResId = STR_DESCRIPTION_FACTORY_GLOBALDOC; + pResId = STR_DESCRIPTION_FACTORY_GLOBALDOC; else if ( rFactory.startsWithIgnoreAsciiCase( "smath" ) ) - nResId = STR_DESCRIPTION_FACTORY_MATH; + pResId = STR_DESCRIPTION_FACTORY_MATH; else if ( rFactory.startsWithIgnoreAsciiCase( "sdatabase" ) ) - nResId = STR_DESCRIPTION_FACTORY_DATABASE; + pResId = STR_DESCRIPTION_FACTORY_DATABASE; - if ( nResId ) + if (pResId) { - SolarMutexGuard aGuard; - return SvtResId(nResId); + return SvtResId(pResId); } return OUString(); } -static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL ) +static const char* GetFolderDescriptionId_Impl( const OUString& rURL ) { - sal_uInt16 nRet = STR_DESCRIPTION_FOLDER; + const char* pRet = STR_DESCRIPTION_FOLDER; svtools::VolumeInfo aVolumeInfo; try { @@ -463,13 +462,13 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL ) if ( GetVolumeProperties_Impl( aCnt, aVolumeInfo ) ) { if ( aVolumeInfo.m_bIsRemote ) - nRet = STR_DESCRIPTION_REMOTE_VOLUME; + pRet = STR_DESCRIPTION_REMOTE_VOLUME; else if ( aVolumeInfo.m_bIsFloppy ) - nRet = STR_DESCRIPTION_FLOPPY_VOLUME; + pRet = STR_DESCRIPTION_FLOPPY_VOLUME; else if ( aVolumeInfo.m_bIsCompactDisc ) - nRet = STR_DESCRIPTION_CDROM_VOLUME; + pRet = STR_DESCRIPTION_CDROM_VOLUME; else if ( aVolumeInfo.m_bIsRemoveable || aVolumeInfo.m_bIsVolume ) - nRet = STR_DESCRIPTION_LOCALE_VOLUME; + pRet = STR_DESCRIPTION_LOCALE_VOLUME; } } catch( const css::uno::RuntimeException& ) @@ -480,7 +479,7 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const OUString& rURL ) { } - return nRet; + return pRet; } static Image GetImageFromList_Impl( sal_uInt16 nImageId, bool bBig ) @@ -702,7 +701,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb { OUString sExtension(rObject.getExtension()); OUString sDescription, sURL( rObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); - sal_uInt16 nResId = 0; + const char* pResId = nullptr; bool bShowExt = false, bOnlyFile = false; bool bFolder = bDetectFolder && CONTENT_HELPER::IsFolder( sURL ); if ( !bFolder ) @@ -727,19 +726,19 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb if ( bExt ) { sExtension = sExtension.toAsciiLowerCase(); - nResId = GetDescriptionId_Impl( sExtension, bShowExt ); + pResId = GetDescriptionId_Impl( sExtension, bShowExt ); } - if ( !nResId ) + if (!pResId) { - nResId = STR_DESCRIPTION_FILE; + pResId = STR_DESCRIPTION_FILE; bOnlyFile = bExt; } } } else - nResId = GetFolderDescriptionId_Impl( sURL ); + pResId = GetFolderDescriptionId_Impl( sURL ); - if ( nResId > 0 ) + if (pResId) { if ( bOnlyFile ) { @@ -748,8 +747,7 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb sDescription = sExtension; sDescription += "-"; } - SolarMutexGuard aGuard; - sDescription += SvtResId(nResId); + sDescription += SvtResId(pResId); } DBG_ASSERT( !sDescription.isEmpty(), "file without description" ); @@ -818,17 +816,17 @@ OUString SvFileInformationManager::GetFileDescription( const INetURLObject& rObj OUString SvFileInformationManager::GetFolderDescription( const svtools::VolumeInfo& rInfo ) { - sal_uInt16 nResId = STR_DESCRIPTION_FOLDER; + const char* pResId = STR_DESCRIPTION_FOLDER; if ( rInfo.m_bIsRemote ) - nResId = STR_DESCRIPTION_REMOTE_VOLUME; + pResId = STR_DESCRIPTION_REMOTE_VOLUME; else if ( rInfo.m_bIsFloppy ) - nResId = STR_DESCRIPTION_FLOPPY_VOLUME; + pResId = STR_DESCRIPTION_FLOPPY_VOLUME; else if ( rInfo.m_bIsCompactDisc ) - nResId = STR_DESCRIPTION_CDROM_VOLUME; + pResId = STR_DESCRIPTION_CDROM_VOLUME; else if ( rInfo.m_bIsRemoveable || rInfo.m_bIsVolume ) - nResId = STR_DESCRIPTION_LOCALE_VOLUME; + pResId = STR_DESCRIPTION_LOCALE_VOLUME; - return SvtResId(nResId); + return SvtResId(pResId); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/imagemgr.hrc b/svtools/source/misc/imagemgr.hrc index 4d6f3132dfa9..7862d3a03c83 100644 --- a/svtools/source/misc/imagemgr.hrc +++ b/svtools/source/misc/imagemgr.hrc @@ -72,77 +72,6 @@ #define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) #define IMG_EXTENSION (IMAGELIST_START + 180) -#define RID_DESCRIPTION_START 256 - -#define STR_DESCRIPTION_SOURCEFILE (RID_DESCRIPTION_START + 0) -#define STR_DESCRIPTION_BOOKMARKFILE (RID_DESCRIPTION_START + 1) -#define STR_DESCRIPTION_GRAPHIC_DOC (RID_DESCRIPTION_START + 2) -#define STR_DESCRIPTION_CFGFILE (RID_DESCRIPTION_START + 3) -#define STR_DESCRIPTION_APPLICATION (RID_DESCRIPTION_START + 4) -#define STR_DESCRIPTION_DATABASE_TABLE (RID_DESCRIPTION_START + 5) -#define STR_DESCRIPTION_SYSFILE (RID_DESCRIPTION_START + 6) -#define STR_DESCRIPTION_WORD_DOC (RID_DESCRIPTION_START + 7) -#define STR_DESCRIPTION_HELP_DOC (RID_DESCRIPTION_START + 8) -#define STR_DESCRIPTION_HTMLFILE (RID_DESCRIPTION_START + 9) -#define STR_DESCRIPTION_ARCHIVFILE (RID_DESCRIPTION_START + 10) -#define STR_DESCRIPTION_LOGFILE (RID_DESCRIPTION_START + 11) -#define STR_DESCRIPTION_SMATH_DOC (RID_DESCRIPTION_START + 12) -#define STR_DESCRIPTION_SCHART_DOC (RID_DESCRIPTION_START + 13) -#define STR_DESCRIPTION_SDRAW_DOC (RID_DESCRIPTION_START + 14) -#define STR_DESCRIPTION_SCALC_DOC (RID_DESCRIPTION_START + 15) -#define STR_DESCRIPTION_SIMPRESS_DOC (RID_DESCRIPTION_START + 16) -#define STR_DESCRIPTION_SWRITER_DOC (RID_DESCRIPTION_START + 17) -#define STR_DESCRIPTION_GLOBALDOC (RID_DESCRIPTION_START + 18) -#define STR_DESCRIPTION_SIMAGE_DOC (RID_DESCRIPTION_START + 19) -#define STR_DESCRIPTION_TEXTFILE (RID_DESCRIPTION_START + 20) -#define STR_DESCRIPTION_LINK (RID_DESCRIPTION_START + 21) -#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC (RID_DESCRIPTION_START + 22) -#define STR_DESCRIPTION_EXCEL_DOC (RID_DESCRIPTION_START + 23) -#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC (RID_DESCRIPTION_START + 24) -#define STR_DESCRIPTION_BATCHFILE (RID_DESCRIPTION_START + 25) -#define STR_DESCRIPTION_FILE (RID_DESCRIPTION_START + 26) -#define STR_DESCRIPTION_FOLDER (RID_DESCRIPTION_START + 27) -#define STR_DESCRIPTION_FACTORY_WRITER (RID_DESCRIPTION_START + 28) -#define STR_DESCRIPTION_FACTORY_CALC (RID_DESCRIPTION_START + 29) -#define STR_DESCRIPTION_FACTORY_IMPRESS (RID_DESCRIPTION_START + 30) -#define STR_DESCRIPTION_FACTORY_DRAW (RID_DESCRIPTION_START + 31) -#define STR_DESCRIPTION_FACTORY_WRITERWEB (RID_DESCRIPTION_START + 32) -#define STR_DESCRIPTION_FACTORY_GLOBALDOC (RID_DESCRIPTION_START + 33) -#define STR_DESCRIPTION_FACTORY_MATH (RID_DESCRIPTION_START + 34) -#define STR_DESCRIPTION_CALC_TEMPLATE (RID_DESCRIPTION_START + 35) -#define STR_DESCRIPTION_DRAW_TEMPLATE (RID_DESCRIPTION_START + 36) -#define STR_DESCRIPTION_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 37) -#define STR_DESCRIPTION_WRITER_TEMPLATE (RID_DESCRIPTION_START + 38) -#define STR_DESCRIPTION_LOCALE_VOLUME (RID_DESCRIPTION_START + 39) -#define STR_DESCRIPTION_FLOPPY_VOLUME (RID_DESCRIPTION_START + 40) -#define STR_DESCRIPTION_CDROM_VOLUME (RID_DESCRIPTION_START + 41) -#define STR_DESCRIPTION_REMOTE_VOLUME (RID_DESCRIPTION_START + 42) -#define STR_DESCRIPTION_POWERPOINT (RID_DESCRIPTION_START + 43) -#define STR_DESCRIPTION_POWERPOINT_TEMPLATE (RID_DESCRIPTION_START + 44) -#define STR_DESCRIPTION_POWERPOINT_SHOW (RID_DESCRIPTION_START + 45) -#define STR_DESCRIPTION_SXMATH_DOC (RID_DESCRIPTION_START + 46) -#define STR_DESCRIPTION_SXCHART_DOC (RID_DESCRIPTION_START + 47) -#define STR_DESCRIPTION_SXDRAW_DOC (RID_DESCRIPTION_START + 48) -#define STR_DESCRIPTION_SXCALC_DOC (RID_DESCRIPTION_START + 49) -#define STR_DESCRIPTION_SXIMPRESS_DOC (RID_DESCRIPTION_START + 50) -#define STR_DESCRIPTION_SXWRITER_DOC (RID_DESCRIPTION_START + 51) -#define STR_DESCRIPTION_SXGLOBAL_DOC (RID_DESCRIPTION_START + 52) -#define STR_DESCRIPTION_MATHML_DOC (RID_DESCRIPTION_START + 53) -#define STR_DESCRIPTION_SDATABASE_DOC (RID_DESCRIPTION_START + 54) -#define STR_DESCRIPTION_OO_DATABASE_DOC (RID_DESCRIPTION_START + 55) -#define STR_DESCRIPTION_OO_DRAW_DOC (RID_DESCRIPTION_START + 56) -#define STR_DESCRIPTION_OO_MATH_DOC (RID_DESCRIPTION_START + 57) -#define STR_DESCRIPTION_OO_GLOBAL_DOC (RID_DESCRIPTION_START + 58) -#define STR_DESCRIPTION_OO_IMPRESS_DOC (RID_DESCRIPTION_START + 59) -#define STR_DESCRIPTION_OO_CALC_DOC (RID_DESCRIPTION_START + 60) -#define STR_DESCRIPTION_OO_WRITER_DOC (RID_DESCRIPTION_START + 61) -#define STR_DESCRIPTION_OO_DRAW_TEMPLATE (RID_DESCRIPTION_START + 62) -#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 63) -#define STR_DESCRIPTION_OO_CALC_TEMPLATE (RID_DESCRIPTION_START + 64) -#define STR_DESCRIPTION_OO_WRITER_TEMPLATE (RID_DESCRIPTION_START + 65) -#define STR_DESCRIPTION_FACTORY_DATABASE (RID_DESCRIPTION_START + 66) -#define STR_DESCRIPTION_EXTENSION (RID_DESCRIPTION_START + 67) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src deleted file mode 100644 index aeed4a10cd93..000000000000 --- a/svtools/source/misc/imagemgr.src +++ /dev/null @@ -1,310 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -#include "imagemgr.hrc" - -// description strings - -String STR_DESCRIPTION_SOURCEFILE -{ - Text [ en-US ] = "Source code" ; -}; -String STR_DESCRIPTION_BOOKMARKFILE -{ - Text [ en-US ] = "Bookmark file" ; -}; -String STR_DESCRIPTION_GRAPHIC_DOC -{ - Text [ en-US ] = "Graphics" ; -}; -String STR_DESCRIPTION_CFGFILE -{ - Text [ en-US ] = "Configuration file" ; -}; -String STR_DESCRIPTION_APPLICATION -{ - Text [ en-US ] = "Application" ; -}; -String STR_DESCRIPTION_DATABASE_TABLE -{ - Text [ en-US ] = "Database table" ; -}; -String STR_DESCRIPTION_SYSFILE -{ - Text [ en-US ] = "System file" ; -}; -String STR_DESCRIPTION_WORD_DOC -{ - Text [ en-US ] = "MS Word document" ; -}; -String STR_DESCRIPTION_HELP_DOC -{ - Text [ en-US ] = "Help file" ; -}; -String STR_DESCRIPTION_HTMLFILE -{ - Text [ en-US ] = "HTML document" ; -}; -String STR_DESCRIPTION_ARCHIVFILE -{ - Text [ en-US ] = "Archive file" ; -}; -String STR_DESCRIPTION_LOGFILE -{ - Text [ en-US ] = "Log file" ; -}; -String STR_DESCRIPTION_SMATH_DOC -{ - Text = "StarMath 2.0 - 5.0" ; -}; -String STR_DESCRIPTION_SCHART_DOC -{ - Text = "StarChart 3.0 - 5.0" ; -}; -String STR_DESCRIPTION_SDRAW_DOC -{ - Text = "StarDraw 3.0 / 5.0 (StarImpress)" ; -}; - -String STR_DESCRIPTION_SDATABASE_DOC -{ - Text [ en-US ] = "StarOffice Database" ; -}; - -String STR_DESCRIPTION_SCALC_DOC -{ - Text = "StarCalc 3.0 - 5.0" ; -}; -String STR_DESCRIPTION_SIMPRESS_DOC -{ - Text = "StarImpress 4.0 / 5.0" ; -}; -String STR_DESCRIPTION_SWRITER_DOC -{ - Text = "StarWriter 3.0 - 5.0" ; -}; -String STR_DESCRIPTION_GLOBALDOC -{ - Text [ en-US ] = "StarWriter 4.0 / 5.0 Master Document" ; -}; -String STR_DESCRIPTION_SIMAGE_DOC -{ - Text [ en-US ] = "StarOffice Image" ; -}; -String STR_DESCRIPTION_TEXTFILE -{ - Text [ en-US ] = "Text file" ; -}; -String STR_DESCRIPTION_LINK -{ - Text [ en-US ] = "Link" ; -}; -String STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC -{ - Text [ en-US ] = "StarOffice 3.0 - 5.0 Template" ; -}; -String STR_DESCRIPTION_EXCEL_DOC -{ - Text [ en-US ] = "MS Excel document" ; -}; -String STR_DESCRIPTION_EXCEL_TEMPLATE_DOC -{ - Text [ en-US ] = "MS Excel template" ; -}; -String STR_DESCRIPTION_BATCHFILE -{ - Text [ en-US ] = "Batch file" ; -}; -String STR_DESCRIPTION_FILE -{ - Text [ en-US ] = "File" ; -}; -String STR_DESCRIPTION_FOLDER -{ - Text [ en-US ] = "Folder" ; -}; -String STR_DESCRIPTION_FACTORY_WRITER -{ - Text [ en-US ] = "Text Document"; -}; -String STR_DESCRIPTION_FACTORY_CALC -{ - Text [ en-US ] = "Spreadsheet"; -}; -String STR_DESCRIPTION_FACTORY_IMPRESS -{ - Text [ en-US ] = "Presentation"; -}; -String STR_DESCRIPTION_FACTORY_DRAW -{ - Text [ en-US ] = "Drawing"; -}; -String STR_DESCRIPTION_FACTORY_WRITERWEB -{ - Text [ en-US ] = "HTML document"; -}; -String STR_DESCRIPTION_FACTORY_GLOBALDOC -{ - Text [ en-US ] = "Master document"; -}; -String STR_DESCRIPTION_FACTORY_MATH -{ - Text [ en-US ] = "Formula"; -}; -String STR_DESCRIPTION_FACTORY_DATABASE -{ - Text [ en-US ] = "Database"; -}; -String STR_DESCRIPTION_CALC_TEMPLATE -{ - Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet Template" ; -}; -String STR_DESCRIPTION_DRAW_TEMPLATE -{ - Text [ en-US ] = "OpenOffice.org 1.0 Drawing Template" ; -}; -String STR_DESCRIPTION_IMPRESS_TEMPLATE -{ - Text [ en-US ] = "OpenOffice.org 1.0 Presentation Template" ; -}; -String STR_DESCRIPTION_WRITER_TEMPLATE -{ - Text [ en-US ] = "OpenOffice.org 1.0 Text Document Template" ; -}; -String STR_DESCRIPTION_LOCALE_VOLUME -{ - Text [ en-US ] = "Local drive" ; -}; -String STR_DESCRIPTION_FLOPPY_VOLUME -{ - Text [ en-US ] = "Disk drive" ; -}; -String STR_DESCRIPTION_CDROM_VOLUME -{ - Text [ en-US ] = "CD-ROM drive" ; -}; -String STR_DESCRIPTION_REMOTE_VOLUME -{ - Text [ en-US ] = "Network connection" ; -}; -String STR_DESCRIPTION_POWERPOINT -{ - Text [ en-US ] = "MS PowerPoint Document"; -}; - -String STR_DESCRIPTION_POWERPOINT_TEMPLATE -{ - Text [ en-US ] = "MS PowerPoint Template"; -}; - -String STR_DESCRIPTION_POWERPOINT_SHOW -{ - Text [ en-US ] = "MS PowerPoint Show"; -}; - -String STR_DESCRIPTION_SXMATH_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Formula" ; -}; - -String STR_DESCRIPTION_SXCHART_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Chart" ; -}; - -String STR_DESCRIPTION_SXDRAW_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ; -}; - -String STR_DESCRIPTION_SXCALC_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ; -}; - -String STR_DESCRIPTION_SXIMPRESS_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ; -}; - -String STR_DESCRIPTION_SXWRITER_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ; -}; - -String STR_DESCRIPTION_SXGLOBAL_DOC -{ - Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ; -}; -String STR_DESCRIPTION_MATHML_DOC -{ - Text [ en-US ] = "MathML Document" ; -}; - -String STR_DESCRIPTION_OO_DATABASE_DOC -{ - Text [ en-US ] = "OpenDocument Database" ; -}; -String STR_DESCRIPTION_OO_DRAW_DOC -{ - Text [ en-US ] = "OpenDocument Drawing" ; -}; -String STR_DESCRIPTION_OO_MATH_DOC -{ - Text [ en-US ] = "OpenDocument Formula" ; -}; -String STR_DESCRIPTION_OO_GLOBAL_DOC -{ - Text [ en-US ] = "OpenDocument Master Document" ; -}; -String STR_DESCRIPTION_OO_IMPRESS_DOC -{ - Text [ en-US ] = "OpenDocument Presentation" ; -}; -String STR_DESCRIPTION_OO_CALC_DOC -{ - Text [ en-US ] = "OpenDocument Spreadsheet" ; -}; -String STR_DESCRIPTION_OO_WRITER_DOC -{ - Text [ en-US ] = "OpenDocument Text" ; -}; -String STR_DESCRIPTION_OO_CALC_TEMPLATE -{ - Text [ en-US ] = "OpenDocument Spreadsheet Template" ; -}; -String STR_DESCRIPTION_OO_DRAW_TEMPLATE -{ - Text [ en-US ] = "OpenDocument Drawing Template" ; -}; -String STR_DESCRIPTION_OO_IMPRESS_TEMPLATE -{ - Text [ en-US ] = "OpenDocument Presentation Template" ; -}; -String STR_DESCRIPTION_OO_WRITER_TEMPLATE -{ - Text [ en-US ] = "OpenDocument Text Template" ; -}; -String STR_DESCRIPTION_EXTENSION -{ - Text [ en-US ] = "%PRODUCTNAME Extension" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index d22880d72246..d714a29599a1 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -26,28 +26,48 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> -#include <svtools/svtools.hrc> +#include <svtools/strings.hrc> #include <svtools/svtresid.hxx> #include <svtools/langtab.hxx> #include <unotools/syslocale.hxx> #include <tools/resary.hxx> #include <officecfg/VCL.hxx> - +#include "langtab.hrc" using namespace ::com::sun::star; -class SvtLanguageTableImpl : public ResStringArray +class SvtLanguageTableImpl { +private: + std::vector<std::pair<OUString, LanguageType>> m_aStrings; public: SvtLanguageTableImpl(); - virtual ~SvtLanguageTableImpl(); bool HasType( const LanguageType eType ) const; const OUString GetString( const LanguageType eType ) const; LanguageType GetType( const OUString& rStr ) const; sal_uInt32 GetEntryCount() const; LanguageType GetTypeAtIndex( sal_uInt32 nIndex ) const; + sal_uInt32 AddItem(const OUString& rLanguage, const LanguageType eType) + { + m_aStrings.push_back(std::make_pair(rLanguage, eType)); + return m_aStrings.size(); + } + LanguageType GetValue(sal_uInt32 nIndex) const + { + return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].second : LANGUAGE_DONTKNOW; + } + sal_uInt32 FindIndex(LanguageType nValue) const + { + const size_t nItems = m_aStrings.size(); + for (size_t i = 0; i < nItems; ++i) + { + if (m_aStrings[i].second == nValue) + return i; + } + return RESARRAY_INDEX_NOTFOUND; + } }; namespace { @@ -131,8 +151,12 @@ const OUString ApplyLreOrRleEmbedding( const OUString &rText ) } SvtLanguageTableImpl::SvtLanguageTableImpl() - : ResStringArray(ResId(STR_ARR_SVT_LANGUAGE_TABLE, *SvtResMgr::GetResMgr())) { + for (size_t i = 0; i < SAL_N_ELEMENTS(STR_ARR_SVT_LANGUAGE_TABLE); ++i) + { + m_aStrings.push_back(std::make_pair(SvtResId(STR_ARR_SVT_LANGUAGE_TABLE[i].first), STR_ARR_SVT_LANGUAGE_TABLE[i].second)); + } + auto xNA = officecfg::VCL::ExtraLanguages::get(); uno::Sequence <OUString> rElementNames = xNA->getElementNames(); sal_Int32 nLen = rElementNames.getLength(); @@ -150,24 +174,19 @@ SvtLanguageTableImpl::SvtLanguageTableImpl() LanguageType nLangType = aLang.getLanguageType(); if (nType <= LanguageTag::ScriptType::RTL && nType > LanguageTag::ScriptType::UNKNOWN) aLang.setScriptType(LanguageTag::ScriptType(nType)); - sal_uInt32 nPos = FindIndex((sal_uInt16)nLangType); + sal_uInt32 nPos = FindIndex(nLangType); if (nPos == RESARRAY_INDEX_NOTFOUND) - AddItem((aName.isEmpty() ? rElementNames[i] : aName), (sal_uInt16)nLangType); + AddItem((aName.isEmpty() ? rElementNames[i] : aName), nLangType); } } } -SvtLanguageTableImpl::~SvtLanguageTableImpl() -{ -} - - bool SvtLanguageTableImpl::HasType( const LanguageType eType ) const { LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType ); - sal_uInt32 nPos = FindIndex( (sal_uInt16)eLang ); + sal_uInt32 nPos = FindIndex(eLang); - return RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count(); + return RESARRAY_INDEX_NOTFOUND != nPos && nPos < GetEntryCount(); } bool SvtLanguageTable::HasLanguageType( const LanguageType eType ) @@ -190,10 +209,10 @@ OUString lcl_getDescription( const OUString& rBcp47 ) const OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const { LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType ); - sal_uInt32 nPos = FindIndex( (sal_uInt16)eLang ); + sal_uInt32 nPos = FindIndex(eLang); - if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) - return ResStringArray::GetString( nPos ); + if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < GetEntryCount() ) + return m_aStrings[nPos].first; //Rather than return a fairly useless "Unknown" name, return a geeky but usable-in-a-pinch lang-tag OUString sLangTag( lcl_getDescription( LanguageTag::convertToBcp47(eType))); @@ -205,7 +224,7 @@ const OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const // And add it to the table if it is an on-the-fly-id, which it usually is, // so it is available in all subsequent language boxes. if (LanguageTag::isOnTheFlyID( eType)) - const_cast<SvtLanguageTableImpl*>(this)->AddItem( sLangTag, (sal_uInt16)eType); + const_cast<SvtLanguageTableImpl*>(this)->AddItem( sLangTag, eType); return sLangTag; } @@ -218,13 +237,13 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType ) LanguageType SvtLanguageTableImpl::GetType( const OUString& rStr ) const { LanguageType eType = LANGUAGE_DONTKNOW; - sal_uInt32 nCount = Count(); + sal_uInt32 nCount = GetEntryCount(); for ( sal_uInt32 i = 0; i < nCount; ++i ) { - if (ResStringArray::GetString( i ) == rStr) + if (m_aStrings[i].first == rStr) { - eType = LanguageType( GetValue( i ) ); + eType = GetValue(i); break; } } @@ -236,10 +255,9 @@ LanguageType SvtLanguageTable::GetLanguageType( const OUString& rStr ) return theLanguageTable::get().GetType( rStr ); } - sal_uInt32 SvtLanguageTableImpl::GetEntryCount() const { - return Count(); + return m_aStrings.size(); } sal_uInt32 SvtLanguageTable::GetLanguageEntryCount() @@ -251,8 +269,8 @@ sal_uInt32 SvtLanguageTable::GetLanguageEntryCount() LanguageType SvtLanguageTableImpl::GetTypeAtIndex( sal_uInt32 nIndex ) const { LanguageType nType = LANGUAGE_DONTKNOW; - if (nIndex < Count()) - nType = LanguageType( GetValue( nIndex ) ); + if (nIndex < GetEntryCount()) + nType = GetValue(nIndex); return nType; } @@ -265,7 +283,7 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( sal_uInt32 nIndex ) sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString ) { return theLanguageTable::get().AddItem( (rString.isEmpty() ? lcl_getDescription(rLanguageTag.getBcp47()) : rString), - (sal_uInt16)rLanguageTag.getLanguageType()); + rLanguageTag.getLanguageType()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src deleted file mode 100644 index bf088d4c112b..000000000000 --- a/svtools/source/misc/langtab.src +++ /dev/null @@ -1,409 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/svtools.hrc> -#include <i18nlangtag/lang.h> - -StringArray STR_ARR_SVT_LANGUAGE_TABLE -{ - ItemList [ en-US ] = - { - < "[None]" ; LANGUAGE_NONE ; > ; - < "Unknown" ; LANGUAGE_DONTKNOW ; > ; - < "Default" ; LANGUAGE_SYSTEM ; > ; - < "Default" ; LANGUAGE_USER_SYSTEM_CONFIG ; > ; - < "Afrikaans (South Africa)" ; LANGUAGE_AFRIKAANS ; > ; - < "Albanian" ; LANGUAGE_ALBANIAN ; > ; - < "Arabic" ; LANGUAGE_ARABIC_PRIMARY_ONLY ; > ; - < "Arabic (Algeria)" ; LANGUAGE_ARABIC_ALGERIA ; > ; - < "Arabic (Bahrain)" ; LANGUAGE_ARABIC_BAHRAIN ; > ; - < "Arabic (Chad)" ; LANGUAGE_USER_ARABIC_CHAD ; > ; - < "Arabic (Comoros)" ; LANGUAGE_USER_ARABIC_COMOROS ; > ; - < "Arabic (Djibouti)" ; LANGUAGE_USER_ARABIC_DJIBOUTI ; > ; - < "Arabic (Egypt)" ; LANGUAGE_ARABIC_EGYPT ; > ; - < "Arabic (Eritrea)" ; LANGUAGE_USER_ARABIC_ERITREA ; > ; - < "Arabic (Iraq)" ; LANGUAGE_ARABIC_IRAQ ; > ; - < "Arabic (Israel)" ; LANGUAGE_USER_ARABIC_ISRAEL ; > ; - < "Arabic (Jordan)" ; LANGUAGE_ARABIC_JORDAN ; > ; - < "Arabic (Kuwait)" ; LANGUAGE_ARABIC_KUWAIT ; > ; - < "Arabic (Lebanon)" ; LANGUAGE_ARABIC_LEBANON ; > ; - < "Arabic (Libya)" ; LANGUAGE_ARABIC_LIBYA ; > ; - < "Arabic (Mauritania)" ; LANGUAGE_USER_ARABIC_MAURITANIA ; > ; - < "Arabic (Morocco)" ; LANGUAGE_ARABIC_MOROCCO ; > ; - < "Arabic (Oman)" ; LANGUAGE_ARABIC_OMAN ; > ; - < "Arabic (Palestine)" ; LANGUAGE_USER_ARABIC_PALESTINE ; > ; - < "Arabic (Qatar)" ; LANGUAGE_ARABIC_QATAR ; > ; - < "Arabic (Saudi Arabia)" ; LANGUAGE_ARABIC_SAUDI_ARABIA ; > ; - < "Arabic (Somalia)" ; LANGUAGE_USER_ARABIC_SOMALIA ; > ; - < "Arabic (Sudan)" ; LANGUAGE_USER_ARABIC_SUDAN ; > ; - < "Arabic (Syria)" ; LANGUAGE_ARABIC_SYRIA ; > ; - < "Arabic (Tunisia)" ; LANGUAGE_ARABIC_TUNISIA ; > ; - < "Arabic (UAE)" ; LANGUAGE_ARABIC_UAE ; > ; - < "Arabic (Yemen)" ; LANGUAGE_ARABIC_YEMEN ; > ; - < "Aragonese" ; LANGUAGE_USER_ARAGONESE ; > ; - < "Armenian" ; LANGUAGE_ARMENIAN ; > ; - < "Assamese" ; LANGUAGE_ASSAMESE ; > ; - < "Azerbaijani Latin" ; LANGUAGE_AZERI_LATIN ; > ; - < "Azerbaijani Cyrillic" ; LANGUAGE_AZERI_CYRILLIC ; > ; - < "Basque" ; LANGUAGE_BASQUE ; > ; - < "Bengali (India)" ; LANGUAGE_BENGALI ; > ; - < "Bulgarian" ; LANGUAGE_BULGARIAN ; > ; - < "Belarusian" ; LANGUAGE_BELARUSIAN ; > ; - < "Catalan" ; LANGUAGE_CATALAN ; > ; - < "Catalan (Valencian)" ; LANGUAGE_USER_CATALAN_VALENCIAN ; > ; - < "Chinese (traditional)" ; LANGUAGE_CHINESE_TRADITIONAL ; > ; - < "Chinese (simplified)" ; LANGUAGE_CHINESE_SIMPLIFIED ; > ; - < "Chinese (Hong Kong)" ; LANGUAGE_CHINESE_HONGKONG ; > ; - < "Chinese (Singapore)" ; LANGUAGE_CHINESE_SINGAPORE ; > ; - < "Chinese (Macau)" ; LANGUAGE_CHINESE_MACAU ; > ; - < "Church Slavic" ; LANGUAGE_USER_CHURCH_SLAVIC ; > ; - < "Croatian" ; LANGUAGE_CROATIAN ; > ; - < "Czech" ; LANGUAGE_CZECH ; > ; - < "Danish" ; LANGUAGE_DANISH ; > ; - < "Dutch (Netherlands)" ; LANGUAGE_DUTCH ; > ; - < "Dutch (Belgium)" ; LANGUAGE_DUTCH_BELGIAN ; > ; - < "English (USA)" ; LANGUAGE_ENGLISH_US ; > ; - < "English (UK)" ; LANGUAGE_ENGLISH_UK ; > ; - < "English, OED spelling (UK)" ; LANGUAGE_USER_ENGLISH_UK_OXENDICT ; > ; - < "English (Australia)" ; LANGUAGE_ENGLISH_AUS ; > ; - < "English (Canada)" ; LANGUAGE_ENGLISH_CAN ; > ; - < "English (New Zealand)" ; LANGUAGE_ENGLISH_NZ ; > ; - < "English (Ireland)" ; LANGUAGE_ENGLISH_EIRE ; > ; - < "English (South Africa)" ; LANGUAGE_ENGLISH_SAFRICA ; > ; - < "English (Jamaica)" ; LANGUAGE_ENGLISH_JAMAICA ; > ; - < "English (Caribbean)" ; LANGUAGE_ENGLISH_CARRIBEAN ; > ; - < "English (Belize)" ; LANGUAGE_ENGLISH_BELIZE ; > ; - < "English (Trinidad)" ; LANGUAGE_ENGLISH_TRINIDAD ; > ; - < "English (Zimbabwe)" ; LANGUAGE_ENGLISH_ZIMBABWE ; > ; - < "English (Philippines)" ; LANGUAGE_ENGLISH_PHILIPPINES ; > ; - < "English (India)" ; LANGUAGE_ENGLISH_INDIA ; > ; - < "Estonian" ; LANGUAGE_ESTONIAN ; > ; - < "Finnish" ; LANGUAGE_FINNISH ; > ; - < "Faroese" ; LANGUAGE_FAEROESE ; > ; - < "Persian" ; LANGUAGE_FARSI ; > ; - < "French (France)" ; LANGUAGE_FRENCH ; > ; - < "French (Belgium)" ; LANGUAGE_FRENCH_BELGIAN ; > ; - < "French (Canada)" ; LANGUAGE_FRENCH_CANADIAN ; > ; - < "French (Switzerland)" ; LANGUAGE_FRENCH_SWISS ; > ; - < "French (Luxembourg)" ; LANGUAGE_FRENCH_LUXEMBOURG ; > ; - < "French (Monaco)" ; LANGUAGE_FRENCH_MONACO ; > ; - < "Gascon" ; LANGUAGE_USER_GASCON ; > ; - < "German (Germany)" ; LANGUAGE_GERMAN ; > ; - < "German (Switzerland)" ; LANGUAGE_GERMAN_SWISS ; > ; - < "German (Austria)" ; LANGUAGE_GERMAN_AUSTRIAN ; > ; - < "German (Luxembourg)" ; LANGUAGE_GERMAN_LUXEMBOURG ; > ; - < "German (Liechtenstein)" ; LANGUAGE_GERMAN_LIECHTENSTEIN ; > ; - < "Greek" ; LANGUAGE_GREEK ; > ; - < "Gujarati" ; LANGUAGE_GUJARATI ; > ; - < "Hebrew" ; LANGUAGE_HEBREW ; > ; - < "Hindi" ; LANGUAGE_HINDI ; > ; - < "Hungarian" ; LANGUAGE_HUNGARIAN ; > ; - < "Icelandic" ; LANGUAGE_ICELANDIC ; > ; - < "Indonesian" ; LANGUAGE_INDONESIAN ; > ; - < "Italian (Italy)" ; LANGUAGE_ITALIAN ; > ; - < "Italian (Switzerland)" ; LANGUAGE_ITALIAN_SWISS ; > ; - < "Japanese" ; LANGUAGE_JAPANESE ; > ; - < "Kannada" ; LANGUAGE_KANNADA ; > ; - < "Kashmiri (Kashmir)" ; LANGUAGE_KASHMIRI ; > ; - < "Kashmiri (India)" ; LANGUAGE_KASHMIRI_INDIA ; > ; - < "Kazakh" ; LANGUAGE_KAZAKH ; > ; - < "Konkani" ; LANGUAGE_KONKANI ; > ; - < "Korean (RoK)" ; LANGUAGE_KOREAN ; > ; - < "Latvian" ; LANGUAGE_LATVIAN ; > ; - < "Lithuanian" ; LANGUAGE_LITHUANIAN ; > ; - < "Macedonian" ; LANGUAGE_MACEDONIAN ; > ; - < "Malay (Malaysia)" ; LANGUAGE_MALAY_MALAYSIA ; > ; - < "Malay (Brunei Darussalam)" ; LANGUAGE_MALAY_BRUNEI_DARUSSALAM ; > ; - < "Malayalam" ; LANGUAGE_MALAYALAM ; > ; - < "Manipuri" ; LANGUAGE_MANIPURI ; > ; - < "Marathi" ; LANGUAGE_MARATHI ; > ; - < "Nepali (Nepal)" ; LANGUAGE_NEPALI ; > ; - < "Nepali (India)" ; LANGUAGE_NEPALI_INDIA ; > ; - < "Norwegian, Bokmål" ; LANGUAGE_NORWEGIAN_BOKMAL ; > ; - < "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ; - < "Odia" ; LANGUAGE_ODIA ; > ; - < "Polish" ; LANGUAGE_POLISH ; > ; - < "Portuguese (Angola)" ; LANGUAGE_USER_PORTUGUESE_ANGOLA ; > ; - < "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ; - < "Portuguese (Brazil)" ; LANGUAGE_PORTUGUESE_BRAZILIAN ; > ; - < "Punjabi" ; LANGUAGE_PUNJABI ; > ; - < "Rhaeto-Romance" ; LANGUAGE_RHAETO_ROMAN ; > ; - < "Romanian (Romania)" ; LANGUAGE_ROMANIAN ; > ; - < "Romanian (Moldova)" ; LANGUAGE_ROMANIAN_MOLDOVA ; > ; - < "Russian" ; LANGUAGE_RUSSIAN ; > ; - < "Sanskrit" ; LANGUAGE_SANSKRIT ; > ; - < "Serbian Cyrillic (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_CYRILLIC_SAM ; > ; - < "Serbian Latin (Serbia and Montenegro)" ; LANGUAGE_SERBIAN_LATIN_SAM ; > ; - < "Serbian Cyrillic (Serbia)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA ; > ; - < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ; - < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ; - < "Serbian Latin (Montenegro)" ; LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ; - < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_LSO ; > ; - < "Sidama" ; LANGUAGE_USER_SIDAMA ; > ; - < "Sindhi" ; LANGUAGE_SINDHI ; > ; - < "Slovak" ; LANGUAGE_SLOVAK ; > ; - < "Slovenian" ; LANGUAGE_SLOVENIAN ; > ; - < "Spanish (Spain)" ; LANGUAGE_SPANISH ; > ; - < "Spanish (Mexico)" ; LANGUAGE_SPANISH_MEXICAN ; > ; - < "Spanish (Guatemala)" ; LANGUAGE_SPANISH_GUATEMALA ; > ; - < "Spanish (Costa Rica)" ; LANGUAGE_SPANISH_COSTARICA ; > ; - < "Spanish (Panama)" ; LANGUAGE_SPANISH_PANAMA ; > ; - < "Spanish (Dom. Rep.)" ; LANGUAGE_SPANISH_DOMINICAN_REPUBLIC ; > ; - < "Spanish (Venezuela)" ; LANGUAGE_SPANISH_VENEZUELA ; > ; - < "Spanish (Colombia)" ; LANGUAGE_SPANISH_COLOMBIA ; > ; - < "Spanish (Peru)" ; LANGUAGE_SPANISH_PERU ; > ; - < "Spanish (Argentina)" ; LANGUAGE_SPANISH_ARGENTINA ; > ; - < "Spanish (Ecuador)" ; LANGUAGE_SPANISH_ECUADOR ; > ; - < "Spanish (Chile)" ; LANGUAGE_SPANISH_CHILE ; > ; - < "Spanish (Uruguay)" ; LANGUAGE_SPANISH_URUGUAY ; > ; - < "Spanish (Paraguay)" ; LANGUAGE_SPANISH_PARAGUAY ; > ; - < "Spanish (Bolivia)" ; LANGUAGE_SPANISH_BOLIVIA ; > ; - < "Spanish (El Salvador)" ; LANGUAGE_SPANISH_EL_SALVADOR ; > ; - < "Spanish (Honduras)" ; LANGUAGE_SPANISH_HONDURAS ; > ; - < "Spanish (Nicaragua)" ; LANGUAGE_SPANISH_NICARAGUA ; > ; - < "Spanish (Puerto Rico)" ; LANGUAGE_SPANISH_PUERTO_RICO ; > ; - < "Swahili (Kenya)" ; LANGUAGE_SWAHILI ; > ; - < "Swedish (Sweden)" ; LANGUAGE_SWEDISH ; > ; - < "Swedish (Finland)" ; LANGUAGE_SWEDISH_FINLAND ; > ; - < "Tajik" ; LANGUAGE_TAJIK ; > ; - < "Tamil" ; LANGUAGE_TAMIL ; > ; - < "Tatar" ; LANGUAGE_TATAR ; > ; - < "Telugu" ; LANGUAGE_TELUGU ; > ; - < "Thai" ; LANGUAGE_THAI ; > ; - < "Turkish" ; LANGUAGE_TURKISH ; > ; - < "Urdu (Pakistan)" ; LANGUAGE_URDU_PAKISTAN ; > ; - < "Urdu (India)" ; LANGUAGE_URDU_INDIA ; > ; - < "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ; - < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ; - < "Uzbek Cyrillic" ; LANGUAGE_UZBEK_CYRILLIC ; > ; - < "Welsh" ; LANGUAGE_WELSH ; > ; - < "Latin" ; LANGUAGE_USER_LATIN_VATICAN ; > ; - < "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ; - < "Kinyarwanda (Rwanda)" ; LANGUAGE_USER_KINYARWANDA ; > ; - < "Maori" ; LANGUAGE_MAORI_NEW_ZEALAND ; > ; - < "Galician" ; LANGUAGE_GALICIAN ; > ; - < "Dhivehi" ; LANGUAGE_DHIVEHI ; > ; - < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ; - < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ; - < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN_CYRILLIC_MONGOLIA ; > ; - < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN_MONGOLIA ; > ; - < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ; - < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ; - < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ; - < "Occitan" ; LANGUAGE_USER_OCCITAN ; > ; - < "Khmer" ; LANGUAGE_KHMER ; > ; - < "Kurdish, Northern (Turkey)" ; LANGUAGE_USER_KURDISH_TURKEY ; > ; - < "Kurdish, Northern (Syria)" ; LANGUAGE_USER_KURDISH_SYRIA ; > ; - < "Kurdish, Central (Iraq)" ; LANGUAGE_USER_KURDISH_IRAQ ; > ; - < "Kurdish, Central (Iran)" ; LANGUAGE_USER_KURDISH_IRAN ; > ; - < "Kurdish, Southern (Iran)" ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAN ; > ; - < "Kurdish, Southern (Iraq)" ; LANGUAGE_USER_KURDISH_SOUTHERN_IRAQ ; > ; - < "Sardinian" ; LANGUAGE_USER_SARDINIAN ; > ; - < "Dzongkha" ; LANGUAGE_DZONGKHA_BHUTAN ; > ; - < "Swahili (Tanzania)" ; LANGUAGE_USER_SWAHILI_TANZANIA ; > ; - < "Lao" ; LANGUAGE_LAO ; > ; - < "Irish" ; LANGUAGE_GAELIC_IRELAND ; > ; - < "Tibetan (PR China)" ; LANGUAGE_TIBETAN ; > ; - < "Georgian" ; LANGUAGE_GEORGIAN ; > ; - < "Frisian" ; LANGUAGE_FRISIAN_NETHERLANDS ; > ; - < "Tswana (South Africa)" ; LANGUAGE_TSWANA ; > ; - < "Zulu" ; LANGUAGE_ZULU ; > ; - < "Vietnamese" ; LANGUAGE_VIETNAMESE ; > ; - < "Breton" ; LANGUAGE_USER_BRETON ; > ; - < "Kalaallisut" ; LANGUAGE_USER_KALAALLISUT ; > ; - < "Ndebele, South" ; LANGUAGE_USER_NDEBELE_SOUTH ; > ; - < "Southern Sotho" ; LANGUAGE_SESOTHO ; > ; - < "Swazi" ; LANGUAGE_USER_SWAZI ; > ; - < "Tsonga" ; LANGUAGE_TSONGA ; > ; - < "Venda" ; LANGUAGE_VENDA ; > ; - < "Tswana (Botswana)" ; LANGUAGE_USER_TSWANA_BOTSWANA ; > ; - < "Xhosa" ; LANGUAGE_XHOSA ; > ; - < "Sinhala" ; LANGUAGE_SINHALESE_SRI_LANKA ; > ; - < "Moore" ; LANGUAGE_USER_MOORE ; > ; - < "Bambara" ; LANGUAGE_USER_BAMBARA ; > ; - < "Akan" ; LANGUAGE_USER_AKAN ; > ; - < "Luxembourgish" ; LANGUAGE_USER_LUXEMBOURGISH ; > ; - < "Friulian" ; LANGUAGE_USER_FRIULIAN ; > ; - < "Fijian" ; LANGUAGE_USER_FIJIAN ; > ; - < "Afrikaans (Namibia)" ; LANGUAGE_USER_AFRIKAANS_NAMIBIA ; > ; - < "English (Namibia)" ; LANGUAGE_USER_ENGLISH_NAMIBIA ; > ; - < "Walloon" ; LANGUAGE_USER_WALLOON ; > ; - < "Coptic" ; LANGUAGE_USER_COPTIC ; > ; - < "Tigrigna (Eritrea)" ; LANGUAGE_TIGRIGNA_ERITREA ; > ; - < "Tigrigna (Ethiopia)" ; LANGUAGE_TIGRIGNA_ETHIOPIA ; > ; - < "Amharic" ; LANGUAGE_AMHARIC_ETHIOPIA ; > ; - < "Kirghiz" ; LANGUAGE_KIRGHIZ ; > ; - < "German (Belgium)" ; LANGUAGE_USER_GERMAN_BELGIUM ; > ; - < "Chuvash" ; LANGUAGE_USER_CHUVASH ; > ; - < "Burmese" ; LANGUAGE_BURMESE ; > ; - < "Hausa (Nigeria)" ; LANGUAGE_HAUSA_NIGERIA ; > ; - < "Hausa (Ghana)" ; LANGUAGE_USER_HAUSA_GHANA ; > ; - < "Éwé" ; LANGUAGE_USER_EWE_GHANA ; > ; - < "English (Ghana)" ; LANGUAGE_USER_ENGLISH_GHANA ; > ; - < "Sango" ; LANGUAGE_USER_SANGO ; > ; - < "Tagalog" ; LANGUAGE_USER_TAGALOG ; > ; - < "Ganda" ; LANGUAGE_USER_GANDA ; > ; - < "Lingala" ; LANGUAGE_USER_LINGALA_DRCONGO ; > ; - < "Low German" ; LANGUAGE_USER_LOW_GERMAN ; > ; - < "Hiligaynon" ; LANGUAGE_USER_HILIGAYNON ; > ; - < "Nyanja" ; LANGUAGE_USER_NYANJA ; > ; - < "Kashubian" ; LANGUAGE_USER_KASHUBIAN ; > ; - < "Spanish (Cuba)" ; LANGUAGE_USER_SPANISH_CUBA ; > ; - < "Tetun (Indonesia)" ; LANGUAGE_USER_TETUN ; > ; - < "Quechua (Bolivia, North)" ; LANGUAGE_USER_QUECHUA_NORTH_BOLIVIA ; > ; - < "Quechua (Bolivia, South)" ; LANGUAGE_USER_QUECHUA_SOUTH_BOLIVIA ; > ; - < "Somali" ; LANGUAGE_SOMALI ; > ; - < "Sami, Inari (Finland)" ; LANGUAGE_SAMI_INARI ; > ; - < "Sami, Lule (Norway)" ; LANGUAGE_SAMI_LULE_NORWAY ; > ; - < "Sami, Lule (Sweden)" ; LANGUAGE_SAMI_LULE_SWEDEN ; > ; - < "Sami, Northern (Finland)" ; LANGUAGE_SAMI_NORTHERN_FINLAND ; > ; - < "Sami, Northern (Norway)" ; LANGUAGE_SAMI_NORTHERN_NORWAY ; > ; - < "Sami, Northern (Sweden)" ; LANGUAGE_SAMI_NORTHERN_SWEDEN ; > ; - < "Sami, Skolt (Finland)" ; LANGUAGE_SAMI_SKOLT ; > ; - < "Sami, Southern (Norway)" ; LANGUAGE_SAMI_SOUTHERN_NORWAY ; > ; - < "Sami, Southern (Sweden)" ; LANGUAGE_SAMI_SOUTHERN_SWEDEN ; > ; - < "Sami, Kildin (Russia)" ; LANGUAGE_USER_SAMI_KILDIN_RUSSIA ; > ; - < "Guarani (Paraguay)" ; LANGUAGE_GUARANI_PARAGUAY ; > ; - < "Bodo" ; LANGUAGE_USER_BODO_INDIA ; > ; - < "Dogri" ; LANGUAGE_USER_DOGRI_INDIA ; > ; - < "Maithili" ; LANGUAGE_USER_MAITHILI_INDIA ; > ; - < "Santali" ; LANGUAGE_USER_SANTALI_INDIA ; > ; - < "Tetun (Timor-Leste)" ; LANGUAGE_USER_TETUN_TIMOR_LESTE ; > ; - < "Turkmen" ; LANGUAGE_TURKMEN ; > ; - < "Maltese" ; LANGUAGE_MALTESE ; > ; - < "Tok Pisin" ; LANGUAGE_USER_TOK_PISIN ; > ; - < "Shuswap" ; LANGUAGE_USER_SHUSWAP ; > ; - < "Oromo" ; LANGUAGE_OROMO ; > ; - < "Greek, Ancient" ; LANGUAGE_USER_ANCIENT_GREEK ; > ; - < "Yiddish (Israel)" ; LANGUAGE_YIDDISH ; > ; - < "Quechua (Ecuador)" ; LANGUAGE_QUECHUA_ECUADOR ; > ; - < "Uyghur" ; LANGUAGE_UIGHUR_CHINA ; > ; - < "Asturian" ; LANGUAGE_USER_ASTURIAN ; > ; - < "Sorbian, Upper" ; LANGUAGE_UPPER_SORBIAN_GERMANY ; > ; - < "Sorbian, Lower" ; LANGUAGE_LOWER_SORBIAN_GERMANY ; > ; - < "Latgalian" ; LANGUAGE_USER_LATGALIAN ; > ; - < "Maore" ; LANGUAGE_USER_MAORE ; > ; - < "Bushi" ; LANGUAGE_USER_BUSHI ; > ; - < "Tahitian" ; LANGUAGE_USER_TAHITIAN ; > ; - < "Malagasy, Plateau" ; LANGUAGE_MALAGASY_PLATEAU ; > ; - < "Papiamentu (Netherlands Antilles)" ; LANGUAGE_PAPIAMENTU ; > ; - < "Papiamento (Aruba)" ; LANGUAGE_USER_PAPIAMENTU_ARUBA ; > ; - < "Sardinian, Campidanese" ; LANGUAGE_USER_SARDINIAN_CAMPIDANESE ; > ; - < "Sardinian, Gallurese" ; LANGUAGE_USER_SARDINIAN_GALLURESE ; > ; - < "Sardinian, Logudorese" ; LANGUAGE_USER_SARDINIAN_LOGUDORESE ; > ; - < "Sardinian, Sassarese" ; LANGUAGE_USER_SARDINIAN_SASSARESE ; > ; - < "Bafia" ; LANGUAGE_USER_BAFIA ; > ; - < "Gikuyu" ; LANGUAGE_USER_GIKUYU ; > ; - < "Yoruba" ; LANGUAGE_YORUBA ; > ; - < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ; - < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ; - < "Kabyle Latin" ; LANGUAGE_TAMAZIGHT_LATIN_ALGERIA ; > ; - < "Yiddish (USA)" ; LANGUAGE_USER_YIDDISH_US ; > ; - < "Hawaiian" ; LANGUAGE_HAWAIIAN_UNITED_STATES ; > ; - < "Limbu" ; LANGUAGE_USER_LIMBU ; > ; - < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ; - < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ; - < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ; - < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ; - < "Kituba (Congo)" ; LANGUAGE_USER_KITUBA ; > ; - < "Lari" ; LANGUAGE_USER_LARI ; > ; - < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ; - < "Teke-Eboo" ; LANGUAGE_USER_TEKE_EBOO ; > ; - < "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ; - < "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ; - < "Vili" ; LANGUAGE_USER_VILI ; > ; - < "KeyID" ; LANGUAGE_USER_KEYID ; > ; - < "Pali Latin" ; LANGUAGE_USER_PALI_LATIN ; > ; - < "Kyrgyz (China)" ; LANGUAGE_USER_KYRGYZ_CHINA ; > ; - < "Komi-Zyrian" ; LANGUAGE_USER_KOMI_ZYRIAN ; > ; - < "Komi-Permyak" ; LANGUAGE_USER_KOMI_PERMYAK ; > ; - < "Pitjantjatjara" ; LANGUAGE_USER_PITJANTJATJARA ; > ; - < "English (Malawi)" ; LANGUAGE_USER_ENGLISH_MALAWI ; > ; - < "Erzya" ; LANGUAGE_USER_ERZYA ; > ; - < "Mari, Meadow" ; LANGUAGE_USER_MARI_MEADOW ; > ; - < "Papiamento (Curaçao)" ; LANGUAGE_USER_PAPIAMENTU_CURACAO ; > ; - < "Papiamento (Bonaire)" ; LANGUAGE_USER_PAPIAMENTU_BONAIRE ; > ; - < "Khanty" ; LANGUAGE_USER_KHANTY ; > ; - < "Livonian" ; LANGUAGE_USER_LIVONIAN ; > ; - < "Moksha" ; LANGUAGE_USER_MOKSHA ; > ; - < "Mari, Hill" ; LANGUAGE_USER_MARI_HILL ; > ; - < "Nganasan" ; LANGUAGE_USER_NGANASAN ; > ; - < "Olonets" ; LANGUAGE_USER_OLONETS ; > ; - < "Veps" ; LANGUAGE_USER_VEPS ; > ; - < "Võro" ; LANGUAGE_USER_VORO ; > ; - < "Nenets" ; LANGUAGE_USER_NENETS ; > ; - < "Aka (Congo)" ; LANGUAGE_USER_AKA_CONGO ; > ; - < "Dibole" ; LANGUAGE_USER_DIBOLE ; > ; - < "Doondo" ; LANGUAGE_USER_DOONDO ; > ; - < "Kaamba" ; LANGUAGE_USER_KAAMBA ; > ; - < "Koongo (Congo)" ; LANGUAGE_USER_KOONGO_CONGO ; > ; - < "Kunyi" ; LANGUAGE_USER_KUNYI ; > ; - < "Ngungwel" ; LANGUAGE_USER_NGUNGWEL ; > ; - < "Njyem (Congo)" ; LANGUAGE_USER_NJYEM_CONGO ; > ; - < "Punu" ; LANGUAGE_USER_PUNU_CONGO ; > ; - < "Suundi" ; LANGUAGE_USER_SUUNDI ; > ; - < "Teke-Kukuya" ; LANGUAGE_USER_TEKE_KUKUYA ; > ; - < "Tsaangi" ; LANGUAGE_USER_TSAANGI ; > ; - < "Yaka" ; LANGUAGE_USER_YAKA ; > ; - < "Yombe (Congo)" ; LANGUAGE_USER_YOMBE_CONGO ; > ; - < "N'ko" ; LANGUAGE_USER_NKO ; > ; - < "Udmurt" ; LANGUAGE_USER_UDMURT ; > ; - < "Tibetan (India)" ; LANGUAGE_USER_TIBETAN_INDIA ; > ; - < "Cornish" ; LANGUAGE_USER_CORNISH ; > ; - < "Sami, Pite (Sweden)" ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; > ; - < "Ngäbere" ; LANGUAGE_USER_NGAEBERE ; > ; - < "Kumyk" ; LANGUAGE_USER_KUMYK ; > ; - < "Nogai" ; LANGUAGE_USER_NOGAI ; > ; - < "Karakalpak Latin" ; LANGUAGE_USER_KARAKALPAK_LATIN ; > ; - < "Ladin" ; LANGUAGE_USER_LADIN ; > ; - < "French (Burkina Faso)" ; LANGUAGE_USER_FRENCH_BURKINA_FASO ; > ; - < "Puinave" ; LANGUAGE_USER_PUINAVE ; > ; - < "Maninkakan, Eastern, Latin" ; LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ; > ; - < "Avar" ; LANGUAGE_USER_AVAR ; > ; - < "Cree, Plains, Latin" ; LANGUAGE_USER_CREE_PLAINS_LATIN ; > ; - < "Cree, Plains, Syllabics" ; LANGUAGE_USER_CREE_PLAINS_SYLLABICS ; > ; - < "Lengo" ; LANGUAGE_USER_LENGO ; > ; - < "French (Côte d'Ivoire)" ; LANGUAGE_FRENCH_COTE_D_IVOIRE ; > ; - < "French (Mali)" ; LANGUAGE_FRENCH_MALI ; > ; - < "French (Senegal)" ; LANGUAGE_FRENCH_SENEGAL ; > ; - < "French (Benin)" ; LANGUAGE_USER_FRENCH_BENIN ; > ; - < "French (Niger)" ; LANGUAGE_USER_FRENCH_NIGER ; > ; - < "French (Togo)" ; LANGUAGE_USER_FRENCH_TOGO ; > ; - < "Kven Finnish" ; LANGUAGE_USER_KVEN_FINNISH ; > ; - < "Venetian" ; LANGUAGE_USER_VENETIAN ; > ; - < "English (Gambia)" ; LANGUAGE_USER_ENGLISH_GAMBIA ; > ; - < "Aranese" ; LANGUAGE_USER_OCCITAN_ARANESE ; > ; - < "Arpitan (France)" ; LANGUAGE_USER_ARPITAN_FRANCE ; > ; - < "Arpitan (Italy)" ; LANGUAGE_USER_ARPITAN_ITALY ; > ; - < "Arpitan (Switzerland)" ; LANGUAGE_USER_ARPITAN_SWITZERLAND ; > ; - < "English (Botswana)" ; LANGUAGE_USER_ENGLISH_BOTSWANA ; > ; - < "Interlingue Occidental" ; LANGUAGE_USER_INTERLINGUE ; > ; - < "Apatani" ; LANGUAGE_USER_APATANI ; > ; - < "English (Mauritius)" ; LANGUAGE_USER_ENGLISH_MAURITIUS ; > ; - < "French (Mauritius)" ; LANGUAGE_USER_FRENCH_MAURITIUS ; > ; - < "Silesian" ; LANGUAGE_USER_SILESIAN ; > ; - < "Hungarian (Szekely-Hungarian Rovas)" ; LANGUAGE_USER_HUNGARIAN_ROVAS ; > ; - < "English (Malaysia)" ; LANGUAGE_ENGLISH_MALAYSIA ; > ; - < "Manchu" ; LANGUAGE_USER_MANCHU ; > ; - < "Xibe" ; LANGUAGE_USER_XIBE ; > ; - < "Kituba (Democratic Republic of the Congo)" ; LANGUAGE_USER_KITUBA_DRCONGO ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtools.src b/svtools/source/misc/svtools.src deleted file mode 100644 index 2604ecc18839..000000000000 --- a/svtools/source/misc/svtools.src +++ /dev/null @@ -1,168 +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 "svtools/svtools.hrc" - -String STR_SVT_1BIT_THRESHOLD -{ - Text [ en-US ] = "1 bit threshold"; -}; -String STR_SVT_1BIT_DITHERED -{ - Text [ en-US ] = "1 bit dithered"; -}; -String STR_SVT_4BIT_GRAYSCALE -{ - Text [ en-US ] = "4 bit grayscale"; -}; -String STR_SVT_4BIT_COLOR_PALETTE -{ - Text [ en-US ] = "4 bit color"; -}; -String STR_SVT_8BIT_GRAYSCALE -{ - Text [ en-US ] = "8 bit grayscale"; -}; -String STR_SVT_8BIT_COLOR_PALETTE -{ - Text [ en-US ] = "8 bit color"; -}; -String STR_SVT_24BIT_TRUE_COLOR -{ - Text [ en-US ] = "24 bit true color"; -}; -String STR_SVT_ESTIMATED_SIZE_PIX_1 -{ - Text [ en-US ] = "The image needs about %1 KB of memory."; -}; -String STR_SVT_ESTIMATED_SIZE_PIX_2 -{ - Text [ en-US ] = "The image needs about %1 KB of memory, the file size is %2 KB."; -}; -String STR_SVT_ESTIMATED_SIZE_VEC -{ - Text [ en-US ] = "The file size is %1 KB."; -}; -String STR_SVT_HOST -{ - Text [ en-US ] = "host"; -}; -String STR_SVT_PORT -{ - Text [ en-US ] = "port"; -}; -String STR_SVT_PRNDLG_READY -{ - Text [ en-US ] = "Ready" ; -}; -String STR_SVT_PRNDLG_PAUSED -{ - Text [ en-US ] = "Paused" ; -}; -String STR_SVT_PRNDLG_PENDING -{ - Text [ en-US ] = "Pending deletion" ; -}; -String STR_SVT_PRNDLG_BUSY -{ - Text [ en-US ] = "Busy" ; -}; -String STR_SVT_PRNDLG_INITIALIZING -{ - Text [ en-US ] = "Initializing" ; -}; -String STR_SVT_PRNDLG_WAITING -{ - Text [ en-US ] = "Waiting" ; -}; -String STR_SVT_PRNDLG_WARMING_UP -{ - Text [ en-US ] = "Warming up" ; -}; -String STR_SVT_PRNDLG_PROCESSING -{ - Text [ en-US ] = "Processing" ; -}; -String STR_SVT_PRNDLG_PRINTING -{ - Text [ en-US ] = "Printing" ; -}; -String STR_SVT_PRNDLG_OFFLINE -{ - Text [ en-US ] = "Offline" ; -}; -String STR_SVT_PRNDLG_ERROR -{ - Text [ en-US ] = "Error" ; -}; -String STR_SVT_PRNDLG_SERVER_UNKNOWN -{ - Text [ en-US ] = "Unknown Server" ; -}; -String STR_SVT_PRNDLG_PAPER_JAM -{ - Text [ en-US ] = "Paper jam" ; -}; -String STR_SVT_PRNDLG_PAPER_OUT -{ - Text [ en-US ] = "Not enough paper" ; -}; -String STR_SVT_PRNDLG_MANUAL_FEED -{ - Text [ en-US ] = "Manual feed" ; -}; -String STR_SVT_PRNDLG_PAPER_PROBLEM -{ - Text [ en-US ] = "Paper problem" ; -}; -String STR_SVT_PRNDLG_IO_ACTIVE -{ - Text [ en-US ] = "I/O active" ; -}; -String STR_SVT_PRNDLG_OUTPUT_BIN_FULL -{ - Text [ en-US ] = "Output bin full" ; -}; -String STR_SVT_PRNDLG_TONER_LOW -{ - Text [ en-US ] = "Toner low" ; -}; -String STR_SVT_PRNDLG_NO_TONER -{ - Text [ en-US ] = "No toner" ; -}; -String STR_SVT_PRNDLG_PAGE_PUNT -{ - Text [ en-US ] = "Delete Page" ; -}; -String STR_SVT_PRNDLG_USER_INTERVENTION -{ - Text [ en-US ] = "User intervention necessary" ; -}; -String STR_SVT_PRNDLG_OUT_OF_MEMORY -{ - Text [ en-US ] = "Insufficient memory" ; -}; -String STR_SVT_PRNDLG_DOOR_OPEN -{ - Text [ en-US ] = "Cover open" ; -}; -String STR_SVT_PRNDLG_POWER_SAVE -{ - Text [ en-US ] = "Power save mode" ; -}; -String STR_SVT_PRNDLG_DEFPRINTER -{ - Text [ en-US ] = "Default printer" ; -}; -String STR_SVT_PRNDLG_JOBCOUNT -{ - Text [ en-US ] = "%d documents" ; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index 59da66bcd51c..dff8d906abcf 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -22,26 +22,31 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -static ResMgr* pMgr=nullptr; +static std::locale* pResLocale=nullptr; namespace { - ResMgr* getResMgr(const LanguageTag& aLocale) + std::locale* getResLocale(const LanguageTag& aLocale) { - if (!pMgr) - pMgr = ResMgr::CreateResMgr("svt", aLocale ); - return pMgr; + if (!pResLocale) + pResLocale = new std::locale(Translate::Create("svt", aLocale)); + return pResLocale; } } -ResMgr* SvtResMgr::GetResMgr() +std::locale* SvtResLocale::GetResLocale() { - return getResMgr(Application::GetSettings().GetUILanguageTag()); + return getResLocale(Application::GetSettings().GetUILanguageTag()); } -void SvtResMgr::DeleteResMgr() +void SvtResLocale::DeleteResLocale() { - DELETEZ( pMgr ); + DELETEZ(pResLocale); +} + +OUString SvtResId(const char* pId) +{ + return Translate::get(pId, *SvtResLocale::GetResLocale()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/undo.src b/svtools/source/misc/undo.src deleted file mode 100644 index 10880afc510e..000000000000 --- a/svtools/source/misc/undo.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 <svtools/svtools.hrc> - -String STR_UNDO -{ - Text [ en-US ] = "Undo: " ; -}; -String STR_REDO -{ - Text [ en-US ] = "Re~do: " ; -}; -String STR_REPEAT -{ - Text [ en-US ] = "~Repeat: " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |